@storacha/clawracha 0.3.8 → 0.3.10

package/dist/handlers/remote.d.ts

@@ -8,14 +8,10 @@
  */
 import type { CID } from "multiformats/cid";
 import type { BlockFetcher, ValueView } from "@storacha/ucn/pail/api";
-import type { DecryptionConfig, EncryptedClient } from "@storacha/encrypt-upload-client/types";
-import type { Signer } from "@ucanto/interface";
 export declare function applyRemoteChanges(changedPaths: string[], entries: Map<string, CID>, workspace: string, options?: {
     gateway?: string;
     blocks?: BlockFetcher;
     current?: ValueView;
-    encryptedClient?: EncryptedClient;
-    decryptionConfig?: DecryptionConfig;
-    agent?: Signer;
+    decrypt?: (cid: CID) => Promise<Uint8Array>;
 }): Promise<void>;
 //# sourceMappingURL=remote.d.ts.map

package/dist/handlers/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/handlers/remote.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAG/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAwBhD,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,IAAI,CAAC,CA2Df"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/handlers/remote.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AA+BtE,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CAC7C,GACA,OAAO,CAAC,IAAI,CAAC,CA6Cf"}

package/dist/handlers/remote.js

@@ -9,7 +9,6 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import * as mdsync from "../mdsync/index.js";
-import { makeDecryptFn } from "../utils/crypto.js";
 const DEFAULT_GATEWAY = "https://storacha.link";
 const isMarkdown = (filePath) => filePath.endsWith(".md");
 /** Drain a ReadableStream into a single Uint8Array. */
@@ -33,7 +32,6 @@ async function drainStream(stream) {
 }
 export async function applyRemoteChanges(changedPaths, entries, workspace, options) {
     const gateway = options?.gateway ?? DEFAULT_GATEWAY;
-    const isEncrypted = !!(options?.encryptedClient && options?.decryptionConfig);
     for (const relativePath of changedPaths) {
         const cid = entries.get(relativePath);
         const fullPath = path.join(workspace, relativePath);
@@ -52,20 +50,14 @@ export async function applyRemoteChanges(changedPaths, entries, workspace, optio
             options?.current) {
             // Markdown: resolve via mdsync CRDT merge.
             // For single-device, unencrypted blocks are stored locally.
-            // TODO: For multi-device private spaces, add decrypt layer to resolveValue.
-            const decrypt = isEncrypted
-                ? makeDecryptFn(options.encryptedClient, options.decryptionConfig, options.agent)
-                : undefined;
-            const content = await mdsync.get(options.blocks, options.current, relativePath, decrypt);
+            const content = await mdsync.get(options.blocks, options.current, relativePath, options.decrypt);
             if (content != null) {
                 await fs.mkdir(path.dirname(fullPath), { recursive: true });
                 await fs.writeFile(fullPath, content);
             }
         }
-        else if (isEncrypted) {
-            // Private space: retrieve and decrypt via EncryptedClient
-            const { stream } = await options.encryptedClient.retrieveAndDecryptFile(cid, options.decryptionConfig);
-            const bytes = await drainStream(stream);
+        else if (options?.decrypt) {
+            const bytes = await options.decrypt(cid);
             await fs.mkdir(path.dirname(fullPath), { recursive: true });
             await fs.writeFile(fullPath, bytes);
         }

package/dist/sync.d.ts

@@ -54,10 +54,6 @@ export declare class SyncEngine {
      * Get current pail entries as map.
      */
     getPailEntries(): Promise<PailEntries>;
-    /**
-     * Apply remote changes to local filesystem.
-     */
-    private applyRemoteChanges;
     /**
      * Mark the engine as stopped.
      */

package/dist/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAOH,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EAEV,YAAY,EACb,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA4BxE,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,KAAK,CAAiD;IAC9D,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,QAAQ,CAAoC;IACpD,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,eAAe,CAAC,CAAkB;gBAE9B,SAAS,EAAE,MAAM;IAK7B;;;OAGG;IACG,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAoE/C;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB1D;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAMb,UAAU;IAwDxB;;OAEG;YACW,iBAAiB;IAe/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;YACW,kBAAkB;IAYhC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;YAMrB,gBAAgB;IA6B9B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC;QACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC5D,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IAkBI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAW5B,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;YAM5B,WAAW;CAK1B"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAOH,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EAEV,YAAY,EACb,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA6BxE,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,KAAK,CAAiD;IAC9D,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,QAAQ,CAAoC;IACpD,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,eAAe,CAAC,CAAkB;gBAE9B,SAAS,EAAE,MAAM;IAK7B;;;OAGG;IACG,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAoE/C;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB1D;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAMb,UAAU;IAmExB;;OAEG;YACW,iBAAiB;IAe/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;YAMrB,gBAAgB;IAkC9B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC;QACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC5D,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IAkBI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAW5B,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;YAM5B,WAAW;CAK1B"}

package/dist/sync.js

@@ -19,7 +19,7 @@ import { makeTempCar } from "./utils/tempcar.js";
 import { createStorachaClient } from "./utils/client.js";
 import { decodeDelegation, encodeDelegation } from "./utils/delegation.js";
 import { extract } from "@storacha/client/delegation";
-import { makeEncryptionConfig, makeDecryptionConfig, getEncryptedClient, delegatePlanningDelegationToKMS, } from "./utils/crypto.js";
+import { makeEncryptionConfig, makeDecryptionConfig, getEncryptedClient, delegatePlanningDelegationToKMS, makeDecryptFn, } from "./utils/crypto.js";
 export class SyncEngine {
     workspace;
     blocks;
@@ -183,7 +183,13 @@ export class SyncEngine {
         const afterEntries = await this.getPailEntries();
         const remoteChanges = diffRemoteChanges(beforeEntries, afterEntries);
         if (remoteChanges.length > 0) {
-            await this.applyRemoteChanges(remoteChanges, afterEntries);
+            await applyRemoteChanges(remoteChanges, afterEntries, this.workspace, {
+                blocks: this.blocks,
+                current: this.current ?? undefined,
+                decrypt: this.decryptionConfig && this.encryptedClient
+                    ? makeDecryptFn(this.encryptedClient, this.decryptionConfig, name.agent)
+                    : undefined,
+            });
         }
         this.lastSync = Date.now();
     }
@@ -219,17 +225,6 @@ export class SyncEngine {
         }
         return entries;
     }
-    /**
-     * Apply remote changes to local filesystem.
-     */
-    async applyRemoteChanges(changedPaths, entries) {
-        await applyRemoteChanges(changedPaths, entries, this.workspace, {
-            blocks: this.blocks,
-            current: this.current ?? undefined,
-            encryptedClient: this.encryptedClient,
-            decryptionConfig: this.decryptionConfig,
-        });
-    }
     /**
      * Mark the engine as stopped.
      */
@@ -274,9 +269,9 @@ export class SyncEngine {
             await applyRemoteChanges(allPaths, entries, this.workspace, {
                 blocks: this.blocks,
                 current: this.current ?? undefined,
-                encryptedClient: this.encryptedClient,
-                decryptionConfig: this.decryptionConfig,
-                agent: name.agent,
+                decrypt: this.decryptionConfig && this.encryptedClient
+                    ? makeDecryptFn(this.encryptedClient, this.decryptionConfig, name.agent)
+                    : undefined,
             });
         }
         this.lastSync = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storacha/clawracha",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "OpenClaw plugin for Storacha workspace sync via UCN Pail",
   "type": "module",
   "files": [