feat: add SURGIO_GFW_FREE environment variable

surgioproject · Oct 21, 2022 · 2aaf242 · 2aaf242
1 parent 5bf51a6
commit 2aaf242
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/lib/constant/env.ts b/lib/constant/env.ts
@@ -12,3 +12,5 @@ export const ENV_SURGIO_REMOTE_SNIPPET_CACHE_MAXAGE =
   'SURGIO_REMOTE_SNIPPET_CACHE_MAXAGE';
 
 export const ENV_SURGIO_PROVIDER_CACHE_MAXAGE = 'SURGIO_PROVIDER_CACHE_MAXAGE';
+
+export const ENV_SURGIO_GFW_FREE = 'SURGIO_GFW_FREE';
diff --git a/lib/index.ts b/lib/index.ts
@@ -13,6 +13,8 @@ import { transports } from '@surgio/logger';
 import {
   isAWS,
   isAWSLambda,
+  isFlyIO,
+  isGFWFree,
   isGitHubActions,
   isGitLabCI,
   isHeroku,
@@ -29,14 +31,7 @@ import { CATEGORIES } from './constant';
 import redis from './redis';
 
 // istanbul ignore next
-if (
-  !isNow() &&
-  !isHeroku() &&
-  !isGitHubActions() &&
-  !isGitLabCI() &&
-  !isRailway() &&
-  !isNetlify()
-) {
+if (!isGFWFree()) {
   // Global proxy
   bootstrap();
 }
@@ -82,6 +77,7 @@ export const utils = {
   isRailway,
   isNetlify,
   isAWS,
+  isFlyIO,
   isAWSLambda,
 };
 

diff --git a/lib/utils/clash.ts b/lib/utils/clash.ts
@@ -226,7 +226,7 @@ export const getClashNodes = function (
             );
             return null;
           }
-          if (!nodeConfig.alpn || !nodeConfig.alpn.length) {
+          if (nodeConfig.alpn && !nodeConfig.alpn.length) {
             logger.warn(
               `节点 ${nodeConfig.nodeName} 的 alpn 为空。Stash 客户端不支持 ALPN 为空，默认的 ALPN 为 h3。`,
             );

diff --git a/lib/utils/env-flag.ts b/lib/utils/env-flag.ts
@@ -3,6 +3,7 @@ import ms from 'ms';
 import {
   ENV_NETWORK_RESOLVE_TIMEOUT,
   ENV_NETWORK_TIMEOUT_KEY,
+  ENV_SURGIO_GFW_FREE,
   ENV_SURGIO_NETWORK_CLASH_UA,
   ENV_SURGIO_NETWORK_CONCURRENCY,
   ENV_SURGIO_NETWORK_RETRY,
@@ -42,3 +43,6 @@ export const getProviderCacheMaxage = (): number =>
   process.env[ENV_SURGIO_PROVIDER_CACHE_MAXAGE]
     ? Number(process.env[ENV_SURGIO_PROVIDER_CACHE_MAXAGE])
     : ms('10m');
+
+export const getIsGFWFree = (): boolean =>
+  typeof process.env[ENV_SURGIO_GFW_FREE] !== 'undefined';
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -25,6 +25,7 @@ import {
   VmessNodeConfig,
 } from '../types';
 import { ERR_INVALID_FILTER, OBFS_UA } from '../constant';
+import { getIsGFWFree } from './env-flag';
 import { validateFilter, applyFilter } from './filter';
 import { formatVmessUri } from './v2ray';
 
@@ -627,11 +628,18 @@ export const isAWS = (): boolean =>
   typeof process.env.AWS_EXECUTION_ENV !== 'undefined' ||
   typeof process.env.AWS_REGION !== 'undefined';
 
+// istanbul ignore next
+export const isFlyIO = (): boolean =>
+  typeof process.env.FLY_REGION !== 'undefined';
+
 export const isGFWFree = (): boolean =>
+  getIsGFWFree() ||
   isAWS() ||
+  isAWSLambda() ||
   isVercel() ||
   isHeroku() ||
   isGitHubActions() ||
   isGitLabCI() ||
   isRailway() ||
-  isNetlify();
+  isNetlify() ||
+  isFlyIO();
diff --git a/lib/utils/patch-proxy.ts b/lib/utils/patch-proxy.ts
@@ -1,6 +1,7 @@
 // istanbul ignore file
 
 import { createLogger } from '@surgio/logger';
+
 import { isGFWFree } from './';
 
 const logger = createLogger({ service: 'surgio:utils:patch-proxy' });