surgio 3.0.0-alpha.6 → 3.0.0-alpha.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/config.d.ts +1 -1
- package/build/config.js +1 -0
- package/build/config.js.map +1 -1
- package/build/configurables.d.ts +1 -0
- package/build/constant/constant.d.ts +1 -0
- package/build/constant/constant.js +2 -1
- package/build/constant/constant.js.map +1 -1
- package/build/generator/artifact.d.ts +3 -1
- package/build/generator/artifact.js +2 -0
- package/build/generator/artifact.js.map +1 -1
- package/build/utils/clash.d.ts +1 -1
- package/build/validators/common.d.ts +2 -0
- package/build/validators/common.js +14 -13
- package/build/validators/common.js.map +1 -1
- package/build/validators/surgio-config.d.ts +3 -0
- package/build/validators/surgio-config.js +1 -0
- package/build/validators/surgio-config.js.map +1 -1
- package/build/validators/vmess.d.ts +3 -3
- package/build/validators/vmess.js +1 -1
- package/build/validators/vmess.js.map +1 -1
- package/package.json +2 -2
package/build/config.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CommandConfig, CommandConfigBeforeNormalize } from './types';
|
|
2
2
|
export declare const loadConfig: (cwd: string, override?: Partial<CommandConfig>) => CommandConfig;
|
|
3
3
|
export declare const getConfig: () => CommandConfig;
|
|
4
|
-
export declare const setConfig: <T extends "artifacts" | "customParams" | "customFilters" | "remoteSnippets" | "urlBase" | "upload" | "binPath" | "flags" | "surgeConfig" | "surfboardConfig" | "quantumultXConfig" | "clashConfig" | "gateway" | "checkHostname" | "proxyTestUrl" | "proxyTestInterval" | "internetTestUrl" | "analytics" | "cache" | "publicUrl" | "output" | "providerDir" | "templateDir" | "configDir">(key: T, value: CommandConfig[T]) => CommandConfig;
|
|
4
|
+
export declare const setConfig: <T extends "artifacts" | "customParams" | "customFilters" | "remoteSnippets" | "urlBase" | "upload" | "binPath" | "flags" | "surgeConfig" | "surfboardConfig" | "quantumultXConfig" | "clashConfig" | "gateway" | "checkHostname" | "proxyTestUrl" | "proxyTestInterval" | "internetTestUrl" | "internetTestInterval" | "analytics" | "cache" | "publicUrl" | "output" | "providerDir" | "templateDir" | "configDir">(key: T, value: CommandConfig[T]) => CommandConfig;
|
|
5
5
|
export declare const normalizeConfig: (cwd: string, userConfig: Partial<CommandConfigBeforeNormalize>) => CommandConfig;
|
|
6
6
|
export declare const validateConfig: (userConfig: Partial<CommandConfig>) => CommandConfigBeforeNormalize;
|
package/build/config.js
CHANGED
|
@@ -99,6 +99,7 @@ const normalizeConfig = (cwd, userConfig) => {
|
|
|
99
99
|
proxyTestUrl: constant_1.PROXY_TEST_URL,
|
|
100
100
|
proxyTestInterval: constant_1.PROXY_TEST_INTERVAL,
|
|
101
101
|
internetTestUrl: constant_1.INTERNET_TEST_URL,
|
|
102
|
+
internetTestInterval: constant_1.INTERNET_TEST_INTERVAL,
|
|
102
103
|
checkHostname: false,
|
|
103
104
|
cache: {
|
|
104
105
|
type: 'default',
|
package/build/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAyB;AACzB,oDAAsB;AACtB,gDAAuB;AACvB,6BAAyB;AAEzB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/build/configurables.d.ts
CHANGED
|
@@ -57,6 +57,7 @@ export declare const defineSurgioConfig: (config: CommandConfigBeforeNormalize)
|
|
|
57
57
|
proxyTestUrl?: string | undefined;
|
|
58
58
|
proxyTestInterval?: number | undefined;
|
|
59
59
|
internetTestUrl?: string | undefined;
|
|
60
|
+
internetTestInterval?: number | undefined;
|
|
60
61
|
customFilters?: Record<string, ((nodeConfig: import("./types").PossibleNodeConfigType) => boolean) | {
|
|
61
62
|
readonly filter: <T extends import("./types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
|
|
62
63
|
readonly supportSort: true;
|
|
@@ -3,6 +3,7 @@ export declare const OBFS_UA = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_5 like Mac
|
|
|
3
3
|
export declare const PROXY_TEST_URL = "http://cp.cloudflare.com/generate_204";
|
|
4
4
|
export declare const INTERNET_TEST_URL = "http://connect.rom.miui.com/generate_204";
|
|
5
5
|
export declare const PROXY_TEST_INTERVAL = 1200;
|
|
6
|
+
export declare const INTERNET_TEST_INTERVAL = 1200;
|
|
6
7
|
export declare const CLASH_SUPPORTED_RULE: readonly ["DOMAIN-SUFFIX", "DOMAIN-KEYWORD", "DOMAIN", "SRC-IP-CIDR", "IP-CIDR", "IP-CIDR6", "GEOIP", "DST-PORT", "SRC-PORT", "MATCH", "FINAL", "PROCESS-NAME"];
|
|
7
8
|
export declare const QUANTUMULT_X_SUPPORTED_RULE: readonly ["USER-AGENT", "HOST", "HOST-KEYWORD", "HOST-SUFFIX", "DOMAIN", "DOMAIN-SUFFIX", "DOMAIN-KEYWORD", "IP-CIDR", "IP-CIDR6", "GEOIP", "FINAL"];
|
|
8
9
|
export declare const LOON_SUPPORTED_RULE: readonly ["DOMAIN-SUFFIX", "DOMAIN", "DOMAIN-KEYWORD", "USER-AGENT", "URL-REGEX", "IP-CIDR", "GEOIP", "FINAL"];
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// istanbul ignore file
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.CACHE_KEYS = exports.TMP_FOLDER_NAME = exports.RELAY_SERVICE = exports.CATEGORIES = exports.SURFBOARD_SUPPORTED_RULE = exports.LOON_SUPPORTED_RULE = exports.QUANTUMULT_X_SUPPORTED_RULE = exports.CLASH_SUPPORTED_RULE = exports.PROXY_TEST_INTERVAL = exports.INTERNET_TEST_URL = exports.PROXY_TEST_URL = exports.OBFS_UA = exports.NETWORK_SURGIO_UA = void 0;
|
|
4
|
+
exports.CACHE_KEYS = exports.TMP_FOLDER_NAME = exports.RELAY_SERVICE = exports.CATEGORIES = exports.SURFBOARD_SUPPORTED_RULE = exports.LOON_SUPPORTED_RULE = exports.QUANTUMULT_X_SUPPORTED_RULE = exports.CLASH_SUPPORTED_RULE = exports.INTERNET_TEST_INTERVAL = exports.PROXY_TEST_INTERVAL = exports.INTERNET_TEST_URL = exports.PROXY_TEST_URL = exports.OBFS_UA = exports.NETWORK_SURGIO_UA = void 0;
|
|
5
5
|
exports.NETWORK_SURGIO_UA = 'surgio';
|
|
6
6
|
exports.OBFS_UA = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.1 Mobile/15E148 Safari/604.1';
|
|
7
7
|
exports.PROXY_TEST_URL = 'http://cp.cloudflare.com/generate_204';
|
|
8
8
|
exports.INTERNET_TEST_URL = 'http://connect.rom.miui.com/generate_204';
|
|
9
9
|
exports.PROXY_TEST_INTERVAL = 1200; // 1200s
|
|
10
|
+
exports.INTERNET_TEST_INTERVAL = 1200; // 1200s
|
|
10
11
|
exports.CLASH_SUPPORTED_RULE = [
|
|
11
12
|
'DOMAIN-SUFFIX',
|
|
12
13
|
'DOMAIN-KEYWORD',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/constant/constant.ts"],"names":[],"mappings":";AAAA,uBAAuB;;;AAEV,QAAA,iBAAiB,GAAG,QAAQ,CAAA;AAE5B,QAAA,OAAO,GAClB,2IAA2I,CAAA;AAEhI,QAAA,cAAc,GAAG,uCAAuC,CAAA;AAExD,QAAA,iBAAiB,GAAG,0CAA0C,CAAA;AAE9D,QAAA,mBAAmB,GAAG,IAAI,CAAA,CAAC,QAAQ;AAEnC,QAAA,oBAAoB,GAAG;IAClC,eAAe;IACf,gBAAgB;IAChB,QAAQ;IACR,aAAa;IACb,SAAS;IACT,UAAU;IACV,OAAO;IACP,UAAU;IACV,UAAU;IACV,OAAO;IACP,OAAO;IACP,cAAc;CACN,CAAA;AAEG,QAAA,2BAA2B,GAAG;IACzC,YAAY;IACZ,MAAM;IACN,cAAc;IACd,aAAa;IACb,QAAQ;IACR,eAAe;IACf,gBAAgB;IAChB,SAAS;IACT,UAAU;IACV,OAAO;IACP,OAAO;CACC,CAAA;AAEV,gEAAgE;AACnD,QAAA,mBAAmB,GAAG;IACjC,eAAe;IACf,QAAQ;IACR,gBAAgB;IAChB,YAAY;IACZ,WAAW;IACX,SAAS;IACT,OAAO;IACP,OAAO;CACC,CAAA;AAEV,0DAA0D;AAC7C,QAAA,wBAAwB,GAAG;IACtC,eAAe;IACf,QAAQ;IACR,gBAAgB;IAChB,SAAS;IACT,UAAU;IACV,OAAO;IACP,OAAO;IACP,cAAc;IACd,UAAU;IACV,YAAY;CACJ,CAAA;AAEG,QAAA,UAAU,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,mBAAmB,EAAE,qBAAqB;IAC1C,mBAAmB,EAAE,qBAAqB;IAC1C,oBAAoB,EAAE,sBAAsB;IAC5C,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,WAAW;CACd,CAAA;AAEG,QAAA,aAAa,GAAG,oCAAoC,CAAA;AAEpD,QAAA,eAAe,GAAG,eAAe,CAAA;AAEjC,QAAA,UAAU,GAAG;IACxB,cAAc,EAAE,iBAAiB;IACjC,QAAQ,EAAE,UAAU;CACZ,CAAA"}
|
|
1
|
+
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/constant/constant.ts"],"names":[],"mappings":";AAAA,uBAAuB;;;AAEV,QAAA,iBAAiB,GAAG,QAAQ,CAAA;AAE5B,QAAA,OAAO,GAClB,2IAA2I,CAAA;AAEhI,QAAA,cAAc,GAAG,uCAAuC,CAAA;AAExD,QAAA,iBAAiB,GAAG,0CAA0C,CAAA;AAE9D,QAAA,mBAAmB,GAAG,IAAI,CAAA,CAAC,QAAQ;AAEnC,QAAA,sBAAsB,GAAG,IAAI,CAAA,CAAC,QAAQ;AAEtC,QAAA,oBAAoB,GAAG;IAClC,eAAe;IACf,gBAAgB;IAChB,QAAQ;IACR,aAAa;IACb,SAAS;IACT,UAAU;IACV,OAAO;IACP,UAAU;IACV,UAAU;IACV,OAAO;IACP,OAAO;IACP,cAAc;CACN,CAAA;AAEG,QAAA,2BAA2B,GAAG;IACzC,YAAY;IACZ,MAAM;IACN,cAAc;IACd,aAAa;IACb,QAAQ;IACR,eAAe;IACf,gBAAgB;IAChB,SAAS;IACT,UAAU;IACV,OAAO;IACP,OAAO;CACC,CAAA;AAEV,gEAAgE;AACnD,QAAA,mBAAmB,GAAG;IACjC,eAAe;IACf,QAAQ;IACR,gBAAgB;IAChB,YAAY;IACZ,WAAW;IACX,SAAS;IACT,OAAO;IACP,OAAO;CACC,CAAA;AAEV,0DAA0D;AAC7C,QAAA,wBAAwB,GAAG;IACtC,eAAe;IACf,QAAQ;IACR,gBAAgB;IAChB,SAAS;IACT,UAAU;IACV,OAAO;IACP,OAAO;IACP,cAAc;IACd,UAAU;IACV,YAAY;CACJ,CAAA;AAEG,QAAA,UAAU,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,mBAAmB,EAAE,qBAAqB;IAC1C,mBAAmB,EAAE,qBAAqB;IAC1C,oBAAoB,EAAE,sBAAsB;IAC5C,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,WAAW;CACd,CAAA;AAEG,QAAA,aAAa,GAAG,oCAAoC,CAAA;AAEpD,QAAA,eAAe,GAAG,eAAe,CAAA;AAEjC,QAAA,UAAU,GAAG;IACxB,cAAc,EAAE,iBAAiB;IACjC,QAAQ,EAAE,UAAU;CACZ,CAAA"}
|
|
@@ -25,7 +25,9 @@ export declare class Artifact extends EventEmitter {
|
|
|
25
25
|
get isReady(): boolean;
|
|
26
26
|
getRenderContext(extendRenderContext?: ExtendableRenderContext): {
|
|
27
27
|
readonly proxyTestUrl: string | undefined;
|
|
28
|
+
readonly proxyTestInterval: number | undefined;
|
|
28
29
|
readonly internetTestUrl: string | undefined;
|
|
30
|
+
readonly internetTestInterval: number | undefined;
|
|
29
31
|
readonly downloadUrl: string;
|
|
30
32
|
readonly snippet: (filePath: string) => RemoteSnippet;
|
|
31
33
|
readonly remoteSnippets: _.Dictionary<RemoteSnippet>;
|
|
@@ -93,7 +95,7 @@ export declare class Artifact extends EventEmitter {
|
|
|
93
95
|
readonly port: string | number;
|
|
94
96
|
readonly udp: boolean;
|
|
95
97
|
readonly uuid: string;
|
|
96
|
-
readonly alterId: string;
|
|
98
|
+
readonly alterId: string | number;
|
|
97
99
|
readonly password?: undefined;
|
|
98
100
|
readonly obfs?: undefined;
|
|
99
101
|
readonly protocol?: undefined;
|
|
@@ -52,7 +52,9 @@ class Artifact extends events_1.EventEmitter {
|
|
|
52
52
|
const mergedCustomParams = this.getMergedCustomParams(extendRenderContext);
|
|
53
53
|
return {
|
|
54
54
|
proxyTestUrl: config.proxyTestUrl,
|
|
55
|
+
proxyTestInterval: config.proxyTestInterval,
|
|
55
56
|
internetTestUrl: config.internetTestUrl,
|
|
57
|
+
internetTestInterval: config.internetTestInterval,
|
|
56
58
|
downloadUrl: downloadUrl
|
|
57
59
|
? downloadUrl
|
|
58
60
|
: (0, utils_1.getDownloadUrl)(config.urlBase, artifactName, true, gatewayToken),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/generator/artifact.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAuC;AACvC,wDAA+B;AAC/B,mCAAqC;AACrC,wDAAyB;AACzB,oDAAsB;AAEtB,gDAAuB;AAEvB,0CAKoB;AACpB,oCAQiB;AACjB,oCAyBiB;AACjB,sCAA4C;AAC5C,gDAAyD;AACzD,4CAsBwB;AACxB,wCAAuD;AACvD,yCAA6C;AAS7C,MAAa,QAAS,SAAQ,qBAAY;IAiB/B;IACA;IACC;IAlBH,YAAY,GAAG,CAAC,CAAA;IAEhB,gBAAgB,CAAuB;IACvC,iBAAiB,GACtB,IAAI,GAAG,EAAE,CAAA;IACJ,WAAW,GAAsC,IAAI,GAAG,EAAE,CAAA;IAC1D,QAAQ,GAA6B,EAAE,CAAA;IAEtC,aAAa,GAAiD,EAAE,CAAA;IAChE,aAAa,GACnB,sBAAoB,CAAA;IACd,oBAAoB,GAExB,6BAA2B,CAAA;IAE/B,YACS,YAA2B,EAC3B,QAAwB,EACvB,UAA2B,EAAE;QAErC,KAAK,EAAE,CAAA;QAJA,iBAAY,GAAZ,YAAY,CAAe;QAC3B,aAAQ,GAAR,QAAQ,CAAgB;QACvB,YAAO,GAAP,OAAO,CAAsB;QAIrC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAA;QAC1C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,IAAI,EAAE,CAAA;QAExD,IAAI,CAAC,gBAAgB,GAAG,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACrE,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAA;IAC3D,CAAC;IAEM,gBAAgB,CAAC,sBAA+C,EAAE;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAA;QAChC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAA;QACpC,MAAM,YAAY,GAChB,aAAa,EAAE,WAAW,IAAI,aAAa,EAAE,WAAW,CAAA;QAC1D,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;QACzD,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,EAAE,aAAa,EAAE,GACpE,IAAI,CAAA;QACN,MAAM,cAAc,GAAG,gBAAC,CAAC,KAAK,CAC5B,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,EAAE,EACpC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CACpB,CAAA;QACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,CAAA;QAE1E,OAAO;YACL,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,WAAW,EAAE,WAAW;gBACtB,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,IAAA,sBAAc,EAAC,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,CAAC;YACpE,OAAO,EAAE,CAAC,QAAgB,EAAiB,EAAE;gBAC3C,OAAO,IAAA,2BAAgB,EAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;YACvD,CAAC;YACD,cAAc;YACd,QAAQ;YACR,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ;YAChC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ;YACpC,YAAY;YACZ,cAAc,EAAE,CAAC,IAAY,EAAE,EAAE,CAC/B,IAAA,sBAAc,EAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC;YAC1D,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,YAAY,CAAC;YAChE,YAAY,EAAZ,oBAAY;YACZ,aAAa,EAAb,qBAAa;YACb,iBAAiB,EAAjB,yBAAiB;YACjB,aAAa,EAAb,qBAAa;YACb,iBAAiB,EAAjB,yBAAiB;YACjB,sBAAsB,EAAtB,8BAAsB;YACtB,iBAAiB,EAAjB,yBAAiB;YACjB,qBAAqB,EAArB,6BAAqB;YACrB,mBAAmB,EAAnB,2BAAmB;YACnB,uBAAuB,EAAvB,+BAAuB;YACvB,oBAAoB,EAApB,4BAAoB;YACpB,cAAc,EAAd,sBAAc;YACd,mBAAmB,EAAnB,2BAAmB;YACnB,uBAAuB,EAAvB,+BAAuB;YACvB,YAAY,EAAZ,oBAAY;YACZ,gBAAgB,EAAhB,wBAAgB;YAChB,QAAQ,EAAR,iBAAQ;YACR,QAAQ,EAAR,iBAAQ;YACR,WAAW,EAAX,oBAAW;YACX,WAAW,EAAX,oBAAW;YACX,eAAe,EAAf,wBAAe;YACf,YAAY,EAAZ,qBAAY;YACZ,eAAe,EAAf,wBAAe;YACf,cAAc,EAAd,uBAAc;YACd,iBAAiB,EAAjB,0BAAiB;YACjB,kBAAkB,EAAlB,2BAAkB;YAClB,WAAW,EAAX,oBAAW;YACX,WAAW,EAAX,oBAAW;YACX,WAAW,EAAX,oBAAW;YACX,UAAU,EAAV,mBAAU;YACV,WAAW,EAAX,oBAAW;YACX,YAAY,EAAZ,qBAAY;YACZ,YAAY,EAAZ,qBAAY;YACZ,eAAe,EAAf,wBAAe;YACf,eAAe,EAAf,uBAAe;YACf,QAAQ,EAAR,gBAAQ;YACR,kBAAkB;YAClB,aAAa;YACb,oBAAoB;YACpB,aAAa;YACb,YAAY,EAAE,kBAAkB;SACxB,CAAA;IACZ,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,SAEI,EAAE;QAEN,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;SACpC;QAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE5D,MAAM,kBAAQ,CAAC,GAAG,CAChB,IAAI,CAAC,gBAAgB,EACrB,KAAK,EAAE,YAAY,EAAE,EAAE;YACrB,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAA;QACnE,CAAC,EACD;YACE,WAAW,EAAE,IAAA,gCAAqB,GAAE;SACrC,CACF,CAAA;QAED,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YAE/D,IAAI,cAAc,EAAE;gBAClB,cAAc,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACpC,IAAI,UAAU,EAAE;wBACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;qBAC/B;gBACH,CAAC,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE1D,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,qBAAqB,CAC1B,yBAA8C,EAAE;QAEhD,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAA;QACzD,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;QAE5D,MAAM,MAAM,GAAG,gBAAC,CAAC,KAAK,CACpB,EAAE,EACF,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,CACvB,CAAA;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CACX,cAA4B,EAC5B,mBAA6C;QAE7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;SAClC;QAED,MAAM,oBAAoB,GAAG,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAA;QAE1E,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;SACrC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAA;QAChE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;QAClD,MAAM,MAAM,GAAG,cAAc;YAC3B,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,cAAc,EAAE;gBAChD,cAAc,EAAE,oBAAoB;gBACpC,GAAG,aAAa;aACjB,CAAC;YACJ,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,QAAQ,MAAM,EAAE;gBAC7C,cAAc,EAAE,oBAAoB;gBACpC,GAAG,aAAa;aACjB,CAAC,CAAA;QAEN,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;QAEhE,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,YAAoB,EACpB,oBAAuC,EAAE;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAA;QAChC,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAA;QAC/C,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,YAAY,KAAK,CAAC,CAAA;QAEvE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY;SACb,CAAC,CAAA;QAEF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,MAAM,QAAQ,MAAM,CAAC,CAAA;SACtC;QAED,IAAI,QAA8B,CAAA;QAClC,IAAI,cAAqD,CAAA;QAEzD,IAAI;YACF,wCAAwC;YACxC,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;YAC7D,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;SAC7C;QAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;YACvC,IAAI,IAAA,qBAAa,EAAC,GAAG,CAAC,EAAE;gBACtB,GAAG,CAAC,YAAY,GAAG,YAAY,CAAA;gBAC/B,GAAG,CAAC,YAAY,GAAG,QAAQ,CAAA;gBAC3B,MAAM,GAAG,CAAA;aACV;iBAAM;gBACL,MAAM,IAAI,mBAAW,CACnB,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,EAC7C;oBACE,KAAK,EAAE,GAAG;oBACV,YAAY;oBACZ,YAAY,EAAE,QAAQ;iBACvB,CACF,CAAA;aACF;SACF;QAED,IAAI;YACF,IAAI;gBACF,cAAc,GAAG,MAAM,QAAQ,CAAC,WAAW,CACzC,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAC9C,CAAA;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,IAAI,IAAA,eAAO,EAAC,GAAG,CAAC,EAAE;oBAClD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;oBAEvD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;wBACzB,MAAM,aAAa,GAAG,IAAI,yBAAc,CAAC,QAAQ,EAAE;4BACjD,IAAI,EAAE,2BAAmB,CAAC,MAAM;4BAChC,QAAQ,EAAE,MAAM;yBACjB,CAAC,CAAA;wBAEF,cAAc,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAA;qBACnD;yBAAM;wBACL,cAAc,GAAG,EAAE,CAAA;qBACpB;iBACF;qBAAM;oBACL,MAAM,GAAG,CAAA;iBACV;aACF;SACF;QAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;YACvC,IAAI,IAAA,qBAAa,EAAC,GAAG,CAAC,EAAE;gBACtB,GAAG,CAAC,YAAY,GAAG,YAAY,CAAA;gBAC/B,GAAG,CAAC,YAAY,GAAG,QAAQ,CAAA;gBAC3B,MAAM,GAAG,CAAA;aACV;iBAAM;gBACL,MAAM,IAAI,mBAAW,CACnB,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,EAC7C;oBACE,KAAK,EAAE,GAAG;oBACV,YAAY;oBACZ,YAAY,EAAE,QAAQ;iBACvB,CACF,CAAA;aACF;SACF;QAED,8BAA8B;QAC9B,IAAI,YAAY,KAAK,gBAAgB,EAAE;YACrC,IAAI,QAAQ,CAAC,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;gBAC/C,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAA;aACnD;YACD,IAAI,QAAQ,CAAC,MAAM,CAAC,oBAAoB,KAAK,SAAS,EAAE;gBACtD,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAA;aACjE;YACD,IAAI,CAAC,aAAa,GAAG;gBACnB,GAAG,IAAI,CAAC,aAAa;gBACrB,GAAG,MAAM,CAAC,aAAa;gBACvB,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa;aACjC,CAAA;SACF;QAED,IACE,IAAA,uBAAc,EAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC;YAC1C,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ;YAC9C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EACtC;YACA,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;SACnE;QAED,cAAc,GAAG,CACf,MAAM,kBAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YACtD,IAAI,OAAO,GAAG,KAAK,CAAA;YAEnB,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,EAAE;gBAC/B,OAAO,SAAS,CAAA;aACjB;YAED,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC/B,OAAO,GAAG,IAAI,CAAA;aACf;iBAAM,IAAI,IAAA,uBAAc,EAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBACrD,OAAO;oBACL,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,KAAK,UAAU;wBAC9C,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;wBACxC,CAAC,CAAC,IAAI,CAAA;aACX;YAED,IAAI,OAAO,EAAE;gBACX,IACE,MAAM,CAAC,OAAO;oBACd,UAAU,CAAC,IAAI,KAAK,oBAAY,CAAC,YAAY;oBAC7C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/B;oBACA,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;oBACpD,UAAU,CAAC,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAA;iBACzC;gBAED,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAA;gBAC9B,UAAU,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAA;gBAC3C,UAAU,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAA;gBAC3C,UAAU,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;gBACvD,UAAU,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;gBAEnD,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE;oBAC9B,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;oBAE/D,IAAI,OAAO,EAAE;wBACX,UAAU,CAAC,QAAQ,GAAG,OAAO,CAAA;qBAC9B;iBACF;gBAED,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAC3B,UAAU;oBACV,UAAU,CAAC,QAAQ,GAAG,IAAA,kBAAW,EAC/B,UAAU,CAAC,QAAQ,EACnB,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CACnC,CAAA;iBACF;qBAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE;oBAC7C,WAAW;oBACX,UAAU,CAAC,QAAQ,GAAG,IAAA,iBAAU,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;iBACtD;gBAED,gBAAgB;gBAChB,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE;oBACvB,UAAU,CAAC,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAA;iBACrC;gBAED,QAAQ;gBACR,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE;oBACzB,UAAU,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAA;iBACzC;gBAED,mBAAmB;gBACnB,IAAI,CAAC,UAAU,CAAC,eAAe,IAAI,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE;oBAClE,UAAU,CAAC,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAA;iBAC7D;gBAED,iFAAiF;gBACjF,IACE,MAAM,EAAE,aAAa;oBACrB,UAAU,IAAI,UAAU;oBACxB,CAAC,IAAA,YAAI,EAAC,UAAU,CAAC,QAAQ,CAAC,EAC1B;oBACA,IAAI;wBACF,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;wBACxD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;4BACtB,eAAM,CAAC,IAAI,CACT,aAAa,UAAU,CAAC,QAAQ,oBAAoB,CACrD,CAAA;4BACD,OAAO,SAAS,CAAA;yBACjB;qBACF;oBAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;wBACvC,eAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,QAAQ,cAAc,CAAC,CAAA;wBACjD,OAAO,SAAS,CAAA;qBACjB;iBACF;gBAED,IACE,MAAM,EAAE,WAAW,EAAE,eAAe;oBACpC,UAAU,IAAI,UAAU;oBACxB,CAAC,IAAA,YAAI,EAAC,UAAU,CAAC,QAAQ,CAAC;oBAC1B,CAAC,oBAAY,CAAC,KAAK,EAAE,oBAAY,CAAC,YAAY,CAAC,CAAC,QAAQ,CACtD,UAAU,CAAC,IAAI,CAChB,EACD;oBACA,IAAI;wBACF,UAAU,CAAC,UAAU,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;qBACjE;oBAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;wBACvC,eAAM,CAAC,IAAI,CACT,GAAG,UAAU,CAAC,QAAQ,mBAAmB,CAC1C,CAAA;qBACF;iBACF;gBAED,OAAO,UAAU,CAAA;aAClB;YAED,OAAO,SAAS,CAAA;QAClB,CAAC,CAAC,CACH,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkC,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;QAEtE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;QACxD,IAAI,CAAC,YAAY,EAAE,CAAA;QAEnB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY;YACZ,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;CACF;AAjaD,4BAiaC"}
|
|
1
|
+
{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../src/generator/artifact.ts"],"names":[],"mappings":"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"}
|
package/build/utils/clash.d.ts
CHANGED
|
@@ -51,7 +51,7 @@ export declare const getClashNodes: (list: ReadonlyArray<PossibleNodeConfigType>
|
|
|
51
51
|
readonly port: string | number;
|
|
52
52
|
readonly udp: boolean;
|
|
53
53
|
readonly uuid: string;
|
|
54
|
-
readonly alterId: string;
|
|
54
|
+
readonly alterId: string | number;
|
|
55
55
|
readonly password?: undefined;
|
|
56
56
|
readonly obfs?: undefined;
|
|
57
57
|
readonly protocol?: undefined;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { NodeTypeEnum } from '../types';
|
|
3
|
+
export declare const getPositiveIntegersNumberValidatior: (validator: (n: number) => boolean, message: string) => z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
|
|
3
4
|
export declare const PortValidator: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
|
|
5
|
+
export declare const AlterIdValiator: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
|
|
4
6
|
export declare const IntegersVersionValidator: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
|
|
5
7
|
export declare const SimpleNodeConfigValidator: z.ZodObject<{
|
|
6
8
|
type: z.ZodNativeEnum<typeof NodeTypeEnum>;
|
|
@@ -1,40 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TlsNodeConfigValidator = exports.SimpleNodeConfigValidator = exports.IntegersVersionValidator = exports.PortValidator = void 0;
|
|
3
|
+
exports.TlsNodeConfigValidator = exports.SimpleNodeConfigValidator = exports.IntegersVersionValidator = exports.AlterIdValiator = exports.PortValidator = exports.getPositiveIntegersNumberValidatior = void 0;
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
5
|
const types_1 = require("../types");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
.transform((v, ctx) => {
|
|
9
|
-
const port = Number(v);
|
|
6
|
+
const getPositiveIntegersNumberValidatior = (validator, message) => zod_1.z.union([zod_1.z.string(), zod_1.z.number()]).transform((v, ctx) => {
|
|
7
|
+
const num = Number(v);
|
|
10
8
|
const isInputString = typeof v === 'string';
|
|
11
|
-
if (
|
|
12
|
-
return isInputString ? `${
|
|
9
|
+
if (validator(num) && Number.isInteger(num)) {
|
|
10
|
+
return isInputString ? `${num}` : num;
|
|
13
11
|
}
|
|
14
12
|
else {
|
|
15
13
|
ctx.addIssue({
|
|
16
14
|
code: zod_1.z.ZodIssueCode.custom,
|
|
17
|
-
message
|
|
15
|
+
message,
|
|
18
16
|
});
|
|
19
17
|
return zod_1.z.NEVER;
|
|
20
18
|
}
|
|
21
19
|
});
|
|
22
|
-
exports.
|
|
20
|
+
exports.getPositiveIntegersNumberValidatior = getPositiveIntegersNumberValidatior;
|
|
21
|
+
exports.PortValidator = zod_1.z
|
|
23
22
|
.union([zod_1.z.string(), zod_1.z.number()])
|
|
24
23
|
.transform((v, ctx) => {
|
|
25
|
-
const
|
|
24
|
+
const port = Number(v);
|
|
26
25
|
const isInputString = typeof v === 'string';
|
|
27
|
-
if (
|
|
28
|
-
return isInputString ? `${
|
|
26
|
+
if (port > 0 && port < 65536 && Number.isInteger(port)) {
|
|
27
|
+
return isInputString ? `${port}` : port;
|
|
29
28
|
}
|
|
30
29
|
else {
|
|
31
30
|
ctx.addIssue({
|
|
32
31
|
code: zod_1.z.ZodIssueCode.custom,
|
|
33
|
-
message: '
|
|
32
|
+
message: '端口号必须为 0 ~ 65535 之间的整数',
|
|
34
33
|
});
|
|
35
34
|
return zod_1.z.NEVER;
|
|
36
35
|
}
|
|
37
36
|
});
|
|
37
|
+
exports.AlterIdValiator = (0, exports.getPositiveIntegersNumberValidatior)((n) => n >= 0, 'alterId 必须为大于等于 0 的整数');
|
|
38
|
+
exports.IntegersVersionValidator = (0, exports.getPositiveIntegersNumberValidatior)((n) => n > 0, '版本号必须为大于 0 的整数');
|
|
38
39
|
exports.SimpleNodeConfigValidator = zod_1.z.object({
|
|
39
40
|
type: zod_1.z.nativeEnum(types_1.NodeTypeEnum),
|
|
40
41
|
nodeName: zod_1.z.string(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/validators/common.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEvB,oCAAuC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/validators/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -151,6 +151,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
|
|
|
151
151
|
proxyTestUrl: z.ZodOptional<z.ZodString>;
|
|
152
152
|
proxyTestInterval: z.ZodOptional<z.ZodNumber>;
|
|
153
153
|
internetTestUrl: z.ZodOptional<z.ZodString>;
|
|
154
|
+
internetTestInterval: z.ZodOptional<z.ZodNumber>;
|
|
154
155
|
customFilters: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodType<(nodeConfig: import("../types").PossibleNodeConfigType) => boolean, z.ZodTypeDef, (nodeConfig: import("../types").PossibleNodeConfigType) => boolean>, z.ZodType<{
|
|
155
156
|
readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
|
|
156
157
|
readonly supportSort: true;
|
|
@@ -227,6 +228,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
|
|
|
227
228
|
proxyTestUrl?: string | undefined;
|
|
228
229
|
proxyTestInterval?: number | undefined;
|
|
229
230
|
internetTestUrl?: string | undefined;
|
|
231
|
+
internetTestInterval?: number | undefined;
|
|
230
232
|
customFilters?: Record<string, ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
|
|
231
233
|
readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
|
|
232
234
|
readonly supportSort: true;
|
|
@@ -294,6 +296,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
|
|
|
294
296
|
proxyTestUrl?: string | undefined;
|
|
295
297
|
proxyTestInterval?: number | undefined;
|
|
296
298
|
internetTestUrl?: string | undefined;
|
|
299
|
+
internetTestInterval?: number | undefined;
|
|
297
300
|
customFilters?: Record<string, ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
|
|
298
301
|
readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
|
|
299
302
|
readonly supportSort: true;
|
|
@@ -77,6 +77,7 @@ exports.SurgioConfigValidator = zod_1.z.object({
|
|
|
77
77
|
proxyTestUrl: zod_1.z.string().url().optional(),
|
|
78
78
|
proxyTestInterval: zod_1.z.onumber(),
|
|
79
79
|
internetTestUrl: zod_1.z.string().url().optional(),
|
|
80
|
+
internetTestInterval: zod_1.z.onumber(),
|
|
80
81
|
customFilters: zod_1.z
|
|
81
82
|
.record(zod_1.z.union([filter_1.NodeFilterTypeValidator, filter_1.SortedNodeFilterTypeValidator]))
|
|
82
83
|
.optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"surgio-config.js","sourceRoot":"","sources":["../../src/validators/surgio-config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"surgio-config.js","sourceRoot":"","sources":["../../src/validators/surgio-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export declare const VmessNodeConfigValidator: z.ZodObject<{
|
|
|
25
25
|
port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
|
|
26
26
|
method: z.ZodUnion<[z.ZodLiteral<"none">, z.ZodLiteral<"aes-128-gcm">, z.ZodLiteral<"chacha20-ietf-poly1305">, z.ZodLiteral<"auto">]>;
|
|
27
27
|
uuid: z.ZodString;
|
|
28
|
-
alterId: z.ZodString
|
|
28
|
+
alterId: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
|
|
29
29
|
network: z.ZodUnion<[z.ZodLiteral<"tcp">, z.ZodLiteral<"ws">]>;
|
|
30
30
|
tls: z.ZodBoolean;
|
|
31
31
|
host: z.ZodOptional<z.ZodString>;
|
|
@@ -43,7 +43,7 @@ export declare const VmessNodeConfigValidator: z.ZodObject<{
|
|
|
43
43
|
method: "none" | "aes-128-gcm" | "chacha20-ietf-poly1305" | "auto";
|
|
44
44
|
tls: boolean;
|
|
45
45
|
uuid: string;
|
|
46
|
-
alterId: string;
|
|
46
|
+
alterId: string | number;
|
|
47
47
|
network: "ws" | "tcp";
|
|
48
48
|
mptcp?: boolean | undefined;
|
|
49
49
|
tfo?: boolean | undefined;
|
|
@@ -70,7 +70,7 @@ export declare const VmessNodeConfigValidator: z.ZodObject<{
|
|
|
70
70
|
method: "none" | "aes-128-gcm" | "chacha20-ietf-poly1305" | "auto";
|
|
71
71
|
tls: boolean;
|
|
72
72
|
uuid: string;
|
|
73
|
-
alterId: string;
|
|
73
|
+
alterId: string | number;
|
|
74
74
|
network: "ws" | "tcp";
|
|
75
75
|
mptcp?: boolean | undefined;
|
|
76
76
|
tfo?: boolean | undefined;
|
|
@@ -15,7 +15,7 @@ exports.VmessNodeConfigValidator = common_1.SimpleNodeConfigValidator.extend({
|
|
|
15
15
|
zod_1.z.literal('auto'),
|
|
16
16
|
]),
|
|
17
17
|
uuid: zod_1.z.string().uuid(),
|
|
18
|
-
alterId:
|
|
18
|
+
alterId: common_1.AlterIdValiator,
|
|
19
19
|
network: zod_1.z.union([zod_1.z.literal('tcp'), zod_1.z.literal('ws')]),
|
|
20
20
|
tls: zod_1.z.boolean(),
|
|
21
21
|
host: zod_1.z.ostring(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vmess.js","sourceRoot":"","sources":["../../src/validators/vmess.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEvB,oCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"vmess.js","sourceRoot":"","sources":["../../src/validators/vmess.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEvB,oCAAuC;AACvC,qCAIiB;AAEJ,QAAA,wBAAwB,GAAG,kCAAyB,CAAC,MAAM,CAAC;IACvE,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC;IACnC,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;IACpB,IAAI,EAAE,sBAAa;IACnB,MAAM,EAAE,OAAC,CAAC,KAAK,CAAC;QACd,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACjB,OAAC,CAAC,OAAO,CAAC,aAAa,CAAC;QACxB,OAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC;QACnC,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC;KAClB,CAAC;IACF,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;IACvB,OAAO,EAAE,wBAAe;IACxB,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,GAAG,EAAE,OAAC,CAAC,OAAO,EAAE;IAChB,IAAI,EAAE,OAAC,CAAC,OAAO,EAAE;IACjB,IAAI,EAAE,OAAC,CAAC,OAAO,EAAE;IACjB,QAAQ,EAAE,OAAC,CAAC,QAAQ,EAAE;IACtB,KAAK,EAAE,OAAC,CAAC,QAAQ,EAAE;IACnB,cAAc,EAAE,OAAC,CAAC,QAAQ,EAAE;IAC5B,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC1C,2BAA2B,EAAE,OAAC,CAAC,OAAO,EAAE;CACzC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "surgio",
|
|
3
3
|
"description": "Generating rules for Surge, Clash, Quantumult like a PRO",
|
|
4
|
-
"version": "3.0.0-alpha.
|
|
4
|
+
"version": "3.0.0-alpha.7",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"types": "./build/index.d.ts",
|
|
7
7
|
"bin": {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"docs:dev": "NODE_ENV=development vuepress dev docs",
|
|
50
50
|
"docs:build": "NODE_ENV=production vuepress build docs",
|
|
51
51
|
"release": "bumpp && npm publish",
|
|
52
|
-
"release:alpha": "bumpp --preid alpha --no-push && npm publish"
|
|
52
|
+
"release:alpha": "bumpp --preid alpha --no-push && npm publish --tag beta"
|
|
53
53
|
},
|
|
54
54
|
"oclif": {
|
|
55
55
|
"bin": "surgio",
|