surgio 3.2.1 → 3.2.3

package/hygen-template/provider/new/index.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const { types } = require('../../../build/internal')
-const { SupportProviderEnum } = types
+const { SupportProviderEnum } = require('../../../build/internal')
 
 module.exports = {
   prompt: ({ prompter: inquirer }) => {
@@ -57,9 +56,8 @@ module.exports = {
       },
       {
         type: 'confirm',
-        name: 'relayUrl',
-        message:
-          '是否开启订阅转发，推荐使用了封锁 now.sh IP 的机场开启（默认关闭）',
+        name: 'isRelayUrlEnabled',
+        message: '是否开启订阅转发（默认关闭）',
         default: false,
         when: (results) => {
           return [
@@ -71,6 +69,13 @@ module.exports = {
           ].includes(results.type)
         },
       },
+      {
+        type: 'input',
+        name: 'relayUrl',
+        message: '输入订阅转发地址',
+        when: (results) => results.isRelayUrlEnabled,
+        validate: (str) => /^https?:\/{2}/.test(str),
+      },
     ])
   },
 }

package/hygen-template/provider/new/template.ejs.t

@@ -20,8 +20,8 @@ module.exports = {
 <% if (typeof udpRelay !== 'undefined' && udpRelay === true) { -%>
   udpRelay: true,
 <% } -%>
-<% if (typeof relayUrl !== 'undefined' && relayUrl === true) { -%>
-  relayUrl: true,
+<% if (typeof relayUrl === 'string') { -%>
+  relayUrl: '<%= relayUrl %>',
 <% } -%>
 };
 

package/package.json

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