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

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.16",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -3927,6 +3927,7 @@ var AcpJobOffering = class {
 var acpJobOffering_default = AcpJobOffering;
 
 // src/acpJob.ts
+import * as util from "util";
 var AcpJob = class {
   constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress, netPayableAmount) {
     this.acpClient = acpClient;
@@ -4301,10 +4302,28 @@ var AcpJob = class {
       waitMs = Math.min(waitMs * 2, maxWaitMs);
     }
   }
+  [util.inspect.custom]() {
+    return {
+      id: this.id,
+      clientAddress: this.clientAddress,
+      providerAddress: this.providerAddress,
+      name: this.name,
+      requirement: this.requirement,
+      priceType: this.priceType,
+      priceValue: this.priceValue,
+      priceTokenAddress: this.priceTokenAddress,
+      memos: this.memos,
+      phase: this.phase,
+      context: this.context,
+      contractAddress: this.contractAddress,
+      netPayableAmount: this.netPayableAmount
+    };
+  }
 };
 var acpJob_default = AcpJob;
 
 // src/acpMemo.ts
+import util2 from "util";
 var AcpMemo = class {
   constructor(contractClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash) {
     this.contractClient = contractClient;
@@ -4344,6 +4363,21 @@ var AcpMemo = class {
     const payload = this.contractClient.signMemo(this.id, approved, reason);
     return await this.contractClient.handleOperation([payload]);
   }
+  [util2.inspect.custom]() {
+    return {
+      id: this.id,
+      senderAddress: this.senderAddress,
+      type: MemoType[this.type],
+      status: this.status,
+      content: this.content,
+      signedReason: this.signedReason,
+      txHash: this.txHash,
+      signedTxHash: this.signedTxHash,
+      nextPhase: AcpJobPhases[this.nextPhase],
+      expiry: this.expiry,
+      payableDetails: this.payableDetails
+    };
+  }
 };
 var acpMemo_default = AcpMemo;
 
@@ -4373,8 +4407,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 +4416,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 +4440,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
@@ -4517,7 +4551,7 @@ var AcpClient = class {
     process.on("SIGTERM", cleanup);
   }
   async browseAgents(keyword, options) {
-    let { cluster, sort_by, top_k, graduationStatus, onlineStatus } = options;
+    let { cluster, sort_by, top_k, graduationStatus, onlineStatus, showHiddenOfferings } = options;
     top_k = top_k ?? 5;
     let url = `${this.acpUrl}/api/agents/v4/search?search=${keyword}`;
     if (sort_by && sort_by.length > 0) {
@@ -4538,6 +4572,9 @@ var AcpClient = class {
     if (onlineStatus) {
       url += `&onlineStatus=${onlineStatus}`;
     }
+    if (showHiddenOfferings) {
+      url += `&showHiddenOfferings=${showHiddenOfferings}`;
+    }
     const response = await fetch(url);
     const data = await response.json();
     const availableContractClientAddresses = this.contractClients.map(
@@ -4575,7 +4612,7 @@ var AcpClient = class {
         twitterHandle: agent.twitterHandle,
         walletAddress: agent.walletAddress,
         metrics: agent.metrics,
-        resource: agent.resources
+        resources: agent.resources
       };
     });
   }
@@ -4646,209 +4683,142 @@ var AcpClient = class {
     return jobId;
   }
   async getActiveJobs(page = 1, pageSize = 10) {
-    let url = `${this.acpUrl}/api/jobs/active?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-    try {
-      const response = await fetch(url, {
-        headers: {
-          "wallet-address": this.walletAddress
-        }
-      });
-      const data = await response.json();
-      if (data.error) {
-        throw new acpError_default(data.error.message);
-      }
-      return data.data.map((job) => {
-        return new acpJob_default(
-          this,
-          job.id,
-          job.clientAddress,
-          job.providerAddress,
-          job.evaluatorAddress,
-          job.price,
-          job.priceTokenAddress,
-          job.memos.map((memo) => {
-            return new acpMemo_default(
-              this.contractClientByAddress(job.contractAddress),
-              memo.id,
-              memo.memoType,
-              memo.content,
-              memo.nextPhase,
-              memo.status,
-              memo.senderAddress,
-              memo.signedReason,
-              memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-              memo.payableDetails,
-              memo.txHash,
-              memo.signedTxHash
-            );
-          }),
-          job.phase,
-          job.context,
-          job.contractAddress,
-          job.netPayableAmount
-        );
-      });
-    } catch (error) {
-      throw new acpError_default("Failed to get active jobs", error);
-    }
+    const url = `${this.acpUrl}/api/jobs/active?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    const rawJobs = await this._fetchJobList(url);
+    return this._hydrateJobs(rawJobs, { logPrefix: "Active jobs" });
   }
   async getPendingMemoJobs(page = 1, pageSize = 10) {
-    let url = `${this.acpUrl}/api/jobs/pending-memos?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-    try {
-      const response = await fetch(url, {
-        headers: {
-          "wallet-address": this.acpContractClient.walletAddress
-        }
-      });
-      const data = await response.json();
-      if (data.error) {
-        throw new acpError_default(data.error.message);
-      }
-      return data.data.map((job) => {
-        return new acpJob_default(
-          this,
-          job.id,
-          job.clientAddress,
-          job.providerAddress,
-          job.evaluatorAddress,
-          job.price,
-          job.priceTokenAddress,
-          job.memos.map((memo) => {
-            return new acpMemo_default(
-              this.contractClientByAddress(job.contractAddress),
-              memo.id,
-              memo.memoType,
-              memo.content,
-              memo.nextPhase,
-              memo.status,
-              memo.senderAddress,
-              memo.signedReason,
-              memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-              typeof memo.payableDetails === "string" ? tryParseJson(memo.payableDetails) || void 0 : memo.payableDetails,
-              memo.txHash,
-              memo.signedTxHash
-            );
-          }),
-          job.phase,
-          job.context,
-          job.contractAddress,
-          job.netPayableAmount
-        );
-      });
-    } catch (error) {
-      throw new acpError_default("Failed to get pending memo jobs", error);
-    }
+    const url = `${this.acpUrl}/api/jobs/pending-memos?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    const rawJobs = await this._fetchJobList(url);
+    return this._hydrateJobs(rawJobs, { logPrefix: "Pending memo jobs" });
   }
   async getCompletedJobs(page = 1, pageSize = 10) {
-    let url = `${this.acpUrl}/api/jobs/completed?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-    try {
-      const response = await fetch(url, {
-        headers: {
-          "wallet-address": this.acpContractClient.walletAddress
-        }
-      });
-      const data = await response.json();
-      if (data.error) {
-        throw new acpError_default(data.error.message);
-      }
-      return data.data.map((job) => {
-        return new acpJob_default(
-          this,
-          job.id,
-          job.clientAddress,
-          job.providerAddress,
-          job.evaluatorAddress,
-          job.price,
-          job.priceTokenAddress,
-          job.memos.map((memo) => {
-            return new acpMemo_default(
-              this.contractClientByAddress(job.contractAddress),
-              memo.id,
-              memo.memoType,
-              memo.content,
-              memo.nextPhase,
-              memo.status,
-              memo.senderAddress,
-              memo.signedReason,
-              memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-              memo.payableDetails,
-              memo.txHash,
-              memo.signedTxHash
-            );
-          }),
-          job.phase,
-          job.context,
-          job.contractAddress,
-          job.netPayableAmount
-        );
-      });
-    } catch (error) {
-      throw new acpError_default("Failed to get completed jobs", error);
-    }
+    const url = `${this.acpUrl}/api/jobs/completed?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    const rawJobs = await this._fetchJobList(url);
+    return this._hydrateJobs(rawJobs, { logPrefix: "Completed jobs" });
   }
   async getCancelledJobs(page = 1, pageSize = 10) {
-    let url = `${this.acpUrl}/api/jobs/cancelled?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    const url = `${this.acpUrl}/api/jobs/cancelled?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    const rawJobs = await this._fetchJobList(url);
+    return this._hydrateJobs(rawJobs, { logPrefix: "Cancelled jobs" });
+  }
+  async _fetchJobList(url) {
+    let response;
     try {
-      const response = await fetch(url, {
+      response = await fetch(url, {
         headers: {
           "wallet-address": this.walletAddress
         }
       });
-      const data = await response.json();
-      if (data.error) {
-        throw new acpError_default(data.error.message);
-      }
-      return data.data.map((job) => {
-        return new acpJob_default(
-          this,
-          job.id,
-          job.clientAddress,
-          job.providerAddress,
-          job.evaluatorAddress,
-          job.price,
-          job.priceTokenAddress,
-          job.memos.map((memo) => {
-            return new acpMemo_default(
-              this.contractClientByAddress(job.contractAddress),
-              memo.id,
-              memo.memoType,
-              memo.content,
-              memo.nextPhase,
-              memo.status,
-              memo.senderAddress,
-              memo.signedReason,
-              memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-              memo.payableDetails,
-              memo.txHash,
-              memo.signedTxHash
-            );
-          }),
-          job.phase,
-          job.context,
-          job.contractAddress,
-          job.netPayableAmount
+    } catch (err) {
+      throw new acpError_default("Failed to fetch ACP jobs (network error)", err);
+    }
+    let data;
+    try {
+      data = await response.json();
+    } catch (err) {
+      throw new acpError_default("Failed to parse ACP jobs response", err);
+    }
+    if (data.error) {
+      throw new acpError_default(data.error.message);
+    }
+    return data.data;
+  }
+  _hydrateJobs(rawJobs, options) {
+    const jobs = [];
+    const errors = [];
+    for (const job of rawJobs) {
+      try {
+        const memos = job.memos.map(
+          (memo) => new acpMemo_default(
+            this.contractClientByAddress(job.contractAddress),
+            memo.id,
+            memo.memoType,
+            memo.content,
+            memo.nextPhase,
+            memo.status,
+            memo.senderAddress,
+            memo.signedReason,
+            memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+            memo.payableDetails,
+            memo.txHash,
+            memo.signedTxHash
+          )
         );
-      });
-    } catch (error) {
-      throw new acpError_default("Failed to get cancelled jobs", error);
+        jobs.push(
+          new acpJob_default(
+            this,
+            job.id,
+            job.clientAddress,
+            job.providerAddress,
+            job.evaluatorAddress,
+            job.price,
+            job.priceTokenAddress,
+            memos,
+            job.phase,
+            job.context,
+            job.contractAddress,
+            job.netPayableAmount
+          )
+        );
+      } catch (err) {
+        errors.push({ jobId: job.id, error: err });
+      }
+    }
+    if (errors.length > 0) {
+      console.warn(
+        `${options?.logPrefix ?? "Skipped"} ${errors.length} malformed job(s)
+` + JSON.stringify(
+          errors.map((e) => ({ jobId: e.jobId, message: e.error.message })),
+          null,
+          2
+        )
+      );
     }
+    return jobs;
   }
   async getJobById(jobId) {
-    let url = `${this.acpUrl}/api/jobs/${jobId}`;
+    const url = `${this.acpUrl}/api/jobs/${jobId}`;
+    let response;
     try {
-      const response = await fetch(url, {
+      response = await fetch(url, {
         headers: {
           "wallet-address": this.acpContractClient.walletAddress
         }
       });
-      const data = await response.json();
-      if (data.error) {
-        throw new acpError_default(data.error.message);
-      }
-      const job = data.data;
-      if (!job) {
-        return;
-      }
+    } catch (err) {
+      throw new acpError_default("Failed to fetch job by id (network error)", err);
+    }
+    let data;
+    try {
+      data = await response.json();
+    } catch (err) {
+      throw new acpError_default("Failed to parse job by id response", err);
+    }
+    if (data.error) {
+      throw new acpError_default(data.error.message);
+    }
+    const job = data.data;
+    if (!job) {
+      return void 0;
+    }
+    try {
+      const memos = job.memos.map(
+        (memo) => new acpMemo_default(
+          this.contractClientByAddress(job.contractAddress),
+          memo.id,
+          memo.memoType,
+          memo.content,
+          memo.nextPhase,
+          memo.status,
+          memo.senderAddress,
+          memo.signedReason,
+          memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+          memo.payableDetails,
+          memo.txHash,
+          memo.signedTxHash
+        )
+      );
       return new acpJob_default(
         this,
         job.id,
@@ -4857,47 +4827,42 @@ var AcpClient = class {
         job.evaluatorAddress,
         job.price,
         job.priceTokenAddress,
-        job.memos.map((memo) => {
-          return new acpMemo_default(
-            this.contractClientByAddress(job.contractAddress),
-            memo.id,
-            memo.memoType,
-            memo.content,
-            memo.nextPhase,
-            memo.status,
-            memo.senderAddress,
-            memo.signedReason,
-            memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-            memo.payableDetails,
-            memo.txHash,
-            memo.signedTxHash
-          );
-        }),
+        memos,
         job.phase,
         job.context,
         job.contractAddress,
         job.netPayableAmount
       );
-    } catch (error) {
-      throw new acpError_default("Failed to get job by id", error);
+    } catch (err) {
+      throw new acpError_default(`Failed to hydrate job ${jobId}`, err);
     }
   }
   async getMemoById(jobId, memoId) {
-    let url = `${this.acpUrl}/api/jobs/${jobId}/memos/${memoId}`;
+    const url = `${this.acpUrl}/api/jobs/${jobId}/memos/${memoId}`;
+    let response;
     try {
-      const response = await fetch(url, {
+      response = await fetch(url, {
         headers: {
           "wallet-address": this.walletAddress
         }
       });
-      const data = await response.json();
-      if (data.error) {
-        throw new acpError_default(data.error.message);
-      }
-      const memo = data.data;
-      if (!memo) {
-        return;
-      }
+    } catch (err) {
+      throw new acpError_default("Failed to fetch memo by id (network error)", err);
+    }
+    let data;
+    try {
+      data = await response.json();
+    } catch (err) {
+      throw new acpError_default("Failed to parse memo by id response", err);
+    }
+    if (data.error) {
+      throw new acpError_default(data.error.message);
+    }
+    const memo = data.data;
+    if (!memo) {
+      return void 0;
+    }
+    try {
       return new acpMemo_default(
         this.contractClientByAddress(memo.contractAddress),
         memo.id,
@@ -4912,8 +4877,11 @@ var AcpClient = class {
         memo.txHash,
         memo.signedTxHash
       );
-    } catch (error) {
-      throw new acpError_default("Failed to get memo by id", error);
+    } catch (err) {
+      throw new acpError_default(
+        `Failed to hydrate memo ${memoId} for job ${jobId}`,
+        err
+      );
     }
   }
   async getAgent(walletAddress) {
@@ -5157,7 +5125,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
       );
     }
     await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
-    console.log("Connected to ACP:", {
+    console.log("Connected to ACP with v1 Contract Client (Legacy):", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
       entityId: sessionEntityKeyId

package/package.json

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