w-ipproxy 1.0.9 → 1.0.11

package/docs/WIpProxy.html

@@ -709,7 +709,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 13:48:35 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Aug 18 2026 13:44:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WIpProxy.mjs.html

@@ -185,6 +185,40 @@ function WIpProxy(opt = {}) {
     let prxsRaw = []
     let kpPrx = {}
 
+    //_normalizeIp: 正規化單一IP字串, 去除[]包裹, ipv4之port, 及ipv4-mapped-ipv6之'::ffff:'前綴
+    function _normalizeIp(v) {
+        let s = trim(v)
+        if (s === '') {
+            return ''
+        }
+        if (s[0] === '[') {
+            //形如'[::1]:8080'或'[2001:db8::1]'
+            let k = s.indexOf(']')
+            if (k > 0) {
+                s = s.slice(1, k)
+            }
+        }
+        else if (s.split(':').length === 2) {
+            //僅單一冒號才視為'1.2.3.4:port', 多冒號為ipv6不可截斷
+            s = s.split(':')[0]
+        }
+        //ipv4-mapped-ipv6, 如'::ffff:1.2.3.4', 統一還原為ipv4
+        let m = s.match(/^::ffff:(\d{1,3}(?:\.\d{1,3}){3})$/i)
+        if (m) {
+            s = m[1]
+        }
+        return s
+    }
+
+    //_originHasIp: 檢查origin(可能為'ip1, ip2, ...')逐段正規化後是否含有指定IP
+    function _originHasIp(origin, ip) {
+        if (!isestr(ip)) {
+            return false
+        }
+        let vs = map(sep(origin, ','), (v) => _normalizeIp(v))
+        return vs.indexOf(ip) >= 0
+    }
+
     //myRealIp: 本機真實公網IP, 用於匿名性檢測時比對代理egress是否洩漏
     let myRealIp = ''
     let myRealIpReady = false
@@ -199,8 +233,8 @@ function WIpProxy(opt = {}) {
                     let res = await axios.get('https://httpbin.org/ip', { timeout: 10000 })
                     let origin = get(res, 'data.origin', '')
                     if (isestr(origin)) {
-                        //origin可能為"1.2.3.4"或"1.2.3.4:port", 取首個逗號前且去port
-                        myRealIp = origin.split(',')[0].trim().split(':')[0]
+                        //origin可能為"1.2.3.4", "1.2.3.4:port", 或"::ffff:1.2.3.4"(部分環境如雲端runner為ipv4-mapped-ipv6), 取首個逗號前再正規化
+                        myRealIp = _normalizeIp(sep(origin, ',')[0])
                     }
                 }
                 catch (err) {
@@ -239,7 +273,7 @@ function WIpProxy(opt = {}) {
                 if (!isestr(origin)) {
                     return { ok: false, reason: 'anonymity non-json' }
                 }
-                if (origin.indexOf(myRealIp) >= 0) {
+                if (_originHasIp(origin, myRealIp)) {
                     return { ok: false, reason: `leaks real IP` }
                 }
             }
@@ -541,7 +575,7 @@ export default WIpProxy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 13:48:35 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Aug 18 2026 13:44:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 13:48:35 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Aug 18 2026 13:44:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "w-ipproxy",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "main": "dist/w-ipproxy.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.8",
     "axios": "^1.13.6",
     "cheerio": "^1.2.0",
-    "wsemi": "^1.8.70"
+    "wsemi": "^1.8.75"
   },
   "devDependencies": {
     "w-package-tools": "^1.1.12"

package/src/WIpProxy.mjs

@@ -138,6 +138,40 @@ function WIpProxy(opt = {}) {
     let prxsRaw = []
     let kpPrx = {}
 
+    //_normalizeIp: 正規化單一IP字串, 去除[]包裹, ipv4之port, 及ipv4-mapped-ipv6之'::ffff:'前綴
+    function _normalizeIp(v) {
+        let s = trim(v)
+        if (s === '') {
+            return ''
+        }
+        if (s[0] === '[') {
+            //形如'[::1]:8080'或'[2001:db8::1]'
+            let k = s.indexOf(']')
+            if (k > 0) {
+                s = s.slice(1, k)
+            }
+        }
+        else if (s.split(':').length === 2) {
+            //僅單一冒號才視為'1.2.3.4:port', 多冒號為ipv6不可截斷
+            s = s.split(':')[0]
+        }
+        //ipv4-mapped-ipv6, 如'::ffff:1.2.3.4', 統一還原為ipv4
+        let m = s.match(/^::ffff:(\d{1,3}(?:\.\d{1,3}){3})$/i)
+        if (m) {
+            s = m[1]
+        }
+        return s
+    }
+
+    //_originHasIp: 檢查origin(可能為'ip1, ip2, ...')逐段正規化後是否含有指定IP
+    function _originHasIp(origin, ip) {
+        if (!isestr(ip)) {
+            return false
+        }
+        let vs = map(sep(origin, ','), (v) => _normalizeIp(v))
+        return vs.indexOf(ip) >= 0
+    }
+
     //myRealIp: 本機真實公網IP, 用於匿名性檢測時比對代理egress是否洩漏
     let myRealIp = ''
     let myRealIpReady = false
@@ -152,8 +186,8 @@ function WIpProxy(opt = {}) {
                     let res = await axios.get('https://httpbin.org/ip', { timeout: 10000 })
                     let origin = get(res, 'data.origin', '')
                     if (isestr(origin)) {
-                        //origin可能為"1.2.3.4"或"1.2.3.4:port", 取首個逗號前且去port
-                        myRealIp = origin.split(',')[0].trim().split(':')[0]
+                        //origin可能為"1.2.3.4", "1.2.3.4:port", 或"::ffff:1.2.3.4"(部分環境如雲端runner為ipv4-mapped-ipv6), 取首個逗號前再正規化
+                        myRealIp = _normalizeIp(sep(origin, ',')[0])
                     }
                 }
                 catch (err) {
@@ -192,7 +226,7 @@ function WIpProxy(opt = {}) {
                 if (!isestr(origin)) {
                     return { ok: false, reason: 'anonymity non-json' }
                 }
-                if (origin.indexOf(myRealIp) >= 0) {
+                if (_originHasIp(origin, myRealIp)) {
                     return { ok: false, reason: `leaks real IP` }
                 }
             }

package/test/anonymity.test.mjs

@@ -4,6 +4,37 @@ import https from 'https'
 import wip from '../src/WIpProxy.mjs'
 
 
+//正規化單一IP字串, 去除[]包裹, ipv4之port, 及ipv4-mapped-ipv6之'::ffff:'前綴
+function normalizeIp(v) {
+    let s = String(v || '').trim()
+    if (s === '') {
+        return ''
+    }
+    if (s[0] === '[') {
+        let k = s.indexOf(']')
+        if (k > 0) {
+            s = s.slice(1, k)
+        }
+    }
+    else if (s.split(':').length === 2) {
+        s = s.split(':')[0]
+    }
+    let m = s.match(/^::ffff:(\d{1,3}(?:\.\d{1,3}){3})$/i)
+    if (m) {
+        s = m[1]
+    }
+    return s
+}
+
+//檢查origin(可能為'ip1, ip2, ...')逐段正規化後是否含有指定IP
+function originHasIp(origin, ip) {
+    if (ip === '') {
+        return false
+    }
+    return String(origin).split(',').map((v) => normalizeIp(v)).indexOf(ip) >= 0
+}
+
+
 describe('anonymity (elite + anonymityCheck)', function() {
     this.timeout(240 * 1000) //4min, 因為getProxiesOnce加上獨立leak驗證本身就耗時
 
@@ -12,10 +43,10 @@ describe('anonymity (elite + anonymityCheck)', function() {
 
     before(async function() {
 
-        //取本機真實公網IP
+        //取本機真實公網IP, 各環境格式不一(如雲端runner為'::ffff:1.2.3.4'), 須正規化後才可比對
         try {
             let r = await axios.get('https://httpbin.org/ip', { timeout: 10000 })
-            myIp = r.data?.origin || ''
+            myIp = normalizeIp(String(r.data?.origin || '').split(',')[0])
         }
         catch (err) {
             this.skip()
@@ -57,7 +88,7 @@ describe('anonymity (elite + anonymityCheck)', function() {
                     return { proxy: p.proxy, ok: true, reason: 'non-json, ignored' }
                 }
                 //回傳origin含本機真實IP即代表該代理洩漏
-                let leaks = origin.indexOf(myIp) >= 0
+                let leaks = originHasIp(origin, myIp)
                 return { proxy: p.proxy, ok: !leaks, origin }
             }
             catch (err) {
@@ -112,7 +143,7 @@ describe('anonymity (elite + anonymityCheck)', function() {
                 }
                 let bad = []
                 for (let k of LEAK_IP_HEADERS) {
-                    if (k in hs && hs[k].indexOf(myIp) >= 0) {
+                    if (k in hs && originHasIp(hs[k], myIp)) {
                         bad.push(`${k}=${hs[k]}`)
                     }
                 }