✨ 支持toml配置文件的stcp

electron/api/frpc.ts

@@ -1,13 +1,13 @@
 import { app, ipcMain, Notification } from "electron";
-import {Config, getConfig} from "../storage/config";
+import { getConfig } from "../storage/config";
-import {listProxy, Proxy} from "../storage/proxy";
+import { listProxy } from "../storage/proxy";
 import { getVersionById } from "../storage/version";
 import treeKill from "tree-kill";
 
 const fs = require("fs");
 const path = require("path");
 const { exec, spawn } = require("child_process");
-const log = require('electron-log');
+const log = require("electron-log");
 export let frpcProcess = null;
 const runningCmd = {
   commandPath: null,
@@ -21,7 +21,7 @@ let frpcStatusListener = null;
  * @param callback
  */
 const getFrpcVersionWorkerPath = (
-    versionId: string,
+  versionId: number,
   callback: (workerPath: string) => void
 ) => {
   getVersionById(versionId, (err2, version) => {
@@ -38,24 +38,47 @@ const getFrpcVersionWorkerPath = (
  * @param config
  * @param proxys
  */
-const genTomlConfig = (config: Config, proxys: Proxy[]) => {
+const genTomlConfig = (config: FrpConfig, proxys: Proxy[]) => {
   const proxyToml = proxys.map(m => {
     let toml = `
-[[proxies]]
+[[${m.type === 'stcp' && m.stcpModel === 'visitors' ? 'visitors' : 'proxies'}]]
 name = "${m.name}"
 type = "${m.type}"
-localIP = "${m.localIp}"
-localPort = ${m.localPort}
 `;
     switch (m.type) {
       case "tcp":
       case "udp":
-                toml += `remotePort = ${m.remotePort}`;
+        toml += `
+localIP = "${m.localIp}"
+localPort = ${m.localPort}
+remotePort = ${m.remotePort}
+`;
         break;
       case "http":
       case "https":
-                toml += `customDomains=[${m.customDomains.map(m => `"${m}"`)}]`;
+        toml += `
+localIP = "${m.localIp}"
+localPort = ${m.localPort}
+customDomains=[${m.customDomains.map(m => `"${m}"`)}]
+`;
         break;
+      case "stcp":
+        if (m.stcpModel === "visitors") {
+          // 访问者
+          toml += `
+serverName = "${m.serverName}"
+bindAddr = "${m.bindAddr}"
+bindPort = ${m.bindPort}
+`;
+        } else if (m.stcpModel === "visited") {
+          // 被访问者
+          toml += `
+localIP = "${m.localIp}"
+localPort = ${m.localPort}`;
+        }
+        toml += `
+secretKey="${m.secretKey}"
+`;
       default:
         break;
     }
@@ -65,20 +88,36 @@ localPort = ${m.localPort}
   const toml = `
 serverAddr = "${config.serverAddr}"
 serverPort = ${config.serverPort}
-${config.authMethod === 'token' ? `
+${
+  config.authMethod === "token"
+    ? `
 auth.method = "token"
 auth.token = "${config.authToken}"
-` : ""}
+`
-${config.authMethod === 'multiuser' ? `
+    : ""
+}
+${
+  config.authMethod === "multiuser"
+    ? `
 user = "${config.user}"
 metadatas.token = "${config.metaToken}"
-` : ""}
+`
-${config.transportHeartbeatInterval ? `
+    : ""
+}
+${
+  config.transportHeartbeatInterval
+    ? `
 transport.heartbeatInterval = ${config.transportHeartbeatInterval}
-` : ""}
+`
-${config.transportHeartbeatTimeout ? `
+    : ""
+}
+${
+  config.transportHeartbeatTimeout
+    ? `
 transport.heartbeatTimeout = ${config.transportHeartbeatTimeout}
-` : ""}
+`
+    : ""
+}
 
 
 log.to = "frpc.log"
@@ -87,28 +126,35 @@ log.maxDays = ${config.logMaxDays}
 webServer.addr = "127.0.0.1"
 webServer.port = 57400
 transport.tls.enable = ${config.tlsConfigEnable}
-${config.tlsConfigEnable ? `
+${
+  config.tlsConfigEnable
+    ? `
 transport.tls.certFile = "${config.tlsConfigCertFile}"
 transport.tls.keyFile = "${config.tlsConfigKeyFile}"
 transport.tls.trustedCaFile = "${config.tlsConfigTrustedCaFile}"
 transport.tls.serverName = "${config.tlsConfigServerName}"
-` : ""}
+`
-${config.proxyConfigEnable ? `
+    : ""
+}
+${
+  config.proxyConfigEnable
+    ? `
 transport.proxyURL = "${config.proxyConfigProxyUrl}"
-` : ""}
+`
+    : ""
+}
 
 ${proxyToml.join("")}
       `;
   return toml;
-}
+};
-
 
 /**
  * 生成ini配置
  * @param config
  * @param proxys
  */
-const genIniConfig = (config: Config, proxys: Proxy[]) => {
+const genIniConfig = (config: FrpConfig, proxys: Proxy[]) => {
   const proxyIni = proxys.map(m => {
     let ini = `
 [${m.name}]
@@ -135,21 +181,37 @@ local_port = ${m.localPort}
 [common]
 server_addr = ${config.serverAddr}
 server_port = ${config.serverPort}
-${config.authMethod === 'token' ? `
+${
+  config.authMethod === "token"
+    ? `
 authentication_method = ${config.authMethod}
 token = ${config.authToken}
-` : ""}
+`
-${config.authMethod === 'multiuser' ? `
+    : ""
+}
+${
+  config.authMethod === "multiuser"
+    ? `
 user = ${config.user}
 meta_token = ${config.metaToken}
-` : ""}
+`
+    : ""
+}
 
-${config.transportHeartbeatInterval ? `
+${
+  config.transportHeartbeatInterval
+    ? `
 heartbeat_interval = ${config.transportHeartbeatInterval}
-` : ""}
+`
-${config.transportHeartbeatTimeout ? `
+    : ""
+}
+${
+  config.transportHeartbeatTimeout
+    ? `
 heartbeat_timeout = ${config.transportHeartbeatTimeout}
-` : ""}
+`
+    : ""
+}
 
 log_file = "frpc.log"
 log_level = ${config.logLevel}
@@ -157,26 +219,34 @@ log_max_days = ${config.logMaxDays}
 admin_addr = 127.0.0.1
 admin_port = 57400
 tls_enable = ${config.tlsConfigEnable}
-${config.tlsConfigEnable ? `
+${
+  config.tlsConfigEnable
+    ? `
 tls_cert_file = ${config.tlsConfigCertFile}
 tls_key_file = ${config.tlsConfigKeyFile}
 tls_trusted_ca_file = ${config.tlsConfigTrustedCaFile}
 tls_server_name = ${config.tlsConfigServerName}
-` : ""}
+`
-${config.proxyConfigEnable ? `
+    : ""
+}
+${
+  config.proxyConfigEnable
+    ? `
 http_proxy = "${config.proxyConfigProxyUrl}"
-` : ""}
+`
+    : ""
+}
 
 ${proxyIni.join("")}
-    `
+    `;
   return ini;
-}
+};
 
 /**
  * 生成配置文件
  */
 export const generateConfig = (
-    config: Config,
+  config: FrpConfig,
   callback: (configPath: string) => void
 ) => {
   listProxy((err3, proxys) => {
@@ -187,13 +257,13 @@ export const generateConfig = (
       if (currentVersion < 124395282) {
         // 版本小于v0.52.0
         filename = "frp.ini";
-                configContent = genIniConfig(config, proxys)
+        configContent = genIniConfig(config, proxys);
       } else {
         filename = "frp.toml";
-                configContent = genTomlConfig(config, proxys)
+        configContent = genTomlConfig(config, proxys);
       }
-            const configPath = path.join(app.getPath("userData"), filename)
+      const configPath = path.join(app.getPath("userData"), filename);
-            log.info(`生成配置成功 配置路径：${configPath}`)
+      log.info(`生成配置成功 配置路径：${configPath}`);
       fs.writeFile(
         configPath, // 配置文件目录
         configContent, // 配置文件内容
@@ -215,7 +285,7 @@ export const generateConfig = (
  * @param configPath
  */
 const startFrpcProcess = (commandPath: string, configPath: string) => {
-    log.info(`启动frpc 目录：${app.getPath("userData")} 命令：${commandPath}`,)
+  log.info(`启动frpc 目录：${app.getPath("userData")} 命令：${commandPath}`);
   const command = `${commandPath} -c ${configPath}`;
   frpcProcess = spawn(command, {
     cwd: app.getPath("userData"),
@@ -224,24 +294,23 @@ const startFrpcProcess = (commandPath: string, configPath: string) => {
   runningCmd.commandPath = commandPath;
   runningCmd.configPath = configPath;
   frpcProcess.stdout.on("data", data => {
-        log.debug(`启动输出：${data}`)
+    log.debug(`启动输出：${data}`);
   });
   frpcProcess.stdout.on("error", data => {
-        log.error(`启动错误：${data}`)
+    log.error(`启动错误：${data}`);
-        stopFrpcProcess(() => {
+    stopFrpcProcess(() => {});
-        })
   });
   frpcStatusListener = setInterval(() => {
-        const status = frpcProcessStatus()
+    const status = frpcProcessStatus();
-        log.debug(`监听frpc子进程状态：${status}`)
+    log.debug(`监听frpc子进程状态：${status}`);
     if (!status) {
       new Notification({
         title: "Frpc Desktop",
         body: "连接已断开，请前往日志查看原因"
-            }).show()
+      }).show();
-            clearInterval(frpcStatusListener)
+      clearInterval(frpcStatusListener);
     }
-    }, 3000)
+  }, 3000);
 };
 
 /**
@@ -254,7 +323,7 @@ export const reloadFrpcProcess = () => {
         if (config) {
           generateConfig(config, configPath => {
             const command = `${runningCmd.commandPath} reload -c ${configPath}`;
-                        log.info(`重载配置：${command}`)
+            log.info(`重载配置：${command}`);
             exec(command, {
               cwd: app.getPath("userData"),
               shell: true
@@ -273,19 +342,19 @@ export const stopFrpcProcess = (callback?: () => void) => {
   if (frpcProcess) {
     treeKill(frpcProcess.pid, (error: Error) => {
       if (error) {
-                log.error(`关闭frpc子进程失败 pid：${frpcProcess.pid} error：${error}`)
+        log.error(`关闭frpc子进程失败 pid：${frpcProcess.pid} error：${error}`);
-                callback()
+        callback();
       } else {
-                log.info(`关闭frpc子进程成功`)
+        log.info(`关闭frpc子进程成功`);
-                frpcProcess = null
+        frpcProcess = null;
-                clearInterval(frpcStatusListener)
+        clearInterval(frpcStatusListener);
-                callback()
+        callback();
       }
-        })
+    });
   } else {
-        callback()
+    callback();
-    }
   }
+};
 
 /**
  * 获取frpc子进程状态
@@ -302,62 +371,50 @@ export const frpcProcessStatus = () => {
     // 进程不存在，抛出异常
     return false;
   }
-}
+};
 
 /**
  * 启动frpc流程
  * @param config
  */
-export const startFrpWorkerProcess = async (config: Config) => {
+export const startFrpWorkerProcess = async (config: FrpConfig) => {
-    getFrpcVersionWorkerPath(
+  getFrpcVersionWorkerPath(config.currentVersion, (frpcVersionPath: string) => {
-        config.currentVersion,
-        (frpcVersionPath: string) => {
     if (frpcVersionPath) {
       generateConfig(config, configPath => {
         const platform = process.platform;
-                    if (platform === 'win32') {
+        if (platform === "win32") {
-                        startFrpcProcess(
+          startFrpcProcess(path.join(frpcVersionPath, "frpc.exe"), configPath);
-                            path.join(frpcVersionPath, "frpc.exe"),
-                            configPath
-                        );
         } else {
-                        startFrpcProcess(
+          startFrpcProcess(path.join(frpcVersionPath, "frpc"), configPath);
-                            path.join(frpcVersionPath, "frpc"),
-                            configPath
-                        );
         }
       });
     }
-        }
+  });
-    );
+};
-}
-
 
 export const initFrpcApi = () => {
   ipcMain.handle("frpc.running", async (event, args) => {
-        return frpcProcessStatus()
+    return frpcProcessStatus();
   });
 
   ipcMain.on("frpc.start", async (event, args) => {
     getConfig((err1, config) => {
       if (!err1) {
         if (config) {
-                    startFrpWorkerProcess(config)
+          startFrpWorkerProcess(config);
         } else {
           event.reply(
-                        "Home.frpc.start.error.hook", "请先前往设置页面，修改配置后再启动"
+            "Home.frpc.start.error.hook",
+            "请先前往设置页面，修改配置后再启动"
           );
         }
       }
     });
-
   });
 
   ipcMain.on("frpc.stop", () => {
     if (frpcProcess && !frpcProcess.killed) {
-            stopFrpcProcess(() => {
+      stopFrpcProcess(() => {});
-
-            })
     }
   });
 };

electron/storage/version.ts

@@ -32,7 +32,7 @@ export const listVersion = (
 };
 
 export const getVersionById = (
-    id: string,
+    id: number,
     callback: (err: Error | null, document: FrpVersion) => void
 ) => {
     versionDB.findOne({id: id}, callback);

src/views/proxy/index.vue

@@ -43,7 +43,7 @@ const defaultForm = ref<Proxy>({
   localPort: 8080,
   remotePort: 8080,
   customDomains: [""],
-  stcpModel: "visitor",
+  stcpModel: "visitors",
   serverName: "",
   secretKey: "",
   bindAddr: "",
@@ -63,7 +63,7 @@ const proxyTypes = ref(["http", "https", "tcp", "udp", "stcp"]);
 const stcpModels = ref([
   {
     label: "访问者",
-    value: "visitor"
+    value: "visitors"
   },
   {
     label: "被访问者",
@@ -469,7 +469,7 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="editForm.stcpModel === 'visitor' ? 12 : 24">
+          <el-col :span="editForm.stcpModel === 'visitors' ? 12 : 24">
             <el-form-item label="代理名称：" prop="name">
               <el-input
                 v-model="editForm.name"
@@ -625,7 +625,7 @@ onUnmounted(() => {
             </el-col>
           </template>
           <template
-            v-if="editForm.type === 'stcp' && editForm.stcpModel === 'visitor'"
+            v-if="editForm.type === 'stcp' && editForm.stcpModel === 'visitors'"
           >
             <el-col :span="12">
               <el-form-item label="被访问者代理名称：" prop="serverName">
@@ -791,6 +791,10 @@ onUnmounted(() => {
   background: #5ec7fe;
 }
 
+.stcp {
+  background: #D63DA6;
+}
+
 .domain-input {
   width: calc(100% - 115px);
 }

types/global.d.ts

@@ -53,7 +53,7 @@ declare global {
      * 全局配置
      */
     type FrpConfig = {
-        currentVersion: string;
+        currentVersion: number;
         serverAddr: string;
         serverPort: number;
         authMethod: string;