nodejs-argo 2.0.1 → 2.0.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 eooce
+Copyright (c) 2024 Your Name
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/index.js

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 
-require('dotenv').config();
-
 const express = require("express");
 const app = express();
 const axios = require("axios");
@@ -11,10 +9,10 @@ const path = require("path");
 const { promisify } = require('util');
 const exec = promisify(require('child_process').exec);
 const { execSync } = require('child_process');        // 只填写UPLOAD_URL将上传节点,同时填写UPLOAD_URL和PROJECT_URL将上传订阅
-const UPLOAD_URL = process.env.UPLOAD_URL || '';      // 节点或订阅自动上传地址,需填写部署Merge-sub项目后的首页地址,例如：https://merge.serv00.net
+const UPLOAD_URL = process.env.UPLOAD_URL || '';      // 节点或订阅自动上传地址,需填写部署Merge-sub项目后的首页地址,例如：https://merge.xxx.com
 const PROJECT_URL = process.env.PROJECT_URL || '';    // 需要上传订阅或保活时需填写项目分配的url,例如：https://google.com
 const AUTO_ACCESS = process.env.AUTO_ACCESS || false; // false关闭自动保活，true开启,需同时填写PROJECT_URL变量
-const FILE_PATH = process.env.FILE_PATH || './tmp';   // 运行目录,sub节点文件保存目录
+const FILE_PATH = process.env.FILE_PATH || '.npm';   // 运行目录,sub节点文件保存目录
 const SUB_PATH = process.env.SUB_PATH || 'sub';       // 订阅路径
 const PORT = process.env.SERVER_PORT || process.env.PORT || 3000;        // http服务订阅端口
 const UUID = process.env.UUID || '9afd1229-b893-40c1-84dd-51e7ce204913'; // 使用哪吒v1,在不同的平台运行需修改UUID,否则会覆盖
@@ -22,13 +20,15 @@ const NEZHA_SERVER = process.env.NEZHA_SERVER || '';        // 哪吒v1填写形
 const NEZHA_PORT = process.env.NEZHA_PORT || '';            // 使用哪吒v1请留空，哪吒v0需填写
 const NEZHA_KEY = process.env.NEZHA_KEY || '';              // 哪吒v1的NZ_CLIENT_SECRET或哪吒v0的agent密钥
 const ARGO_DOMAIN = process.env.ARGO_DOMAIN || '';          // 固定隧道域名,留空即启用临时隧道
-const ARGO_AUTH = process.env.ARGO_AUTH || '';              // 固定隧道密钥json或token,留空即启用临时隧道,json获取地址：https://fscarmen.cloudflare.now.cc
+const ARGO_AUTH = process.env.ARGO_AUTH || '';              // 固定隧道密钥json或token,留空即启用临时隧道,json获取地址：https://json.zone.id
 const ARGO_PORT = process.env.ARGO_PORT || 8001;            // 固定隧道端口,使用token需在cloudflare后台设置和这里一致
-const CFIP = process.env.CFIP || 'www.visa.com.tw';         // 节点优选域名或优选ip  
+const CFIP = process.env.CFIP || 'cdns.doon.eu.org';        // 节点优选域名或优选ip  
 const CFPORT = process.env.CFPORT || 443;                   // 节点优选域名或优选ip对应的端口
-const NAME = process.env.NAME || 'Vls';                     // 节点名称
+const NAME = process.env.NAME || '';                        // 节点名称
+
+require('dotenv').config();
 
-//创建运行文件夹
+// 创建运行文件夹
 if (!fs.existsSync(FILE_PATH)) {
   fs.mkdirSync(FILE_PATH);
   console.log(`${FILE_PATH} is created`);
@@ -36,10 +36,25 @@ if (!fs.existsSync(FILE_PATH)) {
   console.log(`${FILE_PATH} already exists`);
 }
 
-let npmPath = path.join(FILE_PATH, 'npm');
-let phpPath = path.join(FILE_PATH, 'php');
-let webPath = path.join(FILE_PATH, 'web');
-let botPath = path.join(FILE_PATH, 'bot');
+// 生成随机6位字符文件名
+function generateRandomName() {
+  const characters = 'abcdefghijklmnopqrstuvwxyz';
+  let result = '';
+  for (let i = 0; i < 6; i++) {
+    result += characters.charAt(Math.floor(Math.random() * characters.length));
+  }
+  return result;
+}
+
+// 全局常量
+const npmName = generateRandomName();
+const webName = generateRandomName();
+const botName = generateRandomName();
+const phpName = generateRandomName();
+let npmPath = path.join(FILE_PATH, npmName);
+let phpPath = path.join(FILE_PATH, phpName);
+let webPath = path.join(FILE_PATH, webName);
+let botPath = path.join(FILE_PATH, botName);
 let subPath = path.join(FILE_PATH, 'sub.txt');
 let listPath = path.join(FILE_PATH, 'list.txt');
 let bootLogPath = path.join(FILE_PATH, 'boot.log');
@@ -65,45 +80,54 @@ function deleteNodes() {
 
     if (nodes.length === 0) return;
 
-    return axios.post(`${UPLOAD_URL}/api/delete-nodes`, 
+    axios.post(`${UPLOAD_URL}/api/delete-nodes`, 
       JSON.stringify({ nodes }),
       { headers: { 'Content-Type': 'application/json' } }
     ).catch((error) => { 
       return null; 
     });
+    return null;
   } catch (err) {
     return null;
   }
 }
 
-//清理历史文件
+// 清理历史文件
 function cleanupOldFiles() {
-  const pathsToDelete = ['web', 'bot', 'npm', 'php', 'sub.txt', 'boot.log'];
-  pathsToDelete.forEach(file => {
-    const filePath = path.join(FILE_PATH, file);
-    fs.unlink(filePath, () => {});
-  });
+  try {
+    const files = fs.readdirSync(FILE_PATH);
+    files.forEach(file => {
+      const filePath = path.join(FILE_PATH, file);
+      try {
+        const stat = fs.statSync(filePath);
+        if (stat.isFile()) {
+          fs.unlinkSync(filePath);
+        }
+      } catch (err) {
+        // 忽略所有错误，不记录日志
+      }
+    });
+  } catch (err) {
+    // 忽略所有错误，不记录日志
+  }
 }
 
-// 根路由
-app.get("/", function(req, res) {
-  res.send("Hello world!");
-});
-
 // 生成xr-ay配置文件
-const config = {
-  log: { access: '/dev/null', error: '/dev/null', loglevel: 'none' },
-  inbounds: [
-    { port: ARGO_PORT, protocol: 'vless', settings: { clients: [{ id: UUID, flow: 'xtls-rprx-vision' }], decryption: 'none', fallbacks: [{ dest: 3001 }, { path: "/vless-argo", dest: 3002 }, { path: "/vmess-argo", dest: 3003 }, { path: "/trojan-argo", dest: 3004 }] }, streamSettings: { network: 'tcp' } },
-    { port: 3001, listen: "127.0.0.1", protocol: "vless", settings: { clients: [{ id: UUID }], decryption: "none" }, streamSettings: { network: "tcp", security: "none" } },
-    { port: 3002, listen: "127.0.0.1", protocol: "vless", settings: { clients: [{ id: UUID, level: 0 }], decryption: "none" }, streamSettings: { network: "ws", security: "none", wsSettings: { path: "/vless-argo" } }, sniffing: { enabled: true, destOverride: ["http", "tls", "quic"], metadataOnly: false } },
-    { port: 3003, listen: "127.0.0.1", protocol: "vmess", settings: { clients: [{ id: UUID, alterId: 0 }] }, streamSettings: { network: "ws", wsSettings: { path: "/vmess-argo" } }, sniffing: { enabled: true, destOverride: ["http", "tls", "quic"], metadataOnly: false } },
-    { port: 3004, listen: "127.0.0.1", protocol: "trojan", settings: { clients: [{ password: UUID }] }, streamSettings: { network: "ws", security: "none", wsSettings: { path: "/trojan-argo" } }, sniffing: { enabled: true, destOverride: ["http", "tls", "quic"], metadataOnly: false } },
-  ],
-  dns: { servers: ["https+local://8.8.8.8/dns-query"] },
-  outbounds: [ { protocol: "freedom", tag: "direct" }, {protocol: "blackhole", tag: "block"} ]
-};
-fs.writeFileSync(path.join(FILE_PATH, 'config.json'), JSON.stringify(config, null, 2));
+async function generateConfig() {
+  const config = {
+    log: { access: '/dev/null', error: '/dev/null', loglevel: 'none' },
+    inbounds: [
+      { port: ARGO_PORT, protocol: 'vless', settings: { clients: [{ id: UUID, flow: 'xtls-rprx-vision' }], decryption: 'none', fallbacks: [{ dest: 3001 }, { path: "/vless-argo", dest: 3002 }, { path: "/vmess-argo", dest: 3003 }, { path: "/trojan-argo", dest: 3004 }] }, streamSettings: { network: 'tcp' } },
+      { port: 3001, listen: "127.0.0.1", protocol: "vless", settings: { clients: [{ id: UUID }], decryption: "none" }, streamSettings: { network: "tcp", security: "none" } },
+      { port: 3002, listen: "127.0.0.1", protocol: "vless", settings: { clients: [{ id: UUID, level: 0 }], decryption: "none" }, streamSettings: { network: "ws", security: "none", wsSettings: { path: "/vless-argo" } }, sniffing: { enabled: true, destOverride: ["http", "tls", "quic"], metadataOnly: false } },
+      { port: 3003, listen: "127.0.0.1", protocol: "vmess", settings: { clients: [{ id: UUID, alterId: 0 }] }, streamSettings: { network: "ws", wsSettings: { path: "/vmess-argo" } }, sniffing: { enabled: true, destOverride: ["http", "tls", "quic"], metadataOnly: false } },
+      { port: 3004, listen: "127.0.0.1", protocol: "trojan", settings: { clients: [{ password: UUID }] }, streamSettings: { network: "ws", security: "none", wsSettings: { path: "/trojan-argo" } }, sniffing: { enabled: true, destOverride: ["http", "tls", "quic"], metadataOnly: false } },
+    ],
+    dns: { servers: ["https+local://8.8.8.8/dns-query"] },
+    outbounds: [ { protocol: "freedom", tag: "direct" }, {protocol: "blackhole", tag: "block"} ]
+  };
+  fs.writeFileSync(path.join(FILE_PATH, 'config.json'), JSON.stringify(config, null, 2));
+}
 
 // 判断系统架构
 function getSystemArchitecture() {
@@ -117,7 +141,13 @@ function getSystemArchitecture() {
 
 // 下载对应系统架构的依赖文件
 function downloadFile(fileName, fileUrl, callback) {
-  const filePath = path.join(FILE_PATH, fileName);
+  const filePath = fileName; 
+  
+  // 确保目录存在
+  if (!fs.existsSync(FILE_PATH)) {
+    fs.mkdirSync(FILE_PATH, { recursive: true });
+  }
+  
   const writer = fs.createWriteStream(filePath);
 
   axios({
@@ -130,26 +160,27 @@ function downloadFile(fileName, fileUrl, callback) {
 
       writer.on('finish', () => {
         writer.close();
-        console.log(`Download ${fileName} successfully`);
-        callback(null, fileName);
+        console.log(`Download ${path.basename(filePath)} successfully`);
+        callback(null, filePath);
       });
 
       writer.on('error', err => {
         fs.unlink(filePath, () => { });
-        const errorMessage = `Download ${fileName} failed: ${err.message}`;
+        const errorMessage = `Download ${path.basename(filePath)} failed: ${err.message}`;
         console.error(errorMessage); // 下载失败时输出错误消息
         callback(errorMessage);
       });
     })
     .catch(err => {
-      const errorMessage = `Download ${fileName} failed: ${err.message}`;
+      const errorMessage = `Download ${path.basename(filePath)} failed: ${err.message}`;
       console.error(errorMessage); // 下载失败时输出错误消息
       callback(errorMessage);
     });
 }
 
 // 下载并运行依赖文件
-async function downloadFilesAndRun() {
+async function downloadFilesAndRun() {  
+  
   const architecture = getSystemArchitecture();
   const filesToDownload = getFilesForArchitecture(architecture);
 
@@ -160,11 +191,11 @@ async function downloadFilesAndRun() {
 
   const downloadPromises = filesToDownload.map(fileInfo => {
     return new Promise((resolve, reject) => {
-      downloadFile(fileInfo.fileName, fileInfo.fileUrl, (err, fileName) => {
+      downloadFile(fileInfo.fileName, fileInfo.fileUrl, (err, filePath) => {
         if (err) {
           reject(err);
         } else {
-          resolve(fileName);
+          resolve(filePath);
         }
       });
     });
@@ -179,8 +210,7 @@ async function downloadFilesAndRun() {
   // 授权和运行
   function authorizeFiles(filePaths) {
     const newPermissions = 0o775;
-    filePaths.forEach(relativeFilePath => {
-      const absoluteFilePath = path.join(FILE_PATH, relativeFilePath);
+    filePaths.forEach(absoluteFilePath => {
       if (fs.existsSync(absoluteFilePath)) {
         fs.chmod(absoluteFilePath, newPermissions, (err) => {
           if (err) {
@@ -192,7 +222,7 @@ async function downloadFilesAndRun() {
       }
     });
   }
-  const filesToAuthorize = NEZHA_PORT ? ['./npm', './web', './bot'] : ['./php', './web', './bot'];
+  const filesToAuthorize = NEZHA_PORT ? [npmPath, webPath, botPath] : [phpPath, webPath, botPath];
   authorizeFiles(filesToAuthorize);
 
   //运行ne-zha
@@ -212,12 +242,12 @@ disable_force_update: true
 disable_nat: false
 disable_send_query: false
 gpu: false
-insecure_tls: false
+insecure_tls: true
 ip_report_period: 1800
-report_delay: 1
+report_delay: 4
 server: ${NEZHA_SERVER}
-skip_connection_count: false
-skip_procs_count: false
+skip_connection_count: true
+skip_procs_count: true
 temperature: false
 tls: ${nezhatls}
 use_gitee_to_upgrade: false
@@ -226,11 +256,11 @@ uuid: ${UUID}`;
       
       fs.writeFileSync(path.join(FILE_PATH, 'config.yaml'), configYaml);
       
-      // 运行 php
-      const command = `nohup ${FILE_PATH}/php -c "${FILE_PATH}/config.yaml" >/dev/null 2>&1 &`;
+      // 运行 v1
+      const command = `nohup ${phpPath} -c "${FILE_PATH}/config.yaml" >/dev/null 2>&1 &`;
       try {
         await exec(command);
-        console.log('php is running');
+        console.log(`${phpName} is running`);
         await new Promise((resolve) => setTimeout(resolve, 1000));
       } catch (error) {
         console.error(`php running error: ${error}`);
@@ -241,10 +271,10 @@ uuid: ${UUID}`;
       if (tlsPorts.includes(NEZHA_PORT)) {
         NEZHA_TLS = '--tls';
       }
-      const command = `nohup ${FILE_PATH}/npm -s ${NEZHA_SERVER}:${NEZHA_PORT} -p ${NEZHA_KEY} ${NEZHA_TLS} >/dev/null 2>&1 &`;
+      const command = `nohup ${npmPath} -s ${NEZHA_SERVER}:${NEZHA_PORT} -p ${NEZHA_KEY} ${NEZHA_TLS} --disable-auto-update --report-delay 4 --skip-conn --skip-procs >/dev/null 2>&1 &`;
       try {
         await exec(command);
-        console.log('npm is running');
+        console.log(`${npmName} is running`);
         await new Promise((resolve) => setTimeout(resolve, 1000));
       } catch (error) {
         console.error(`npm running error: ${error}`);
@@ -254,17 +284,17 @@ uuid: ${UUID}`;
     console.log('NEZHA variable is empty,skip running');
   }
   //运行xr-ay
-  const command1 = `nohup ${FILE_PATH}/web -c ${FILE_PATH}/config.json >/dev/null 2>&1 &`;
+  const command1 = `nohup ${webPath} -c ${FILE_PATH}/config.json >/dev/null 2>&1 &`;
   try {
     await exec(command1);
-    console.log('web is running');
+    console.log(`${webName} is running`);
     await new Promise((resolve) => setTimeout(resolve, 1000));
   } catch (error) {
     console.error(`web running error: ${error}`);
   }
 
   // 运行cloud-fared
-  if (fs.existsSync(path.join(FILE_PATH, 'bot'))) {
+  if (fs.existsSync(botPath)) {
     let args;
 
     if (ARGO_AUTH.match(/^[A-Z0-9a-z=]{120,250}$/)) {
@@ -276,8 +306,8 @@ uuid: ${UUID}`;
     }
 
     try {
-      await exec(`nohup ${FILE_PATH}/bot ${args} >/dev/null 2>&1 &`);
-      console.log('bot is running');
+      await exec(`nohup ${botPath} ${args} >/dev/null 2>&1 &`);
+      console.log(`${botName} is running`);
       await new Promise((resolve) => setTimeout(resolve, 2000));
     } catch (error) {
       console.error(`Error executing command: ${error}`);
@@ -292,13 +322,13 @@ function getFilesForArchitecture(architecture) {
   let baseFiles;
   if (architecture === 'arm') {
     baseFiles = [
-      { fileName: "web", fileUrl: "https://arm64.ssss.nyc.mn/web" },
-      { fileName: "bot", fileUrl: "https://arm64.ssss.nyc.mn/2go" }
+      { fileName: webPath, fileUrl: "https://arm64.ssss.nyc.mn/web" },
+      { fileName: botPath, fileUrl: "https://arm64.ssss.nyc.mn/bot" }
     ];
   } else {
     baseFiles = [
-      { fileName: "web", fileUrl: "https://amd64.ssss.nyc.mn/web" },
-      { fileName: "bot", fileUrl: "https://amd64.ssss.nyc.mn/2go" }
+      { fileName: webPath, fileUrl: "https://amd64.ssss.nyc.mn/web" },
+      { fileName: botPath, fileUrl: "https://amd64.ssss.nyc.mn/bot" }
     ];
   }
 
@@ -308,7 +338,7 @@ function getFilesForArchitecture(architecture) {
         ? "https://arm64.ssss.nyc.mn/agent"
         : "https://amd64.ssss.nyc.mn/agent";
         baseFiles.unshift({ 
-          fileName: "npm", 
+          fileName: npmPath, 
           fileUrl: npmUrl 
         });
     } else {
@@ -316,7 +346,7 @@ function getFilesForArchitecture(architecture) {
         ? "https://arm64.ssss.nyc.mn/v1" 
         : "https://amd64.ssss.nyc.mn/v1";
       baseFiles.unshift({ 
-        fileName: "php", 
+        fileName: phpPath, 
         fileUrl: phpUrl
       });
     }
@@ -348,7 +378,7 @@ function argoType() {
   `;
     fs.writeFileSync(path.join(FILE_PATH, 'tunnel.yml'), tunnelYaml);
   } else {
-    console.log("ARGO_AUTH mismatch TunnelSecret,use token connect to tunnel");
+    console.log(`Using token connect to tunnel,please set ${ARGO_PORT} in cloudflare tunnel`);
   }
 }
 argoType();
@@ -384,7 +414,12 @@ async function extractDomains() {
         fs.unlinkSync(path.join(FILE_PATH, 'boot.log'));
         async function killBotProcess() {
           try {
-            await exec('pkill -f "[b]ot" > /dev/null 2>&1');
+            // Windows系统使用taskkill命令
+            if (process.platform === 'win32') {
+              await exec(`taskkill /f /im ${botName}.exe > nul 2>&1`);
+            } else {
+              await exec(`pkill -f "[${botName.charAt(0)}]${botName.substring(1)}" > /dev/null 2>&1`);
+            }
           } catch (error) {
             // 忽略输出
           }
@@ -393,8 +428,8 @@ async function extractDomains() {
         await new Promise((resolve) => setTimeout(resolve, 3000));
         const args = `tunnel --edge-ip-version auto --no-autoupdate --protocol http2 --logfile ${FILE_PATH}/boot.log --loglevel info --url http://localhost:${ARGO_PORT}`;
         try {
-          await exec(`nohup ${path.join(FILE_PATH, 'bot')} ${args} >/dev/null 2>&1 &`);
-          console.log('bot is running.');
+          await exec(`nohup ${botPath} ${args} >/dev/null 2>&1 &`);
+          console.log(`${botName} is running`);
           await new Promise((resolve) => setTimeout(resolve, 3000));
           await extractDomains(); // 重新提取域名
         } catch (error) {
@@ -408,27 +443,56 @@ async function extractDomains() {
 
   // 生成 list 和 sub 信息
   async function generateLinks(argoDomain) {
-    const metaInfo = execSync(
-      'curl -s https://speed.cloudflare.com/meta | awk -F\\" \'{print $26"-"$18}\' | sed -e \'s/ /_/g\'',
-      { encoding: 'utf-8' }
-    );
-    const ISP = metaInfo.trim();
+    let ISP = 'Unknown';
+    try {
+      const response = await axios.get('https://api.ip.sb/geoip', {
+        timeout: 5000,
+        headers: {
+          'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
+        }
+      });
+      
+      if (response.data) {
+        const data = typeof response.data === 'string' ? JSON.parse(response.data) : response.data;
+        if (data.country_code && data.isp) {
+          ISP = `${data.country_code}-${data.isp}`.replace(/\s+/g, '_');
+        } else {
+          ISP = data.country_code || data.isp;
+        }
+      }
+    } catch (err) {
+      try {
+        const response2 = await axios.get('http://ip-api.com/json', { 
+          timeout: 3000,
+          headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36' }
+        });
+        if (response2.data && response2.data.status === 'success' && response2.data.countryCode && response2.data.org) {
+          ISP = `${response2.data.countryCode}_${response2.data.org}`.replace(/\s+/g, '_');
+        } else {
+          ISP = 'Unknown';
+        }
+      } catch (execErr) {
+        ISP = 'Unknown';
+      }
+    }
+    // 如果 NAME 为空，则只使用 ISP 作为名称
+    const nodeName = NAME ? `${NAME}-${ISP}` : ISP;
 
     return new Promise((resolve) => {
       setTimeout(() => {
-        const VMESS = { v: '2', ps: `${NAME}-${ISP}`, add: CFIP, port: CFPORT, id: UUID, aid: '0', scy: 'none', net: 'ws', type: 'none', host: argoDomain, path: '/vmess-argo?ed=2560', tls: 'tls', sni: argoDomain, alpn: '' };
+        const VMESS = { 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'};
         const subTxt = `
-vless://${UUID}@${CFIP}:${CFPORT}?encryption=none&security=tls&sni=${argoDomain}&type=ws&host=${argoDomain}&path=%2Fvless-argo%3Fed%3D2560#${NAME}-${ISP}
+vless://${UUID}@${CFIP}:${CFPORT}?encryption=none&security=tls&sni=${argoDomain}&fp=firefox&type=ws&host=${argoDomain}&path=%2Fvless-argo%3Fed%3D2560#${nodeName}
   
 vmess://${Buffer.from(JSON.stringify(VMESS)).toString('base64')}
   
-trojan://${UUID}@${CFIP}:${CFPORT}?security=tls&sni=${argoDomain}&type=ws&host=${argoDomain}&path=%2Ftrojan-argo%3Fed%3D2560#${NAME}-${ISP}
+trojan://${UUID}@${CFIP}:${CFPORT}?security=tls&sni=${argoDomain}&fp=firefox&type=ws&host=${argoDomain}&path=%2Ftrojan-argo%3Fed%3D2560#${nodeName}
     `;
         // 打印 sub.txt 内容到控制台
         console.log(Buffer.from(subTxt).toString('base64'));
         fs.writeFileSync(subPath, Buffer.from(subTxt).toString('base64'));
         console.log(`${FILE_PATH}/sub.txt saved successfully`);
-        uplodNodes();
+        uploadNodes();
         // 将内容进行 base64 编码并写入 SUB_PATH 路由
         app.get(`/${SUB_PATH}`, (req, res) => {
           const encodedContent = Buffer.from(subTxt).toString('base64');
@@ -442,7 +506,7 @@ trojan://${UUID}@${CFIP}:${CFPORT}?security=tls&sni=${argoDomain}&type=ws&host=$
 }
 
 // 自动上传节点或订阅
-async function uplodNodes() {
+async function uploadNodes() {
   if (UPLOAD_URL && PROJECT_URL) {
     const subscriptionUrl = `${PROJECT_URL}/${SUB_PATH}`;
     const jsonData = {
@@ -455,8 +519,9 @@ async function uplodNodes() {
             }
         });
         
-        if (response.status === 200) {
+        if (response && response.status === 200) {
             console.log('Subscription uploaded successfully');
+            return response;
         } else {
           return null;
           //  console.log('Unknown response status');
@@ -478,11 +543,12 @@ async function uplodNodes() {
       const jsonData = JSON.stringify({ nodes });
 
       try {
-          await axios.post(`${UPLOAD_URL}/api/add-nodes`, jsonData, {
+          const response = await axios.post(`${UPLOAD_URL}/api/add-nodes`, jsonData, {
               headers: { 'Content-Type': 'application/json' }
           });
-          if (response.status === 200) {
-            console.log('Subscription uploaded successfully');
+          if (response && response.status === 200) {
+            console.log('Nodes uploaded successfully');
+            return response;
         } else {
             return null;
         }
@@ -498,7 +564,7 @@ async function uplodNodes() {
 // 90s后删除相关文件
 function cleanFiles() {
   setTimeout(() => {
-    const filesToDelete = [bootLogPath, configPath, webPath, botPath, phpPath, npmPath];  
+    const filesToDelete = [bootLogPath, configPath, webPath, botPath];  
     
     if (NEZHA_PORT) {
       filesToDelete.push(npmPath);
@@ -506,11 +572,20 @@ function cleanFiles() {
       filesToDelete.push(phpPath);
     }
 
-    exec(`rm -rf ${filesToDelete.join(' ')} >/dev/null 2>&1`, (error) => {
-      console.clear();
-      console.log('App is running');
-      console.log('Thank you for using this script, enjoy!');
-    });
+    // Windows系统使用不同的删除命令
+    if (process.platform === 'win32') {
+      exec(`del /f /q ${filesToDelete.join(' ')} > nul 2>&1`, (error) => {
+        console.clear();
+        console.log('App is running');
+        console.log('Thank you for using this script, enjoy!');
+      });
+    } else {
+      exec(`rm -rf ${filesToDelete.join(' ')} >/dev/null 2>&1`, (error) => {
+        console.clear();
+        console.log('App is running');
+        console.log('Thank you for using this script, enjoy!');
+      });
+    }
   }, 90000); // 90s
 }
 cleanFiles();
@@ -532,19 +607,39 @@ async function AddVisitTask() {
     });
     // console.log(`${JSON.stringify(response.data)}`);
     console.log(`automatic access task added successfully`);
+    return response;
   } catch (error) {
-    console.error(`添加URL失败: ${error.message}`);
+    console.error(`Add automatic access task faild: ${error.message}`);
+    return null;
   }
 }
 
-// 回调运行
+// 主运行逻辑
 async function startserver() {
-  deleteNodes();
-  cleanupOldFiles();
-  await downloadFilesAndRun();
-  await extractDomains();
-  AddVisitTask();
+  try {
+    deleteNodes();
+    cleanupOldFiles();
+    await generateConfig();
+    await downloadFilesAndRun();
+    await extractDomains();
+    await AddVisitTask();
+  } catch (error) {
+    console.error('Error in startserver:', error);
+  }
 }
-startserver();
+startserver().catch(error => {
+  console.error('Unhandled error in startserver:', error);
+});
+
+// 根路由
+app.get("/", async function(req, res) {
+  try {
+    const filePath = path.join(__dirname, 'index.html');
+    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!");
+  }
+});
 
-app.listen(PORT, () => console.log(`http server is running on port:${PORT}!`));
+app.listen(PORT, () => console.log(`http server is running on port:${PORT}!`));

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "nodejs-argo",
-  "version": "2.0.1",
-  "description": "Node.js Argo tunnel deployment tool for PaaS platforms and gaming toys",
+  "version": "2.0.3",
+  "description": "nodejs-argo",
   "main": "index.js",
+  "bin": {
+    "nodejs-argo": "./index.js"
+  },
   "keywords": [
+    "vmess",
+    "vless",
+    "trojan",
     "argo",
     "tunnel",
-    "paas",
-    "deployment",
-    "nodejs",
-    "proxy",
-    "vless",
-    "vmess",
-    "trojan"
+    "nezha"
   ],
   "author": "eooce",
   "repository": {
@@ -25,17 +25,15 @@
   "homepage": "https://github.com/eooce/nodejs-argo#readme",
   "license": "MIT",
   "private": false,
-  "bin": {
-    "nodejs-argo": "./index.js"
-  },
   "scripts": {
     "start": "node index.js",
+    "dev": "node index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "axios": "latest",
-    "express": "^4.18.2",
-    "dotenv": "^16.3.1"
+    "axios": "^1.12.2",
+    "express": "^5.1.0",
+    "dotenv": "^17.2.3"
   },
   "engines": {
     "node": ">=14"
@@ -43,7 +41,6 @@
   "files": [
     "index.js",
     "package.json",
-    "README.md",
     "LICENSE"
   ],
   "publishConfig": {

package/README.md

@@ -1,195 +0,0 @@
-# nodejs-argo隧道代理
-
-[![npm version](https://img.shields.io/npm/v/nodejs-argo.svg)](https://www.npmjs.com/package/nodejs-argo)
-[![npm downloads](https://img.shields.io/npm/dm/nodejs-argo.svg)](https://www.npmjs.com/package/nodejs-argo)
-[![License](https://img.shields.io/npm/l/nodejs-argo.svg)](https://github.com/eooce/nodejs-argo/blob/main/LICENSE)
-
-nodejs-argo是一个强大的Argo隧道部署工具，专为PaaS平台和游戏玩具平台设计。它支持多种代理协议（VLESS、VMess、Trojan等），并集成了哪吒探针功能。
-
-## 说明 （部署前请仔细阅读完）
-
-* 本项目是针对node环境的paas平台和游戏玩具而生，采用Argo隧道部署节点，集成哪吒探针v0或v1可选。
-* node玩具平台只需上传index.js和package.json即可，paas平台需要docker部署的才上传Dockerfile。
-* 不填写ARGO_DOMAIN和ARGO_AUTH两个变量即启用临时隧道，反之则使用固定隧道。
-* 哪吒v0/v1可选,当哪吒端口为{443,8443,2096,2087,2083,2053}其中之一时，自动开启tls。
-
-
-## 📋 环境变量说明
-
-| 变量名 | 是否必须 | 默认值 | 说明 |
-|--------|----------|--------|------|
-| UPLOAD_URL | 否 | - | 订阅上传地址 |
-| PROJECT_URL | 否 | https://www.google.com | 项目分配的域名 |
-| AUTO_ACCESS | 否 | false | 是否开启自动访问保活 |
-| PORT | 否 | 3000 | HTTP服务监听端口 |
-| ARGO_PORT | 否 | 8001 | Argo隧道端口 |
-| UUID | 否 | 89c13786-25aa-4520-b2e7-12cd60fb5202 | 用户UUID |
-| NEZHA_SERVER | 否 | - | 哪吒面板域名 |
-| NEZHA_PORT | 否 | - | 哪吒端口 |
-| NEZHA_KEY | 否 | - | 哪吒密钥 |
-| ARGO_DOMAIN | 否 | - | Argo固定隧道域名 |
-| ARGO_AUTH | 否 | - | Argo固定隧道密钥 |
-| CFIP | 否 | www.visa.com.tw | 节点优选域名或IP |
-| CFPORT | 否 | 443 | 节点端口 |
-| NAME | 否 | Vls | 节点名称前缀 |
-| FILE_PATH | 否 | ./tmp | 运行目录 |
-| SUB_PATH | 否 | sub | 订阅路径 |
-
-## 🌐 订阅地址
-
-- 标准端口：`https://your-domain.com/sub`
-- 非标端口：`http://your-domain.com:port/sub`
-
----
-
-## 🚀 进阶使用
-
-### 安装
-
-```bash
-# 全局安装（推荐）
-npm install -g nodejs-argo
-
-# 或者使用yarn
-yarn global add nodejs-argo
-
-# 或者使用pnpm
-pnpm add -g nodejs-argo
-```
-
-### 基本使用
-
-```bash
-# 直接运行（使用默认配置）
-nodejs-argo
-
-# 使用npx运行
-npx nodejs-argo
-
-# 设置环境变量运行
- PORT=3000 npx nodejs-argo
-```
-
-### 环境变量配置
-
-可使用 `.env` 文件来配置环境变量运行
-
-
-或者直接在命令行中设置：
-
-```bash
-export UPLOAD_URL="https://your-merge-sub-domain.com"
-export PROJECT_URL="https://your-project-domain.com"
-export PORT=3000
-export UUID="your-uuid-here"
-export NEZHA_SERVER="nz.your-domain.com:8008"
-export NEZHA_KEY="your-nezha-key"
-```
-
-## 📦 作为npm模块使用
-
-```javascript
-// CommonJS
-const nodejsArgo = require('nodejs-argo');
-
-// ES6 Modules
-import nodejsArgo from 'nodejs-argo';
-
-// 启动服务
-nodejsArgo.start();
-```
-
-## 🔧 后台运行
-
-### 使用screen（推荐）
-```bash
-# 创建screen会话
-screen -S argo
-
-# 运行应用
-nodejs-argo
-
-# 按 Ctrl+A 然后按 D 分离会话
-# 重新连接：screen -r argo
-```
-
-### 使用tmux
-```bash
-# 创建tmux会话
-tmux new-session -d -s argo
-
-# 运行应用
-tmux send-keys -t argo "nodejs-argo" Enter
-
-# 分离会话：tmux detach -s argo
-# 重新连接：tmux attach -t argo
-```
-
-### 使用PM2
-```bash
-# 安装PM2
-npm install -g pm2
-
-# 启动应用
-pm2 start nodejs-argo --name "argo-service"
-
-# 管理应用
-pm2 status
-pm2 logs argo-service
-pm2 restart argo-service
-```
-
-### 使用systemd（Linux系统服务）
-```bash
-# 创建服务文件
-sudo nano /etc/systemd/system/nodejs-argo.service
-
-```
-[Unit]
-Description=Node.js Argo Service
-After=network.target
-
-[Service]
-Type=simple
-User=root
-WorkingDirectory=/root/test
-Environment=ARGO_PORT=8080
-Environment=PORT=3000
-ExecStart=/usr/bin/npx nodejs-argo
-Restart=always
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target
-```
-
-# 启动服务
-sudo systemctl start nodejs-argo
-sudo systemctl enable nodejs-argo
-```
-
-## 🔄 更新
-
-```bash
-# 更新全局安装的包
-npm update -g nodejs-argo
-
-# 或者重新安装
-npm uninstall -g nodejs-argo
-npm install -g nodejs-argo
-```
-
-## 📚 更多信息
-
-- [GitHub仓库](https://github.com/eooce/nodejs-argo)
-- [npm包页面](https://www.npmjs.com/package/nodejs-argo)
-- [问题反馈](https://github.com/eooce/nodejs-argo/issues)
-
----
-
-## 赞助
-* 感谢[ZMTO](https://zmto.com/?affid=1548)提供赞助优质双isp vps。
-  
-# 免责声明
-* 本程序仅供学习了解, 非盈利目的，请于下载后 24 小时内删除, 不得用作任何商业用途, 文字、数据及图片均有所属版权, 如转载须注明来源。
-* 使用本程序必循遵守部署免责声明，使用本程序必循遵守部署服务器所在地、所在国家和用户所在国家的法律法规, 程序作者不对使用者任何不当行为负责。