external-ips 0.0.3 → 0.0.5

package/index.js

@@ -10,7 +10,6 @@ function normalizeFamily(family){
 		return false;
 	} else throw new Error('bad family='+family);
 }
-
 class AbstractObject {
 	constructor(family){
 		assert(this.constructor!==AbstractObject); //Abstract
@@ -22,11 +21,22 @@ class AbstractObject {
 		defaultFamily = normalizeFamily(defaultFamily);
 		assert.equal(typeof agent,                  'object');
 		assert.equal(typeof agent.createConnection, 'function');
-		const old = agent.createConnection;
+		const old  = agent.createConnection;
+		const self = this;
 		agent.createConnection = (options, callback)=>{
-			const family = normalizeFamily(options.family) || defaultFamily;
-			if(!family || !this.family || this.family===family){
-				options.localAddress ||= this.next().address;
+			const family = options.family ? normalizeFamily(options.family)||defaultFamily : defaultFamily;
+			if((!family || !self.family || self.family===family) && !options.localAddress){
+				const ip = self.random();
+				if(ip){
+					//КОПИЯ, а не мутация. Agent уже вычислил ключ реестра (getName БЕЗ localAddress)
+					//и замкнул этот же объект options в свои слушатели. Если дописать localAddress
+					//в него, removeSocket/onFree пересчитают имя уже С адресом и попадут в другой
+					//список: закрытые сокеты никогда не удаляются из agent.sockets (на боевом
+					//mexc-гейтвее агент накопил 7744 сокета, из них 5578 мёртвых, ~1.5 ГБ/ч), а
+					//freeSockets кладутся под ключ, по которому их никто не ищет — keep-alive не
+					//переиспользуется вовсе, и каждый запрос открывает новый TLS.
+					return old.call(agent, { ...options, localAddress: ip.address ? ip.address : ip }, callback);
+				}
 			}
 			return old.call(agent, options, callback);
 		}
@@ -37,10 +47,16 @@ class AbstractObject {
 		return family;
 	}
 	random(family){
-		return this._random(family).address; 
+		const ip = this._random(family);
+		if(ip){
+			return ip.address; 
+		} //else console.log('!!!!!!!ip.rnd', this.constructor.name, this.length)
 	}
 	next(family){
-		return this._next(family).address; 
+		const ip = this._next(family);
+		if(ip){
+			return ip.address; 
+		} //else console.log('!!!!!!!ip.nxt', this.constructor.name, this.length)
 	}
 	_random(family){
 		return this.__random(this.checkFamily(family)) 
@@ -65,15 +81,18 @@ class IP extends AbstractObject{
 	__next(){return this}	
 };
 
+fid = 0
 class FamilyList extends AbstractObject{
-	ips = [];
+	ips       = [];
+	lastIndex = 0; 
 	constructor(family){
 		super(family);
-		Object.defineProperty(this, 'lastIndex', {
-			value: 0,
-			enumerable: false,
-			writable  : true,
-		})
+		this.fid = fid++; 
+		//Object.defineProperty(this, 'lastIndex', {
+		//	value: 0,
+		//	enumerable: false,
+		//	writable  : true,
+		//})
 	}
 	push(...ips){
 		ips.forEach(ip=>{
@@ -87,7 +106,11 @@ class FamilyList extends AbstractObject{
 		return this.ips.length;
 	}
 	__random(){
-		return this[Math.floor(this.length*Math.random())]
+		const pos = Math.floor(this.length*Math.random());
+		const res = this.ips[pos]; 
+		//console.log(this.ips);
+		//console.log('__random', 'length='+this.length, 'pos='+pos, res)
+		return res;
 	}
 	__next(){
 		const res      = this.ips[this.lastIndex];
@@ -149,12 +172,13 @@ Object.values(os.networkInterfaces()).forEach(arr=>{
 	mainList.push(...arr.filter(ip=>!ip.internal).map(ip=>new IP(ip)))
 });
 
+//console.log('--------------')
 //mainList.print();
+//console.log('/--------------')
 
 mainList.MainList       = MainList;
 mainList.IP             = IP;
 mainList.AbstractObject = AbstractObject;
 mainList.FamilyList     = FamilyList;
 
-
-module.exports = mainList;
+module.exports = mainList;

package/package.json

@@ -1,27 +1,29 @@
 {
-    "name": "external-ips",
-    "version": "0.0.3",
-    "main": "./index.js",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "author": "Andrey Belousoff <a.v.belousoff@gmail.com>",
-    "license": "MIT",
-    "description": "any IPs in HTTP(s) requests or WS",
-    "keywords": ["ips", "ip"],
-    "dependencies": {
-    },
-    "engines": {
-        "node": ">=0.1.0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Hkey1/external-ips"
-    },
-    "readme":"External IPs",
-    "readmeFilename": "README.md",
-    "bugs": {
-        "url": "https://github.com/Hkey1/external-ips/issues"
-    },
-    "homepage": "https://github.com/Hkey1/external-ips"
+  "name": "external-ips",
+  "version": "0.0.5",
+  "main": "./index.js",
+  "scripts": {
+    "test": "node test.js"
+  },
+  "author": "Andrey Belousoff <a.v.belousoff@gmail.com>",
+  "license": "MIT",
+  "description": "any IPs in HTTP(s) requests or WS",
+  "keywords": [
+    "ips",
+    "ip"
+  ],
+  "dependencies": {},
+  "engines": {
+    "node": ">=0.1.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Hkey1/external-ips"
+  },
+  "readme": "External IPs",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/Hkey1/external-ips/issues"
+  },
+  "homepage": "https://github.com/Hkey1/external-ips"
 }

package/test.js

@@ -0,0 +1,34 @@
+//node test.js — регрессия: патч не должен ломать учёт сокетов у http.Agent
+const assert = require("node:assert");
+const http = require("node:http");
+const IPs = require("./index.js");
+
+const server = http.createServer((req, res)=>res.end("ok"));
+server.listen(0, "127.0.0.1", async()=>{
+    const port = server.address().port;
+    try {
+        const agent = new http.Agent({ keepAlive: true });
+        //как manyIPs в ccxtPatch; random() вернёт локальный адрес этой машины
+        IPs.v4.patchAgent(agent);
+        for(let i = 0; i < 8; i++){
+            await new Promise((res, rej)=>{
+                http.get({ host: "127.0.0.1", port, agent }, r=>{ r.resume(); r.on("end", res); }).on("error", rej);
+            });
+            await new Promise(r=>setTimeout(r, 30));
+        }
+        const cnt = o=>Object.values(o).reduce((a, arr)=>a + arr.length, 0);
+        const busy = cnt(agent.sockets);
+        const free = cnt(agent.freeSockets);
+        const dead = Object.values(agent.sockets).flat().filter(s=>s.destroyed).length;
+        console.log(`sockets=${busy} (мёртвых ${dead}), freeSockets=${free}`);
+        //до фикса: sockets=8 под одним ключом, freeSockets=8 под другим, реюза ноль
+        assert.equal(busy, 0, `в agent.sockets не должно оставаться сокетов, осталось ${busy}`);
+        assert.equal(dead, 0);
+        assert.ok(free >= 1 && free <= 2, `keep-alive должен переиспользоваться: freeSockets=${free}`);
+        console.log("ok: учёт агента цел, keep-alive переиспользуется");
+        agent.destroy(); server.close();
+    } catch(err){
+        console.error("FAIL:", err.message);
+        server.close(); process.exitCode = 1;
+    }
+});