@storacha/clawracha 0.3.14 → 0.4.0

package/dist/handlers/process.js

@@ -8,8 +8,6 @@
  * before upload via encryptToBlockStream.
  */
 import { Revision } from "@storacha/ucn/pail";
-import { encodeFiles } from "../utils/encoder.js";
-import { encryptToBlockStream } from "../utils/crypto.js";
 import * as mdsync from "../mdsync/index.js";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
@@ -29,7 +27,7 @@ async function drainBlockStream(stream, sink) {
         throw new Error("Empty block stream");
     return root;
 }
-export async function processChanges(changes, workspace, current, blocks, sink, store, encryptionConfig) {
+export async function processChanges(changes, workspace, current, blocks, sink, encoder, contentFetcher) {
     const pendingOps = [];
     const mdChanges = changes.filter((c) => isMarkdown(c.path));
     const regularChanges = changes.filter((c) => !isMarkdown(c.path));
@@ -37,79 +35,51 @@ export async function processChanges(changes, workspace, current, blocks, sink,
     const toEncode = regularChanges
         .filter((c) => c.type !== "unlink")
         .map((c) => c.path);
-    const files = [];
-    if (encryptionConfig) {
-        // Private space: encrypt each file
-        for (const relPath of toEncode) {
-            try {
-                const fileBytes = await fs.readFile(path.join(workspace, relPath));
-                const encStream = await encryptToBlockStream(new Blob([fileBytes]), encryptionConfig);
-                const rootCID = await drainBlockStream(encStream, sink);
-                files.push({ path: relPath, rootCID });
-            }
-            catch (err) {
-                if (err.code === "ENOENT") {
-                    console.warn(`File not found during encoding: ${relPath}`);
-                    continue;
+    for (const relPath of toEncode) {
+        try {
+            const fileBytes = await fs.readFile(path.join(workspace, relPath));
+            const existing = current
+                ? await Revision.get(blocks, current, relPath)
+                : null;
+            if (existing) {
+                const existingBytes = await contentFetcher(existing);
+                if (Buffer.compare(existingBytes, fileBytes) === 0) {
+                    continue; // No change detected, skip encoding/uploading.
                 }
-                throw err;
             }
-        }
-    }
-    else {
-        // Public space: UnixFS encode
-        const encoded = await encodeFiles(workspace, toEncode);
-        for (const file of encoded) {
-            const rootCID = await drainBlockStream(file.blocks, sink);
-            files.push({ path: file.path, rootCID });
-        }
-    }
-    for (const file of files) {
-        const existing = current
-            ? await Revision.get(blocks, current, file.path)
-            : null;
-        if (!existing || !existing.equals(file.rootCID)) {
+            const encStream = await encoder(new Blob([fileBytes]));
+            const rootCID = await drainBlockStream(encStream, sink);
             pendingOps.push({
                 type: "put",
-                key: file.path,
-                value: file.rootCID,
+                key: relPath,
+                value: rootCID,
             });
         }
+        catch (err) {
+            if (err.code === "ENOENT") {
+                console.warn(`File not found during encoding: ${relPath}`);
+                continue;
+            }
+            throw err;
+        }
     }
     // --- Markdown files (CRDT merge via mdsync) ---
     const mdPuts = mdChanges.filter((c) => c.type !== "unlink");
     for (const change of mdPuts) {
         const content = await fs.readFile(path.join(workspace, change.path), "utf-8");
         const block = current
-            ? await mdsync.put(blocks, current, change.path, content)
+            ? await mdsync.put(blocks, contentFetcher, current, change.path, content)
             : await mdsync.v0Put(content);
         if (!block) {
             continue; // No change detected, skip writing a new entry.
         }
-        if (encryptionConfig) {
-            // Private space: encrypt the single-block entry
-            const encStream = await encryptToBlockStream(new Blob([block.bytes]), encryptionConfig);
-            const rootCID = await drainBlockStream(encStream, sink);
-            // Store unencrypted block locally for future resolveValue calls
-            if (store)
-                await store(block);
-            pendingOps.push({
-                type: "put",
-                key: change.path,
-                value: rootCID,
-            });
-        }
-        else {
-            // Public space: store block directly
-            await sink(block);
-            if (store)
-                await store(block);
-            pendingOps.push({
-                type: "put",
-                key: change.path,
-                value: block.cid,
-            });
-        }
+        const encStream = await encoder(new Blob([block.bytes]));
+        const rootCID = await drainBlockStream(encStream, sink);
+        pendingOps.push({
+            type: "put",
+            key: change.path,
+            value: rootCID,
+        });
     }
     // --- Deletes (both regular and markdown) ---
     const toDelete = changes

package/dist/handlers/remote.d.ts

@@ -8,10 +8,8 @@
  */
 import type { CID } from "multiformats/cid";
 import type { BlockFetcher, ValueView } from "@storacha/ucn/pail/api";
-export declare function applyRemoteChanges(changedPaths: string[], entries: Map<string, CID>, workspace: string, options?: {
-    gateway?: string;
+export declare function applyRemoteChanges(changedPaths: string[], entries: Map<string, CID>, workspace: string, contentFetcher: (cid: CID) => Promise<Uint8Array>, options?: {
     blocks?: BlockFetcher;
     current?: ValueView;
-    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;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"}
+{"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;AAKtE,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,EACjD,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB,GACA,OAAO,CAAC,IAAI,CAAC,CAmCf"}

package/dist/handlers/remote.js

@@ -9,29 +9,8 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import * as mdsync from "../mdsync/index.js";
-const DEFAULT_GATEWAY = "https://storacha.link";
 const isMarkdown = (filePath) => filePath.endsWith(".md");
-/** Drain a ReadableStream into a single Uint8Array. */
-async function drainStream(stream) {
-    const reader = stream.getReader();
-    const chunks = [];
-    while (true) {
-        const { done, value } = await reader.read();
-        if (done)
-            break;
-        chunks.push(value);
-    }
-    const totalLength = chunks.reduce((sum, c) => sum + c.length, 0);
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    for (const chunk of chunks) {
-        result.set(chunk, offset);
-        offset += chunk.length;
-    }
-    return result;
-}
-export async function applyRemoteChanges(changedPaths, entries, workspace, options) {
-    const gateway = options?.gateway ?? DEFAULT_GATEWAY;
+export async function applyRemoteChanges(changedPaths, entries, workspace, contentFetcher, options) {
     for (const relativePath of changedPaths) {
         const cid = entries.get(relativePath);
         const fullPath = path.join(workspace, relativePath);
@@ -50,25 +29,16 @@ export async function applyRemoteChanges(changedPaths, entries, workspace, optio
             options?.current) {
             // Markdown: resolve via mdsync CRDT merge.
             // For single-device, unencrypted blocks are stored locally.
-            const content = await mdsync.get(options.blocks, options.current, relativePath, options.decrypt);
+            const content = await mdsync.get(options.blocks, contentFetcher, options.current, relativePath);
             if (content != null) {
                 await fs.mkdir(path.dirname(fullPath), { recursive: true });
                 await fs.writeFile(fullPath, content);
             }
         }
-        else if (options?.decrypt) {
-            const bytes = await options.decrypt(cid);
-            await fs.mkdir(path.dirname(fullPath), { recursive: true });
-            await fs.writeFile(fullPath, bytes);
-        }
         else {
-            // Public space: fetch full file from gateway (handles UnixFS reassembly)
-            const res = await fetch(`${gateway}/ipfs/${cid}`);
-            if (!res.ok) {
-                throw new Error(`Gateway fetch failed for ${cid}: ${res.status}`);
-            }
+            const bytes = await contentFetcher(cid);
             await fs.mkdir(path.dirname(fullPath), { recursive: true });
-            await fs.writeFile(fullPath, new Uint8Array(await res.arrayBuffer()));
+            await fs.writeFile(fullPath, bytes);
         }
     }
 }

package/dist/index.d.ts

@@ -3,7 +3,6 @@
  */
 export * from "./types/index.js";
 export * from "./blockstore/index.js";
-export { encodeWorkspaceFile, encodeFiles } from "./utils/encoder.js";
 export { diffEntries, diffRemoteChanges } from "./utils/differ.js";
 export { SyncEngine } from "./sync.js";
 export { FileWatcher } from "./watcher.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -3,7 +3,6 @@
  */
 export * from "./types/index.js";
 export * from "./blockstore/index.js";
-export { encodeWorkspaceFile, encodeFiles } from "./utils/encoder.js";
 export { diffEntries, diffRemoteChanges } from "./utils/differ.js";
 export { SyncEngine } from "./sync.js";
 export { FileWatcher } from "./watcher.js";

package/dist/mdsync/index.d.ts

@@ -78,11 +78,11 @@ export declare const v0Put: (newMarkdown: string) => Promise<Block>;
  * Returns a single block to store, or null if no changes detected.
  * Caller is responsible for creating the Pail revision via Revision.put.
  */
-export declare const put: (blocks: BlockFetcher, current: ValueView, key: string, newMarkdown: string) => Promise<Block | null>;
+export declare const put: (blocks: BlockFetcher, contentFetcher: (cid: CID) => Promise<Uint8Array>, current: ValueView, key: string, newMarkdown: string) => Promise<Block | null>;
 /**
  * Get the current markdown string for a key, resolving concurrent heads.
  * Returns undefined if the key doesn't exist.
  */
-export declare const get: (blocks: BlockFetcher, current: ValueView, key: string, decrypt?: (cid: CID) => Promise<Uint8Array>) => Promise<string | undefined>;
+export declare const get: (blocks: BlockFetcher, contentFetcher: (cid: CID) => Promise<Uint8Array>, current: ValueView, key: string) => Promise<string | undefined>;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/mdsync/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mdsync/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EACL,YAAY,EACZ,SAAS,EAET,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAEL,GAAG,EAGH,WAAW,EACX,YAAY,EAUb,MAAM,oBAAoB,CAAC;AAQ5B;;;;;;;;GAQG;AACH,cAAM,aAAa;IACjB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;gBAEd,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IAIrC,QAAQ;CAGT;AAyBD,wDAAwD;AACxD,KAAK,QAAQ,GAAG,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAElD,UAAU,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,IAAI,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACjC;;;;OAIG;IACH,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,UAAU,gCACR,SAAQ,6BAA6B;IACrC,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,UAAU,+BACR,SAAQ,6BAA6B;IACrC,IAAI,EAAE,QAAQ,CAAC;IACf,0EAA0E;IAC1E,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;CACxC;AAED,KAAK,yBAAyB,GAC1B,gCAAgC,GAChC,+BAA+B,CAAC;AA8BpC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,yBAAyB,KAC/B,OAAO,CAAC,KAAK,CAcf,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO;IAAE,KAAK,EAAE,UAAU,CAAA;CAAE,KAC3B,OAAO,CAAC,yBAAyB,CA+BnC,CAAC;AA4BF;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAU,aAAa,MAAM,KAAG,OAAO,CAAC,KAAK,CAG9D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,SAAS,SAAS,EAClB,KAAK,MAAM,EACX,aAAa,MAAM,KAClB,OAAO,CAAC,KAAK,GAAG,IAAI,CAiCtB,CAAC;AA4IF;;;GAGG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,SAAS,SAAS,EAClB,KAAK,MAAM,EACX,UAAU,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,KAC1C,OAAO,CAAC,MAAM,GAAG,SAAS,CAM5B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mdsync/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EACL,YAAY,EACZ,SAAS,EAET,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAEL,GAAG,EAGH,WAAW,EACX,YAAY,EAUb,MAAM,oBAAoB,CAAC;AAQ5B;;;;;;;;GAQG;AACH,cAAM,aAAa;IACjB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;gBAEd,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IAIrC,QAAQ;CAGT;AAyBD,wDAAwD;AACxD,KAAK,QAAQ,GAAG,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAElD,UAAU,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,IAAI,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACjC;;;;OAIG;IACH,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,UAAU,gCAAiC,SAAQ,6BAA6B;IAC9E,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,UAAU,+BAAgC,SAAQ,6BAA6B;IAC7E,IAAI,EAAE,QAAQ,CAAC;IACf,0EAA0E;IAC1E,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;CACxC;AAED,KAAK,yBAAyB,GAC1B,gCAAgC,GAChC,+BAA+B,CAAC;AA8BpC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,yBAAyB,KAC/B,OAAO,CAAC,KAAK,CAcf,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAU,OAAO;IAC/C,KAAK,EAAE,UAAU,CAAC;CACnB,KAAG,OAAO,CAAC,yBAAyB,CA+BpC,CAAC;AA0BF;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAU,aAAa,MAAM,KAAG,OAAO,CAAC,KAAK,CAG9D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,gBAAgB,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,EACjD,SAAS,SAAS,EAClB,KAAK,MAAM,EACX,aAAa,MAAM,KAClB,OAAO,CAAC,KAAK,GAAG,IAAI,CAiCtB,CAAC;AA8IF;;;GAGG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,gBAAgB,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,EACjD,SAAS,SAAS,EAClB,KAAK,MAAM,KACV,OAAO,CAAC,MAAM,GAAG,SAAS,CAM5B,CAAC"}

package/dist/mdsync/index.js

@@ -152,8 +152,8 @@ export const v0Put = async (newMarkdown) => {
  * Returns a single block to store, or null if no changes detected.
  * Caller is responsible for creating the Pail revision via Revision.put.
  */
-export const put = async (blocks, current, key, newMarkdown) => {
-    const mdEntry = await resolveValue(blocks, current, key);
+export const put = async (blocks, contentFetcher, current, key, newMarkdown) => {
+    const mdEntry = await resolveValue(blocks, contentFetcher, current, key);
     if (!mdEntry) {
         // Key doesn't exist yet — bootstrap with firstPut.
         const entry = firstPut(newMarkdown, current.revision.map((r) => r.event.cid));
@@ -188,7 +188,7 @@ export const put = async (blocks, current, key, newMarkdown) => {
  * If there are multiple heads, finds their common ancestor in the Pail's
  * merkle clock, then replays all events from ancestor → heads in causal order.
  */
-const resolveValue = async (blocks, current, key, decrypt) => {
+const resolveValue = async (blocks, contentFetcher, current, key) => {
     const mdEntryBlockCid = await Pail.get(blocks, current.root, key);
     if (!mdEntryBlockCid) {
         return undefined;
@@ -196,18 +196,11 @@ const resolveValue = async (blocks, current, key, decrypt) => {
     // Cache event blocks in memory so EventFetcher can find them.
     blocks = withCache(blocks, new MemoryBlockstore(current.revision.map((r) => r.event)));
     const events = new EventFetcher(blocks);
-    // Fetch entry bytes: decrypt callback for private spaces, or raw block fetch.
-    const getEntryBytes = async (cid) => {
-        if (decrypt)
-            return decrypt(cid);
-        const block = await blocks.get(cid);
-        if (!block)
-            throw new Error(`Could not find block for CID ${cid}`);
-        return block.bytes;
-    };
     // Fast path: single head, no merge needed.
     if (current.revision.length === 1) {
-        return decodeMarkdownEntry({ bytes: await getEntryBytes(mdEntryBlockCid) });
+        return decodeMarkdownEntry({
+            bytes: await contentFetcher(mdEntryBlockCid),
+        });
     }
     // Multi-head: find common ancestor and replay events in causal order.
     const ancestor = await CRDT.findCommonAncestor(events, current.revision.map((r) => r.event.cid));
@@ -220,7 +213,9 @@ const resolveValue = async (blocks, current, key, decrypt) => {
     const rootMDEntryCid = await Pail.get(blocks, root, key);
     let mdEntry;
     if (rootMDEntryCid) {
-        mdEntry = await decodeMarkdownEntry({ bytes: await getEntryBytes(rootMDEntryCid) });
+        mdEntry = await decodeMarkdownEntry({
+            bytes: await contentFetcher(rootMDEntryCid),
+        });
     }
     // Get all events from ancestor → heads, sorted in deterministic causal order.
     const sorted = await CRDT.findSortedEvents(events, current.revision.map((r) => r.event.cid), ancestor);
@@ -254,7 +249,9 @@ const resolveValue = async (blocks, current, key, decrypt) => {
             if (!mdEntryCid) {
                 throw new Error(`Could not find markdown entry for CID ${data.root} and key ${key}`);
             }
-            const newMDEntry = await decodeMarkdownEntry({ bytes: await getEntryBytes(mdEntryCid) });
+            const newMDEntry = await decodeMarkdownEntry({
+                bytes: await contentFetcher(mdEntryCid),
+            });
             if (newMDEntry.type === "initial") {
                 if (mdEntry) {
                     // Concurrent initial — merge event histories and RGA trees.
@@ -295,8 +292,8 @@ const resolveValue = async (blocks, current, key, decrypt) => {
  * Get the current markdown string for a key, resolving concurrent heads.
  * Returns undefined if the key doesn't exist.
  */
-export const get = async (blocks, current, key, decrypt) => {
-    const mdEntry = await resolveValue(blocks, current, key, decrypt);
+export const get = async (blocks, contentFetcher, current, key) => {
+    const mdEntry = await resolveValue(blocks, contentFetcher, current, key);
     if (!mdEntry) {
         return undefined;
     }

package/dist/plugin.js

@@ -367,8 +367,8 @@ export default function plugin(api) {
                     engine = activeSync.engine;
                 }
                 else {
-                    engine = new SyncEngine(workspace);
-                    await engine.init(deviceConfig);
+                    engine = await SyncEngine.fromConfig(workspace, deviceConfig);
+                    await engine.start();
                 }
                 const state = await engine.inspect();
                 console.log(`🔥 Storacha Inspect [${agentId}]`);

package/dist/sync.d.ts

@@ -8,8 +8,18 @@
  * 5. Upload all blocks as CAR
  * 6. Apply remote changes to local filesystem
  */
-import type { SyncState, FileChange, DeviceConfig } from "./types/index.js";
+import type { NameView, ClockConnection } from "@storacha/ucn/pail/api";
+import type { SyncState, FileChange, DeviceConfig, ContentFetcher, Encoder, StorageClient } from "./types/index.js";
+import { type WorkspaceBlockstore } from "./blockstore/index.js";
 import { type PailEntries } from "./utils/differ.js";
+export interface SyncDeps {
+    blocks: WorkspaceBlockstore;
+    name: NameView;
+    client: StorageClient;
+    encoder: Encoder;
+    contentFetcher: ContentFetcher;
+    remotes?: ClockConnection[];
+}
 export declare class SyncEngine {
     private workspace;
     private blocks;
@@ -19,23 +29,22 @@ export declare class SyncEngine {
     private carFile;
     private lastSync;
     private syncLock;
-    private encryptionConfig?;
-    private decryptionConfig?;
-    private encryptedClient?;
-    constructor(workspace: string);
+    private client;
+    private name;
+    private encoder;
+    private contentFetcher;
+    private remotes?;
+    constructor(workspace: string, deps: SyncDeps);
+    start(): Promise<void>;
     /**
      * Initialize sync engine with device config.
      * Creates the Storacha client and resolves the UCN name.
      */
-    init(config: DeviceConfig): Promise<void>;
+    static fromConfig(workspace: string, config: DeviceConfig): Promise<SyncEngine>;
     /**
      * Require running state or throw.
      */
     private requireRunning;
-    /**
-     * Require state is initialized or throw.
-     */
-    private requireInitialized;
     /**
      * Process a batch of file changes.
      * Can be called even when not running (accumulates pending ops).
@@ -83,5 +92,6 @@ export declare class SyncEngine {
     status(): Promise<SyncState>;
     exportNameArchive(): Promise<string>;
     private storeBlocks;
+    private storeForUpload;
 }
 //# sourceMappingURL=sync.d.ts.map

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;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"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,QAAQ,EAAa,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEnF,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EAEV,YAAY,EACZ,cAAc,EACd,OAAO,EACP,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAiBxE,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;CAC7B;AACD,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,KAAK,CAA6B;IAC1C,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,MAAM,CAAgB;IAC9B,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,OAAO,CAAC,CAAoB;gBACxB,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ;IAUvC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB5B;;;OAGG;WACU,UAAU,CACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAoBtB;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB1D;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAMb,UAAU;IAwExB;;OAEG;YACW,iBAAiB;IAe/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;YAMrB,gBAAgB;IAgC9B;;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;YAK5B,WAAW;YAMX,cAAc;CAI7B"}