@eooce/idx 1.0.4 → 1.0.6

package/index.js

@@ -128,12 +128,6 @@ function cleanupOldFiles() {
   });
 }
 
-
-// 根路由
-app.get("/", function(req, res) {
-  res.send("Hello world!");
-});
-
 // 获取固定隧道json
 function argoType() {
   if (!ARGO_AUTH || !ARGO_DOMAIN) {
@@ -842,69 +836,87 @@ async function extractDomains() {
     }
   }
 }
-  
-  // 生成 list 和 sub 信息
-  async function generateLinks(argoDomain) {
-    let SERVER_IP = '';
-    try {
-      SERVER_IP = execSync('curl -s --max-time 2 ipv4.ip.sb').toString().trim();
-    } catch (err) {
+
+// 获取isp信息
+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}`.replace(/\s+/g, '_');
+    }
+  } catch (error) {
       try {
-        SERVER_IP = `[${execSync('curl -s --max-time 1 ipv6.ip.sb').toString().trim()}]`;
-      } catch (ipv6Err) {
-        console.error('Failed to get IP address:', ipv6Err.message);
+        // 备用 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}`.replace(/\s+/g, '_');
+        }
+      } catch (error) {
+        // console.error('Backup API also failed');
       }
-    }
+  }
+  return 'Unknown';
+}
 
-    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();
+// 生成 list 和 sub 信息
+async function generateLinks(argoDomain) {
+  let SERVER_IP = '';
+  try {
+    const response = await axios.get('https://ipv4.ip.sb', { timeout: 3000 });
+    SERVER_IP = response.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();
+    }
+  }
 
-    const nodeName = NAME ? `${NAME}-${ISP}` : ISP;
+  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')}`;
+  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 = vmessNode; // 始终生成vmess节点
+      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#${nodeName}`;
-          subTxt += tuicNode;
-        }
+      // 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#${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#${nodeName}`;
-          subTxt += hysteriaNode;
-        }
+      // 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#${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=firefox&pbk=${publicKey}&type=tcp&headerType=none#${nodeName}`;
-          subTxt += vlessNode;
-        }
+      // 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=firefox&pbk=${publicKey}&type=tcp&headerType=none#${nodeName}`;
+        subTxt += vlessNode;
+      }
 
-        // 打印 sub.txt 内容到控制台
-        console.log(Buffer.from(subTxt).toString('base64')); 
-        fs.writeFileSync(subPath, Buffer.from(subTxt).toString('base64'));
-        fs.writeFileSync(listPath, subTxt, 'utf8');
-        console.log(`${FILE_PATH}/sub.txt saved successfully`);
-        sendTelegram(); // 发送tg消息提醒
-        uplodNodes(); // 推送节点到订阅器
-        // 将内容进行 base64 编码并写入 SUB_PATH 路由
-        app.get(`/${SUB_PATH}`, (req, res) => {
-          const encodedContent = Buffer.from(subTxt).toString('base64');
-          res.set('Content-Type', 'text/plain; charset=utf-8');
-          res.send(encodedContent);
-        });
-        resolve(subTxt);
-      }, 2000);
-    });
-  }
+      // 打印 sub.txt 内容到控制台
+      console.log(Buffer.from(subTxt).toString('base64')); 
+      fs.writeFileSync(subPath, Buffer.from(subTxt).toString('base64'));
+      fs.writeFileSync(listPath, subTxt, 'utf8');
+      console.log(`${FILE_PATH}/sub.txt saved successfully`);
+      sendTelegram(); // 发送tg消息提醒
+      uplodNodes(); // 推送节点到订阅器
+      // 将内容进行 base64 编码并写入 SUB_PATH 路由
+      app.get(`/${SUB_PATH}`, (req, res) => {
+        const encodedContent = Buffer.from(subTxt).toString('base64');
+        res.set('Content-Type', 'text/plain; charset=utf-8');
+        res.send(encodedContent);
+      });
+      resolve(subTxt);
+    }, 2000);
+  });
+}
   
 // 90s分钟后删除相关文件
 function cleanFiles() {
@@ -1040,5 +1052,16 @@ async function startserver() {
   cleanFiles();
 }
 startserver();
-  
+
+// 根路由
+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(`server is running on port:${PORT}!`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eooce/idx",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "@eooce/idx",
   "main": "index.js",
   "bin": {
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "axios": "^1.12.2",
-    "express": "^5.1.0",
+    "express": "^4.18.2",
     "dotenv": "^17.2.3"
   },
   "engines": {