nodejs-argo 2.0.2 → 2.0.3

package/index.js

@@ -12,7 +12,7 @@ const { execSync } = require('child_process');        // 只填写UPLOAD_URL将
 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,否则会覆盖
@@ -112,11 +112,6 @@ function cleanupOldFiles() {
   }
 }
 
-// 根路由
-app.get("/", function(req, res) {
-  res.send("Hello world!");
-});
-
 // 生成xr-ay配置文件
 async function generateConfig() {
   const config = {
@@ -383,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();
@@ -449,9 +444,8 @@ async function extractDomains() {
   // 生成 list 和 sub 信息
   async function generateLinks(argoDomain) {
     let ISP = 'Unknown';
-    
     try {
-      const response = await axios.get('https://speed.cloudflare.com/meta', {
+      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'
@@ -460,19 +454,23 @@ async function extractDomains() {
       
       if (response.data) {
         const data = typeof response.data === 'string' ? JSON.parse(response.data) : response.data;
-        if (data.country && data.asOrganization) {
-          ISP = `${data.country}-${data.asOrganization}`.replace(/\s+/g, '_');
+        if (data.country_code && data.isp) {
+          ISP = `${data.country_code}-${data.isp}`.replace(/\s+/g, '_');
         } else {
-          ISP = data.country || data.asOrganization;
+          ISP = data.country_code || data.isp;
         }
       }
     } catch (err) {
       try {
-        const metaInfo = execSync(
-          'curl -s https://speed.cloudflare.com/meta | awk -F\\" \'{print $26\"-\"$18}\' | sed -e \'s/ /_/g\'',
-          { encoding: 'utf-8', timeout: 5000 }
-        );
-        ISP = metaInfo.trim() || 'Unknown';
+        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';
       }
@@ -633,4 +631,15 @@ 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}!`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs-argo",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "nodejs-argo",
   "main": "index.js",
   "bin": {