@olane/o-tool 0.1.1 → 0.1.2

package/dist/index.js

@@ -1,25 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./o-tool"), exports);
-__exportStar(require("./interfaces/tool.interface"), exports);
-__exportStar(require("./interfaces/run-result.interface"), exports);
-__exportStar(require("./interfaces/run-params.interface"), exports);
-__exportStar(require("./interfaces/run-tool.interface"), exports);
-__exportStar(require("./node.tool"), exports);
-__exportStar(require("./interfaces/tool-result.interface"), exports);
-__exportStar(require("./tool.utils"), exports);
-__exportStar(require("./virtual.tool"), exports);
+export * from './o-tool';
+export * from './interfaces/tool.interface';
+export * from './interfaces/run-result.interface';
+export * from './interfaces/run-params.interface';
+export * from './interfaces/run-tool.interface';
+export * from './node.tool';
+export * from './interfaces/tool-result.interface';
+export * from './tool.utils';
+export * from './virtual.tool';

package/dist/interfaces/run-params.interface.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/run-result.interface.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/run-tool.interface.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/tool-result.interface.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/tool.interface.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/node.tool.d.ts

@@ -8,12 +8,12 @@ declare const oHostNodeTool_base: {
         use(address: oAddress, data: {
             [key: string]: unknown;
         }, config?: import("@olane/o-core").UseOptions): Promise<import("@olane/o-core").oResponse>;
-        handleStream(streamData: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).IncomingStreamData): Promise<void>;
-        execute(req: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).Stream): Promise<import(".").RunResult>;
-        run(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).Stream): Promise<import(".").RunResult>;
+        handleStream(streamData: import("@libp2p/interface").IncomingStreamData): Promise<void>;
+        execute(req: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface").Stream): Promise<import(".").RunResult>;
+        run(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface").Stream): Promise<import(".").RunResult>;
         myTools(): string[];
         myToolParams(tool: string): Record<string, any>;
-        callMyTool(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).Stream): Promise<import(".").ToolResult>;
+        callMyTool(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface").Stream): Promise<import(".").ToolResult>;
         index(): Promise<{
             provider: string;
             summary: string;
@@ -28,16 +28,16 @@ declare const oHostNodeTool_base: {
         }>;
         findMissingParams(methodName: string, params: any): import("@olane/o-protocol").oParameter[];
         readonly config: import("@olane/o-core").CoreConfig;
-        p2pNode: import("libp2p", { with: { "resolution-mode": "import" } }).Libp2p;
+        p2pNode: import("@libp2p/interface").Libp2p;
         logger: import("@olane/o-core").Logger;
         networkConfig: import("@olane/o-config").Libp2pConfig;
         address: oAddress;
         readonly staticAddress: oAddress;
-        peerId: import("@libp2p/interface-peer-id", { with: { "resolution-mode": "import" } }).PeerId;
+        peerId: import("@libp2p/interface-peer-id").PeerId;
         state: import("@olane/o-core").NodeState;
         errors: Error[];
         connectionManager: import("@olane/o-core").oConnectionManager;
-        leaders: import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
+        leaders: import("@olane/o-config").Multiaddr[];
         addressResolution: import("@olane/o-core").oAddressResolution;
         readonly description: string;
         dependencies: import("@olane/o-core").oDependency[];
@@ -49,8 +49,8 @@ declare const oHostNodeTool_base: {
         get type(): import("@olane/o-core").NodeType;
         get transports(): string[];
         get parent(): oAddress | null;
-        get parentTransports(): import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
-        getTransports(address: oAddress): import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
+        get parentTransports(): import("@olane/o-config").Multiaddr[];
+        getTransports(address: oAddress): import("@olane/o-config").Multiaddr[];
         handleStaticAddressTranslation(addressInput: oAddress): Promise<oAddress>;
         translateAddress(addressWithLeaderTransports: oAddress): Promise<{
             nextHopAddress: oAddress;

package/dist/node.tool.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.oHostNodeTool = void 0;
-const o_tool_1 = require("./o-tool");
-const o_core_1 = require("@olane/o-core");
-class oHostNodeTool extends (0, o_tool_1.oTool)(o_core_1.oHostNode) {
+import { oTool } from './o-tool';
+import { oHostNode } from '@olane/o-core';
+export class oHostNodeTool extends oTool(oHostNode) {
     constructor(config) {
         super(config);
     }
 }
-exports.oHostNodeTool = oHostNodeTool;

package/dist/o-tool.d.ts

@@ -36,16 +36,16 @@ export declare function oTool<T extends new (...args: any[]) => oCoreNode>(Base:
         }>;
         findMissingParams(methodName: string, params: any): oParameter[];
         readonly config: import("@olane/o-core").CoreConfig;
-        p2pNode: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).Libp2p;
+        p2pNode: import("@libp2p/interface").Libp2p;
         logger: import("@olane/o-core").Logger;
         networkConfig: import("@olane/o-config").Libp2pConfig;
         address: oAddress;
         readonly staticAddress: oAddress;
-        peerId: import("@libp2p/interface-peer-id", { with: { "resolution-mode": "import" } }).PeerId;
+        peerId: import("@libp2p/interface-peer-id").PeerId;
         state: import("@olane/o-core").NodeState;
         errors: Error[];
         connectionManager: import("@olane/o-core").oConnectionManager;
-        leaders: import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
+        leaders: import("@olane/o-config").Multiaddr[];
         addressResolution: import("@olane/o-core").oAddressResolution;
         readonly description: string;
         dependencies: oDependency[];
@@ -57,8 +57,8 @@ export declare function oTool<T extends new (...args: any[]) => oCoreNode>(Base:
         get type(): NodeType;
         get transports(): string[];
         get parent(): oAddress | null;
-        get parentTransports(): import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
-        getTransports(address: oAddress): import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
+        get parentTransports(): import("@olane/o-config").Multiaddr[];
+        getTransports(address: oAddress): import("@olane/o-config").Multiaddr[];
         handleStaticAddressTranslation(addressInput: oAddress): Promise<oAddress>;
         translateAddress(addressWithLeaderTransports: oAddress): Promise<{
             nextHopAddress: oAddress;

package/dist/o-tool.js

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.oTool = oTool;
-const o_core_1 = require("@olane/o-core");
-const o_protocol_1 = require("@olane/o-protocol");
-const tool_utils_1 = require("./tool.utils");
-const uuid_1 = require("uuid");
+import { CoreUtils, oAddress, oRequest, oToolError, oToolErrorCodes, } from '@olane/o-core';
+import { oProtocolMethods } from '@olane/o-protocol';
+import { ToolUtils } from './tool.utils';
+import { v4 as uuidv4 } from 'uuid';
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
  * @param Base - The base class to extend
  * @returns A new class that extends the base class and implements the oTool interface
  */
-function oTool(Base) {
+export function oTool(Base) {
     return class extends Base {
         constructor(...args) {
             super(...args);
@@ -47,7 +44,7 @@ function oTool(Base) {
                 address.toString() === this.staticAddress.toString()) {
                 // let's call our own tool
                 this.logger.debug('Calling ourselves, skipping...', data);
-                const request = new o_core_1.oRequest({
+                const request = new oRequest({
                     method: data.method,
                     params: {
                         _connectionId: 0,
@@ -70,21 +67,21 @@ function oTool(Base) {
                 else {
                     this.errorCount++;
                 }
-                return tool_utils_1.ToolUtils.buildResponse(request, result, result?.error);
+                return ToolUtils.buildResponse(request, result, result?.error);
             }
             return super.use(address, data, config);
         }
         async handleStream(streamData) {
             const { stream } = streamData;
-            const requestConfig = await o_core_1.CoreUtils.processStream(stream);
-            const request = new o_core_1.oRequest(requestConfig);
+            const requestConfig = await CoreUtils.processStream(stream);
+            const request = new oRequest(requestConfig);
             let success = true;
             const result = await this.execute(request, stream).catch((error) => {
                 this.logger.error('Error executing tool: ' + error, typeof error);
                 success = false;
-                const responseError = error instanceof o_core_1.oToolError
+                const responseError = error instanceof oToolError
                     ? error
-                    : new o_core_1.oToolError(o_core_1.oToolErrorCodes.TOOL_ERROR, error.message);
+                    : new oToolError(oToolErrorCodes.TOOL_ERROR, error.message);
                 return {
                     error: responseError,
                 };
@@ -96,9 +93,9 @@ function oTool(Base) {
                 this.errorCount++;
             }
             // compose the response & add the expected connection + request fields
-            const response = tool_utils_1.ToolUtils.buildResponse(request, result, result?.error);
+            const response = ToolUtils.buildResponse(request, result, result?.error);
             // add the request method to the response
-            return o_core_1.CoreUtils.sendResponse(response, streamData.stream);
+            return CoreUtils.sendResponse(response, streamData.stream);
         }
         async execute(req, stream) {
             this.logger.debug('Tool handling incoming stream: ' + this.address.protocol);
@@ -115,11 +112,11 @@ function oTool(Base) {
             // validate and run the tool
             this.validateToolCall(request);
             // check if it's a route and we have reached the destination
-            if (request.method === o_protocol_1.oProtocolMethods.ROUTE &&
+            if (request.method === oProtocolMethods.ROUTE &&
                 request.params.address === this.address.value) {
                 const { payload } = request.params;
                 this.logger.debug('Reached destination, processing payload', payload);
-                request = new o_core_1.oRequest({
+                request = new oRequest({
                     id: requestConfig.id,
                     method: payload.method,
                     params: {
@@ -139,7 +136,7 @@ function oTool(Base) {
             const missingParams = this.findMissingParams(request.method, request.params || {});
             if (missingParams.length > 0) {
                 this.logger.error('Missing required parameters: ', missingParams, ' with passed params: ', request.params);
-                throw new o_core_1.oToolError(o_core_1.oToolErrorCodes.TOOL_MISSING_PARAMETERS, 'Missing required parameters', {
+                throw new oToolError(oToolErrorCodes.TOOL_MISSING_PARAMETERS, 'Missing required parameters', {
                     parameters: missingParams,
                     toolAddress: this.address.toString(),
                     data: request.params,
@@ -178,7 +175,7 @@ function oTool(Base) {
             }
             for (const method in this.methods) {
                 const m = this.methods[method];
-                await this.use(new o_core_1.oAddress('o://vector-store'), {
+                await this.use(new oAddress('o://vector-store'), {
                     method: 'add_documents',
                     params: {
                         documents: [
@@ -186,7 +183,7 @@ function oTool(Base) {
                                 pageContent: m.description,
                                 metadata: {
                                     address: this.address?.toString() + '/' + method,
-                                    id: (0, uuid_1.v4)(),
+                                    id: uuidv4(),
                                 },
                             },
                         ],
@@ -196,7 +193,7 @@ function oTool(Base) {
             let summary = metadata.description ? metadata.description : null;
             if (!summary) {
                 this.logger.debug('No description found, generating summary...');
-                const response = await this.use(new o_core_1.oAddress('o://intelligence'), {
+                const response = await this.use(new oAddress('o://intelligence'), {
                     method: 'prompt',
                     params: {
                         prompt: `You are a helpful assistant that summarizes what a service does by looking at the service description and the details of the tools that the service contains. \n
@@ -223,7 +220,7 @@ function oTool(Base) {
             }
             try {
                 if (summary) {
-                    await this.use(new o_core_1.oAddress('o://vector-store'), {
+                    await this.use(new oAddress('o://vector-store'), {
                         method: 'add_documents',
                         params: {
                             documents: [
@@ -231,7 +228,7 @@ function oTool(Base) {
                                     pageContent: summary,
                                     metadata: {
                                         address: this.address?.toString(),
-                                        id: (0, uuid_1.v4)(),
+                                        id: uuidv4(),
                                     },
                                 },
                             ],
@@ -262,7 +259,7 @@ function oTool(Base) {
         // ensure that the required parameters are present
         findMissingParams(methodName, params) {
             const method = this.methods[methodName];
-            const protectedMethods = Object.values(o_protocol_1.oProtocolMethods);
+            const protectedMethods = Object.values(oProtocolMethods);
             if (protectedMethods.includes(methodName)) {
                 return [];
             }

package/dist/tool.utils.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolUtils = void 0;
-const o_core_1 = require("@olane/o-core");
-class ToolUtils {
+import { oResponse } from '@olane/o-core';
+export class ToolUtils {
     static buildResponse(request, result, error) {
         let success = true;
         if (error) {
             success = false;
         }
-        return new o_core_1.oResponse({
+        return new oResponse({
             id: request.id,
             data: result,
             error: result?.error,
@@ -18,4 +15,3 @@ class ToolUtils {
         });
     }
 }
-exports.ToolUtils = ToolUtils;

package/dist/virtual.tool.d.ts

@@ -8,12 +8,12 @@ declare const oVirtualTool_base: {
         use(address: oAddress, data: {
             [key: string]: unknown;
         }, config?: import("@olane/o-core").UseOptions): Promise<import("@olane/o-core").oResponse>;
-        handleStream(streamData: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).IncomingStreamData): Promise<void>;
-        execute(req: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).Stream): Promise<import(".").RunResult>;
-        run(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).Stream): Promise<import(".").RunResult>;
+        handleStream(streamData: import("@libp2p/interface").IncomingStreamData): Promise<void>;
+        execute(req: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface").Stream): Promise<import(".").RunResult>;
+        run(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface").Stream): Promise<import(".").RunResult>;
         myTools(): string[];
         myToolParams(tool: string): Record<string, any>;
-        callMyTool(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface", { with: { "resolution-mode": "import" } }).Stream): Promise<import(".").ToolResult>;
+        callMyTool(request: import("@olane/o-core").oRequest, stream?: import("@libp2p/interface").Stream): Promise<import(".").ToolResult>;
         index(): Promise<{
             provider: string;
             summary: string;
@@ -28,16 +28,16 @@ declare const oVirtualTool_base: {
         }>;
         findMissingParams(methodName: string, params: any): import("@olane/o-protocol").oParameter[];
         readonly config: import("@olane/o-core").CoreConfig;
-        p2pNode: import("libp2p", { with: { "resolution-mode": "import" } }).Libp2p;
+        p2pNode: import("@libp2p/interface").Libp2p;
         logger: import("@olane/o-core").Logger;
         networkConfig: import("@olane/o-config").Libp2pConfig;
         address: oAddress;
         readonly staticAddress: oAddress;
-        peerId: import("@libp2p/interface-peer-id", { with: { "resolution-mode": "import" } }).PeerId;
+        peerId: import("@libp2p/interface-peer-id").PeerId;
         state: import("@olane/o-core").NodeState;
         errors: Error[];
         connectionManager: import("@olane/o-core").oConnectionManager;
-        leaders: import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
+        leaders: import("@olane/o-config").Multiaddr[];
         addressResolution: import("@olane/o-core").oAddressResolution;
         readonly description: string;
         dependencies: import("@olane/o-core").oDependency[];
@@ -49,8 +49,8 @@ declare const oVirtualTool_base: {
         get type(): import("@olane/o-core").NodeType;
         get transports(): string[];
         get parent(): oAddress | null;
-        get parentTransports(): import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
-        getTransports(address: oAddress): import("@multiformats/multiaddr", { with: { "resolution-mode": "import" } }).Multiaddr[];
+        get parentTransports(): import("@olane/o-config").Multiaddr[];
+        getTransports(address: oAddress): import("@olane/o-config").Multiaddr[];
         handleStaticAddressTranslation(addressInput: oAddress): Promise<oAddress>;
         translateAddress(addressWithLeaderTransports: oAddress): Promise<{
             nextHopAddress: oAddress;

package/dist/virtual.tool.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.oVirtualTool = void 0;
-const o_tool_1 = require("./o-tool");
-const o_core_1 = require("@olane/o-core");
-class oVirtualTool extends (0, o_tool_1.oTool)(o_core_1.oVirtualNode) {
+import { oTool } from './o-tool';
+import { oVirtualNode } from '@olane/o-core';
+export class oVirtualTool extends oTool(oVirtualNode) {
     constructor(config) {
         super(config);
     }
 }
-exports.oVirtualTool = oVirtualTool;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@olane/o-tool",
-  "version": "0.1.1",
+  "version": "0.1.2",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "default": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "files": [
@@ -37,9 +38,9 @@
     "@babel/preset-typescript": "^7.27.1",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.29.0",
-    "@olane/o-config": "^0.1.1",
-    "@olane/o-core": "^0.1.1",
-    "@olane/o-protocol": "^0.1.1",
+    "@olane/o-config": "file:../o-config",
+    "@olane/o-core": "file:../..",
+    "@olane/o-protocol": "file:../o-protocol",
     "@tsconfig/node20": "^20.1.6",
     "@types/jest": "^30.0.0",
     "@typescript-eslint/eslint-plugin": "^8.34.1",
@@ -63,9 +64,9 @@
     "webpack-dev-server": "^5.2.2"
   },
   "peerDependencies": {
-    "@olane/o-config": "^0.1.1",
-    "@olane/o-core": "^0.1.1",
-    "@olane/o-protocol": "^0.1.1"
+    "@olane/o-config": "^0.1.2",
+    "@olane/o-core": "^0.1.2",
+    "@olane/o-protocol": "^0.1.2"
   },
   "dependencies": {
     "debug": "^4.4.1",