@vibes.diy/api-svc 2.2.6 → 2.2.8

package/intern/recovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../jsr/intern/recovery.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibes.diy/api-svc",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "type": "module",
   "main": "./index.js",
   "scripts": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@adviser/cement": "~0.5.34",
     "@adviser/scopey": "~0.0.4",
-    "@cloudflare/workers-types": "~4.20260418.1",
+    "@cloudflare/workers-types": "~4.20260402.1",
     "@fireproof/core-device-id": "~0.24.19",
     "@fireproof/core-protocols-dashboard": "~0.24.19",
     "@fireproof/core-runtime": "~0.24.19",
@@ -23,19 +23,19 @@
     "@fireproof/core-types-protocols-cloud": "~0.24.19",
     "@fireproof/core-types-protocols-dashboard": "~0.24.19",
     "@libsql/client": "~0.17.2",
-    "@neondatabase/serverless": "~1.0.2",
-    "@noble/hashes": "~2.0.1",
-    "@vibes.diy/api-impl": "2.2.6",
-    "@vibes.diy/api-pkg": "2.2.6",
-    "@vibes.diy/api-sql": "2.2.6",
-    "@vibes.diy/api-types": "2.2.6",
-    "@vibes.diy/call-ai-v2": "2.2.6",
-    "@vibes.diy/prompts": "2.2.6",
-    "@vibes.diy/use-vibes-base": "2.2.6",
-    "@vibes.diy/vibe-db-explorer": "2.2.6",
+    "@neondatabase/serverless": "~1.1.0",
+    "@noble/hashes": "~2.2.0",
+    "@vibes.diy/api-impl": "2.2.8",
+    "@vibes.diy/api-pkg": "2.2.8",
+    "@vibes.diy/api-sql": "2.2.8",
+    "@vibes.diy/api-types": "2.2.8",
+    "@vibes.diy/call-ai-v2": "2.2.8",
+    "@vibes.diy/prompts": "2.2.8",
+    "@vibes.diy/use-vibes-base": "2.2.8",
+    "@vibes.diy/vibe-db-explorer": "2.2.8",
     "acorn": "~8.16.0",
     "arktype": "~2.2.0",
-    "call-ai": "2.2.6",
+    "call-ai": "2.2.8",
     "cookie": "~1.1.1",
     "drizzle-orm": "~0.45.2",
     "jose": "~6.2.2",

package/peers/r2-to-s3api.d.ts

@@ -1,16 +1,28 @@
 import { Result } from "@adviser/cement";
-import { R2Bucket } from "@cloudflare/workers-types";
-import { SuperThis } from "@fireproof/core-types-base";
-import { FetchResult, S3Api } from "@vibes.diy/api-types";
+import type { R2GetOptions, R2MultipartUpload, R2Object, R2ObjectBody } from "@cloudflare/workers-types";
+import type { SuperThis } from "@fireproof/core-types-base";
+import type { FetchResult, S3Api, S3PutOptions, S3RenameOptions } from "@vibes.diy/api-types";
+export interface R2BucketSubset {
+    get(key: string, options?: R2GetOptions): Promise<R2ObjectBody | null>;
+    head(key: string): Promise<R2Object | null>;
+    put(key: string, value: Uint8Array): Promise<R2Object>;
+    delete(key: string): Promise<void>;
+    createMultipartUpload(key: string): Promise<R2MultipartUpload>;
+}
 export declare class R2ToS3Api implements S3Api {
-    private r2;
-    private smThis;
-    constructor(r2: R2Bucket, smThis: {
+    private readonly r2;
+    private readonly smThis;
+    private readonly pendingPuts;
+    constructor(r2: R2BucketSubset, smThis: {
         nextId: SuperThis["nextId"];
     });
     genId(): string;
     private toKey;
     get(iurl: string): Promise<FetchResult>;
-    put(iurl: string): Promise<WritableStream<Uint8Array>>;
-    rename(fromUrl: string, toUrl: string): Promise<Result<void>>;
+    put(iurl: string, opts?: S3PutOptions): Promise<WritableStream<Uint8Array>>;
+    awaitPut(iurl: string): Promise<void>;
+    rename(fromUrl: string, toUrl: string, opts?: S3RenameOptions): Promise<Result<void>>;
+    private copySmallObject;
+    private copyLargeObjectStreaming;
+    private abortQuiet;
 }

package/peers/r2-to-s3api.js

@@ -1,7 +1,18 @@
-import { Result, URI } from "@adviser/cement";
+import { exception2Result, Result, URI } from "@adviser/cement";
+const PART_SIZE = 5 * 1024 * 1024;
+function concatChunks(chunks, total) {
+    const merged = new Uint8Array(total);
+    let off = 0;
+    for (const c of chunks) {
+        merged.set(c, off);
+        off += c.length;
+    }
+    return merged;
+}
 export class R2ToS3Api {
     r2;
     smThis;
+    pendingPuts = new Map();
     constructor(r2, smThis) {
         this.r2 = r2;
         this.smThis = smThis;
@@ -10,38 +21,316 @@ export class R2ToS3Api {
         return this.smThis.nextId(12).str;
     }
     toKey(iurl) {
-        return URI.from(iurl).pathname.replace(/.*\//, "");
+        return URI.from(iurl).pathname.replace(/^\/+/, "");
     }
     async get(iurl) {
-        try {
-            const obj = await this.r2.get(this.toKey(iurl));
-            if (obj === null) {
-                return { type: "fetch.notfound", url: iurl };
+        const r = await exception2Result(() => this.r2.get(this.toKey(iurl)));
+        if (r.isErr()) {
+            const err = r.Err();
+            console.error(`R2ToS3Api.get(${iurl}) failed:`, err);
+            return { type: "fetch.err", url: iurl, error: err };
+        }
+        const obj = r.Ok();
+        if (obj === null) {
+            return { type: "fetch.notfound", url: iurl };
+        }
+        return { type: "fetch.ok", url: iurl, data: obj.body };
+    }
+    async put(iurl, opts) {
+        const key = this.toKey(iurl);
+        const r2 = this.r2;
+        const pendingPuts = this.pendingPuts;
+        const onProgress = opts?.onProgress;
+        let chunks = [];
+        let bufferedBytes = 0;
+        let multipartPromise = undefined;
+        let nextPartNumber = 1;
+        const inFlightParts = [];
+        let totalBytesUploaded = 0;
+        let resolveDone;
+        let rejectDone;
+        const donePromise = new Promise((resolve, reject) => {
+            resolveDone = resolve;
+            rejectDone = reject;
+        });
+        const settled = donePromise.then(() => {
+            pendingPuts.delete(key);
+        }, () => {
+            pendingPuts.delete(key);
+        });
+        pendingPuts.set(key, settled);
+        const ensureMultipart = () => {
+            if (multipartPromise === undefined) {
+                multipartPromise = exception2Result(() => r2.createMultipartUpload(key));
+            }
+            return multipartPromise;
+        };
+        const flushPartBackground = () => {
+            const merged = concatChunks(chunks, bufferedBytes);
+            chunks = [];
+            bufferedBytes = 0;
+            const myPartNumber = nextPartNumber++;
+            const partBytes = merged.byteLength;
+            return (async () => {
+                const mpResult = await ensureMultipart();
+                if (mpResult.isErr())
+                    return Result.Err(mpResult.Err());
+                const mp = mpResult.Ok();
+                const r = await exception2Result(() => mp.uploadPart(myPartNumber, merged));
+                if (r.isOk() && onProgress) {
+                    totalBytesUploaded += partBytes;
+                    onProgress({ stage: "uploading-part", partNumber: myPartNumber, bytes: totalBytesUploaded });
+                }
+                return r;
+            })();
+        };
+        const finalize = async () => {
+            const partResults = await Promise.all(inFlightParts);
+            const firstErr = partResults.find((r) => r.isErr());
+            if (firstErr !== undefined) {
+                const mpResult = multipartPromise === undefined ? undefined : await multipartPromise;
+                if (mpResult !== undefined && mpResult.isOk()) {
+                    const mp = mpResult.Ok();
+                    const ar = await exception2Result(() => mp.abort());
+                    if (ar.isErr())
+                        console.error(`R2ToS3Api.put(${key}) abort after part failure also failed:`, ar.Err());
+                }
+                return Result.Err(firstErr.Err());
+            }
+            if (multipartPromise === undefined) {
+                const small = concatChunks(chunks, bufferedBytes);
+                const rPut = await exception2Result(() => r2.put(key, small).then(() => undefined));
+                if (rPut.isOk() && onProgress) {
+                    onProgress({ stage: "asset-stored", bytes: small.byteLength });
+                }
+                return rPut;
+            }
+            if (chunks.length > 0) {
+                const finalR = await flushPartBackground();
+                if (finalR.isErr()) {
+                    const mpResult = await multipartPromise;
+                    if (mpResult.isOk()) {
+                        const mp = mpResult.Ok();
+                        const ar = await exception2Result(() => mp.abort());
+                        if (ar.isErr())
+                            console.error(`R2ToS3Api.put(${key}) abort after final-part failure also failed:`, ar.Err());
+                    }
+                    return Result.Err(finalR.Err());
+                }
+                partResults.push(finalR);
+            }
+            const completed = partResults.flatMap((r) => (r.isOk() ? [r.Ok()] : []));
+            const mpResult = await multipartPromise;
+            if (mpResult.isErr())
+                return Result.Err(mpResult.Err());
+            const mp = mpResult.Ok();
+            const completeR = await exception2Result(() => mp.complete(completed).then(() => undefined));
+            if (completeR.isErr()) {
+                const ar = await exception2Result(() => mp.abort());
+                if (ar.isErr())
+                    console.error(`R2ToS3Api.put(${key}) abort after complete failure also failed:`, ar.Err());
+            }
+            else if (onProgress) {
+                onProgress({ stage: "asset-stored", bytes: totalBytesUploaded });
+            }
+            return completeR;
+        };
+        const finalizeInBackground = () => {
+            finalize().then((r) => {
+                if (r.isErr()) {
+                    const err = r.Err();
+                    console.error(`R2ToS3Api.put(${key}) finalize failed:`, err);
+                    rejectDone(err);
+                }
+                else {
+                    resolveDone();
+                }
+            }, (e) => {
+                const err = e instanceof Error ? e : new Error(String(e));
+                console.error(`R2ToS3Api.put(${key}) finalize threw:`, err);
+                rejectDone(err);
+            });
+        };
+        return new WritableStream({
+            write(chunk) {
+                chunks.push(chunk);
+                bufferedBytes += chunk.byteLength;
+                if (bufferedBytes > PART_SIZE) {
+                    inFlightParts.push(flushPartBackground());
+                }
+            },
+            close() {
+                finalizeInBackground();
+            },
+            async abort(reason) {
+                const err = reason instanceof Error ? reason : new Error(String(reason));
+                if (multipartPromise !== undefined) {
+                    const mpResult = await multipartPromise;
+                    if (mpResult.isOk()) {
+                        const mp = mpResult.Ok();
+                        const ar = await exception2Result(() => mp.abort());
+                        if (ar.isErr())
+                            console.error(`R2ToS3Api.put(${key}) abort failed:`, ar.Err());
+                    }
+                }
+                rejectDone(err);
+            },
+        });
+    }
+    async awaitPut(iurl) {
+        const pending = this.pendingPuts.get(this.toKey(iurl));
+        if (pending !== undefined) {
+            await pending;
+        }
+    }
+    async rename(fromUrl, toUrl, opts) {
+        const fromKey = this.toKey(fromUrl);
+        const toKey = this.toKey(toUrl);
+        const onProgress = opts?.onProgress;
+        await this.awaitPut(fromUrl);
+        const rHead = await exception2Result(() => this.r2.head(fromKey));
+        if (rHead.isErr()) {
+            const err = rHead.Err();
+            console.error(`R2ToS3Api.rename(${fromUrl}) head failed:`, err);
+            return Result.Err(err);
+        }
+        const srcMeta = rHead.Ok();
+        if (srcMeta === null) {
+            const err = new Error(`Object not found: ${fromUrl}`);
+            console.error(`R2ToS3Api.rename: ${err.message}`);
+            return Result.Err(err);
+        }
+        const sourceSize = srcMeta.size;
+        if (sourceSize <= PART_SIZE) {
+            const rCopy = await this.copySmallObject(fromKey, toKey);
+            if (rCopy.isErr())
+                return rCopy;
+            if (onProgress) {
+                onProgress({ stage: "asset-renamed", bytes: sourceSize });
             }
-            return { type: "fetch.ok", url: iurl, data: obj.body };
         }
-        catch (e) {
-            return { type: "fetch.err", url: iurl, error: e instanceof Error ? e : new Error(String(e)) };
+        else {
+            const rCopy = await this.copyLargeObjectStreaming(fromKey, toKey, sourceSize, onProgress);
+            if (rCopy.isErr())
+                return rCopy;
         }
+        const rDestHead = await exception2Result(() => this.r2.head(toKey));
+        if (rDestHead.isErr()) {
+            const err = rDestHead.Err();
+            console.error(`R2ToS3Api.rename(${toUrl}) destination head failed:`, err);
+            return Result.Err(err);
+        }
+        const dest = rDestHead.Ok();
+        if (dest === null) {
+            const err = new Error(`Destination put failed: ${toUrl}`);
+            console.error(`R2ToS3Api.rename: ${err.message}`);
+            return Result.Err(err);
+        }
+        if (dest.size !== sourceSize) {
+            const err = new Error(`Destination size mismatch: from=${sourceSize} to=${dest.size}`);
+            console.error(`R2ToS3Api.rename: ${err.message}`);
+            return Result.Err(err);
+        }
+        const rDel = await exception2Result(() => this.r2.delete(fromKey));
+        if (rDel.isErr()) {
+            const err = rDel.Err();
+            console.error(`R2ToS3Api.rename(${fromUrl}) delete failed:`, err);
+            return Result.Err(err);
+        }
+        return Result.Ok(undefined);
     }
-    async put(iurl) {
-        const { readable, writable } = new TransformStream();
-        void this.r2.put(this.toKey(iurl), readable);
-        return writable;
+    async copySmallObject(fromKey, toKey) {
+        const rGet = await exception2Result(() => this.r2.get(fromKey));
+        if (rGet.isErr()) {
+            const err = rGet.Err();
+            console.error(`R2ToS3Api.rename get(${fromKey}) failed:`, err);
+            return Result.Err(err);
+        }
+        const src = rGet.Ok();
+        if (src === null) {
+            const err = new Error(`Object disappeared during rename: ${fromKey}`);
+            console.error(`R2ToS3Api.rename: ${err.message}`);
+            return Result.Err(err);
+        }
+        const rBytes = await exception2Result(() => src.arrayBuffer());
+        if (rBytes.isErr()) {
+            const err = rBytes.Err();
+            console.error(`R2ToS3Api.rename arrayBuffer(${fromKey}) failed:`, err);
+            return Result.Err(err);
+        }
+        const rPut = await exception2Result(() => this.r2.put(toKey, new Uint8Array(rBytes.Ok())));
+        if (rPut.isErr()) {
+            const err = rPut.Err();
+            console.error(`R2ToS3Api.rename put(${toKey}) failed:`, err);
+            return Result.Err(err);
+        }
+        return Result.Ok(undefined);
     }
-    async rename(fromUrl, toUrl) {
-        try {
-            const obj = await this.r2.get(this.toKey(fromUrl));
-            if (obj === null) {
-                return Result.Err(`Object not found: ${fromUrl}`);
+    async copyLargeObjectStreaming(fromKey, toKey, sourceSize, onProgress) {
+        const rMp = await exception2Result(() => this.r2.createMultipartUpload(toKey));
+        if (rMp.isErr()) {
+            const err = rMp.Err();
+            console.error(`R2ToS3Api.rename createMultipartUpload(${toKey}) failed:`, err);
+            return Result.Err(err);
+        }
+        const mp = rMp.Ok();
+        const completedParts = [];
+        let partNumber = 1;
+        let totalCopied = 0;
+        for (let offset = 0; offset < sourceSize; offset += PART_SIZE) {
+            const length = Math.min(PART_SIZE, sourceSize - offset);
+            const rGet = await exception2Result(() => this.r2.get(fromKey, { range: { offset, length } }));
+            if (rGet.isErr()) {
+                const err = rGet.Err();
+                console.error(`R2ToS3Api.rename range-get(${fromKey}, offset=${offset}) failed:`, err);
+                await this.abortQuiet(mp, toKey);
+                return Result.Err(err);
+            }
+            const part = rGet.Ok();
+            if (part === null) {
+                const err = new Error(`Range get returned null on ${fromKey} at offset=${offset}`);
+                console.error(`R2ToS3Api.rename: ${err.message}`);
+                await this.abortQuiet(mp, toKey);
+                return Result.Err(err);
+            }
+            const rBytes = await exception2Result(() => part.arrayBuffer());
+            if (rBytes.isErr()) {
+                const err = rBytes.Err();
+                console.error(`R2ToS3Api.rename arrayBuffer(${fromKey}, offset=${offset}) failed:`, err);
+                await this.abortQuiet(mp, toKey);
+                return Result.Err(err);
+            }
+            const bytes = new Uint8Array(rBytes.Ok());
+            const rUpload = await exception2Result(() => mp.uploadPart(partNumber, bytes));
+            if (rUpload.isErr()) {
+                const err = rUpload.Err();
+                console.error(`R2ToS3Api.rename uploadPart(${toKey}, part=${partNumber}) failed:`, err);
+                await this.abortQuiet(mp, toKey);
+                return Result.Err(err);
             }
-            await this.r2.put(this.toKey(toUrl), obj.body);
-            await this.r2.delete(this.toKey(fromUrl));
-            return Result.Ok(undefined);
+            completedParts.push(rUpload.Ok());
+            totalCopied += bytes.byteLength;
+            if (onProgress) {
+                onProgress({ stage: "rename-part", partNumber, bytes: totalCopied });
+            }
+            partNumber += 1;
+        }
+        const rComplete = await exception2Result(() => mp.complete(completedParts).then(() => undefined));
+        if (rComplete.isErr()) {
+            const err = rComplete.Err();
+            console.error(`R2ToS3Api.rename complete(${toKey}) failed:`, err);
+            await this.abortQuiet(mp, toKey);
+            return Result.Err(err);
         }
-        catch (e) {
-            return Result.Err(e);
+        if (onProgress) {
+            onProgress({ stage: "asset-renamed", bytes: totalCopied });
         }
+        return Result.Ok(undefined);
+    }
+    async abortQuiet(mp, key) {
+        const ar = await exception2Result(() => mp.abort());
+        if (ar.isErr())
+            console.error(`R2ToS3Api.rename abort(${key}) failed:`, ar.Err());
     }
 }
 //# sourceMappingURL=r2-to-s3api.js.map

package/peers/r2-to-s3api.js.map

@@ -1 +1 @@
-{"version":3,"file":"r2-to-s3api.js","sourceRoot":"","sources":["../../jsr/peers/r2-to-s3api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAK9C,MAAM,OAAO,SAAS;IACZ,EAAE,CAAW;IACb,MAAM,CAAkC;IAChD,YAAY,EAAY,EAAE,MAAuC;QAC/D,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IACD,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;IACpC,CAAC;IACO,KAAK,CAAC,IAAY;QACxB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,IAAY;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAChD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACjB,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;YAC/C,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAA6C,EAAE,CAAC;QAClG,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChG,CAAC;IACH,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,IAAY;QACpB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,eAAe,EAA0B,CAAC;QAE7E,KAAK,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,QAAuC,CAAC,CAAC;QAC5E,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe,EAAE,KAAa;QACzC,IAAI,CAAC;YAEH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YACnD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACjB,OAAO,MAAM,CAAC,GAAG,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,IAAmC,CAAC,CAAC;YAC9E,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1C,OAAO,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,MAAM,CAAC,GAAG,CAAC,CAAU,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"r2-to-s3api.js","sourceRoot":"","sources":["../../jsr/peers/r2-to-s3api.ts"],"names":[],"mappings":"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"}

package/peers/s3.d.ts

@@ -1,14 +1,19 @@
 import { Option, URI, Result } from "@adviser/cement";
-import { Cider, PeerStreamWithCommit, PeerWithCommit } from "@vibes.diy/api-pkg";
-import { FetchResult, S3Api } from "@vibes.diy/api-types";
+import { Cider, PeerFetch, PeerStreamWithCommit, PeerWithCommit, StoragePeer } from "@vibes.diy/api-pkg";
+import type { FetchResult, S3Api, StorageProgressFn } from "@vibes.diy/api-types";
 export declare class S3Peer implements PeerWithCommit {
     readonly s3: S3Api;
     readonly cider: Cider;
-    constructor(s3: S3Api, cider: Cider);
+    readonly onProgress?: StorageProgressFn;
+    constructor(s3: S3Api, cider: Cider, onProgress?: StorageProgressFn);
     begin(): Promise<Result<PeerStreamWithCommit>>;
 }
-export declare class S3PeerFetch {
+export declare class S3PeerFetch implements PeerFetch {
     readonly s3: S3Api;
     constructor(s3: S3Api);
     fetch(url: URI): Promise<Option<FetchResult>>;
 }
+export interface CreateS3PeerParams {
+    s3: S3Api;
+}
+export declare function createS3Peer(params: CreateS3PeerParams): StoragePeer;

package/peers/s3.js

@@ -1,58 +1,47 @@
 import { Option, Result, exception2Result } from "@adviser/cement";
 const S3_PEER_PROTOCOL = "s3:";
+const S3_PEER_HOST = "r2";
 class S3PeerStream {
     owner;
     tmpUrl;
     writer;
     constructor(owner, tmpUrl, writer) {
-        console.log("S3PeerStream constructor called, tmpUrl:", tmpUrl);
         this.owner = owner;
         this.writer = writer;
         this.tmpUrl = tmpUrl;
     }
     write(chunk) {
-        console.log("S3PeerStream write called, chunk size:", chunk.length);
         return this.writer.write(chunk);
     }
     async cancel() {
-        console.log("S3PeerStream cancel called");
         return this.writer.abort();
     }
     async close() {
-        console.log("S3PeerStream close called");
-        return this.writer.close();
+        await this.writer.close();
     }
     async commit() {
-        console.log("S3PeerStream commit called, tmpUrl:", this.tmpUrl);
         const { cid: assetID } = await this.owner.cider.getCID();
-        console.log("S3PeerStream commit called, got assetID from cider:", assetID);
-        const url = `${S3_PEER_PROTOCOL}://-/${assetID}`;
-        const res = await this.owner.s3.rename(this.tmpUrl, url);
-        console.log("S3PeerStream commit called, rename result:", assetID, res);
+        const url = `${S3_PEER_PROTOCOL}//${S3_PEER_HOST}/${assetID}`;
+        const res = await this.owner.s3.rename(this.tmpUrl, url, { onProgress: this.owner.onProgress });
         if (res.isErr()) {
             return Result.Err(res);
         }
-        console.log("S3PeerStream commit result:", url);
-        return Result.Ok({
-            url,
-        });
+        return Result.Ok({ url });
     }
 }
 export class S3Peer {
     s3;
     cider;
-    constructor(s3, cider) {
-        console.log("S3Peer constructor called");
+    onProgress;
+    constructor(s3, cider, onProgress) {
         this.s3 = s3;
         this.cider = cider;
+        this.onProgress = onProgress;
     }
     async begin() {
-        console.log("S3Peer begin called, generated tmpUrl pre genId:");
-        const tmpUrl = `s3://temp/${this.s3.genId()}.tmp`;
-        console.log("S3Peer begin called, generated tmpUrl:", tmpUrl);
-        const rWriter = await exception2Result(() => this.s3.put(tmpUrl).then((stream) => stream.getWriter()));
+        const tmpUrl = `${S3_PEER_PROTOCOL}//${S3_PEER_HOST}/temp/${this.s3.genId()}.tmp`;
+        const rWriter = await exception2Result(() => this.s3.put(tmpUrl, { onProgress: this.onProgress }).then((stream) => stream.getWriter()));
         if (rWriter.isErr()) {
-            console.log("S3Peer begin error getting writer for tmpUrl:", tmpUrl, "error:", rWriter.Err());
             return Result.Err(rWriter.Err());
         }
         return Result.Ok(new S3PeerStream(this, tmpUrl, rWriter.Ok()));
@@ -67,8 +56,13 @@ export class S3PeerFetch {
         if (url.protocol !== S3_PEER_PROTOCOL) {
             return Promise.resolve(Option.None());
         }
-        const assetId = url.pathname.slice("-/".length);
-        return Option.Some(await this.s3.get(assetId));
+        return Option.Some(await this.s3.get(url.toString()));
     }
 }
+export function createS3Peer(params) {
+    return {
+        fetch: new S3PeerFetch(params.s3),
+        factory: (cider, fopts) => new S3Peer(params.s3, cider, fopts?.onProgress),
+    };
+}
 //# sourceMappingURL=s3.js.map

package/peers/s3.js.map

@@ -1 +1 @@
-{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../jsr/peers/s3.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../jsr/peers/s3.ts"],"names":[],"mappings":"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"}

package/public/app-documents.js

@@ -42,7 +42,7 @@ export const putDocEvento = {
             return Result.Ok(EventoResult.Continue);
         }
         const now = new Date().toISOString();
-        const docId = req.docId ?? vctx.sthis.nextId().str;
+        const docId = req.docId ?? vctx.sthis.timeOrderedNextId().str;
         const dbName = req.dbName;
         const t = vctx.sql.tables.appDocuments;
         const maxSeqResult = await vctx.sql.db
@@ -81,7 +81,7 @@ export const putDocEvento = {
         }
         if (vctx.notifyDocChanged) {
             vctx
-                .notifyDocChanged({ userSlug: req.userSlug, appSlug: req.appSlug, dbName, docId })
+                .notifyDocChanged({ userSlug: req.userSlug, appSlug: req.appSlug, dbName, docId }, clientWsSend(ctx).connId)
                 .catch((e) => console.error("DocNotify error:", e));
         }
         await ctx.send.send(ctx, {
@@ -231,7 +231,7 @@ export const deleteDocEvento = {
         });
         if (vctx.notifyDocChanged) {
             vctx
-                .notifyDocChanged({ userSlug: req.userSlug, appSlug: req.appSlug, dbName, docId: req.docId })
+                .notifyDocChanged({ userSlug: req.userSlug, appSlug: req.appSlug, dbName, docId: req.docId }, clientWsSend(ctx).connId)
                 .catch((e) => console.error("DocNotify error:", e));
         }
         await ctx.send.send(ctx, {