@activeledger/activenetwork 2.15.6 → 4.3.3

package/lib/network/neighbour.js

@@ -4,15 +4,27 @@ exports.Neighbour = void 0;
 const activeoptions_1 = require("@activeledger/activeoptions");
 const activecrypto_1 = require("@activeledger/activecrypto");
 const activelogger_1 = require("@activeledger/activelogger");
+const activeutilities_1 = require("@activeledger/activeutilities");
 const home_1 = require("./home");
 const neighbourhood_1 = require("./neighbourhood");
+const p2pClient_1 = require("./p2pClient");
 class Neighbour {
+    host;
+    port;
+    isHome;
+    identity;
+    p2pClient;
+    reference;
+    graceStop = false;
     constructor(host, port, isHome = false, identity) {
         this.host = host;
         this.port = port;
         this.isHome = isHome;
         this.identity = identity;
-        this.graceStop = false;
+        if (activeoptions_1.ActiveOptions.get("p2pStream", false)) {
+            this.p2pClient = new p2pClient_1.P2PClient(host, port + 1);
+            this.p2pClient.connect();
+        }
         this.reference = activecrypto_1.ActiveCrypto.Hash.getHash(host + port + activeoptions_1.ActiveOptions.get("network", ""), "sha1");
         if (neighbourhood_1.Neighbourhood.remapedAddr &&
             neighbourhood_1.Neighbourhood.remapedAddr[this.reference]) {
@@ -31,17 +43,28 @@ class Neighbour {
         }
         return false;
     }
-    knock(endpoint, params, external, resend) {
+    bundle = [];
+    nextSend;
+    async knock(endpoint, params, external, resend, bundle) {
+        if (params &&
+            !external &&
+            this.p2pClient &&
+            this.p2pClient.ready &&
+            activeoptions_1.ActiveOptions.get("p2pStream", false) &&
+            endpoint === 'init') {
+            this.p2pClient.send(await activeutilities_1.ActiveClone.serialize(params, { enableCompression: true }), home_1.Home.reference);
+            return Promise.resolve({ ok: 1 });
+        }
+        else {
+            if (endpoint === 'init-legacy') {
+                endpoint = 'init';
+            }
+        }
         if (!params) {
             return new Promise((resolve, reject) => {
-                activeoptions_1.ActiveRequest.send(`http://${this.host}:${this.port}/a/${endpoint}`, "GET", ["X-Activeledger:" + home_1.Home.reference])
-                    .then((response) => {
-                    resolve(response);
-                })
-                    .catch((error) => {
-                    activelogger_1.ActiveLogger.error(error, `${this.host}:${this.port}/${endpoint} - GET Failed`);
-                    reject(error);
-                });
+                activeoptions_1.ActiveRequest.send(`http://${this.host}:${this.port}/a/${endpoint}`, "GET", ["X-Activeledger:" + home_1.Home.reference], null, false, 60)
+                    .then(resolve)
+                    .catch(reject);
             });
         }
         else {
@@ -62,18 +85,23 @@ class Neighbour {
                     $enc: params.$encrypt ? true : false,
                 };
             }
-            return new Promise((resolve, reject) => {
+            const sender = (postData, extraHeader) => new Promise((resolve, reject) => {
                 let attempt = (attempts) => {
-                    activeoptions_1.ActiveRequest.send(url, "POST", ["X-Activeledger:" + home_1.Home.reference], post, activeoptions_1.ActiveOptions.get("gzip", false))
+                    activeoptions_1.ActiveRequest.send(url, "POST", [
+                        "X-Activeledger:" + home_1.Home.reference,
+                        "content-type: application/json",
+                        extraHeader,
+                    ], postData, activeoptions_1.ActiveOptions.get("gzip", true), 60)
                         .then((response) => {
-                        if (response.data.$enc && response.data.$packet) {
-                            response.data = JSON.parse(Buffer.from(home_1.Home.identity.decrypt(response.data.$packet), "base64").toString());
+                        if (!bundle) {
+                            if (response.data?.$enc && response.data.$packet) {
+                                response.data = JSON.parse(Buffer.from(home_1.Home.identity.decrypt(response.data.$packet), "base64").toString());
+                            }
+                            resolve(response);
                         }
-                        resolve(response);
                     })
                         .catch((error) => {
                         if (error && error.response && error.response.data) {
-                            activelogger_1.ActiveLogger.error(error.response.data, `${this.host}:${this.port}/${endpoint} - POST Failed`);
                             reject(error.response.data);
                         }
                         else {
@@ -85,14 +113,50 @@ class Neighbour {
                             }
                             else {
                                 activelogger_1.ActiveLogger.fatal(error, `Network Error - ${this.host}:${this.port}/${endpoint}`);
-                                activelogger_1.ActiveLogger.error(post, `Data sent which caused the error`);
-                                reject("Network Communication Error");
+                                if (extraHeader !== "X-Bundle: 1") {
+                                    reject("Network Communication Error");
+                                }
+                                else {
+                                    resolve({ ok: 1 });
+                                }
                             }
                         }
                     });
                 };
                 attempt(0);
             });
+            if (bundle) {
+                this.bundle.push(JSON.stringify(post));
+                if (this.bundle.length >= 100) {
+                    if (this.nextSend) {
+                        clearTimeout(this.nextSend);
+                        this.nextSend = null;
+                    }
+                    const bundled = Buffer.from(this.bundle.join(":$ALB:"));
+                    this.bundle = [];
+                    sender(bundled, "X-Bundle: 1").catch(() => {
+                        activelogger_1.ActiveLogger.warn("X-Bundle Error");
+                    });
+                }
+                else {
+                    if (!this.nextSend) {
+                        this.nextSend = setTimeout(() => {
+                            if (this.bundle.length > 0) {
+                                this.nextSend = null;
+                                const bundled = Buffer.from(this.bundle.join(":$ALB:"));
+                                this.bundle = [];
+                                sender(bundled, "X-Bundle: 1").catch(() => {
+                                    activelogger_1.ActiveLogger.warn("X-Bundle Error");
+                                });
+                            }
+                        }, 5);
+                    }
+                }
+                return Promise.resolve();
+            }
+            else {
+                return sender(Buffer.from(JSON.stringify(post)), "X-Null: 0");
+            }
         }
     }
     encryptKnock(data, encrypted = false) {

package/lib/network/neighbour.js.map

@@ -1 +1 @@
-{"version":3,"file":"neighbour.js","sourceRoot":"","sources":["../../src/network/neighbour.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"neighbour.js","sourceRoot":"","sources":["../../src/network/neighbour.ts"],"names":[],"mappings":"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"}

package/lib/network/neighbourhood.d.ts

@@ -23,7 +23,7 @@ export declare class Neighbourhood {
     get(reference: string): Neighbour;
     get(random: boolean, skip?: Neighbour): Neighbour;
     keys(): string[];
-    checkFirewall(remote: string): boolean;
+    checkFirewall(remote: string, nodeRef?: string): boolean;
     exists(reference: string): boolean;
     count(): number;
     knockAll(endpoint: string, params?: any, force?: boolean): Promise<any>;

package/lib/network/neighbourhood.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"neighbourhood.d.ts","sourceRoot":"","sources":["../../src/network/neighbourhood.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAWxC,oBAAY,eAAe;IACzB,YAAY,IAAA;IACZ,OAAO,IAAA;IACP,UAAU,IAAA;IACV,QAAQ,IAAA;IACR,MAAM,IAAA;CACP;AAQD,qBAAa,aAAa;IAOxB,OAAO,CAAC,UAAU,CAA0C;IAQ5D,OAAO,CAAC,cAAc,CAAW;IAQjC,OAAO,CAAC,QAAQ,CAAwC;IAQxD,OAAO,CAAC,MAAM,CAAa;IAQ3B,OAAc,WAAW,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;;IA2CvD,OAAO,CAAC,GAAG;IAoCJ,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI;IAoCnC,GAAG,IAAI;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;IACzC,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IACjC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS;IAoCjD,IAAI,IAAI,MAAM,EAAE;IAahB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAYtC,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAYlC,KAAK,IAAI,MAAM;IAYf,QAAQ,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,GAAG,EACZ,KAAK,GAAE,OAAe,GACrB,OAAO,CAAC,GAAG,CAAC;CAkChB"}
+{"version":3,"file":"neighbourhood.d.ts","sourceRoot":"","sources":["../../src/network/neighbourhood.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAWxC,oBAAY,eAAe;IACzB,YAAY,IAAA;IACZ,OAAO,IAAA;IACP,UAAU,IAAA;IACV,QAAQ,IAAA;IACR,MAAM,IAAA;CACP;AAQD,qBAAa,aAAa;IAOxB,OAAO,CAAC,UAAU,CAA0C;IAQ5D,OAAO,CAAC,cAAc,CAAW;IAQjC,OAAO,CAAC,QAAQ,CAAuC;IAQvD,OAAO,CAAC,MAAM,CAAa;IAQ3B,OAAc,WAAW,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;;IA0CvD,OAAO,CAAC,GAAG;IAwCJ,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI;IAkCnC,GAAG,IAAI;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;IACzC,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IACjC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS;IAkCjD,IAAI,IAAI,MAAM,EAAE;IAahB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO;IAgBxD,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAYlC,KAAK,IAAI,MAAM;IAYf,QAAQ,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,GAAG,EACZ,KAAK,GAAE,OAAe,GACrB,OAAO,CAAC,GAAG,CAAC;CAoBhB"}

package/lib/network/neighbourhood.js

@@ -14,19 +14,20 @@ var NeighbourStatus;
     NeighbourStatus[NeighbourStatus["Stable"] = 4] = "Stable";
 })(NeighbourStatus = exports.NeighbourStatus || (exports.NeighbourStatus = {}));
 class Neighbourhood {
+    neighbours = {};
+    neighboursKeys;
+    firewall = {};
+    houses = 0;
+    static remapedAddr;
     constructor() {
-        this.neighbours = {};
-        this.firewall = {};
-        this.houses = 0;
         let neighbourhood = activeoptions_1.ActiveOptions.get("neighbourhood", false);
         if (!Neighbourhood.remapedAddr) {
             Neighbourhood.remapedAddr = activeoptions_1.ActiveOptions.get("neighbourhoodRemap", {});
         }
         if (!neighbourhood)
             throw activelogger_1.ActiveLogger.fatal("Neighbourhood not found inside config");
-        let i = neighbourhood.length;
-        while (i--) {
-            this.add(new neighbour_1.Neighbour(neighbourhood[i].host, neighbourhood[i].port, false, new activecrypto_1.ActiveCrypto.KeyPair(neighbourhood[i].identity.type, neighbourhood[i].identity.public)));
+        for (const neighbour of neighbourhood) {
+            this.add(new neighbour_1.Neighbour(neighbour.host, neighbour.port, false, new activecrypto_1.ActiveCrypto.KeyPair(neighbour.identity.type, neighbour.identity.public)));
         }
     }
     add(neighbour) {
@@ -36,7 +37,8 @@ class Neighbourhood {
                 if (!this.neighbours[neighbour[i].reference]) {
                     this.neighbours[neighbour[i].reference] = neighbour[i];
                     this.houses++;
-                    this.firewall[neighbour[i].getAddress().host] = true;
+                    this.firewall[neighbour[i].getAddress().host] = neighbour[i].reference;
+                    this.firewall[neighbour[i].reference] = neighbour[i].getAddress().host;
                 }
                 else {
                     this.neighbours[neighbour[i].reference].graceStop = false;
@@ -47,7 +49,8 @@ class Neighbourhood {
             if (!this.neighbours[neighbour.reference]) {
                 this.neighbours[neighbour.reference] = neighbour;
                 this.houses++;
-                this.firewall[neighbour.getAddress().host] = true;
+                this.firewall[neighbour.getAddress().host] = neighbour.reference;
+                this.firewall[neighbour.reference] = neighbour.getAddress().host;
             }
             else {
                 this.neighbours[neighbour.reference].graceStop = false;
@@ -57,30 +60,26 @@ class Neighbourhood {
     reset(neighbours) {
         activelogger_1.ActiveLogger.debug("Reload Request (Worker Resetting)");
         let keys = this.keys();
-        let i = keys.length;
-        while (i--) {
-            this.neighbours[keys[i]].graceStop = true;
+        for (const key of keys) {
+            this.neighbours[key].graceStop = true;
         }
-        i = neighbours.length;
-        while (i--) {
-            this.add(new neighbour_1.Neighbour(neighbours[i].host, neighbours[i].port, false, new activecrypto_1.ActiveCrypto.KeyPair(neighbours[i].identity.type, neighbours[i].identity.public)));
+        for (const neighbour of neighbours) {
+            this.add(new neighbour_1.Neighbour(neighbour.host, neighbour.port, false, new activecrypto_1.ActiveCrypto.KeyPair(neighbour.identity.type, neighbour.identity.public)));
         }
         this.neighboursKeys = Object.keys(this.neighbours);
     }
     get(p1, p2) {
         if (p1) {
             if (typeof p1 == "boolean") {
-                let keys = this.keys();
-                if (p2) {
-                    let i = keys.length;
-                    while (i--) {
-                        if (keys[i] == p2.reference) {
-                            keys.splice(i, 1);
-                            break;
-                        }
+                const keys = this.keys();
+                const getRandomNeighbour = () => this.neighbours[keys[(keys.length * Math.random()) << 0]];
+                let neighbour = getRandomNeighbour();
+                if (p2 && keys.length > 1) {
+                    while (neighbour.reference === p2.reference) {
+                        neighbour = getRandomNeighbour();
                     }
                 }
-                return this.neighbours[keys[(keys.length * Math.random()) << 0]];
+                return neighbour;
             }
             else {
                 if (this.neighbours[p1])
@@ -98,10 +97,15 @@ class Neighbourhood {
         }
         return this.neighboursKeys;
     }
-    checkFirewall(remote) {
+    checkFirewall(remote, nodeRef) {
         if (remote.substr(0, 7) == "::ffff:")
             remote = remote.substr(7);
-        return this.firewall[remote] || false;
+        if (nodeRef) {
+            return this.firewall[remote] === nodeRef ? true : this.firewall[nodeRef] === remote;
+        }
+        else {
+            return this.firewall[remote] ? true : false;
+        }
     }
     exists(reference) {
         if (this.neighbours[reference]) {
@@ -113,23 +117,16 @@ class Neighbourhood {
         return this.houses;
     }
     knockAll(endpoint, params, force = false) {
-        let neighbours = this.keys();
-        let i = neighbours.length;
-        let knocks = [];
-        while (i--) {
-            if (force || this.neighbours[neighbours[i]].isHome)
-                knocks.push(new Promise((resolve, reject) => {
-                    this.neighbours[neighbours[i]]
-                        .knock(endpoint, params)
-                        .then((response) => {
-                        resolve(response.data);
-                    })
-                        .catch((e) => {
-                        activelogger_1.ActiveLogger.debug(e, "Knock All Single Knock Failure");
-                        resolve({ error: true });
-                    });
-                }));
-        }
+        const neighbourKeys = this.keys();
+        const knocks = neighbourKeys
+            .filter(key => force || this.neighbours[key].isHome)
+            .map(key => this.neighbours[key]
+            .knock(endpoint, params)
+            .then(response => response.data)
+            .catch(e => {
+            activelogger_1.ActiveLogger.debug(e, `Knock failed for ${key} during knockAll`);
+            return { error: true, from: key };
+        }));
         return Promise.all(knocks);
     }
 }

package/lib/network/neighbourhood.js.map

@@ -1 +1 @@
-{"version":3,"file":"neighbourhood.js","sourceRoot":"","sources":["../../src/network/neighbourhood.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"neighbourhood.js","sourceRoot":"","sources":["../../src/network/neighbourhood.ts"],"names":[],"mappings":"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"}

package/lib/network/p2pClient.d.ts

@@ -0,0 +1,20 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { EventEmitter } from "events";
+export declare class P2PClient extends EventEmitter {
+    private host;
+    private port;
+    private socket?;
+    private isConnected;
+    private hasEverConnected;
+    private startTime;
+    private chunks;
+    private bufferLength;
+    private reconnectTimer?;
+    constructor(host: string, port: number);
+    get ready(): boolean;
+    stop(): void;
+    connect(): void;
+    send(data: Buffer, senderRef: string): void;
+}
+//# sourceMappingURL=p2pClient.d.ts.map

package/lib/network/p2pClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"p2pClient.d.ts","sourceRoot":"","sources":["../../src/network/p2pClient.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,qBAAa,SAAU,SAAQ,YAAY;IAS7B,OAAO,CAAC,IAAI;IAAU,OAAO,CAAC,IAAI;IAR9C,OAAO,CAAC,MAAM,CAAC,CAAa;IAC5B,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,cAAc,CAAC,CAAiB;gBAEpB,IAAI,EAAE,MAAM,EAAU,IAAI,EAAE,MAAM;IAItD,IAAW,KAAK,IAAI,OAAO,CAE1B;IAEM,IAAI,IAAI,IAAI;IASZ,OAAO,IAAI,IAAI;IAuDf,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;CAanD"}

package/lib/network/p2pClient.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.P2PClient = void 0;
+const net = require("net");
+const activelogger_1 = require("@activeledger/activelogger");
+const events_1 = require("events");
+const activeutilities_1 = require("@activeledger/activeutilities");
+class P2PClient extends events_1.EventEmitter {
+    host;
+    port;
+    socket;
+    isConnected = false;
+    hasEverConnected = false;
+    startTime = Date.now();
+    chunks = [];
+    bufferLength = 0;
+    reconnectTimer;
+    constructor(host, port) {
+        super();
+        this.host = host;
+        this.port = port;
+    }
+    get ready() {
+        return this.isConnected;
+    }
+    stop() {
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+        }
+        if (this.socket) {
+            this.socket.destroy();
+        }
+    }
+    connect() {
+        if (this.isConnected)
+            return;
+        const gracePeriodPassed = (Date.now() - this.startTime) > (10 * 60 * 1000);
+        if (gracePeriodPassed && !this.hasEverConnected) {
+            activelogger_1.ActiveLogger.warn(`P2P grace period expired for ${this.host}:${this.port}, disabling P2P.`);
+            return;
+        }
+        this.socket = net.createConnection(this.port, this.host);
+        this.socket.on("connect", () => {
+            this.isConnected = true;
+            this.hasEverConnected = true;
+            activelogger_1.ActiveLogger.info(`Connected to peer at ${this.host}:${this.port}`);
+        });
+        this.chunks = [];
+        this.bufferLength = 0;
+        this.socket.on("data", (data) => {
+            this.chunks.push(data);
+            this.bufferLength += data.length;
+            let frame = activeutilities_1.ActiveFrame.read(this.chunks, this.bufferLength);
+            while (frame) {
+                this.emit("message", frame.item);
+                this.chunks = frame.remaining.length > 0 ? [frame.remaining] : [];
+                this.bufferLength = frame.remaining.length;
+                frame = activeutilities_1.ActiveFrame.read(this.chunks, this.bufferLength);
+            }
+        });
+        this.socket.on("close", () => {
+            this.isConnected = false;
+            activelogger_1.ActiveLogger.warn(`Connection lost to ${this.host}:${this.port}, reconnecting...`);
+            if (this.hasEverConnected || (Date.now() - this.startTime) <= (10 * 60 * 1000)) {
+                this.reconnectTimer = setTimeout(() => this.connect(), 2000);
+                this.reconnectTimer.unref();
+            }
+            else {
+                activelogger_1.ActiveLogger.warn(`P2P reconnection window closed for ${this.host}:${this.port}`);
+            }
+        });
+        this.socket.on("error", (err) => {
+            activelogger_1.ActiveLogger.error(err, `Error with peer ${this.host}:${this.port}`);
+        });
+    }
+    send(data, senderRef) {
+        if (this.socket && this.socket.writable) {
+            const refBuf = Buffer.alloc(40);
+            refBuf.write(senderRef.padEnd(40, ' '), 0, 'utf8');
+            const frame = Buffer.alloc(4 + data.length);
+            frame.writeUInt32BE(data.length, 0);
+            data.copy(frame, 4);
+            this.socket.write(Buffer.concat([refBuf, frame]));
+        }
+    }
+}
+exports.P2PClient = P2PClient;
+//# sourceMappingURL=p2pClient.js.map

package/lib/network/p2pClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"p2pClient.js","sourceRoot":"","sources":["../../src/network/p2pClient.ts"],"names":[],"mappings":"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"}