@eooce/idx 1.0.5 → 1.0.7

package/index.js

@@ -6,6 +6,7 @@ const axios = require("axios");
 const os = require('os');
 const fs = require("fs");
 const path = require("path");
+require('dotenv').config();
 const { promisify } = require('util');
 const exec = promisify(require('child_process').exec);
 const { execSync } = require('child_process');
@@ -15,24 +16,26 @@ const AUTO_ACCESS = process.env.AUTO_ACCESS || false; // false关闭自动保活
 const YT_WARPOUT = process.env.YT_WARPOUT || false;   // 设置为true时强制使用warp出站访问youtube,false时自动检测是否设置warp出站
 const FILE_PATH = process.env.FILE_PATH || '.npm';    // sub.txt订阅文件路径
 const SUB_PATH = process.env.SUB_PATH || 'sub';       // 订阅sub路径，默认为sub,例如：https://google.com/sub
-const UUID = process.env.UUID || '0a6568ff-ea3c-4271-9020-450560e10d63';  // 在不同的平台运行了v1哪吒请修改UUID,否则会覆盖
+const UUID = process.env.UUID || '96c78932-b21d-42f9-906c-6de0d74e0e4b';  // 在不同的平台运行了v1哪吒请修改UUID,否则会覆盖
 const NEZHA_SERVER = process.env.NEZHA_SERVER || '';         // 哪吒面板地址,v1形式：nz.serv00.net:8008  v0形式：nz.serv00.net
 const NEZHA_PORT = process.env.NEZHA_PORT || '';             // v1哪吒请留空，v0 agent端口，当端口为{443,8443,2087,2083,2053,2096}时，自动开启tls
 const NEZHA_KEY = process.env.NEZHA_KEY || '';               // v1的NZ_CLIENT_SECRET或v0 agwnt密钥 
 const ARGO_DOMAIN = process.env.ARGO_DOMAIN || '';           // argo固定隧道域名,留空即使用临时隧道
 const ARGO_AUTH = process.env.ARGO_AUTH || '';               // argo固定隧道token或json,留空即使用临时隧道
 const ARGO_PORT = process.env.ARGO_PORT || 8001;             // argo固定隧道端口,使用token需在cloudflare控制台设置和这里一致，否则节点不通
+const S5_PORT = process.env.S5_PORT || '';                   // socks5端口，支持多端口的可以填写，否则留空
 const TUIC_PORT = process.env.TUIC_PORT || '';               // tuic端口，支持多端口的可以填写，否则留空
 const HY2_PORT = process.env.HY2_PORT || '';                 // hy2端口，支持多端口的可以填写，否则留空
+const ANYTLS_PORT = process.env.ANYTLS_PORT || '';           // AnyTLS端口，支持多端口的可以填写，否则留空
 const REALITY_PORT = process.env.REALITY_PORT || '';         // reality端口，支持多端口的可以填写，否则留空
-const CFIP = process.env.CFIP || 'cdns.doon.eu.org';         // 优选域名或优选IP
+const ANYREALITY_PORT = process.env.ANYREALITY_PORT || '';   // Anyr-eality端口，支持多端口的可以填写，否则留空
+const CFIP = process.env.CFIP || 'saas.sin.fan';             // 优选域名或优选IP
 const CFPORT = process.env.CFPORT || 443;                    // 优选域名或优选IP对应端口
 const PORT = process.env.PORT || 3000;                       // http订阅端口    
 const NAME = process.env.NAME || '';                         // 节点名称
 const CHAT_ID = process.env.CHAT_ID || '';                   // Telegram chat_id  两个变量不全不推送节点到TG 
 const BOT_TOKEN = process.env.BOT_TOKEN || '';               // Telegram bot_token 两个变量不全不推送节点到TG 
-
-require('dotenv').config();
+const DISABLE_ARGO = process.env.DISABLE_ARGO || false;      // 设置为 true 时禁用argo,false开启
 
 //创建运行文件夹
 if (!fs.existsSync(FILE_PATH)) {
@@ -130,6 +133,11 @@ function cleanupOldFiles() {
 
 // 获取固定隧道json
 function argoType() {
+  if (DISABLE_ARGO === 'true' || DISABLE_ARGO === true) {
+    console.log("DISABLE_ARGO is set to true, disable argo tunnel");
+    return;
+  }
+
   if (!ARGO_AUTH || !ARGO_DOMAIN) {
     console.log("ARGO_DOMAIN or ARGO_AUTH variable is empty, use quick tunnels");
     return;
@@ -436,25 +444,25 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
         }
       ],
       "endpoints": [
-          {
-              "type": "wireguard",
-              "tag": "wireguard-out",
-              "mtu": 1280,
-              "address": [
-                  "172.16.0.2/32",
-                  "2606:4700:110:8dfe:d141:69bb:6b80:925/128"
-              ],
-              "private_key": "YFYOAdbw1bKTHlNNi+aEjBM3BO7unuFC5rOkMRAz9XY=",
-              "peers": [
-                  {
-                      "address": "engage.cloudflareclient.com",
-                      "port": 2408,
-                      "public_key": "bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo=",
-                      "allowed_ips": ["0.0.0.0/0", "::/0"],
-                      "reserved": [78, 135, 76]
-                  }
-              ]
-          }
+        {
+          "type": "wireguard",
+          "tag": "wireguard-out",
+          "mtu": 1280,
+          "address": [
+              "172.16.0.2/32",
+              "2606:4700:110:8dfe:d141:69bb:6b80:925/128"
+          ],
+          "private_key": "YFYOAdbw1bKTHlNNi+aEjBM3BO7unuFC5rOkMRAz9XY=",
+          "peers": [
+            {
+              "address": "engage.cloudflareclient.com",
+              "port": 2408,
+              "public_key": "bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo=",
+              "allowed_ips": ["0.0.0.0/0", "::/0"],
+              "reserved": [78, 135, 76]
+            }
+          ]
+        }
       ],
       "outbounds": [
         {
@@ -574,6 +582,82 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
       // 忽略错误，继续运行
     }
 
+    // S5配置
+    try {
+      if (isValidPort(S5_PORT)) {
+        config.inbounds.push({
+          "tag": "s5-in",
+          "type": "socks",
+          "listen": "::",
+          "listen_port": parseInt(S5_PORT),
+          "users": [
+            {
+              "username": UUID.substring(0, 8),
+              "password": UUID.slice(-12)
+            }
+          ]
+        });
+      }
+    } catch (error) {
+      // 忽略错误，继续运行
+    }
+
+    // AnyTLS配置
+    try {
+      if (isValidPort(ANYTLS_PORT)) {
+        config.inbounds.push({
+          "tag": "anytls-in",
+          "type": "anytls",
+          "listen": "::",
+          "listen_port": parseInt(ANYTLS_PORT),
+          "users": [
+            {
+              "password": UUID
+            }
+          ],
+          "tls": {
+            "enabled": true,
+            "certificate_path": path.join(FILE_PATH, "cert.pem"),
+            "key_path": path.join(FILE_PATH, "private.key")
+          }
+        });
+      }
+    } catch (error) {
+      // 忽略错误，继续运行
+    }
+
+    // AnyReality配置
+    try {
+      if (isValidPort(ANYREALITY_PORT)) {
+        config.inbounds.push({
+          "tag": "anyreality-in",
+          "type": "anytls",
+          "listen": "::",
+          "listen_port": parseInt(ANYREALITY_PORT),
+          "users": [
+            {
+              "password": UUID
+            }
+          ],
+          "tls": {
+            "enabled": true,
+            "server_name": "www.iij.ad.jp",
+            "reality": {
+              "enabled": true,
+              "handshake": {
+                "server": "www.iij.ad.jp",
+                "server_port": 443
+              },
+              "private_key": privateKey, 
+              "short_id": [""]
+            }
+          }
+        });
+      }
+    } catch (error) {
+      // 忽略错误，继续运行
+    }
+
     // 检测YouTube可访问性并智能配置出站规则
     try {
       // console.log(`YT_WARPOUT environment variable is set to: ${YT_WARPOUT}`);
@@ -703,29 +787,29 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
     }
 
     // 运行cloud-fared
-    // 修改检查和执行命令以使用随机文件名
-    if (fs.existsSync(path.join(FILE_PATH, botRandomName))) {
-      let args;
-
-      if (ARGO_AUTH.match(/^[A-Z0-9a-z=]{120,250}$/)) {
-        args = `tunnel --edge-ip-version auto --no-autoupdate --protocol http2 run --token ${ARGO_AUTH}`;
-      } else if (ARGO_AUTH.match(/TunnelSecret/)) {
-        args = `tunnel --edge-ip-version auto --config ${path.join(FILE_PATH, 'tunnel.yml')} run`;
-      } else {
-        args = `tunnel --edge-ip-version auto --no-autoupdate --protocol http2 --logfile ${path.join(FILE_PATH, 'boot.log')} --loglevel info --url http://localhost:${ARGO_PORT}`;
-      }
+    if (DISABLE_ARGO !== 'true' && DISABLE_ARGO !== true) {
+      if (fs.existsSync(path.join(FILE_PATH, botRandomName))) {
+        let args;
+
+        if (ARGO_AUTH.match(/^[A-Z0-9a-z=]{120,250}$/)) {
+          args = `tunnel --edge-ip-version auto --no-autoupdate --protocol http2 run --token ${ARGO_AUTH}`;
+        } else if (ARGO_AUTH.match(/TunnelSecret/)) {
+          args = `tunnel --edge-ip-version auto --config ${path.join(FILE_PATH, 'tunnel.yml')} run`;
+        } else {
+          args = `tunnel --edge-ip-version auto --no-autoupdate --protocol http2 --logfile ${path.join(FILE_PATH, 'boot.log')} --loglevel info --url http://localhost:${ARGO_PORT}`;
+        }
 
-      try {
-        await execPromise(`nohup ${path.join(FILE_PATH, botRandomName)} ${args} >/dev/null 2>&1 &`);
-        console.log('bot is running');
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-      } catch (error) {
-        console.error(`Error executing command: ${error}`);
+        try {
+          await execPromise(`nohup ${path.join(FILE_PATH, botRandomName)} ${args} >/dev/null 2>&1 &`);
+          console.log('bot is running');
+          await new Promise((resolve) => setTimeout(resolve, 2000));
+        } catch (error) {
+          console.error(`Error executing command: ${error}`);
+        }
       }
     }
+    // 无论是否禁用 Argo，都需要生成节点信息
     await new Promise((resolve) => setTimeout(resolve, 5000));
-
-    // 提取域名并生成sub.txt文件
     await extractDomains();
     });
   };
@@ -784,6 +868,11 @@ function getFilesForArchitecture(architecture) {
 
 // 获取临时隧道domain
 async function extractDomains() {
+  if (DISABLE_ARGO === 'true' || DISABLE_ARGO === true) {
+    await generateLinks(null);
+    return;
+  }
+
   let argoDomain;
 
   if (ARGO_AUTH && ARGO_DOMAIN) {
@@ -842,14 +931,14 @@ async function getMetaInfo() {
   try {
     const response1 = await axios.get('https://api.ip.sb/geoip', { headers: { 'User-Agent': 'Mozilla/5.0', timeout: 3000 }});
     if (response1.data && response1.data.country_code && response1.data.isp) {
-      return `${response1.data.country_code}_${response1.data.isp}`;
+      return `${response1.data.country_code}-${response1.data.isp}`.replace(/\s+/g, '_');
     }
   } catch (error) {
       try {
         // 备用 ip-api.com 获取isp
         const response2 = await axios.get('http://ip-api.com/json', { headers: { 'User-Agent': 'Mozilla/5.0', timeout: 3000 }});
         if (response2.data && response2.data.status === 'success' && response2.data.countryCode && response2.data.org) {
-          return `${response2.data.countryCode}_${response2.data.org}`;
+          return `${response2.data.countryCode}-${response2.data.org}`.replace(/\s+/g, '_');
         }
       } catch (error) {
         // console.error('Backup API also failed');
@@ -862,25 +951,36 @@ async function getMetaInfo() {
 async function generateLinks(argoDomain) {
   let SERVER_IP = '';
   try {
-    const response = await axios.get('https://ipv4.ip.sb', { timeout: 3000 });
-    SERVER_IP = response.data.trim();
+    const ipv4Response = await axios.get('http://ipv4.ip.sb', { timeout: 3000 });
+    SERVER_IP = ipv4Response.data.trim();
   } catch (err) {
     try {
-      const response = await axios.get('https://ipv6.ip.sb', { timeout: 2000 });
-      SERVER_IP = `[${response.data.trim()}]`;
-    } catch (ipv6Err) {
       SERVER_IP = execSync('curl -sm 3 ipv4.ip.sb').toString().trim();
+    } catch (curlErr) {
+      try {
+        const ipv6Response = await axios.get('http://ipv6.ip.sb', { timeout: 3000 });
+        SERVER_IP = `[${ipv6Response.data.trim()}]`;
+      } catch (ipv6AxiosErr) {
+        try {
+          SERVER_IP = `[${execSync('curl -sm 3 ipv6.ip.sb').toString().trim()}]`;
+        } catch (ipv6CurlErr) {
+          console.error('Failed to get IP address:', ipv6CurlErr.message);
+        }
+      }
     }
   }
 
   const ISP = await getMetaInfo();
   const nodeName = NAME ? `${NAME}-${ISP}` : ISP;
-
   return new Promise((resolve) => {
     setTimeout(() => {
-      const vmessNode = `vmess://${Buffer.from(JSON.stringify({ v: '2', ps: `${nodeName}`, add: CFIP, port: CFPORT, id: UUID, aid: '0', scy: 'auto', net: 'ws', type: 'none', host: argoDomain, path: '/vmess-argo?ed=2560', tls: 'tls', sni: argoDomain, alpn: '', fp: 'firefox'})).toString('base64')}`;
+      let subTxt = '';
 
-      let subTxt = vmessNode; // 始终生成vmess节点
+      // 只有当 DISABLE_ARGO 不为 'true' 且 argoDomain 存在时才生成默认的 vmess 节点
+      if ((DISABLE_ARGO !== 'true' && DISABLE_ARGO !== true) && argoDomain) {
+        const vmessNode = `vmess://${Buffer.from(JSON.stringify({ v: '2', ps: `${nodeName}`, add: CFIP, port: CFPORT, id: UUID, aid: '0', scy: 'auto', net: 'ws', type: 'none', host: argoDomain, path: '/vmess-argo?ed=2560', tls: 'tls', sni: argoDomain, alpn: '', fp: 'firefox'})).toString('base64')}`;
+        subTxt = vmessNode;
+      }
 
       // TUIC_PORT是有效端口号时生成tuic节点
       if (isValidPort(TUIC_PORT)) {
@@ -900,8 +1000,28 @@ async function generateLinks(argoDomain) {
         subTxt += vlessNode;
       }
 
+      // ANYTLS_PORT是有效端口号时生成anytls节点
+      if (isValidPort(ANYTLS_PORT)) {
+        const anytlsNode = `\nanytls://${UUID}@${SERVER_IP}:${ANYTLS_PORT}?security=tls&sni=${SERVER_IP}&fp=chrome&insecure=1&allowInsecure=1#${nodeName}`;
+        subTxt += anytlsNode;
+      }
+
+      // ANYREALITY_PORT是有效端口号时生成anyreality节点
+      if (isValidPort(ANYREALITY_PORT)) {
+        const anyrealityNode = `\nanytls://${UUID}@${SERVER_IP}:${ANYREALITY_PORT}?security=reality&sni=www.iij.ad.jp&fp=chrome&pbk=${publicKey}&type=tcp&headerType=none#${nodeName}`;
+        subTxt += anyrealityNode;
+      }
+
+      // S5_PORT是有效端口号时生成socks5节点 
+      if (isValidPort(S5_PORT)) {
+        const S5_AUTH = Buffer.from(`${UUID.substring(0, 8)}:${UUID.slice(-12)}`).toString('base64');
+        const s5Node = `\nsocks://${S5_AUTH}@${SERVER_IP}:${S5_PORT}#${nodeName}`;
+        subTxt += s5Node;
+      }
+
       // 打印 sub.txt 内容到控制台
-      console.log(Buffer.from(subTxt).toString('base64')); 
+      console.log('\x1b[32m' + Buffer.from(subTxt).toString('base64') + '\x1b[0m'); // 输出绿色
+      console.log('\x1b[35m' + 'Logs will be deleted in 90 seconds,you can copy the above nodes' + '\x1b[0m'); // 洋红色
       fs.writeFileSync(subPath, Buffer.from(subTxt).toString('base64'));
       fs.writeFileSync(listPath, subTxt, 'utf8');
       console.log(`${FILE_PATH}/sub.txt saved successfully`);
@@ -928,14 +1048,10 @@ function cleanFiles() {
     } else if (NEZHA_SERVER && NEZHA_KEY) {
       filesToDelete.push(phpPath);
     }
-
-    // 修改为使用随机文件名删除文件
     const filePathsToDelete = filesToDelete.map(file => {
-      // 对于已经使用随机路径的变量，直接使用
       if ([webPath, botPath, phpPath, npmPath].includes(file)) {
         return file;
       }
-      // 对于其他文件，使用原始路径
       return path.join(FILE_PATH, path.basename(file));
     });
 
@@ -1048,7 +1164,7 @@ async function startserver() {
   cleanupOldFiles();
   argoType();
   await downloadFilesAndRun();
-  AddVisitTask();
+  await AddVisitTask();
   cleanFiles();
 }
 startserver();
@@ -1060,7 +1176,7 @@ app.get("/", async function(req, res) {
     const data = await fs.promises.readFile(filePath, 'utf8');
     res.send(data);
   } catch (err) {
-    res.send("Hello world!<br><br>You can visit /{SUB_PATH}(Default: /sub) get your nodes!");
+    res.send("Hello world!<br><br>You can access /{SUB_PATH}(Default: /sub) get your nodes!");
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eooce/idx",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "@eooce/idx",
   "main": "index.js",
   "bin": {
@@ -9,11 +9,11 @@
   "keywords": [
     "vmess",
     "vless",
-    "hysteria2",
     "tuic",
-    "reality",
     "argo",
-    "tunnel"
+    "tunnel",
+    "reality",
+    "hysteria2"
   ],
   "author": "eooce",
   "license": "MIT",
@@ -24,9 +24,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "axios": "^1.12.2",
-    "express": "^4.18.2",
-    "dotenv": "^17.2.3"
+    "axios": "^1.13.2",
+    "dotenv": "^17.2.3",
+    "express": "^5.2.1"
   },
   "engines": {
     "node": ">=14"