@olane/o-tool 0.7.12-alpha.6 → 0.7.12-alpha.60

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

@@ -1,4 +1,4 @@
-import { oAddress, oConnection, oCore, oRequest, oNotificationManager } from '@olane/o-core';
+import { oConnection, oCore, oRequest, oNotificationManager, oConnectionConfig } from '@olane/o-core';
 import { Stream } from '@olane/o-config';
 import { RunResult } from './interfaces/run-result.interface.js';
 import { ToolResult } from './interfaces/tool-result.interface.js';
@@ -11,7 +11,7 @@ export declare class oToolBase extends oCore {
     private indexed;
     validateToolCall(oRequest: oRequest): boolean;
     configureTransports(): any[];
-    connect(nextHopAddress: oAddress, targetAddress: oAddress): Promise<oConnection>;
+    connect(config: oConnectionConfig): Promise<oConnection>;
     initializeRouter(): Promise<void>;
     unregister(): Promise<void>;
     register(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"o-tool.base.d.ts","sourceRoot":"","sources":["../../src/o-tool.base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,KAAK,EAGL,QAAQ,EAER,oBAAoB,EACrB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAInE;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,KAAK;IAClC,OAAO,CAAC,OAAO,CAAkB;IAEjC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAY7C,mBAAmB,IAAI,GAAG,EAAE;IAI5B,OAAO,CACL,cAAc,EAAE,QAAQ,EACxB,aAAa,EAAE,QAAQ,GACtB,OAAO,CAAC,WAAW,CAAC;IAGvB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,SAAS,CAAC,yBAAyB,IAAI,oBAAoB;IAOrD,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IA8B3D,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IA2BjE,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAS/B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIvD,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAiBnE,KAAK;;;;;;;IA4FL,MAAM;;;;CAQb"}
+{"version":3,"file":"o-tool.base.d.ts","sourceRoot":"","sources":["../../src/o-tool.base.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACX,KAAK,EAGL,QAAQ,EAER,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAInE;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,KAAK;IAClC,OAAO,CAAC,OAAO,CAAkB;IAEjC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAY7C,mBAAmB,IAAI,GAAG,EAAE;IAI5B,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IAGxD,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,SAAS,CAAC,yBAAyB,IAAI,oBAAoB;IAOrD,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IA8B3D,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IA2BjE,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAS/B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIvD,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAiBnE,KAAK;;;;;;;IA4FL,MAAM;;;;CAQb"}

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

@@ -26,7 +26,7 @@ export class oToolBase extends oCore {
     configureTransports() {
         return [];
     }
-    connect(nextHopAddress, targetAddress) {
+    connect(config) {
         throw new oError(oErrorCodes.NOT_IMPLEMENTED, 'Connect not implemented');
     }
     initializeRouter() {
@@ -87,7 +87,7 @@ export class oToolBase extends oCore {
     }
     async callMyTool(request, stream) {
         const method = request.method;
-        this.logger.debug('Calling tool: ' + method);
+        this.logger.verbose('Calling tool: ' + method);
         // TODO: implement this
         // this.requests[request.id] = request;
         // @ts-ignore
@@ -103,7 +103,7 @@ export class oToolBase extends oCore {
     }
     async index() {
         if (this.indexed) {
-            this.logger.debug('Tool already indexed, skipping...');
+            this.logger.verbose('Tool already indexed, skipping...');
             return {
                 summary: 'Tool already indexed',
             };

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

@@ -1 +1 @@
-{"version":3,"file":"o-tool.d.ts","sourceRoot":"","sources":["../../src/o-tool.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAgQ7E"}
+{"version":3,"file":"o-tool.d.ts","sourceRoot":"","sources":["../../src/o-tool.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAuQ7E"}

package/dist/src/o-tool.js

@@ -45,6 +45,8 @@ export function oTool(Base) {
                     await this.useChild(child, {
                         method: 'index_network',
                         params: {},
+                    }).catch((error) => {
+                        this.logger.error('Error indexing child: ', error);
                     });
                 }
                 this.logger.debug('Node + children indexed!');
@@ -67,7 +69,7 @@ export function oTool(Base) {
                 errorCount: this.metrics.errorCount,
                 activeRequests: this.requestManager.activeRequests.length,
                 state: this.state,
-                uptime: process.uptime(),
+                uptime: 0,
                 memoryUsage: process.memoryUsage(),
                 children: this.hierarchyManager.getChildren().map((c) => c.toString()),
             };
@@ -75,7 +77,7 @@ export function oTool(Base) {
         async _tool_route(request) {
             if (request.params.address === this.address.toString() ||
                 request.params.address === this.staticAddress.toString()) {
-                this.logger.debug('Route to self, calling tool...');
+                this.logger.verbose('Route to self, calling tool...');
                 const { payload } = request.params;
                 return this.callMyTool(new oRequest({
                     method: payload.method,
@@ -85,6 +87,12 @@ export function oTool(Base) {
             }
             return this.router.route(request, this);
         }
+        async _tool_register_leader(request) {
+            await this.registerLeader();
+            return {
+                message: 'Leader registered',
+            };
+        }
         async _tool_child_register(request) {
             throw new oError(oErrorCodes.NOT_IMPLEMENTED, 'Child register not implemented');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-tool",
-  "version": "0.7.12-alpha.6",
+  "version": "0.7.12-alpha.60",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:node": "aegir test -t node",
     "deep:clean": "rm -rf node_modules && rm package-lock.json",
     "test:browser": "aegir test -t browser",
-    "build": "tsc",
+    "build": "rm -rf dist && tsc",
     "start:prod": "node dist/index.js",
     "prepublishOnly": "npm run build",
     "lint": "aegir lint"
@@ -54,11 +54,11 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@olane/o-config": "0.7.12-alpha.5",
-    "@olane/o-core": "0.7.12-alpha.6",
-    "@olane/o-protocol": "0.7.12-alpha.6",
+    "@olane/o-config": "0.7.12-alpha.60",
+    "@olane/o-core": "0.7.12-alpha.60",
+    "@olane/o-protocol": "0.7.12-alpha.60",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0"
   },
-  "gitHead": "fad0400ec59d38b163bd996d967cd46c6a5a9e0a"
+  "gitHead": "4419813eec431b7030c230069d08984f25bbaed2"
 }

package/dist/src/router/o-request.router.d.ts

@@ -1,15 +0,0 @@
-import { oProtocolMethods, oRouterRequest as oRouterRequestInterface, RequestParams } from '@olane/o-protocol';
-import { oRequest } from '@olane/o-core';
-import { Stream } from '@olane/o-config';
-export declare class oRouterRequest extends oRequest implements oRouterRequestInterface {
-    method: oProtocolMethods.ROUTE;
-    stream?: Stream | undefined;
-    params: RequestParams & {
-        address: string;
-        payload: {
-            [key: string]: unknown;
-        };
-    };
-    constructor(config: oRouterRequestInterface);
-}
-//# sourceMappingURL=o-request.router.d.ts.map

package/dist/src/router/o-request.router.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"o-request.router.d.ts","sourceRoot":"","sources":["../../../src/router/o-request.router.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,cAAc,IAAI,uBAAuB,EACzC,aAAa,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,qBAAa,cACX,SAAQ,QACR,YAAW,uBAAuB;IAElC,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,aAAa,GAAG;QACtB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE;YACP,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SACxB,CAAC;KACH,CAAC;gBACU,MAAM,EAAE,uBAAuB;CAO5C"}

package/dist/src/router/o-request.router.js

@@ -1,10 +0,0 @@
-import { oRequest } from '@olane/o-core';
-export class oRouterRequest extends oRequest {
-    constructor(config) {
-        super(config);
-        this.method = config.method;
-        this.params = config.params;
-        this.stream = config.stream;
-        this.id = config.id;
-    }
-}

package/dist/src/utils/tool.utils.d.ts

@@ -1,6 +0,0 @@
-import { oResponse } from '@olane/o-core';
-import { oRequest } from '@olane/o-protocol';
-export declare class ToolUtils {
-    static buildResponse(request: oRequest, result: any, error: any): oResponse;
-}
-//# sourceMappingURL=tool.utils.d.ts.map

package/dist/src/utils/tool.utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tool.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/tool.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,qBAAa,SAAS;IACpB,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS;CAc5E"}

package/dist/src/utils/tool.utils.js

@@ -1,17 +0,0 @@
-import { oResponse } from '@olane/o-core';
-export class ToolUtils {
-    static buildResponse(request, result, error) {
-        let success = true;
-        if (error) {
-            success = false;
-        }
-        return new oResponse({
-            id: request.id,
-            data: result,
-            error: result?.error,
-            ...{ success },
-            _requestMethod: request.method,
-            _connectionId: request.params?._connectionId,
-        });
-    }
-}