@olane/o-tool 0.4.4 → 0.6.1

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":"AAAA,OAAO,EAIL,SAAS,EAMV,MAAM,eAAe,CAAC;AASvB;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAiV7E"}
+{"version":3,"file":"o-tool.d.ts","sourceRoot":"","sources":["../../src/o-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,SAAS,EAMV,MAAM,eAAe,CAAC;AASvB;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAqV7E"}

package/dist/src/o-tool.js

@@ -14,7 +14,6 @@ export function oTool(Base) {
             const config = args[0];
         }
         validateToolCall(oRequest) {
-            this.logger.debug('Validating tool call: ' + oRequest.method);
             const method = oRequest.method;
             if (!method) {
                 throw new Error('method parameter is required');
@@ -54,10 +53,13 @@ export function oTool(Base) {
                 });
                 let success = true;
                 const result = await this.execute(request).catch((error) => {
-                    this.logger.error('Error executing tool: ' + error);
+                    this.logger.error('Error executing tool: ', error);
                     success = false;
+                    const responseError = error instanceof oToolError
+                        ? error
+                        : new oToolError(oToolErrorCodes.TOOL_ERROR, error.message);
                     return {
-                        error: error.message,
+                        error: responseError.toJSON(),
                     };
                 });
                 if (success) {
@@ -76,13 +78,13 @@ export function oTool(Base) {
             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);
+                this.logger.error('Error executing tool: ', error, typeof error);
                 success = false;
                 const responseError = error instanceof oToolError
                     ? error
                     : new oToolError(oToolErrorCodes.TOOL_ERROR, error.message);
                 return {
-                    error: responseError,
+                    error: responseError.toJSON(),
                 };
             });
             if (success) {
@@ -97,7 +99,6 @@ export function oTool(Base) {
             return CoreUtils.sendResponse(response, streamData.stream);
         }
         async execute(req, stream) {
-            this.logger.debug('Tool handling incoming stream: ' + this.address.protocol);
             // const protocolUsageCounter = this.p2pNode.metrics?.registerCounter(
             //   'libp2p_protocol_custom_track',
             //   {
@@ -114,7 +115,6 @@ export function oTool(Base) {
             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 oRequest({
                     id: requestConfig.id,
                     method: payload.method,
@@ -124,7 +124,6 @@ export function oTool(Base) {
                         ...(payload.params || {}), // TODO: is this correct? this line used to be ...payload
                     },
                 });
-                this.logger.debug('Processed request: ', request);
             }
             const result = await this.run(request, stream);
             return result;
@@ -141,13 +140,15 @@ export function oTool(Base) {
                     data: request.params,
                 });
             }
-            return this.callMyTool(request, stream);
-        }
-        myTools() {
-            return Object.getOwnPropertyNames(this.constructor.prototype)
-                .filter((key) => key.startsWith('_tool_'))
-                .filter((key) => !!key)
-                .map((key) => key.replace('_tool_', ''));
+            // resolve o:// addresses
+            // THIS HAS A RECURSIVE CALL issue
+            this.logger.debug('Calling function at address: ', this.address.toString(), 'with request: ', request.method);
+            // const isPlaceholder = this.address.toString().includes('placeholder');
+            // request = await oRequest.translateToRawRequest(request, this);
+            let result = await this.callMyTool(request, stream);
+            // result = await oRequest.translateResultForAgent(result, this);
+            return result;
+            // translate to o:// addresses
         }
         myToolParams(tool) {
             const func = Object.keys(this).find((key) => key.startsWith('_params_' + tool));
@@ -249,6 +250,7 @@ export function oTool(Base) {
         async whoami() {
             const metadata = await super.whoami();
             return {
+                // @ts-ignore
                 tools: this.myTools(),
                 description: this.description,
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-tool",
-  "version": "0.4.4",
+  "version": "0.6.1",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -18,6 +18,7 @@
   "scripts": {
     "test": "aegir test",
     "test:node": "aegir test -t node",
+    "deep:clean": "rm -rf node_modules && rm package-lock.json",
     "test:browser": "aegir test -t browser",
     "build": "tsc",
     "start:prod": "node dist/index.js",
@@ -34,6 +35,9 @@
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.29.0",
+    "@olane/o-config": "0.6.1",
+    "@olane/o-core": "0.6.1",
+    "@olane/o-protocol": "0.6.1",
     "@tsconfig/node20": "^20.1.6",
     "@types/jest": "^30.0.0",
     "@types/uuid": "^10.0.0",
@@ -53,9 +57,9 @@
     "typescript": "^5.8.3"
   },
   "peerDependencies": {
-    "@olane/o-config": "^0.4.4",
-    "@olane/o-core": "^0.4.4",
-    "@olane/o-protocol": "^0.4.4"
+    "@olane/o-config": "^0.6.1",
+    "@olane/o-core": "^0.6.1",
+    "@olane/o-protocol": "^0.6.1"
   },
   "dependencies": {
     "debug": "^4.4.1",