Merge branch 'main' into feat/subscription

Author: ariessa

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@virtuals-protocol/acp-node",
-  "version": "0.3.0-beta.37",
+  "version": "0.3.0-beta.38",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -35,7 +35,6 @@
     "ajv": "^8.17.1",
     "axios": "^1.13.2",
     "jwt-decode": "^4.0.0",
-    "dotenv": "^17.2.3",
     "ox": "^0.13.1",
     "socket.io-client": "^4.8.1",
     "tsup": "^8.5.0",

package.json

@@ -293,7 +293,7 @@ class AcpClient {
       callback(true);
 
       if (this.onEvaluate) {
-        const job = this._hydrateJob(data);
+        const job = await this._hydrateJob(data);
 
         this.onEvaluate(job);
       }
@@ -303,7 +303,7 @@ class AcpClient {
       callback(true);
 
       if (this.onNewTask) {
-        const job = this._hydrateJob(data);
+        const job = await this._hydrateJob(data);
 
         if (job.phase === AcpJobPhases.EXPIRED) {
           console.warn(`onNewTask skipped for job ${data.id}: job has expired`);
@@ -364,13 +364,10 @@ class AcpClient {
     }
   }
 
-  private _hydrateMemo(
-    memo: IAcpMemoData,
-    contractClient: BaseAcpContractClient
-  ): AcpMemo {
+  private async _hydrateMemo(memo: IAcpMemoData): Promise<AcpMemo> {
     try {
-      return new AcpMemo(
-        contractClient,
+      return await AcpMemo.build(
+        this,
         memo.id,
         memo.memoType,
         memo.content,
@@ -389,7 +386,7 @@ class AcpClient {
     }
   }
 
-  private _hydrateJob(job: IAcpJob): AcpJob {
+  private async _hydrateJob(job: IAcpJob): Promise<AcpJob> {
     try {
       return new AcpJob(
         this,
@@ -399,37 +396,33 @@ class AcpClient {
         job.evaluatorAddress,
         job.price,
         job.priceTokenAddress,
-        job.memos.map((memo) =>
-          this._hydrateMemo(
-            memo,
-            this.contractClientByAddress(job.contractAddress)
-          )
-        ),
+        await Promise.all(job.memos.map((memo) => this._hydrateMemo(memo))),
         job.phase,
         job.context,
         job.contractAddress,
-        job.deliverable,
         job.netPayableAmount
       );
     } catch (err) {
       throw new AcpError(`Failed to hydrate job ${job.id}`, err);
     }
   }
 
-  private _hydrateJobs(
+  private async _hydrateJobs(
     rawJobs: IAcpJob[],
     options?: {
       logPrefix?: string;
     }
-  ): AcpJob[] {
-    const jobs = rawJobs.map((job) => {
-      try {
-        return this._hydrateJob(job);
-      } catch (err) {
-        console.warn(`${options?.logPrefix ?? "Skipped"}`, err);
-        return null;
-      }
-    });
+  ): Promise<AcpJob[]> {
+    const jobs = await Promise.all(
+      rawJobs.map((job) => {
+        try {
+          return this._hydrateJob(job);
+        } catch (err) {
+          console.warn(`${options?.logPrefix ?? "Skipped"}`, err);
+          return null;
+        }
+      })
+    );
 
     return jobs.filter((job) => !!job) as AcpJob[];
   }
@@ -471,6 +464,7 @@ class AcpClient {
             offering.requirement,
             offering.deliverable,
             offering.subscriptionTiers ?? [],
+            offering.isPrivate
           );
         }),
       contractAddress: agent.contractAddress,
@@ -657,12 +651,25 @@ class AcpClient {
             priceType: PriceType.SUBSCRIPTION,
           })
         : preparePayload(serviceRequirement);
+    const isPrivate =
+      typeof serviceRequirement === "object" &&
+      "isPrivate" in serviceRequirement &&
+      serviceRequirement.isPrivate;
+
+    let content = preparePayload(serviceRequirement);
+
+    if (isPrivate) {
+      const memoContent = await this.createMemoContent(jobId, content);
+      content = memoContent.url;
+    }
 
     payloads.push(
       this.acpContractClient.createMemo(
         jobId,
         memoPayload,
         MemoType.MESSAGE,
+        content,
+        isPrivate ? MemoType.OBJECT_URL : MemoType.MESSAGE,
         true,
         AcpJobPhases.NEGOTIATION
       )
@@ -744,10 +751,7 @@ class AcpClient {
       return null;
     }
 
-    return this._hydrateMemo(
-      memo,
-      this.contractClientByAddress(memo.contractAddress)
-    );
+    return this._hydrateMemo(memo);
   }
 
   async getAgent(walletAddress: Address, options: IAcpGetAgentOptions = {}) {