surgio 2.10.2 → 2.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "surgio",
-  "version": "2.10.2",
+  "version": "2.13.0",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {
@@ -34,8 +34,8 @@
     "@types/lru-cache": "^5.1.0",
     "@types/node": "^12",
     "@types/nunjucks": "^3.2.0",
+    "@types/sinon": "^10.0.6",
     "@types/urlsafe-base64": "^1.0.28",
-    "@types/yaml": "^1.9.7",
     "@typescript-eslint/eslint-plugin": "^4.31.2",
     "@typescript-eslint/parser": "^4.31.2",
     "@vuepress/plugin-docsearch": "^2.0.0-beta.26",
@@ -48,8 +48,6 @@
     "codecov": "^3.7.1",
     "coffee": "^5.3.0",
     "conventional-changelog-cli": "^2.0.31",
-    "esbuild": "^0.13.9",
-    "esbuild-register": "^3.0.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^4.3.0",
@@ -63,9 +61,9 @@
     "nyc": "^15.0.1",
     "pkg": "^4.4.8",
     "prettier": "^2.4.1",
-    "sinon": "^9.0.2",
+    "sinon": "^12.0.1",
     "sitemap": "^3.0.0",
-    "ts-node": "^9.0.0",
+    "ts-node": "^10.4.0",
     "type-fest": "^2.3.4",
     "typescript": "^4.4.3",
     "vuepress": "^2.0.0-beta.26"
@@ -87,7 +85,6 @@
     "docs:build": "vuepress build docs"
   },
   "dependencies": {
-    "@hapi/joi": "^17.1.1",
     "@royli/hygen": "^5.0.4",
     "@surgio/eslint-config-surgio": "^1.0.3",
     "@surgio/logger": "^1.1.0",
@@ -113,6 +110,7 @@
     "global-agent": "^2.1.7",
     "got": "^11.6.1",
     "inquirer": "^7.1.0",
+    "joi": "^17.1.1",
     "listr": "^0.14.3",
     "lodash": "^4.17.19",
     "lru-cache": "^6.0.0",
@@ -142,7 +140,7 @@
       "lib/**/*.test.ts"
     ],
     "require": [
-      "esbuild-register/register",
+      "ts-node/register",
       "./test/stub-axios.js"
     ]
   },

package/build/utils/constant.js

@@ -1,98 +0,0 @@
-"use strict";
-// istanbul ignore file
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TMP_FOLDER_NAME = exports.ERR_INVALID_FILTER = exports.RELAY_SERVICE = exports.CATEGORIES = exports.PROVIDER_CACHE_MAXAGE = exports.REMOTE_SNIPPET_CACHE_MAXAGE = exports.MELLOW_UNSUPPORTED_RULE = exports.LOON_SUPPORTED_RULE = exports.QUANTUMULT_X_SUPPORTED_RULE = exports.CLASH_SUPPORTED_RULE = exports.PROXY_TEST_INTERVAL = exports.PROXY_TEST_URL = exports.OBFS_UA = exports.NETWORK_SURGIO_UA = exports.NETWORK_CLASH_UA = exports.NETWORK_RETRY = exports.NETWORK_CONCURRENCY = exports.NETWORK_RESOLVE_TIMEOUT = exports.NETWORK_TIMEOUT = void 0;
-const ms_1 = __importDefault(require("ms"));
-exports.NETWORK_TIMEOUT = process.env.SURGIO_NETWORK_TIMEOUT
-    ? Number(process.env.SURGIO_NETWORK_TIMEOUT)
-    : (0, ms_1.default)('5s');
-exports.NETWORK_RESOLVE_TIMEOUT = process.env
-    .SURGIO_NETWORK_RESOLVE_TIMEOUT
-    ? Number(process.env.SURGIO_NETWORK_RESOLVE_TIMEOUT)
-    : (0, ms_1.default)('10s');
-exports.NETWORK_CONCURRENCY = process.env.SURGIO_NETWORK_CONCURRENCY
-    ? Number(process.env.SURGIO_NETWORK_CONCURRENCY)
-    : 5;
-exports.NETWORK_RETRY = process.env.SURGIO_NETWORK_RETRY
-    ? Number(process.env.SURGIO_NETWORK_RETRY)
-    : 1;
-exports.NETWORK_CLASH_UA = (_a = process.env.SURGIO_NETWORK_CLASH_UA) !== null && _a !== void 0 ? _a : 'clash';
-exports.NETWORK_SURGIO_UA = 'surgio';
-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';
-exports.PROXY_TEST_URL = 'http://cp.cloudflare.com/generate_204';
-exports.PROXY_TEST_INTERVAL = 1200; // 1200s
-exports.CLASH_SUPPORTED_RULE = [
-    'DOMAIN-SUFFIX',
-    'DOMAIN-KEYWORD',
-    'DOMAIN',
-    'SRC-IP-CIDR',
-    'IP-CIDR',
-    'IP-CIDR6',
-    'GEOIP',
-    'DST-PORT',
-    'SRC-PORT',
-    'MATCH',
-    'FINAL',
-    'PROCESS-NAME',
-];
-exports.QUANTUMULT_X_SUPPORTED_RULE = [
-    'USER-AGENT',
-    'HOST',
-    'HOST-KEYWORD',
-    'HOST-SUFFIX',
-    'DOMAIN',
-    'DOMAIN-SUFFIX',
-    'DOMAIN-KEYWORD',
-    'IP-CIDR',
-    'IP-CIDR6',
-    'GEOIP',
-    'FINAL',
-];
-// @see https://www.notion.so/2-967c1a07462c43ab88906162bec475a4
-exports.LOON_SUPPORTED_RULE = [
-    'DOMAIN-SUFFIX',
-    'DOMAIN',
-    'DOMAIN-KEYWORD',
-    'USER-AGENT',
-    'URL-REGEX',
-    'IP-CIDR',
-    'GEOIP',
-    'FINAL',
-];
-exports.MELLOW_UNSUPPORTED_RULE = [
-    'URL-REGEX',
-    'USER-AGENT',
-    'AND',
-    'OR',
-    'NOT',
-    'DEST-PORT',
-    'IN-PORT',
-    'SRC-IP',
-    'RULE-SET',
-];
-exports.REMOTE_SNIPPET_CACHE_MAXAGE = process.env
-    .SURGIO_REMOTE_SNIPPET_CACHE_MAXAGE
-    ? Number(process.env.SURGIO_REMOTE_SNIPPET_CACHE_MAXAGE)
-    : (0, ms_1.default)('12h');
-exports.PROVIDER_CACHE_MAXAGE = process.env
-    .SURGIO_PROVIDER_CACHE_MAXAGE
-    ? Number(process.env.SURGIO_PROVIDER_CACHE_MAXAGE)
-    : (0, ms_1.default)('10m');
-exports.CATEGORIES = {
-    SNIPPET: 'Snippet',
-    SURGE: 'Surge',
-    QUANTUMULT_X: 'Quantumult X',
-    QUANTUMULT_X_SERVER: 'Quantumult X Server',
-    QUANTUMULT_X_FILTER: 'Quantumult X Filter',
-    QUANTUMULT_X_REWRITE: 'Quantumult X Rewrite',
-    CLASH: 'Clash',
-    LOON: 'Loon',
-};
-exports.RELAY_SERVICE = 'https://surgio-cors.herokuapp.com/';
-exports.ERR_INVALID_FILTER = '传入的过滤器无效，请检查语法和变量名是否正确';
-exports.TMP_FOLDER_NAME = 'surgio-config';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvY29uc3RhbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1Qjs7Ozs7OztBQUV2Qiw0Q0FBb0I7QUFFUCxRQUFBLGVBQWUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQjtJQUMvRCxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUM7SUFDNUMsQ0FBQyxDQUFDLElBQUEsWUFBRSxFQUFDLElBQUksQ0FBQyxDQUFDO0FBRUEsUUFBQSx1QkFBdUIsR0FBRyxPQUFPLENBQUMsR0FBRztLQUMvQyw4QkFBOEI7SUFDL0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDhCQUE4QixDQUFDO0lBQ3BELENBQUMsQ0FBQyxJQUFBLFlBQUUsRUFBQyxLQUFLLENBQUMsQ0FBQztBQUVELFFBQUEsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQywwQkFBMEI7SUFDdkUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDBCQUEwQixDQUFDO0lBQ2hELENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFTyxRQUFBLGFBQWEsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLG9CQUFvQjtJQUMzRCxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUM7SUFDMUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVPLFFBQUEsZ0JBQWdCLEdBQUcsTUFBQSxPQUFPLENBQUMsR0FBRyxDQUFDLHVCQUF1QixtQ0FBSSxPQUFPLENBQUM7QUFFbEUsUUFBQSxpQkFBaUIsR0FBRyxRQUFRLENBQUM7QUFFN0IsUUFBQSxPQUFPLEdBQ2xCLDJJQUEySSxDQUFDO0FBRWpJLFFBQUEsY0FBYyxHQUFHLHVDQUF1QyxDQUFDO0FBRXpELFFBQUEsbUJBQW1CLEdBQUcsSUFBSSxDQUFDLENBQUMsUUFBUTtBQUVwQyxRQUFBLG9CQUFvQixHQUEwQjtJQUN6RCxlQUFlO0lBQ2YsZ0JBQWdCO0lBQ2hCLFFBQVE7SUFDUixhQUFhO0lBQ2IsU0FBUztJQUNULFVBQVU7SUFDVixPQUFPO0lBQ1AsVUFBVTtJQUNWLFVBQVU7SUFDVixPQUFPO0lBQ1AsT0FBTztJQUNQLGNBQWM7Q0FDZixDQUFDO0FBRVcsUUFBQSwyQkFBMkIsR0FBMEI7SUFDaEUsWUFBWTtJQUNaLE1BQU07SUFDTixjQUFjO0lBQ2QsYUFBYTtJQUNiLFFBQVE7SUFDUixlQUFlO0lBQ2YsZ0JBQWdCO0lBQ2hCLFNBQVM7SUFDVCxVQUFVO0lBQ1YsT0FBTztJQUNQLE9BQU87Q0FDUixDQUFDO0FBRUYsZ0VBQWdFO0FBQ25ELFFBQUEsbUJBQW1CLEdBQTBCO0lBQ3hELGVBQWU7SUFDZixRQUFRO0lBQ1IsZ0JBQWdCO0lBQ2hCLFlBQVk7SUFDWixXQUFXO0lBQ1gsU0FBUztJQUNULE9BQU87SUFDUCxPQUFPO0NBQ1IsQ0FBQztBQUVXLFFBQUEsdUJBQXVCLEdBQTBCO0lBQzVELFdBQVc7SUFDWCxZQUFZO0lBQ1osS0FBSztJQUNMLElBQUk7SUFDSixLQUFLO0lBQ0wsV0FBVztJQUNYLFNBQVM7SUFDVCxRQUFRO0lBQ1IsVUFBVTtDQUNYLENBQUM7QUFFVyxRQUFBLDJCQUEyQixHQUFXLE9BQU8sQ0FBQyxHQUFHO0tBQzNELGtDQUFrQztJQUNuQyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0NBQWtDLENBQUM7SUFDeEQsQ0FBQyxDQUFDLElBQUEsWUFBRSxFQUFDLEtBQUssQ0FBQyxDQUFDO0FBRUQsUUFBQSxxQkFBcUIsR0FBVyxPQUFPLENBQUMsR0FBRztLQUNyRCw0QkFBNEI7SUFDN0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDO0lBQ2xELENBQUMsQ0FBQyxJQUFBLFlBQUUsRUFBQyxLQUFLLENBQUMsQ0FBQztBQUVELFFBQUEsVUFBVSxHQUFHO0lBQ3hCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLEtBQUssRUFBRSxPQUFPO0lBQ2QsWUFBWSxFQUFFLGNBQWM7SUFDNUIsbUJBQW1CLEVBQUUscUJBQXFCO0lBQzFDLG1CQUFtQixFQUFFLHFCQUFxQjtJQUMxQyxvQkFBb0IsRUFBRSxzQkFBc0I7SUFDNUMsS0FBSyxFQUFFLE9BQU87SUFDZCxJQUFJLEVBQUUsTUFBTTtDQUNiLENBQUM7QUFFVyxRQUFBLGFBQWEsR0FBRyxvQ0FBb0MsQ0FBQztBQUVyRCxRQUFBLGtCQUFrQixHQUM3Qix3QkFBd0IsQ0FBQztBQUVkLFFBQUEsZUFBZSxHQUFHLGVBQWUsQ0FBQyJ9