surgio 2.18.4 → 2.19.0-0

package/build/utils/v2ray.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatVmessUri = void 0;
-const query_string_1 = __importDefault(require("query-string"));
+const url_1 = require("url");
 // https://github.com/v2ray/v2ray-core/issues/1569
 const formatVmessUri = (nodeConfig, options) => {
     const uri = [
@@ -15,10 +12,10 @@ const formatVmessUri = (nodeConfig, options) => {
     ];
     const queries = {
         network: nodeConfig.network,
-        tls: nodeConfig.tls,
+        tls: nodeConfig.tls ? 'true' : 'false',
     };
     if (nodeConfig.skipCertVerify) {
-        queries['tls.allowInsecure'] = true;
+        queries['tls.allowInsecure'] = 'true';
     }
     if (nodeConfig.network === 'ws') {
         if (typeof nodeConfig.wsHeaders !== 'undefined') {
@@ -37,7 +34,8 @@ const formatVmessUri = (nodeConfig, options) => {
             }
         }
     }
-    return `vmess://${uri.join('')}?${query_string_1.default.stringify(queries)}`;
+    const queryObject = new url_1.URLSearchParams(queries);
+    return `vmess://${uri.join('')}?${queryObject.toString()}`;
 };
 exports.formatVmessUri = formatVmessUri;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjJyYXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvdjJyYXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsZ0VBQXVDO0FBRXZDLGtEQUFrRDtBQUMzQyxNQUFNLGNBQWMsR0FBRyxDQUM1QixVQUEyQixFQUMzQixPQUF3QyxFQUNoQyxFQUFFO0lBQ1YsTUFBTSxHQUFHLEdBQWE7UUFDcEIsVUFBVSxDQUFDLElBQUk7UUFDZixHQUFHO1FBQ0gsR0FBRyxVQUFVLENBQUMsUUFBUSxJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7UUFDM0MsVUFBVSxDQUFDLElBQUksSUFBSSxHQUFHO0tBQ3ZCLENBQUM7SUFDRixNQUFNLE9BQU8sR0FBUTtRQUNuQixPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU87UUFDM0IsR0FBRyxFQUFFLFVBQVUsQ0FBQyxHQUFHO0tBQ3BCLENBQUM7SUFFRixJQUFJLFVBQVUsQ0FBQyxjQUFjLEVBQUU7UUFDN0IsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEdBQUcsSUFBSSxDQUFDO0tBQ3JDO0lBRUQsSUFBSSxVQUFVLENBQUMsT0FBTyxLQUFLLElBQUksRUFBRTtRQUMvQixJQUFJLE9BQU8sVUFBVSxDQUFDLFNBQVMsS0FBSyxXQUFXLEVBQUU7WUFDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQ2hELElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFO29CQUN0QixPQUFPLENBQUMsY0FBYyxHQUFHLEVBQUUsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxTQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQzNEO1lBQ0gsQ0FBQyxDQUFDLENBQUM7U0FDSjtRQUNELElBQUksVUFBVSxDQUFDLElBQUksRUFBRTtZQUNuQixJQUFJLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxRQUFRLEVBQUU7Z0JBQ3JCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO2FBQ3RDO2lCQUFNO2dCQUNMLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7YUFDOUM7U0FDRjtLQUNGO0lBRUQsT0FBTyxXQUFXLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksc0JBQVcsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztBQUNyRSxDQUFDLENBQUM7QUFyQ1csUUFBQSxjQUFjLGtCQXFDekIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjJyYXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvdjJyYXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQXNDO0FBR3RDLGtEQUFrRDtBQUMzQyxNQUFNLGNBQWMsR0FBRyxDQUM1QixVQUEyQixFQUMzQixPQUF3QyxFQUNoQyxFQUFFO0lBQ1YsTUFBTSxHQUFHLEdBQWE7UUFDcEIsVUFBVSxDQUFDLElBQUk7UUFDZixHQUFHO1FBQ0gsR0FBRyxVQUFVLENBQUMsUUFBUSxJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7UUFDM0MsVUFBVSxDQUFDLElBQUksSUFBSSxHQUFHO0tBQ3ZCLENBQUM7SUFDRixNQUFNLE9BQU8sR0FBMkI7UUFDdEMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxPQUFPO1FBQzNCLEdBQUcsRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU87S0FDdkMsQ0FBQztJQUVGLElBQUksVUFBVSxDQUFDLGNBQWMsRUFBRTtRQUM3QixPQUFPLENBQUMsbUJBQW1CLENBQUMsR0FBRyxNQUFNLENBQUM7S0FDdkM7SUFFRCxJQUFJLFVBQVUsQ0FBQyxPQUFPLEtBQUssSUFBSSxFQUFFO1FBQy9CLElBQUksT0FBTyxVQUFVLENBQUMsU0FBUyxLQUFLLFdBQVcsRUFBRTtZQUMvQyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDaEQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUU7b0JBQ3RCLE9BQU8sQ0FBQyxjQUFjLEdBQUcsRUFBRSxDQUFDLEdBQUcsVUFBVSxDQUFDLFNBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztpQkFDM0Q7WUFDSCxDQUFDLENBQUMsQ0FBQztTQUNKO1FBQ0QsSUFBSSxVQUFVLENBQUMsSUFBSSxFQUFFO1lBQ25CLElBQUksT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFFBQVEsRUFBRTtnQkFDckIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7YUFDdEM7aUJBQU07Z0JBQ0wsT0FBTyxDQUFDLGlCQUFpQixDQUFDLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQzthQUM5QztTQUNGO0tBQ0Y7SUFFRCxNQUFNLFdBQVcsR0FBRyxJQUFJLHFCQUFlLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFakQsT0FBTyxXQUFXLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksV0FBVyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUM7QUFDN0QsQ0FBQyxDQUFDO0FBdkNXLFFBQUEsY0FBYyxrQkF1Q3pCIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "surgio",
   "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
-  "version": "2.18.4",
+  "version": "2.19.0-0",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {
@@ -27,7 +27,6 @@
     "coverage": "cross-env TS_NODE_FILES=true nyc ava",
     "clean": "rimraf build",
     "build": "run-s clean && tsc -p tsconfig.json",
-    "build:binary": "pkg --target node12-macos,node12-win,node12-linux,node12-alpine --out-path ./binary-build .",
     "prepublish": "run-s build",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
     "pub": "np",
@@ -36,7 +35,6 @@
     "docs:build": "vuepress build docs"
   },
   "dependencies": {
-    "@royli/hygen": "^5.0.4",
     "@surgio/eslint-config-surgio": "^1.0.3",
     "@surgio/logger": "^1.1.0",
     "@types/eslint": "^7.2.0",
@@ -49,35 +47,33 @@
     "common-bin": "^2.8.3",
     "cross-env": "^7.0.2",
     "date-fns": "^2.16.1",
-    "debug": "^4.1.1",
     "detect-newline": "^3.1.0",
-    "emoji-regex": "^9.0.0",
+    "emoji-regex": "^10.1.0",
     "env2": "^2.2.2",
     "eslint": "^7.8.1",
     "espree": "^7.3.0",
     "execa": "^4.0.3",
-    "filesize": "^6.1.0",
+    "filesize": "^9.0.0",
     "fs-extra": "^9.0.0",
     "get-port": "^5.1.0",
-    "global-agent": "^2.1.7",
+    "global-agent": "^3.0.0",
     "got": "^11.6.1",
+    "hygen": "^6.2.0",
     "inquirer": "^7.1.0",
+    "ioredis": "^5.0.5",
     "joi": "^17.1.1",
     "listr": "^0.14.3",
     "lodash": "^4.17.19",
-    "merge-stream": "^2.0.0",
     "ms": "^2.1.3",
     "node-cache": "^5.1.2",
     "node-dir": "^0.1.17",
     "nunjucks": "^3.2.1",
     "ora": "^5.1.0",
-    "query-string": "^6.12.1",
+    "query-string": "^7.1.1",
     "rimraf": "^3.0.0",
-    "shelljs": "^0.8.5",
     "source-map-support": "^0.5.19",
     "update-notifier": "^5.0.0",
     "urlsafe-base64": "^1.0.0",
-    "winston": "^3.2.1",
     "yaml": "^1.9.2"
   },
   "devDependencies": {
@@ -112,14 +108,13 @@
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^4.3.0",
     "ini": "^1.3.5",
-    "jsdom": "^16.2.2",
+    "ioredis-mock": "^8.2.2",
     "lint-staged": "^12.1.7",
     "nock": "^13.0.0-beta.3",
     "np": "^6.3.1",
     "npm-debug-log-cleaner": "^1.0.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.1",
-    "pkg": "^4.4.8",
     "prettier": "^2.4.1",
     "sinon": "^12.0.1",
     "sitemap": "^3.0.0",
@@ -165,16 +160,11 @@
       "pre-commit": "npm-debug-log-cleaner && lint-staged"
     }
   },
-  "pkg": {
-    "scripts": "build/**/*.js",
-    "assets": [
-      "hygen-template/**/*"
-    ]
-  },
   "keywords": [
     "surgio",
     "surge",
     "quantumult",
-    "clash"
+    "clash",
+    "shadowrocket"
   ]
 }