@olane/o-node 0.7.4 → 0.7.6

package/dist/src/connection/o-node-connection.js

@@ -9,7 +9,7 @@ export class oNodeConnection extends oConnection {
     async read(source) {
         const bytes = byteStream(source);
         const output = await bytes.read({
-            signal: AbortSignal.timeout(5000),
+            signal: AbortSignal.timeout(120000), // 2 min timeout
         });
         const outputObj = output instanceof Uint8ArrayList ? output.subarray() : output;
         const jsonStr = new TextDecoder().decode(outputObj);

package/dist/src/o-node.d.ts

@@ -26,6 +26,7 @@ export declare class oNode extends oToolBase {
     get parentTransports(): oNodeTransport[];
     get transports(): oNodeTransport[];
     unregister(): Promise<void>;
+    registerParent(): Promise<void>;
     register(): Promise<void>;
     extractMethod(address: oNodeAddress): string;
     start(): Promise<void>;

package/dist/src/o-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node.d.ts","sourceRoot":"","sources":["../../src/o-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EACN,YAAY,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAKL,QAAQ,EAET,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAmB,SAAS,EAAE,MAAM,eAAe,CAAC;AAI3D,qBAAa,KAAM,SAAQ,SAAS;IAC3B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,MAAM,CAAC;IACjB,OAAO,EAAG,YAAY,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAG,sBAAsB,CAAC;IAC3C,gBAAgB,EAAG,qBAAqB,CAAC;IAChD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;gBAE3B,MAAM,EAAE,WAAW;IAK/B,IAAI,MAAM,IAAI,YAAY,GAAG,IAAI,CAEhC;IAED,IAAI,aAAa,IAAI,YAAY,CAKhC;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAOhC;IAED,mBAAmB,IAAI,GAAG,EAAE;IAItB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,IAAI,aAAa,IAAI,YAAY,CAEhC;IAED,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,IAAI,UAAU,IAAI,cAAc,EAAE,CAIjC;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC/B,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAG1D;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;cA0FxB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAMvC,OAAO,CACX,cAAc,EAAE,YAAY,EAC5B,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,eAAe,CAAC;IA0BrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAoC3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAMhC"}
+{"version":3,"file":"o-node.d.ts","sourceRoot":"","sources":["../../src/o-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EACN,YAAY,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAKL,QAAQ,EAET,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAmB,SAAS,EAAE,MAAM,eAAe,CAAC;AAI3D,qBAAa,KAAM,SAAQ,SAAS;IAC3B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,MAAM,CAAC;IACjB,OAAO,EAAG,YAAY,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAG,sBAAsB,CAAC;IAC3C,gBAAgB,EAAG,qBAAqB,CAAC;IAChD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;gBAE3B,MAAM,EAAE,WAAW;IAK/B,IAAI,MAAM,IAAI,YAAY,GAAG,IAAI,CAEhC;IAED,IAAI,aAAa,IAAI,YAAY,CAKhC;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAOhC;IAED,mBAAmB,IAAI,GAAG,EAAE;IAItB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,IAAI,aAAa,IAAI,YAAY,CAEhC;IAED,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,IAAI,UAAU,IAAI,cAAc,EAAE,CAIjC;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B/B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC/B,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAG1D;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;cA0FxB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAMvC,OAAO,CACX,cAAc,EAAE,YAAY,EAC5B,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,eAAe,CAAC;IA0BrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAoC3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC"}

package/dist/src/o-node.js

@@ -55,6 +55,7 @@ export class oNode extends oToolBase {
             .map((multiaddr) => new oNodeTransport(multiaddr.toString()));
     }
     async unregister() {
+        this.logger.debug('Unregistering node...');
         if (this.type === NodeType.LEADER) {
             this.logger.debug('Skipping unregistration, node is leader');
             return;
@@ -73,6 +74,28 @@ export class oNode extends oToolBase {
         };
         await this.use(address, params);
     }
+    async registerParent() {
+        if (this.type === NodeType.LEADER) {
+            this.logger.debug('Skipping parent registration, node is leader');
+            return;
+        }
+        // if no parent transports, register with the parent to get them
+        if (this.config.parent && this.config.parent.transports.length === 0) {
+            this.logger.debug('Registering node with parent...', this.config.parent);
+            const parentRegistration = await this.use(this.config.parent, {
+                method: 'child_register',
+                params: {
+                    address: this.address.toString(),
+                    transports: this.transports.map((t) => t.toString()),
+                    peerId: this.peerId.toString(),
+                    _token: this.config.joinToken,
+                },
+            });
+            const { parentTransports } = parentRegistration.result.data;
+            // update the parent transports
+            this.config.parent.setTransports(parentTransports.map((t) => new oNodeTransport(t)));
+        }
+    }
     async register() {
         if (this.type === NodeType.LEADER) {
             this.logger.debug('Skipping registration, node is leader');
@@ -92,6 +115,7 @@ export class oNode extends oToolBase {
         else {
             this.logger.debug('Registering node with leader...');
         }
+        await this.registerParent();
         const address = oAddress.registry();
         const params = {
             method: 'commit',
@@ -248,6 +272,7 @@ export class oNode extends oToolBase {
         }
     }
     async teardown() {
+        await this.unregister();
         await super.teardown();
         if (this.p2pNode) {
             await this.p2pNode.stop();

package/dist/src/o-node.tool.d.ts

@@ -1,4 +1,4 @@
-import { oAddress } from '@olane/o-core';
+import { oAddress, oRequest } from '@olane/o-core';
 import { oServerNode } from './nodes/server.node.js';
 import { Connection, Stream } from '@olane/o-config';
 declare const oNodeTool_base: typeof oServerNode;
@@ -11,6 +11,8 @@ export declare class oNodeTool extends oNodeTool_base {
     handleProtocol(address: oAddress): Promise<void>;
     initialize(): Promise<void>;
     handleStream(stream: Stream, connection: Connection): Promise<void>;
+    _tool_identify(): Promise<any>;
+    _tool_child_register(request: oRequest): Promise<any>;
 }
 export {};
 //# sourceMappingURL=o-node.tool.d.ts.map

package/dist/src/o-node.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAKT,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAErD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAQhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA0C1E"}
+{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,QAAQ,EAET,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAGrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAQhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CnE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CAa5D"}

package/dist/src/o-node.tool.js

@@ -1,6 +1,7 @@
-import { CoreUtils, oError, oErrorCodes, oRequest, } from '@olane/o-core';
+import { CoreUtils, oAddress, oError, oErrorCodes, oRequest, } from '@olane/o-core';
 import { oTool } from '@olane/o-tool';
 import { oServerNode } from './nodes/server.node.js';
+import { oNodeTransport } from './router/o-node.transport.js';
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
  * @param Base - The base class to extend
@@ -53,4 +54,21 @@ export class oNodeTool extends oTool(oServerNode) {
             await CoreUtils.sendResponse(response, stream);
         });
     }
+    async _tool_identify() {
+        return {
+            address: this.address.toString(),
+            staticAddress: this.staticAddress?.toString(),
+            transports: this.transports.map((t) => t.toMultiaddr().toString()),
+        };
+    }
+    async _tool_child_register(request) {
+        this.logger.debug('Child register: ', request.params);
+        const { address, transports } = request.params;
+        const childAddress = new oAddress(address, transports.map((t) => new oNodeTransport(t)));
+        this.hierarchyManager.addChild(childAddress);
+        return {
+            message: `Child node registered with parent! ${childAddress.toString()}`,
+            parentTransports: this.parentTransports.map((t) => t.toString()),
+        };
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -56,10 +56,10 @@
     "typescript": "5.4.5"
   },
   "peerDependencies": {
-    "@olane/o-config": "^0.7.3",
-    "@olane/o-core": "^0.7.3",
-    "@olane/o-protocol": "^0.7.3",
-    "@olane/o-tool": "^0.7.3"
+    "@olane/o-config": "^0.7.5",
+    "@olane/o-core": "^0.7.5",
+    "@olane/o-protocol": "^0.7.5",
+    "@olane/o-tool": "^0.7.5"
   },
   "dependencies": {
     "debug": "^4.4.1",