@eooce/idx 1.0.0 → 1.0.1

package/index.js

@@ -12,10 +12,10 @@ const { execSync } = require('child_process');
 const UPLOAD_URL = process.env.UPLOAD_URL || '';      // 订阅或节点自动上传地址,需填写部署Merge-sub项目后的首页地址,例如：https://merge.ct8.pl
 const PROJECT_URL = process.env.PROJECT_URL || '';    // 需要上传订阅或保活时需填写项目分配的url,例如：https://google.com
 const AUTO_ACCESS = process.env.AUTO_ACCESS || false; // false关闭自动保活，true开启,需同时填写PROJECT_URL变量
-const YT_WARPOUT = process.env.YT_WARPOUT || true;   // 设置为true时强制使用warp出站访问youtube,false时自动检测是否设置warp出站
-const FILE_PATH = process.env.FILE_PATH || './.npm';  // sub.txt订阅文件路径
+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 || 'f8e6d3d3-dad7-427e-8a72-8ca1f03a59e2';  // 在不同的平台运行了v1哪吒请修改UUID,否则会覆盖
+const UUID = process.env.UUID || '0a6568ff-ea3c-4271-9020-450560e10d63';  // 在不同的平台运行了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密钥 
@@ -25,10 +25,10 @@ const ARGO_PORT = process.env.ARGO_PORT || 8001;             // argo固定隧道
 const TUIC_PORT = process.env.TUIC_PORT || '';               // tuic端口，支持多端口的可以填写，否则留空
 const HY2_PORT = process.env.HY2_PORT || '';                 // hy2端口，支持多端口的可以填写，否则留空
 const REALITY_PORT = process.env.REALITY_PORT || '';         // reality端口，支持多端口的可以填写，否则留空
-const CFIP = process.env.CFIP || 'cf.877774.xyz';            // 优选域名或优选IP
+const CFIP = process.env.CFIP || 'cdns.doon.eu.org';         // 优选域名或优选IP
 const CFPORT = process.env.CFPORT || 443;                    // 优选域名或优选IP对应端口
 const PORT = process.env.PORT || 3000;                       // http订阅端口    
-const NAME = process.env.NAME || 'Idx';                      // 节点名称
+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 
 
@@ -44,10 +44,28 @@ if (!fs.existsSync(FILE_PATH)) {
 
 let privateKey = '';
 let publicKey = '';
-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 chars = 'abcdefghijklmnopqrstuvwxyz';
+  let result = '';
+  for (let i = 0; i < 6; i++) {
+    result += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+  return result;
+}
+
+// 生成随机名称
+const npmRandomName = generateRandomName();
+const webRandomName = generateRandomName();
+const botRandomName = generateRandomName();
+const phpRandomName = generateRandomName();
+
+// 使用随机文件名定义路径
+let npmPath = path.join(FILE_PATH, npmRandomName);
+let phpPath = path.join(FILE_PATH, phpRandomName);
+let webPath = path.join(FILE_PATH, webRandomName);
+let botPath = path.join(FILE_PATH, botRandomName);
 let subPath = path.join(FILE_PATH, 'sub.txt');
 let listPath = path.join(FILE_PATH, 'list.txt');
 let bootLogPath = path.join(FILE_PATH, 'boot.log');
@@ -102,7 +120,7 @@ function isValidPort(port) {
 }
 
 //清理历史文件
-const pathsToDelete = [ 'web', 'bot', 'npm', 'boot.log', 'list.txt'];
+const pathsToDelete = [ webRandomName, botRandomName, npmRandomName, 'boot.log', 'list.txt'];
 function cleanupOldFiles() {
   pathsToDelete.forEach(file => {
     const filePath = path.join(FILE_PATH, file);
@@ -196,7 +214,24 @@ async function downloadFilesAndRun() {
     return;
   }
 
-  const downloadPromises = filesToDownload.map(fileInfo => {
+  // 修改文件名映射为使用随机名称
+  const renamedFiles = filesToDownload.map(file => {
+    let newFileName;
+    if (file.fileName === 'npm') {
+      newFileName = npmRandomName;
+    } else if (file.fileName === 'web') {
+      newFileName = webRandomName;
+    } else if (file.fileName === 'bot') {
+      newFileName = botRandomName;
+    } else if (file.fileName === 'php') {
+      newFileName = phpRandomName;
+    } else {
+      newFileName = file.fileName;
+    }
+    return { ...file, fileName: newFileName };
+  });
+
+  const downloadPromises = renamedFiles.map(fileInfo => {
     return new Promise((resolve, reject) => {
       downloadFile(fileInfo.fileName, fileInfo.fileUrl, (err, fileName) => {
         if (err) {
@@ -231,13 +266,14 @@ async function downloadFilesAndRun() {
       }
     });
   }
-  const filesToAuthorize = NEZHA_PORT ? ['./npm', './web', './bot'] : ['./php', './web', './bot'];
+  // 修改授权文件列表以使用随机名称
+  const filesToAuthorize = NEZHA_PORT ? [npmRandomName, webRandomName, botRandomName] : [phpRandomName, webRandomName, botRandomName];
   authorizeFiles(filesToAuthorize);
 
   // 检测哪吒是否开启TLS
   const port = NEZHA_SERVER.includes(':') ? NEZHA_SERVER.split(':').pop() : '';
   const tlsPorts = new Set(['443', '8443', '2096', '2087', '2083', '2053']);
-  const nezhatls = tlsPorts.has(port) ? 'tls' : 'false';
+  const nezhatls = tlsPorts.has(port) ? 'true' : 'false';
 
   //运行ne-zha
   if (NEZHA_SERVER && NEZHA_KEY) {
@@ -252,12 +288,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: 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
@@ -289,7 +325,8 @@ uuid: ${UUID}`;
 
     continueExecution();
   } else {
-    exec(`${path.join(FILE_PATH, 'web')} generate reality-keypair`, async (err, stdout, stderr) => {
+    // 修改执行命令以使用随机文件名
+    exec(`${path.join(FILE_PATH, webRandomName)} generate reality-keypair`, async (err, stdout, stderr) => {
       if (err) {
         console.error(`Error generating reality-keypair: ${err.message}`);
         return;
@@ -647,7 +684,7 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
       } else {
         NEZHA_TLS = '';
       }
-      const command = `nohup ${path.join(FILE_PATH, 'npm')} -s ${NEZHA_SERVER}:${NEZHA_PORT} -p ${NEZHA_KEY} ${NEZHA_TLS} >/dev/null 2>&1 &`;
+      const command = `nohup ${path.join(FILE_PATH, npmRandomName)} -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 execPromise(command);
         console.log('npm is running');
@@ -657,7 +694,7 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
       }
     } else if (NEZHA_SERVER && NEZHA_KEY) {
         // 运行 V1
-        const command = `nohup ${FILE_PATH}/php -c "${FILE_PATH}/config.yaml" >/dev/null 2>&1 &`;
+        const command = `nohup ${FILE_PATH}/${phpRandomName} -c "${FILE_PATH}/config.yaml" >/dev/null 2>&1 &`;
         try {
           await exec(command);
           console.log('php is running');
@@ -670,7 +707,8 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
     }
 
     // 运行sbX
-    const command1 = `nohup ${path.join(FILE_PATH, 'web')} run -c ${path.join(FILE_PATH, 'config.json')} >/dev/null 2>&1 &`;
+    // 修改执行命令以使用随机文件名
+    const command1 = `nohup ${path.join(FILE_PATH, webRandomName)} run -c ${path.join(FILE_PATH, 'config.json')} >/dev/null 2>&1 &`;
     try {
       await execPromise(command1);
       console.log('web is running');
@@ -680,7 +718,8 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
     }
 
     // 运行cloud-fared
-    if (fs.existsSync(path.join(FILE_PATH, 'bot'))) {
+    // 修改检查和执行命令以使用随机文件名
+    if (fs.existsSync(path.join(FILE_PATH, botRandomName))) {
       let args;
 
       if (ARGO_AUTH.match(/^[A-Z0-9a-z=]{120,250}$/)) {
@@ -692,7 +731,7 @@ eQ6OFb9LbLYL9f+sAiAffoMbi4y/0YUSlTtz7as9S8/lciBF5VCUoVIKS+vX2g==
       }
 
       try {
-        await execPromise(`nohup ${path.join(FILE_PATH, 'bot')} ${args} >/dev/null 2>&1 &`);
+        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) {
@@ -789,7 +828,7 @@ 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');
+              await exec(`pkill -f "${botRandomName}" > /dev/null 2>&1`);
             } catch (error) {
                 return null;
               // 忽略输出
@@ -799,7 +838,7 @@ async function extractDomains() {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           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 &`);
+            await exec(`nohup ${path.join(FILE_PATH, botRandomName)} ${args} >/dev/null 2>&1 &`);
             console.log('bot is running.');
             await new Promise((resolve) => setTimeout(resolve, 6000)); // 等待6秒
             await extractDomains(); // 重新提取域名
@@ -832,27 +871,29 @@ async function extractDomains() {
     );
     const ISP = metaInfo.trim();
 
+    const nodeName = NAME ? `${NAME}-${ISP}` : ISP;
+
     return new Promise((resolve) => {
       setTimeout(() => {
-        const vmessNode = `vmess://${Buffer.from(JSON.stringify({ 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: '', fp: 'chrome'})).toString('base64')}`;
+        const vmessNode = `vmess://${Buffer.from(JSON.stringify({ v: '2', ps: `${nodeName}`, 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: '', fp: 'firefox'})).toString('base64')}`;
 
         let subTxt = vmessNode; // 始终生成vmess节点
 
         // TUIC_PORT是有效端口号时生成tuic节点
         if (isValidPort(TUIC_PORT)) {
-          const tuicNode = `\ntuic://${UUID}:@${SERVER_IP}:${TUIC_PORT}?sni=www.bing.com&congestion_control=bbr&udp_relay_mode=native&alpn=h3&allow_insecure=1#${NAME}-${ISP}`;
+          const tuicNode = `\ntuic://${UUID}:@${SERVER_IP}:${TUIC_PORT}?sni=www.bing.com&congestion_control=bbr&udp_relay_mode=native&alpn=h3&allow_insecure=1#${nodeName}`;
           subTxt += tuicNode;
         }
 
         // HY2_PORT是有效端口号时生成hysteria2节点
         if (isValidPort(HY2_PORT)) {
-          const hysteriaNode = `\nhysteria2://${UUID}@${SERVER_IP}:${HY2_PORT}/?sni=www.bing.com&insecure=1&alpn=h3&obfs=none#${NAME}-${ISP}`;
+          const hysteriaNode = `\nhysteria2://${UUID}@${SERVER_IP}:${HY2_PORT}/?sni=www.bing.com&insecure=1&alpn=h3&obfs=none#${nodeName}`;
           subTxt += hysteriaNode;
         }
 
         // REALITY_PORT是有效端口号时生成reality节点
         if (isValidPort(REALITY_PORT)) {
-          const vlessNode = `\nvless://${UUID}@${SERVER_IP}:${REALITY_PORT}?encryption=none&flow=xtls-rprx-vision&security=reality&sni=www.iij.ad.jp&fp=chrome&pbk=${publicKey}&type=tcp&headerType=none#${NAME}-${ISP}`;
+          const vlessNode = `\nvless://${UUID}@${SERVER_IP}:${REALITY_PORT}?encryption=none&flow=xtls-rprx-vision&security=reality&sni=www.iij.ad.jp&fp=firefox&pbk=${publicKey}&type=tcp&headerType=none#${nodeName}`;
           subTxt += vlessNode;
         }
 
@@ -885,7 +926,17 @@ function cleanFiles() {
       filesToDelete.push(phpPath);
     }
 
-    exec(`rm -rf ${filesToDelete.join(' ')} >/dev/null 2>&1`, (error) => {
+    // 修改为使用随机文件名删除文件
+    const filePathsToDelete = filesToDelete.map(file => {
+      // 对于已经使用随机路径的变量，直接使用
+      if ([webPath, botPath, phpPath, npmPath].includes(file)) {
+        return file;
+      }
+      // 对于其他文件，使用原始路径
+      return path.join(FILE_PATH, path.basename(file));
+    });
+
+    exec(`rm -rf ${filePathsToDelete.join(' ')} >/dev/null 2>&1`, (error) => {
       console.clear();
       console.log('App is running');
       console.log('Thank you for using this script, enjoy!');

package/package.json

@@ -1,17 +1,20 @@
 {
   "name": "@eooce/idx",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "@eooce/idx",
   "main": "index.js",
   "bin": {
     "@eooce/idx": "./index.js"
   },
   "keywords": [
+    "vmess",
+    "vless",
+    "hysteria2",
+    "tuic",
+    "reality",
+    "argo",
     "tunnel",
-    "nezha",
-    "deployment",
-    "paas",
-    "vps"
+    "nezha"
   ],
   "author": "eooce",
   "repository": {
@@ -22,7 +25,7 @@
     "url": "https://github.com/eooce/Sing-box/issues"
   },
   "homepage": "https://github.com/eooce/Sing-box#readme",
-  "license": "AGPL-3.0-only",
+  "license": "MIT",
   "private": false,
   "scripts": {
     "start": "node index.js",
@@ -30,9 +33,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "axios": "latest",
-    "express": "latest",
-    "dotenv": "latest"
+    "axios": "^1.12.2",
+    "express": "^5.1.0",
+    "dotenv": "^17.2.3"
   },
   "engines": {
     "node": ">=14"

package/README.md

@@ -1,64 +0,0 @@
-# @eooce/idx
-
-A lightweight Node.js project for executing backend services or network requests tasks with support for HTTP requests, environment variable management, and basic web services.
-
-## Features
-
-- Start local Node.js service (via express)
-- Send HTTP requests (via axios)
-- Load environment configuration files (via dotenv)
-- Support for Node.js 14 and above
-- Quick start with `npm start`
-
-## Installation
-
-```bash
-npm install @eooce/idx
-```
-
-## Usage
-
-```javascript
-// Require the package
-const idx = require('@eooce/idx');
-
-// Start the service
-idx.start();
-```
-
-Or run directly from the command line:
-
-```bash
-npx @eooce/idx
-```
-
-## Environment Variables
-
-The following environment variables can be configured:
-
-- `UPLOAD_URL`: Subscription or node auto-upload address
-- `PROJECT_URL`: Project assigned URL for subscription upload or keep-alive
-- `AUTO_ACCESS`: false to disable auto keep-alive, true to enable
-- `YT_WARPOUT`: true to force WARP outbound for YouTube, false for auto-detection
-- `FILE_PATH`: Subscription file path (default: './.npm')
-- `SUB_PATH`: Subscription path (default: 'sub')
-- `UUID`: UUID for different platform operation (default: 'f8e6d3d3-dad7-427e-8a72-8ca1f03a59e2')
-- `NEZHA_SERVER`: Nezha panel address
-- `NEZHA_PORT`: Nezha agent port
-- `NEZHA_KEY`: Nezha client secret or agent key
-- `ARGO_DOMAIN`: Argo tunnel domain
-- `ARGO_AUTH`: Argo tunnel token or JSON
-- `ARGO_PORT`: Argo tunnel port (default: 8001)
-- `TUIC_PORT`: TUIC port
-- `HY2_PORT`: Hysteria2 port
-- `REALITY_PORT`: Reality port
-- `CFIP`: Preferred domain or IP (default: 'cf.877774.xyz')
-- `CFPORT`: Preferred domain or IP port (default: 443)
-- `PORT`: HTTP subscription port (default: 3000)
-- `NAME`: Node name (default: 'Idx')
-- `CHAT_ID`: Telegram chat_id
-- `BOT_TOKEN`: Telegram bot_token
-
-## License
-
-AGPL-3.0-only