Merge remote-tracking branch 'origin/master'

# Conflicts:
#	api/client/add.js

api/client/add.js

@@ -24,16 +24,22 @@ module.exports = async (ctx) => {
   const result = await ins.post("/panel/api/inbounds/addClient", {id, settings: JSON.stringify(settings)});
   if (result?.success) {
     const {remark, port, protocol, streamSettings = "{}"} = inbound.obj || {};
-    const {
+    const setting = JSON.parse(streamSettings || "{}"), {network = "ws", security = "none"} = setting;
-      network = "ws",
+    if (network === "ws") {
-      security = "none",
+      const {wsSettings: {host, path}} = setting
-      wsSettings: { host, path },
-    } = JSON.parse(streamSettings);
       ctx.body = {
-      code: "0",
+        code: "0", message: "success",
         data: `${protocol}://${uuid}@vless.jjcp52.com:${port}?type=${network}&path=${path}&host=${host}&security=${security}#${remark}-${email}`,
-      message: "success",
       };
+    } else if (network === "tcp") {
+      // 生成的链接格式 vless://842f52b6-4945-46c8-89ed-165bf51123fc@206.237.11.232:34261?type=tcp&security=reality&pbk=3-yeUp9rz5KacCLJqaLt_rHUY_6EKw6tveLpVB2hxQI&fp=random&sni=yahoo.com&sid=0f7f86d03b646595&spx=%2F#temu-reality-kubbo
+      const {serverNames: [sni], shortIds: [sid], settings: {publicKey, fingerprint, spiderX}} = (setting.realitySettings || {})
+      ctx.body = {
+        code: "0", message: "success",
+        data: `${protocol}://${uuid}@vless.jjcp52.com:${port}?type=${network}&security=${security}&pbk=${publicKey}&fp=${fingerprint}&sni=${sni}&sid=${sid}&spx=${spiderX}#${remark}-${email}`,
+      };
+    }
+
   } else {
     ctx.body = {
       code: 1,

index.js

@@ -0,0 +1 @@
+require("./app")

package.json

@@ -1,11 +1,10 @@
 {
   "name": "vless-api",
   "version": "1.0.0",
-  "description": "",
+  "main": "index.js",
-  "main": "app.js",
   "scripts": {
-    "start": "node app.js",
+    "dev": "nodemon index.js",
-    "dev": "nodemon app.js"
+    "build": "pkg index.js --targets=node18-win-x64,node18-linux-x64 --output=dist/"
   },
   "author": "kubbo",
   "license": "ISC",