@virtuals-protocol/acp-node 0.3.0-beta.14 → 0.3.0-beta.15

package/dist/index.d.mts

@@ -343,6 +343,7 @@ interface IAcpClientOptions {
     onNewTask?: (job: AcpJob, memoToSign?: AcpMemo) => void;
     onEvaluate?: (job: AcpJob) => void;
     customRpcUrl?: string;
+    skipSocketConnection?: boolean;
 }
 type AcpAgent = {
     id: number;
@@ -605,6 +606,10 @@ declare abstract class BaseAcpContractClient {
     abstract getAcpVersion(): string;
 }
 
+declare class AcpError extends Error {
+    constructor(message: string, originalError?: unknown);
+}
+
 interface IAcpBrowseAgentsOptions {
     cluster?: string;
     sort_by?: AcpAgentSort[];
@@ -621,8 +626,8 @@ declare class AcpClient {
     get acpContractClient(): BaseAcpContractClient;
     get acpUrl(): string;
     private defaultOnEvaluate;
-    get walletAddress(): any;
-    init(): Promise<void>;
+    get walletAddress(): `0x${string}`;
+    init(skipSocketConnection?: boolean): Promise<void>;
     browseAgents(keyword: string, options: IAcpBrowseAgentsOptions): Promise<{
         id: number;
         name: string;
@@ -647,12 +652,12 @@ declare class AcpClient {
         }[];
     }[]>;
     initiateJob(providerAddress: Address, serviceRequirement: Object | string, fareAmount: FareAmountBase, evaluatorAddress?: Address, expiredAt?: Date): Promise<number>;
-    getActiveJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getPendingMemoJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getCompletedJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getCancelledJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getJobById(jobId: number): Promise<AcpJob | undefined>;
-    getMemoById(jobId: number, memoId: number): Promise<AcpMemo | undefined>;
+    getActiveJobs(page?: number, pageSize?: number): Promise<AcpError | AcpJob[]>;
+    getPendingMemoJobs(page?: number, pageSize?: number): Promise<AcpError | AcpJob[]>;
+    getCompletedJobs(page?: number, pageSize?: number): Promise<AcpError | AcpJob[]>;
+    getCancelledJobs(page?: number, pageSize?: number): Promise<Error | AcpJob[]>;
+    getJobById(jobId: number): Promise<AcpError | AcpJob | undefined>;
+    getMemoById(jobId: number, memoId: number): Promise<AcpError | AcpMemo | undefined>;
     getAgent(walletAddress: Address): Promise<AcpAgent | undefined>;
     getAccountByJobId(jobId: number, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
     getByClientAndProvider(clientAddress: Address, providerAddress: Address, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
@@ -8949,10 +8954,6 @@ declare class AcpContractClient extends BaseAcpContractClient {
 
 declare function preparePayload(payload: string | object): string;
 
-declare class AcpError extends Error {
-    constructor(message: string, originalError?: unknown);
-}
-
 declare class AcpContractClientV2 extends BaseAcpContractClient {
     private jobManagerAddress;
     private memoManagerAddress;

package/dist/index.d.ts

@@ -343,6 +343,7 @@ interface IAcpClientOptions {
     onNewTask?: (job: AcpJob, memoToSign?: AcpMemo) => void;
     onEvaluate?: (job: AcpJob) => void;
     customRpcUrl?: string;
+    skipSocketConnection?: boolean;
 }
 type AcpAgent = {
     id: number;
@@ -605,6 +606,10 @@ declare abstract class BaseAcpContractClient {
     abstract getAcpVersion(): string;
 }
 
+declare class AcpError extends Error {
+    constructor(message: string, originalError?: unknown);
+}
+
 interface IAcpBrowseAgentsOptions {
     cluster?: string;
     sort_by?: AcpAgentSort[];
@@ -621,8 +626,8 @@ declare class AcpClient {
     get acpContractClient(): BaseAcpContractClient;
     get acpUrl(): string;
     private defaultOnEvaluate;
-    get walletAddress(): any;
-    init(): Promise<void>;
+    get walletAddress(): `0x${string}`;
+    init(skipSocketConnection?: boolean): Promise<void>;
     browseAgents(keyword: string, options: IAcpBrowseAgentsOptions): Promise<{
         id: number;
         name: string;
@@ -647,12 +652,12 @@ declare class AcpClient {
         }[];
     }[]>;
     initiateJob(providerAddress: Address, serviceRequirement: Object | string, fareAmount: FareAmountBase, evaluatorAddress?: Address, expiredAt?: Date): Promise<number>;
-    getActiveJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getPendingMemoJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getCompletedJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getCancelledJobs(page?: number, pageSize?: number): Promise<AcpJob[]>;
-    getJobById(jobId: number): Promise<AcpJob | undefined>;
-    getMemoById(jobId: number, memoId: number): Promise<AcpMemo | undefined>;
+    getActiveJobs(page?: number, pageSize?: number): Promise<AcpError | AcpJob[]>;
+    getPendingMemoJobs(page?: number, pageSize?: number): Promise<AcpError | AcpJob[]>;
+    getCompletedJobs(page?: number, pageSize?: number): Promise<AcpError | AcpJob[]>;
+    getCancelledJobs(page?: number, pageSize?: number): Promise<Error | AcpJob[]>;
+    getJobById(jobId: number): Promise<AcpError | AcpJob | undefined>;
+    getMemoById(jobId: number, memoId: number): Promise<AcpError | AcpMemo | undefined>;
     getAgent(walletAddress: Address): Promise<AcpAgent | undefined>;
     getAccountByJobId(jobId: number, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
     getByClientAndProvider(clientAddress: Address, providerAddress: Address, acpContractClient?: BaseAcpContractClient): Promise<AcpAccount | null>;
@@ -8949,10 +8954,6 @@ declare class AcpContractClient extends BaseAcpContractClient {
 
 declare function preparePayload(payload: string | object): string;
 
-declare class AcpError extends Error {
-    constructor(message: string, originalError?: unknown);
-}
-
 declare class AcpContractClientV2 extends BaseAcpContractClient {
     private jobManagerAddress;
     private memoManagerAddress;

package/dist/index.js

@@ -35,7 +35,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.14",
+      version: "0.3.0-beta.15",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -4420,8 +4420,8 @@ var AcpClient = class {
     if (this.contractClients.length === 0) {
       throw new acpError_default("ACP contract client is required");
     }
-    this.contractClients.every((client) => {
-      if (client.contractAddress !== this.contractClients[0].contractAddress) {
+    this.contractClients.forEach((client) => {
+      if (client.walletAddress !== this.contractClients[0].walletAddress) {
         throw new acpError_default(
           "All contract clients must have the same agent wallet address"
         );
@@ -4429,7 +4429,7 @@ var AcpClient = class {
     });
     this.onNewTask = options.onNewTask;
     this.onEvaluate = options.onEvaluate || this.defaultOnEvaluate;
-    this.init();
+    this.init(options.skipSocketConnection);
   }
   contractClientByAddress(address) {
     if (!address) {
@@ -4453,12 +4453,12 @@ var AcpClient = class {
     await job.evaluate(true, "Evaluated by default");
   }
   get walletAddress() {
-    if (Array.isArray(this.acpContractClient)) {
-      return this.acpContractClient[0].walletAddress;
-    }
     return this.acpContractClient.walletAddress;
   }
-  async init() {
+  async init(skipSocketConnection = false) {
+    if (skipSocketConnection) {
+      return;
+    }
     const socket = (0, import_socket.io)(this.acpUrl, {
       auth: {
         walletAddress: this.walletAddress
@@ -4736,6 +4736,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get active jobs", error);
     }
   }
@@ -4783,6 +4786,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get pending memo jobs", error);
     }
   }
@@ -4830,6 +4836,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get completed jobs", error);
     }
   }
@@ -4877,6 +4886,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof Error) {
+        return error;
+      }
       throw new acpError_default("Failed to get cancelled jobs", error);
     }
   }
@@ -4926,6 +4938,9 @@ var AcpClient = class {
         job.netPayableAmount
       );
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get job by id", error);
     }
   }
@@ -4960,6 +4975,9 @@ var AcpClient = class {
         memo.signedTxHash
       );
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get memo by id", error);
     }
   }

package/dist/index.mjs

@@ -8,7 +8,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.14",
+      version: "0.3.0-beta.15",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -4373,8 +4373,8 @@ var AcpClient = class {
     if (this.contractClients.length === 0) {
       throw new acpError_default("ACP contract client is required");
     }
-    this.contractClients.every((client) => {
-      if (client.contractAddress !== this.contractClients[0].contractAddress) {
+    this.contractClients.forEach((client) => {
+      if (client.walletAddress !== this.contractClients[0].walletAddress) {
         throw new acpError_default(
           "All contract clients must have the same agent wallet address"
         );
@@ -4382,7 +4382,7 @@ var AcpClient = class {
     });
     this.onNewTask = options.onNewTask;
     this.onEvaluate = options.onEvaluate || this.defaultOnEvaluate;
-    this.init();
+    this.init(options.skipSocketConnection);
   }
   contractClientByAddress(address) {
     if (!address) {
@@ -4406,12 +4406,12 @@ var AcpClient = class {
     await job.evaluate(true, "Evaluated by default");
   }
   get walletAddress() {
-    if (Array.isArray(this.acpContractClient)) {
-      return this.acpContractClient[0].walletAddress;
-    }
     return this.acpContractClient.walletAddress;
   }
-  async init() {
+  async init(skipSocketConnection = false) {
+    if (skipSocketConnection) {
+      return;
+    }
     const socket = io(this.acpUrl, {
       auth: {
         walletAddress: this.walletAddress
@@ -4689,6 +4689,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get active jobs", error);
     }
   }
@@ -4736,6 +4739,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get pending memo jobs", error);
     }
   }
@@ -4783,6 +4789,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get completed jobs", error);
     }
   }
@@ -4830,6 +4839,9 @@ var AcpClient = class {
         );
       });
     } catch (error) {
+      if (error instanceof Error) {
+        return error;
+      }
       throw new acpError_default("Failed to get cancelled jobs", error);
     }
   }
@@ -4879,6 +4891,9 @@ var AcpClient = class {
         job.netPayableAmount
       );
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get job by id", error);
     }
   }
@@ -4913,6 +4928,9 @@ var AcpClient = class {
         memo.signedTxHash
       );
     } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
       throw new acpError_default("Failed to get memo by id", error);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@virtuals-protocol/acp-node",
-  "version": "0.3.0-beta.14",
+  "version": "0.3.0-beta.15",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",