surgio 2.21.0 → 2.23.0

package/build/utils/surge.js

@@ -352,6 +352,27 @@ const getSurgeNodes = function (list, filter) {
                 }
                 return [nodeConfig.nodeName, config.join(', ')].join(' = ');
             }
+            case types_1.NodeTypeEnum.Tuic: {
+                const config = [
+                    'tuic',
+                    nodeConfig.hostname,
+                    nodeConfig.port,
+                    ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['token', 'sni']),
+                    ...(Array.isArray(nodeConfig.alpn)
+                        ? [`alpn=${nodeConfig.alpn.join(',')}`]
+                        : []),
+                    ...(typeof nodeConfig.underlyingProxy === 'string'
+                        ? [`underlying-proxy=${nodeConfig.underlyingProxy}`]
+                        : []),
+                    ...(typeof nodeConfig.testUrl === 'string'
+                        ? [`test-url=${nodeConfig.testUrl}`]
+                        : []),
+                    ...(typeof nodeConfig.skipCertVerify === 'boolean'
+                        ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
+                        : []),
+                ];
+                return [nodeConfig.nodeName, config.join(', ')].join(' = ');
+            }
             // istanbul ignore next
             default:
                 logger.warn(`不支持为 Surge 生成 ${nodeConfig.type} 的节点，节点 ${nodeConfig.nodeName} 会被省略`);
@@ -362,4 +383,4 @@ const getSurgeNodes = function (list, filter) {
     return result.join('\n');
 };
 exports.getSurgeNodes = getSurgeNodes;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"surge.js","sourceRoot":"","sources":["../../lib/utils/surge.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"surge.js","sourceRoot":"","sources":["../../lib/utils/surge.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.21.0",
+  "version": "2.23.0",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {
@@ -38,7 +38,7 @@
   "dependencies": {
     "@royli/hygen": "^6.2.0",
     "@surgio/eslint-config-surgio": "^1.0.4",
-    "@surgio/logger": "^1.1.4",
+    "@surgio/logger": "^1.2.0",
     "@types/eslint": "^7.29.0",
     "agentkeepalive": "^4.2.1",
     "ali-oss": "^6.17.1",
@@ -48,21 +48,21 @@
     "check-node-version": "^4.2.1",
     "common-bin": "^2.9.2",
     "cross-env": "^7.0.3",
-    "date-fns": "^2.28.0",
+    "date-fns": "^2.29.3",
     "detect-newline": "^3.1.0",
-    "emoji-regex": "^10.1.0",
+    "emoji-regex": "^10.2.1",
     "env2": "^2.2.2",
     "eslint": "^7.32.0",
     "espree": "^7.3.1",
     "execa": "^4.1.0",
-    "filesize": "^9.0.9",
+    "filesize": "^9.0.11",
     "fs-extra": "^9.1.0",
     "get-port": "^5.1.1",
     "global-agent": "^3.0.0",
     "got": "^11.8.5",
     "inquirer": "^7.3.3",
-    "ioredis": "^5.1.0",
-    "joi": "^17.6.0",
+    "ioredis": "^5.2.3",
+    "joi": "^17.6.3",
     "listr": "^0.14.3",
     "lodash": "^4.17.21",
     "micromatch": "^4.0.5",
@@ -74,56 +74,59 @@
     "query-string": "^7.1.1",
     "rimraf": "^3.0.2",
     "source-map-support": "^0.5.21",
+    "type-fest": "^3.1.0",
     "update-notifier": "^5.1.0",
     "urlsafe-base64": "^1.0.0",
     "yaml": "^1.10.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-angular": "^11.0.0",
+    "@algolia/client-search": "^4.14.2",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-angular": "^17.1.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/bluebird": "^3.5.36",
+    "@types/bluebird": "^3.5.37",
     "@types/bytes": "^3.1.1",
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
     "@types/hapi__joi": "^17.1.8",
     "@types/inquirer": "^7.3.3",
     "@types/listr": "^0.14.4",
-    "@types/lodash": "^4.14.182",
-    "@types/node": "^16.11.41",
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^16.11.68",
     "@types/nunjucks": "^3.2.1",
-    "@types/sinon": "^10.0.11",
+    "@types/sinon": "^10.0.13",
     "@types/urlsafe-base64": "^1.0.28",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
-    "@typescript-eslint/parser": "^5.29.0",
-    "@vuepress/client": "^2.0.0-beta.48",
-    "@vuepress/plugin-docsearch": "^2.0.0-beta.48",
-    "@vuepress/plugin-google-analytics": "^2.0.0-beta.48",
-    "@vuepress/plugin-register-components": "^2.0.0-beta.48",
-    "@vuepress/theme-default": "^2.0.0-beta.48",
-    "@vuepress/utils": "^2.0.0-beta.48",
-    "ava": "^4.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
+    "@typescript-eslint/parser": "^5.40.1",
+    "@vuepress/client": "2.0.0-beta.51",
+    "@vuepress/plugin-docsearch": "2.0.0-beta.51",
+    "@vuepress/plugin-google-analytics": "2.0.0-beta.51",
+    "@vuepress/plugin-register-components": "2.0.0-beta.51",
+    "@vuepress/theme-default": "2.0.0-beta.51",
+    "@vuepress/utils": "2.0.0-beta.51",
+    "ava": "^4.3.3",
     "benchmark": "^2.1.4",
     "coffee": "^5.4.0",
     "conventional-changelog-cli": "^2.2.2",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.1",
-    "ini": "^1.3.8",
+    "ini": "^3.0.1",
     "ioredis-mock": "^8.2.2",
-    "lint-staged": "^12.5.0",
-    "nock": "^13.2.7",
+    "lint-staged": "^13.0.3",
+    "nock": "^13.2.9",
     "np": "^6.5.0",
     "npm-debug-log-cleaner": "^1.0.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "prettier": "^2.7.1",
-    "sinon": "^12.0.1",
-    "ts-node": "^10.8.1",
-    "type-fest": "^2.14.0",
-    "typescript": "^4.7.4",
-    "vuepress": "^2.0.0-beta.48",
-    "vuepress-plugin-sitemap2": "^2.0.0-beta.84"
+    "sass": "^1.55.0",
+    "sinon": "^14.0.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.4",
+    "vue": "^3.2.41",
+    "vuepress": "2.0.0-beta.51",
+    "vuepress-plugin-sitemap2": "2.0.0-beta.110"
   },
   "ava": {
     "failFast": false,