surgio 3.11.1 → 3.11.3

package/build/validators/provider.d.ts

@@ -14,42 +14,42 @@ export declare const ProviderValidator: z.ZodObject<{
     requestUserAgent: z.ZodOptional<z.ZodString>;
     renameNode: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodString], z.ZodUnknown>, z.ZodUnion<[z.ZodString, z.ZodUndefined, z.ZodVoid]>>>;
     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<{
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }, z.ZodTypeDef, {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }>]>>>;
     nodeFilter: z.ZodOptional<z.ZodUnion<[z.ZodType<(nodeConfig: import("../types").PossibleNodeConfigType) => boolean, z.ZodTypeDef, (nodeConfig: import("../types").PossibleNodeConfigType) => boolean>, z.ZodType<{
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }, z.ZodTypeDef, {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }>]>>;
     netflixFilter: z.ZodOptional<z.ZodUnion<[z.ZodType<(nodeConfig: import("../types").PossibleNodeConfigType) => boolean, z.ZodTypeDef, (nodeConfig: import("../types").PossibleNodeConfigType) => boolean>, z.ZodType<{
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }, z.ZodTypeDef, {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }>]>>;
     youtubePremiumFilter: z.ZodOptional<z.ZodUnion<[z.ZodType<(nodeConfig: import("../types").PossibleNodeConfigType) => boolean, z.ZodTypeDef, (nodeConfig: import("../types").PossibleNodeConfigType) => boolean>, z.ZodType<{
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }, z.ZodTypeDef, {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }>]>>;
     hooks: z.ZodOptional<z.ZodObject<{
-        afterNodeListResponse: z.ZodOptional<z.ZodType<(<T_1 extends import("../types").PossibleNodeConfigType>(nodeList: T_1[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<void | T_1[] | undefined>), z.ZodTypeDef, <T_1 extends import("../types").PossibleNodeConfigType>(nodeList: T_1[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<void | T_1[] | undefined>>>;
-        onError: z.ZodOptional<z.ZodType<(error: Error) => unknown, z.ZodTypeDef, (error: Error) => unknown>>;
+        afterNodeListResponse: z.ZodOptional<z.ZodType<(<T extends import("../types").PossibleNodeConfigType>(nodeList: T[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<T[] | undefined | void>), z.ZodTypeDef, <T extends import("../types").PossibleNodeConfigType>(nodeList: T[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<T[] | undefined | void>>>;
+        onError: z.ZodOptional<z.ZodType<(error: Error) => import("type-fest").Promisable<unknown>, z.ZodTypeDef, (error: Error) => import("type-fest").Promisable<unknown>>>;
     }, "strip", z.ZodTypeAny, {
-        afterNodeListResponse?: (<T_1 extends import("../types").PossibleNodeConfigType>(nodeList: T_1[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<void | T_1[] | undefined>) | undefined;
-        onError?: ((error: Error) => unknown) | undefined;
+        afterNodeListResponse?: (<T extends import("../types").PossibleNodeConfigType>(nodeList: T[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<T[] | undefined | void>) | undefined;
+        onError?: ((error: Error) => import("type-fest").Promisable<unknown>) | undefined;
     }, {
-        afterNodeListResponse?: (<T_1 extends import("../types").PossibleNodeConfigType>(nodeList: T_1[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<void | T_1[] | undefined>) | undefined;
-        onError?: ((error: Error) => unknown) | undefined;
+        afterNodeListResponse?: (<T extends import("../types").PossibleNodeConfigType>(nodeList: T[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<T[] | undefined | void>) | undefined;
+        onError?: ((error: Error) => import("type-fest").Promisable<unknown>) | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: SupportProviderEnum;
@@ -63,26 +63,26 @@ export declare const ProviderValidator: z.ZodObject<{
     startPort?: number | undefined;
     relayUrl?: string | undefined;
     requestUserAgent?: string | undefined;
-    renameNode?: ((args_0: string, ...args_1: unknown[]) => string | void | undefined) | undefined;
+    renameNode?: ((args_0: string, ...args: unknown[]) => string | void | undefined) | undefined;
     customFilters?: Record<string, ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }> | undefined;
     nodeFilter?: ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     } | undefined;
     netflixFilter?: ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     } | undefined;
     youtubePremiumFilter?: ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     } | undefined;
     hooks?: {
-        afterNodeListResponse?: (<T_1 extends import("../types").PossibleNodeConfigType>(nodeList: T_1[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<void | T_1[] | undefined>) | undefined;
-        onError?: ((error: Error) => unknown) | undefined;
+        afterNodeListResponse?: (<T extends import("../types").PossibleNodeConfigType>(nodeList: T[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<T[] | undefined | void>) | undefined;
+        onError?: ((error: Error) => import("type-fest").Promisable<unknown>) | undefined;
     } | undefined;
 }, {
     type: SupportProviderEnum;
@@ -96,25 +96,25 @@ export declare const ProviderValidator: z.ZodObject<{
     startPort?: number | undefined;
     relayUrl?: string | undefined;
     requestUserAgent?: string | undefined;
-    renameNode?: ((args_0: string, ...args_1: unknown[]) => string | void | undefined) | undefined;
+    renameNode?: ((args_0: string, ...args: unknown[]) => string | void | undefined) | undefined;
     customFilters?: Record<string, ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }> | undefined;
     nodeFilter?: ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     } | undefined;
     netflixFilter?: ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     } | undefined;
     youtubePremiumFilter?: ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     } | undefined;
     hooks?: {
-        afterNodeListResponse?: (<T_1 extends import("../types").PossibleNodeConfigType>(nodeList: T_1[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<void | T_1[] | undefined>) | undefined;
-        onError?: ((error: Error) => unknown) | undefined;
+        afterNodeListResponse?: (<T extends import("../types").PossibleNodeConfigType>(nodeList: T[], customParams: import("../provider").GetNodeListParams) => import("type-fest").Promisable<T[] | undefined | void>) | undefined;
+        onError?: ((error: Error) => import("type-fest").Promisable<unknown>) | undefined;
     } | undefined;
 }>;

package/build/validators/surgio-config.d.ts

@@ -68,6 +68,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
         customParams: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
         customFilters: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>>;
         destDir: z.ZodOptional<z.ZodString>;
+        destDirs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         downloadUrl: z.ZodOptional<z.ZodString>;
         templateString: z.ZodOptional<z.ZodString>;
         subscriptionUserInfoProvider: z.ZodOptional<z.ZodString>;
@@ -76,12 +77,13 @@ export declare const SurgioConfigValidator: z.ZodObject<{
         template: string;
         templateType: "default" | "json";
         provider: string;
-        extendTemplate?: ((args_0: unknown, ...args_1: unknown[]) => unknown) | undefined;
+        extendTemplate?: ((args_0: unknown, ...args: unknown[]) => unknown) | undefined;
         categories?: string[] | undefined;
         combineProviders?: string[] | undefined;
         customParams?: Record<string, any> | undefined;
         customFilters?: Record<string, (...args: unknown[]) => unknown> | undefined;
         destDir?: string | undefined;
+        destDirs?: string[] | undefined;
         downloadUrl?: string | undefined;
         templateString?: string | undefined;
         subscriptionUserInfoProvider?: string | undefined;
@@ -90,12 +92,13 @@ export declare const SurgioConfigValidator: z.ZodObject<{
         template: string;
         provider: string;
         templateType?: "default" | "json" | undefined;
-        extendTemplate?: ((args_0: unknown, ...args_1: unknown[]) => unknown) | undefined;
+        extendTemplate?: ((args_0: unknown, ...args: unknown[]) => unknown) | undefined;
         categories?: string[] | undefined;
         combineProviders?: string[] | undefined;
         customParams?: Record<string, any> | undefined;
         customFilters?: Record<string, (...args: unknown[]) => unknown> | undefined;
         destDir?: string | undefined;
+        destDirs?: string[] | undefined;
         downloadUrl?: string | undefined;
         templateString?: string | undefined;
         subscriptionUserInfoProvider?: string | undefined;
@@ -216,10 +219,10 @@ export declare const SurgioConfigValidator: z.ZodObject<{
     internetTestUrl: z.ZodOptional<z.ZodString>;
     internetTestInterval: z.ZodOptional<z.ZodNumber>;
     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<{
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }, z.ZodTypeDef, {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }>]>>>;
     customParams: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -240,12 +243,13 @@ export declare const SurgioConfigValidator: z.ZodObject<{
         template: string;
         templateType: "default" | "json";
         provider: string;
-        extendTemplate?: ((args_0: unknown, ...args_1: unknown[]) => unknown) | undefined;
+        extendTemplate?: ((args_0: unknown, ...args: unknown[]) => unknown) | undefined;
         categories?: string[] | undefined;
         combineProviders?: string[] | undefined;
         customParams?: Record<string, any> | undefined;
         customFilters?: Record<string, (...args: unknown[]) => unknown> | undefined;
         destDir?: string | undefined;
+        destDirs?: string[] | undefined;
         downloadUrl?: string | undefined;
         templateString?: string | undefined;
         subscriptionUserInfoProvider?: string | undefined;
@@ -300,7 +304,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
     internetTestUrl?: string | undefined;
     internetTestInterval?: number | undefined;
     customFilters?: Record<string, ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }> | undefined;
     customParams?: Record<string, any> | undefined;
@@ -315,12 +319,13 @@ export declare const SurgioConfigValidator: z.ZodObject<{
         template: string;
         provider: string;
         templateType?: "default" | "json" | undefined;
-        extendTemplate?: ((args_0: unknown, ...args_1: unknown[]) => unknown) | undefined;
+        extendTemplate?: ((args_0: unknown, ...args: unknown[]) => unknown) | undefined;
         categories?: string[] | undefined;
         combineProviders?: string[] | undefined;
         customParams?: Record<string, any> | undefined;
         customFilters?: Record<string, (...args: unknown[]) => unknown> | undefined;
         destDir?: string | undefined;
+        destDirs?: string[] | undefined;
         downloadUrl?: string | undefined;
         templateString?: string | undefined;
         subscriptionUserInfoProvider?: string | undefined;
@@ -375,7 +380,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
     internetTestUrl?: string | undefined;
     internetTestInterval?: number | undefined;
     customFilters?: Record<string, ((nodeConfig: import("../types").PossibleNodeConfigType) => boolean) | {
-        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
+        readonly filter: <T extends import("../types").PossibleNodeConfigType>(nodeList: ReadonlyArray<T>) => ReadonlyArray<T>;
         readonly supportSort: true;
     }> | undefined;
     customParams?: Record<string, any> | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "surgio",
   "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
-  "version": "3.11.1",
+  "version": "3.11.3",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "bin": {
@@ -33,27 +33,6 @@
     "url": "https://github.com/geekdada/surgio/issues"
   },
   "homepage": "https://surgio.js.org",
-  "scripts": {
-    "dev": "npm run build -- --watch",
-    "test": "run-s build test:lint test:unit test:cli",
-    "test:types": "tsc --noEmit",
-    "test:lint": "eslint -c .eslintrc.js --ext .js,.ts .",
-    "test:unit": "ava",
-    "test:cli": "mocha",
-    "test:cli:update": "CHAI_JEST_SNAPSHOT_UPDATE_ALL=true pnpm test:cli",
-    "run-example": "node ./scripts/run-example.js",
-    "coverage": "TS_NODE_FILES=true nyc ava",
-    "clean": "rimraf build",
-    "build": "tsc -p tsconfig.build.json",
-    "prepublishOnly": "npm run clean && npm run build",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "prepare": "husky install",
-    "docs:dev": "NODE_ENV=development vuepress dev docs",
-    "docs:build": "NODE_ENV=production vuepress build docs",
-    "release": "bumpp && npm publish",
-    "release:beta": "bumpp --preid beta --no-push && npm publish --tag beta",
-    "check-vuepress-version": "ncu -f \"*vuepress*\" --interactive --target @next -p pnpm"
-  },
   "oclif": {
     "bin": "surgio",
     "dirname": "surgio",
@@ -104,10 +83,12 @@
     "hpagent": "^1.2.0",
     "inquirer": "^8.2.6",
     "ioredis": "^5.3.2",
+    "is-gzip": "^2.0.0",
     "lodash": "^4.17.21",
     "micromatch": "^4.0.5",
     "ms": "^2.1.3",
     "node-dir": "^0.1.17",
+    "node-gzip": "^1.1.2",
     "nunjucks": "^3.2.4",
     "ora": "^5.4.1",
     "query-string": "^7.1.3",
@@ -136,12 +117,14 @@
     "@types/ini": "^1.3.34",
     "@types/inquirer": "^8.2.10",
     "@types/ioredis-mock": "^8.2.5",
+    "@types/is-gzip": "^2.0.2",
     "@types/lodash": "^4.14.202",
     "@types/micromatch": "^4.0.6",
     "@types/mocha": "^10.0.6",
     "@types/ms": "^0.7.34",
     "@types/node": "^18.19.21",
     "@types/node-dir": "^0.0.35",
+    "@types/node-gzip": "^1.1.3",
     "@types/nunjucks": "^3.2.6",
     "@types/sinon": "^10.0.20",
     "@types/urlsafe-base64": "^1.0.31",
@@ -184,7 +167,7 @@
     "search-insights": ">=1.0.0 <3.0.0-0",
     "sinon": "^15.2.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
+    "typescript": "^5.9.2",
     "vue": "^3.5.0",
     "vuepress": "2.0.0-rc.19",
     "vuepress-plugin-umami-analytics": "1.8.1"
@@ -223,7 +206,6 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "packageManager": "pnpm@9.15.9+sha256.cf86a7ad764406395d4286a6d09d730711720acc6d93e9dce9ac7ac4dc4a28a7",
   "lint-staged": {
     "*.js": "eslint",
     "*.ts": "eslint --ext .ts"
@@ -243,9 +225,23 @@
     "singbox",
     "shadowrocket"
   ],
-  "pnpm": {
-    "patchedDependencies": {
-      "vuepress-plugin-umami-analytics@1.8.1": "patches/vuepress-plugin-umami-analytics@1.8.1.patch"
-    }
+  "scripts": {
+    "dev": "npm run build -- --watch",
+    "test": "run-s build test:lint test:unit test:cli",
+    "test:types": "tsc --noEmit",
+    "test:lint": "eslint -c .eslintrc.js --ext .js,.ts .",
+    "test:unit": "ava",
+    "test:cli": "mocha",
+    "test:cli:update": "CHAI_JEST_SNAPSHOT_UPDATE_ALL=true pnpm test:cli",
+    "run-example": "node ./scripts/run-example.js",
+    "coverage": "TS_NODE_FILES=true nyc ava",
+    "clean": "rimraf build",
+    "build": "tsc -p tsconfig.build.json",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
+    "docs:dev": "NODE_ENV=development vuepress dev docs",
+    "docs:build": "NODE_ENV=production vuepress build docs",
+    "release": "bumpp && npm publish",
+    "release:beta": "bumpp --preid beta --no-push && npm publish --tag beta",
+    "check-vuepress-version": "ncu -f \"*vuepress*\" --interactive --target @next -p pnpm"
   }
-}
+}