@olane/o-core 0.6.6 → 0.6.8

package/dist/src/core/lib/resolvers/next-hop.resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next-hop.resolver.d.ts","sourceRoot":"","sources":["../../../../../src/core/lib/resolvers/next-hop.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAG5D,qBAAa,eAAgB,SAAQ,gBAAgB;IAE7C,0BAA0B,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAYnE,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAwB/D,WAAW,CAAC,aAAa,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAqBvD,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;CAIpD"}
+{"version":3,"file":"next-hop.resolver.d.ts","sourceRoot":"","sources":["../../../../../src/core/lib/resolvers/next-hop.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAG5D,qBAAa,eAAgB,SAAQ,gBAAgB;IAE7C,0BAA0B,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAYnE,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IA+B/D,WAAW,CAAC,aAAa,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAqBvD,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;CAIpD"}

package/dist/src/core/lib/resolvers/next-hop.resolver.js

@@ -8,7 +8,7 @@ export class NextHopResolver extends oAddressResolver {
         try {
             this.logger.debug('Finding node for address: ', address.toString());
             const { transports } = await NetworkUtils.findNode(this.p2pNode, address);
-            this.logger.debug('Found node for address: ', address.toString());
+            this.logger.debug('Found node for address: ', transports);
             return transports;
         }
         catch (e) {
@@ -17,15 +17,20 @@ export class NextHopResolver extends oAddressResolver {
         }
     }
     async findProviderTransports(address) {
+        this.logger.debug('Finding provider transports for address: ', address.toString());
         // let's default the static resolution to the p2p approach
         if (this.isStaticAddress(address)) {
             return this.resolveAddressToTransports(address);
         }
         const peers = await this.p2pNode.peerStore.all();
         const peer = peers.find((p) => p.protocols.some((p) => p === address.protocol));
-        if (!peer &&
-            this.isHoppingDown(address) &&
-            !this.isLeaderNextHop(address)) {
+        this.logger.debug('Found peer: ', peer);
+        if (!peer ||
+            !peer.addresses.length
+        // &&
+        // this.isHoppingDown(address) &&
+        // !this.isLeaderNextHop(address)
+        ) {
             return this.resolveAddressToTransports(address);
         }
         if (!peer) {

package/dist/src/core/utils/network.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.utils.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/network.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,qBAAa,YAAY;WACH,QAAQ,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC;QACT,UAAU,EAAE,SAAS,EAAE,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CAyCH"}
+{"version":3,"file":"network.utils.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/network.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG3C,qBAAa,YAAY;WACH,QAAQ,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC;QACT,UAAU,EAAE,SAAS,EAAE,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CA2CH"}

package/dist/src/core/utils/network.utils.js

@@ -1,5 +1,7 @@
+import { Logger } from '../index.js';
 export class NetworkUtils {
     static async findNode(p2pNode, address) {
+        const logger = new Logger(this.constructor.name);
         const cid = await address.toCID();
         const providers = await p2pNode.services.dht.findProviders(cid);
         const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error('Content routing provide timeout')), 5000));
@@ -21,6 +23,7 @@ export class NetworkUtils {
             }
             // let's translate the peerId to a multiaddr
             const result = await p2pNode.peerRouting.findPeer(value.peer);
+            logger.debug('Found node:', result);
             return {
                 transports: result.multiaddrs,
                 staticAddress: '',

package/dist/src/node/interfaces/route.request.d.ts

@@ -0,0 +1,14 @@
+import { RequestParams } from '@olane/o-protocol';
+import { oRequest } from '../../index.js';
+import { Stream } from '@olane/o-config';
+export interface RouteRequest extends oRequest {
+    stream: Stream;
+    params: RequestParams & {
+        address: string;
+        payload: {
+            method: string;
+            params: RequestParams;
+        };
+    };
+}
+//# sourceMappingURL=route.request.d.ts.map

package/dist/src/node/interfaces/route.request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route.request.d.ts","sourceRoot":"","sources":["../../../../src/node/interfaces/route.request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,GAAG;QACtB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE;YACP,MAAM,EAAE,MAAM,CAAC;YACf,MAAM,EAAE,aAAa,CAAC;SACvB,CAAC;KACH,CAAC;CACH"}

package/dist/src/node/interfaces/route.request.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,8 +1,9 @@
-import { Libp2pConfig, Stream } from '@olane/o-config';
+import { Libp2pConfig } from '@olane/o-config';
 import { oAddress, oCoreNode, oRequest, oResponse } from '../core/index.js';
 import { NetworkActivity } from './lib/network-activity.lib.js';
 import { CID } from 'multiformats';
 import { oHandshakeResult } from '../plan/interfaces/handshake.result.js';
+import { RouteRequest } from './interfaces/route.request.js';
 export declare abstract class oNode extends oCoreNode {
     networkActivity: NetworkActivity;
     childNodes: oNode[];
@@ -14,9 +15,7 @@ export declare abstract class oNode extends oCoreNode {
     applyBridgeTransports(address: oAddress, request: oRequest): Promise<oResponse>;
     matchAgainstMethods(address: oAddress): Promise<boolean>;
     extractMethod(address: oAddress): string;
-    _tool_route(request: oRequest & {
-        stream: Stream;
-    }): Promise<any>;
+    _tool_route(request: RouteRequest): Promise<any>;
     /**
      * Where all intents go to be resolved.
      * @param request

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

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EAKZ,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,QAAQ,EAER,SAAS,EACT,QAAQ,EACR,SAAS,EACV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAMhE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAK1E,8BAAsB,KAAM,SAAQ,SAAS;IACpC,eAAe,EAAG,eAAe,CAAC;IAClC,UAAU,EAAE,KAAK,EAAE,CAAM;IACzB,cAAc,EAAE,QAAQ,EAAE,CAAM;IAEvC,QAAQ,IAAI,IAAI;IASV,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkBrE,QAAQ,CAAC,mBAAmB,IAAI,GAAG,EAAE;IAErC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,EAAE;IAOtB,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,SAAS,CAAC;IAOf,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAS9D,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAIlC,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IA4EvE;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IA4B7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IASrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C9B,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpD,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYtD,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAK/B,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA4ElC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3B,uBAAuB,CAAC,KAAK,EAAE,GAAG;IAexC,IAAI,QAAQ,IAAI,OAAO,CAItB;IAEK,kBAAkB;IAgCxB,sBAAsB;IAIhB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EAMb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,QAAQ,EAER,SAAS,EACT,QAAQ,EACR,SAAS,EACV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAMhE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAK7D,8BAAsB,KAAM,SAAQ,SAAS;IACpC,eAAe,EAAG,eAAe,CAAC;IAClC,UAAU,EAAE,KAAK,EAAE,CAAM;IACzB,cAAc,EAAE,QAAQ,EAAE,CAAM;IAEvC,QAAQ,IAAI,IAAI;IASV,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkBrE,QAAQ,CAAC,mBAAmB,IAAI,GAAG,EAAE;IAErC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,EAAE;IAOtB,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,SAAS,CAAC;IAOf,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAS9D,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAIlC,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IA4EtD;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IA4B7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IASrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C9B,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpD,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYtD,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAK/B,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA4ElC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3B,uBAAuB,CAAC,KAAK,EAAE,GAAG;IAexC,IAAI,QAAQ,IAAI,OAAO,CAItB;IAEK,kBAAkB;IAgCxB,sBAAsB;IAIhB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC"}

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

@@ -1 +1 @@
-{"version":3,"file":"o-plan.d.ts","sourceRoot":"","sources":["../../../src/plan/o-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAInC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAK1D,qBAAa,KAAK;IASJ,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW;IARlD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,KAAK,EAAE,CAAM;IACvB,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IACrB,EAAE,EAAE,MAAM,CAAY;IACtB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;gBAER,MAAM,EAAE,WAAW;IAMlD,IAAI,MAAM,aAET;IAED,IAAI,QAAQ,yBAEX;IAED,IAAI,IAAI,6CAEP;IAED,UAAU,IAAI,GAAG;IAQjB,IAAI;IAIJ,MAAM;;;;;IAQN,eAAe,CAAC,IAAI,EAAE,KAAK;IAarB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAUrB,SAAS;IAef,IAAI,YAAY,WA0Bf;IAEK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;IAmB3B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;IAsC3B,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAQ/B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB7B,UAAU,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAc9D"}
+{"version":3,"file":"o-plan.d.ts","sourceRoot":"","sources":["../../../src/plan/o-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAInC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAK1D,qBAAa,KAAK;IASJ,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW;IARlD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,KAAK,EAAE,CAAM;IACvB,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IACrB,EAAE,EAAE,MAAM,CAAY;IACtB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;gBAER,MAAM,EAAE,WAAW;IAMlD,IAAI,MAAM,aAET;IAED,IAAI,QAAQ,yBAEX;IAED,IAAI,IAAI,6CAEP;IAED,UAAU,IAAI,GAAG;IAQjB,IAAI;IAIJ,MAAM;;;;;IAQN,eAAe,CAAC,IAAI,EAAE,KAAK;IAarB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAUrB,SAAS;IAef,IAAI,YAAY,WA0Bf;IAEK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;IAmB3B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;IAyC3B,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAQ/B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB7B,UAAU,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAc9D"}

package/dist/src/plan/o-plan.js

@@ -134,6 +134,9 @@ export class oPlan {
         const data = response.result.data;
         this.logger.debug('Plan response: ', data);
         const message = data.message;
+        if (!message) {
+            throw new Error('No message returned from intelligence');
+        }
         const planResult = RegexUtils.extractResultFromAI(message);
         return planResult;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-core",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -55,8 +55,8 @@
     "typescript": "^5.8.3"
   },
   "peerDependencies": {
-    "@olane/o-config": "^0.6.5",
-    "@olane/o-protocol": "^0.6.6"
+    "@olane/o-config": "^0.6.7",
+    "@olane/o-protocol": "^0.6.8"
   },
   "dependencies": {
     "chalk": "^5.4.1",