surgio 2.20.0 → 2.20.1

package/README.md

@@ -5,7 +5,6 @@
 </p>
 
 [![NPM version][npm-image]][npm-url]
-[![TAONPM version][taonpm-image]][taonpm-url]
 ![Nodejs][nodejs-version]
 ![Github Actions][github-actions-image]
 [![Test coverage][codecov-image]][codecov-url]
@@ -22,8 +21,6 @@
 [download-image]: https://img.shields.io/npm/dm/surgio.svg?style=flat-square
 [download-url]: https://npmjs.org/package/surgio
 [github-actions-image]: https://github.com/surgioproject/surgio/workflows/Node%20CI/badge.svg
-[taonpm-image]: https://npmmirror.com/badge/v/surgio.svg
-[taonpm-url]: https://npmmirror.com/package/surgio
 [nodejs-version]: https://img.shields.io/node/v/surgio
 
 ## 文档

package/build/generator/artifact.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+import _ from 'lodash';
 import { Environment } from 'nunjucks';
 import { EventEmitter } from 'events';
 import { getProvider } from '../provider';
@@ -26,7 +27,62 @@ export declare class Artifact extends EventEmitter {
     private youtubePremiumFilter;
     constructor(surgioConfig: CommandConfig, artifact: ArtifactConfig, options?: ArtifactOptions);
     get isReady(): boolean;
-    getRenderContext(extendRenderContext?: ExtendableRenderContext): any;
+    getRenderContext(extendRenderContext?: ExtendableRenderContext): {
+        clashProxyConfig?: {
+            proxies: readonly any[];
+            'proxy-groups': readonly any[];
+        } | undefined;
+        proxyTestUrl: string | undefined;
+        downloadUrl: string;
+        snippet: (filePath: string) => RemoteSnippet;
+        nodes: PossibleNodeConfigType[];
+        names: SimpleNodeConfig[];
+        remoteSnippets: _.Dictionary<RemoteSnippet>;
+        nodeList: PossibleNodeConfigType[];
+        provider: string;
+        providerName: string;
+        artifactName: string;
+        getDownloadUrl: (name: string) => string;
+        getUrl: (p: string) => string;
+        getNodeNames: (list: readonly SimpleNodeConfig[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined, separator?: string | undefined) => string;
+        getClashNodeNames: (list: readonly SimpleNodeConfig[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined, existingProxies?: readonly string[] | undefined) => readonly string[];
+        getClashNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeFilterType | undefined) => readonly any[];
+        getSurgeNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeFilterType | undefined) => string;
+        getShadowsocksNodes: (list: readonly import("../types").ShadowsocksNodeConfig[], groupName?: string) => string;
+        getShadowsocksNodesJSON: (list: readonly import("../types").ShadowsocksNodeConfig[]) => string;
+        getShadowsocksrNodes: (list: readonly import("../types").ShadowsocksrNodeConfig[], groupName: string) => string;
+        getQuantumultNodes: (list: readonly (import("../types").VmessNodeConfig | import("../types").HttpsNodeConfig | import("../types").ShadowsocksNodeConfig | import("../types").ShadowsocksrNodeConfig)[], groupName?: string, filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined) => string;
+        getV2rayNNodes: (list: readonly import("../types").VmessNodeConfig[]) => string;
+        getQuantumultXNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined) => string;
+        getMellowNodes: (list: readonly (import("../types").VmessNodeConfig | import("../types").ShadowsocksNodeConfig)[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeFilterType | undefined) => string;
+        getLoonNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined) => string;
+        usFilter: import("../types").NodeNameFilterType;
+        hkFilter: import("../types").NodeNameFilterType;
+        japanFilter: import("../types").NodeNameFilterType;
+        koreaFilter: import("../types").NodeNameFilterType;
+        singaporeFilter: import("../types").NodeNameFilterType;
+        taiwanFilter: import("../types").NodeNameFilterType;
+        chinaBackFilter: import("../types").NodeNameFilterType;
+        chinaOutFilter: import("../types").NodeNameFilterType;
+        shadowsocksFilter: import("../types").NodeNameFilterType;
+        shadowsocksrFilter: import("../types").NodeNameFilterType;
+        vmessFilter: import("../types").NodeNameFilterType;
+        v2rayFilter: import("../types").NodeNameFilterType;
+        snellFilter: import("../types").NodeNameFilterType;
+        httpFilter: import("../types").NodeNameFilterType;
+        httpsFilter: import("../types").NodeNameFilterType;
+        trojanFilter: import("../types").NodeNameFilterType;
+        socks5Filter: import("../types").NodeNameFilterType;
+        toUrlSafeBase64: (str: string) => string;
+        toBase64: (str: string) => string;
+        encodeURIComponent: typeof encodeURIComponent;
+        netflixFilter: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType;
+        youtubePremiumFilter: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType;
+        customFilters: {
+            readonly [name: string]: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType;
+        };
+        customParams: import("../types").PlainObjectOf<string | number | boolean> & Record<string, string>;
+    };
     init({ requestUserAgent, }?: {
         requestUserAgent?: string;
     }): Promise<this>;

package/build/generator/artifact.js

@@ -53,7 +53,7 @@ class Artifact extends events_1.EventEmitter {
     getRenderContext(extendRenderContext = {}) {
         const config = this.surgioConfig;
         const gatewayConfig = config.gateway;
-        const gatewayHasToken = !!(gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken);
+        const gatewayToken = (gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.viewerToken) || (gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken);
         const { name: artifactName, customParams, downloadUrl } = this.artifact;
         const { nodeList, nodeNameList, netflixFilter, youtubePremiumFilter, customFilters, } = this;
         const remoteSnippets = lodash_1.default.keyBy(this.options.remoteSnippetList || [], (item) => item.name);
@@ -61,10 +61,10 @@ class Artifact extends events_1.EventEmitter {
         const mergedCustomParams = lodash_1.default.merge({}, globalCustomParams, customParams, extendRenderContext === null || extendRenderContext === void 0 ? void 0 : extendRenderContext.urlParams);
         return Object.assign({ proxyTestUrl: config.proxyTestUrl, downloadUrl: downloadUrl
                 ? downloadUrl
-                : (0, utils_1.getDownloadUrl)(config.urlBase, artifactName, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), snippet: (filePath) => {
+                : (0, utils_1.getDownloadUrl)(config.urlBase, artifactName, true, gatewayToken), snippet: (filePath) => {
                 return (0, template_1.loadLocalSnippet)(config.templateDir, filePath);
             }, nodes: nodeList, names: nodeNameList, remoteSnippets,
-            nodeList, provider: this.artifact.provider, providerName: this.artifact.provider, artifactName, getDownloadUrl: (name) => (0, utils_1.getDownloadUrl)(config.urlBase, name, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getUrl: (p) => (0, utils_1.getUrl)(config.publicUrl, p, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getNodeNames: utils_1.getNodeNames,
+            nodeList, provider: this.artifact.provider, providerName: this.artifact.provider, artifactName, getDownloadUrl: (name) => (0, utils_1.getDownloadUrl)(config.urlBase, name, true, gatewayToken), getUrl: (p) => (0, utils_1.getUrl)(config.publicUrl, p, gatewayToken), getNodeNames: utils_1.getNodeNames,
             getClashNodeNames: utils_1.getClashNodeNames,
             getClashNodes: utils_1.getClashNodes,
             getSurgeNodes: utils_1.getSurgeNodes,
@@ -295,4 +295,4 @@ class Artifact extends events_1.EventEmitter {
     }
 }
 exports.Artifact = Artifact;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "surgio",
   "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {