Improvements

matfurrier · Dec 26, 2023 · 9c29b86 · 9c29b86
1 parent 4290220
commit 9c29b86
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 19 deletions.
diff --git a/api/validate-site.js b/api/validate-site.js
@@ -0,0 +1,4 @@
+module.exports = (req, res) => {
+    const isIpCheckEnabled = process.env.IS_IPCHECK_ING === 'ipcheck.ing';
+    res.status(200).json({ isIpCheckEnabled });
+};
diff --git a/public/contents/ipDataCards.js b/public/contents/ipDataCards.js
@@ -1,6 +1,6 @@
 export default [
   {
-    id: "upai",
+    id: "taobao",
     ip: "",
     country_name: "",
     region: "",
@@ -12,10 +12,10 @@ export default [
     asnlink: "",
     mapUrl: "res/img/defaultMap.jpg",
     showMap: false,
-    source: "Upai",
+    source: "Taobao",
   },
   {
-    id: "taobao",
+    id: "special",
     ip: "",
     country_name: "",
     region: "",
@@ -27,7 +27,7 @@ export default [
     asnlink: "",
     mapUrl: "res/img/defaultMap.jpg",
     showMap: false,
-    source: "Taobao",
+    source: "Special",
   },
   {
     id: "cloudflare_v4",

diff --git a/public/res/app.js b/public/res/app.js
@@ -69,6 +69,33 @@ new Vue({
     keyMap,
   },
   methods: {
+
+    getIPFromTaobao() {
+      window.ipCallback = (data) => {
+        var ip = data.ip;
+        this.ipDataCards[0].source = "TaoBao";
+        this.fetchIPDetails(0, ip);
+        delete window.ipCallback; // 清理
+      };
+      var script = document.createElement("script");
+      script.src = "https://www.taobao.com/help/getip.php?callback=ipCallback";
+      document.head.appendChild(script);
+      // 清理
+      document.head.removeChild(script);
+    },
+
+    getIPFromSpecial() {
+      fetch('/api/validate-site')
+        .then(response => response.json())
+        .then(data => {
+          if (data.isIpCheckEnabled) {
+            this.getIPFromGCR();
+          } else {
+            this.getIPFromUpai();
+          }
+        });
+    },
+
     getIPFromUpai() {
       const unixTime = Date.now();
       const url = `https://pubstatic.b0.upaiyun.com/?_upnode&t=${unixTime}`;
@@ -82,26 +109,38 @@ new Vue({
         })
         .then((data) => {
           const ip = data.remote_addr;
-          this.fetchIPDetails(0, ip);
+          this.ipDataCards[1].source = "Upai"
+          this.fetchIPDetails(1, ip);
         })
         .catch((error) => {
           console.error("Error fetching IP from Upai:", error);
-          this.ipDataCards[0].ip = this.currentTexts.ipInfos.IPv4Error;
+          this.ipDataCards[1].ip = this.currentTexts.ipInfos.IPv4Error;
         });
     },
 
-    getIPFromTaobao() {
-      window.ipCallback = (data) => {
-        var ip = data.ip;
-        this.ipDataCards[1].source = "TaoBao";
-        this.fetchIPDetails(1, ip);
-        delete window.ipCallback; // 清理
-      };
-      var script = document.createElement("script");
-      script.src = "https://www.taobao.com/help/getip.php?callback=ipCallback";
-      document.head.appendChild(script);
-      // 清理
-      document.head.removeChild(script);
+    getIPFromGCR() {
+      const url = `https://getipfromgoogle.ipcheck.ing/`;
+
+      fetch(url)
+        .then((response) => {
+          if (!response.ok) {
+            throw new Error("Network response was not ok");
+          }
+          return response.json();
+        })
+        .then((data) => {
+          // 从 data.ip 获取第一个逗号前的部分
+          const fullIp = data.ip;
+          const ip = fullIp.includes(',') ? fullIp.split(',')[0] : fullIp;
+          this.ipDataCards[1].source = "IPCheck.ing";
+          // 使用提取的 IP 地址
+          this.fetchIPDetails(1, ip);
+        })
+
+        .catch((error) => {
+          console.error("Error fetching IP from IPCheck.ing:", error);
+          this.ipDataCards[1].ip = this.currentTexts.ipInfos.IPv4Error;
+        });
     },
 
     getIPFromCloudflare_V4() {
@@ -247,6 +286,9 @@ new Vue({
         case "Upai":
           this.getIPFromUpai(card);
           break;
+        case "IPCheck.ing":
+          this.getIPFromGCR(card);
+          break;
         case "TaoBao":
           this.getIPFromTaobao(card);
           break;
@@ -278,7 +320,7 @@ new Vue({
     checkAllIPs() {
       // 从所有来源获取 IP 地址
       setTimeout(() => {
-        this.getIPFromUpai();
+        this.getIPFromSpecial();
       }, 100);
       setTimeout(() => {
         this.getIPFromTaobao();

diff --git a/server.js b/server.js
@@ -3,6 +3,7 @@ const express = require('express');
 const path = require('path');
 const mapHandler = require('./api/map');
 const validateMapKeyHandler = require('./api/validate-map-key');
+const validateSite = require('./api/validate-site');
 const ipinfoHandler = require('./api/ipinfo');
 const ipapicomHandler = require('./api/ipapicom');
 
@@ -19,7 +20,9 @@ app.get('/api/ipapicom', ipapicomHandler);
 // 设置静态文件服务
 app.use(express.static(path.join(__dirname, 'public')));
 
+// 一些判断
 app.all('/api/validate-map-key', validateMapKeyHandler);
+app.all('/api/validate-site', validateSite);
 
 // 启动服务器
 app.listen(port, () => {