@segmentstream-cloud/ontology 0.25.1 → 0.26.1

package/dist/storage/sessions.d.ts

@@ -82,6 +82,25 @@ export declare function blobRuntime(ontology: Ontology, sql: SqlClient.SqlClient
         state: string;
         expiresAt: string;
     }, import("../errors.js").PermissionDenied | Conflict | NotFound | import("effect/unstable/sql/SqlError").SqlError, never>;
-    download: (entityName: string, recordId: string, propertyName: string, input: typeof DownloadRequest.Type, principal: Principal) => Effect.Effect<import("./provider.js").TransferGrant, import("../errors.js").PermissionDenied | NotFound | import("effect/unstable/sql/SqlError").SqlError | import("./provider.js").BlobStorageError, never>;
+    download: (entityName: string, recordId: string, propertyName: string, input: {
+        readonly inline?: boolean | undefined;
+        readonly revisionId?: string | undefined;
+    }, principal: Principal) => Effect.Effect<import("./provider.js").TransferGrant, import("../errors.js").PermissionDenied | NotFound | import("effect/unstable/sql/SqlError").SqlError | import("./provider.js").BlobStorageError, never>;
+    downloadFile: (entityName: string, recordId: string, propertyName: string, input: {
+        readonly inline?: boolean | undefined;
+        readonly revisionId?: string | undefined;
+    }, principal: Principal) => Effect.Effect<{
+        file: {
+            id: string;
+            entity: string;
+            property: string;
+            revision_id: string;
+            filename: string;
+            content_type: string;
+            size: number;
+            sha256: string;
+        };
+        download: import("./provider.js").TransferGrant;
+    }, import("../errors.js").PermissionDenied | NotFound | import("effect/unstable/sql/SqlError").SqlError | import("./provider.js").BlobStorageError, never>;
 };
 export type BlobRuntime = ReturnType<typeof blobRuntime>;

package/dist/storage/sessions.js

@@ -299,7 +299,7 @@ export function blobRuntime(ontology, sql, provider) {
       WHERE id = $1::uuid`, [id]);
         return view(yield* load(id, principal));
     }));
-    const download = (entityName, recordId, propertyName, input, principal) => Effect.gen(function* () {
+    const prepareDownload = (entityName, recordId, propertyName, input, principal) => Effect.gen(function* () {
         const entity = ontology.manifest.entities.find((item) => item.name === entityName);
         const property = entity?.properties.find((item) => item.name === propertyName && item.type === "blob");
         if (!entity || !property) {
@@ -319,9 +319,10 @@ export function blobRuntime(ontology, sql, provider) {
                 });
                 revisionId = record[propertyName]?.id;
             }
-            const [blob] = yield* sql.unsafe(`SELECT b.key, b.filename, b.content_type FROM "_blobs" b JOIN "_blob_references" r ON r.blob_id = b.id
-         WHERE b.id = $1::uuid AND b.state = 'retained' AND r.entity_id = $2
-           AND r.property_id = $3 AND r.record_id = $4::uuid FOR SHARE OF b`, [revisionId ?? null, entity.id, property.name, recordId]);
+            const [blob] = yield* sql.unsafe(`SELECT b.id::text, b.key, b.filename, b.content_type, b.size::text
+           FROM "_blobs" b JOIN "_blob_references" r ON r.blob_id = b.id
+         WHERE b.id = $1::uuid AND b.state = 'retained' AND b.branch_id = $5 AND r.entity_id = $2
+           AND r.property_id = $3 AND r.record_id = $4::uuid FOR SHARE OF b`, [revisionId ?? null, entity.id, property.name, recordId, binding.branchId]);
             if (!blob) {
                 return yield* new NotFound({
                     entity: entityName,
@@ -331,13 +332,42 @@ export function blobRuntime(ontology, sql, provider) {
             }
             return blob;
         }));
+        return blob;
+    });
+    const download = (...args) => Effect.gen(function* () {
+        const blob = yield* prepareDownload(...args);
         return yield* provider.download({
             key: blob.key,
             filename: blob.filename,
             contentType: blob.content_type,
-            inline: input.inline === true &&
+            inline: args[3].inline === true &&
                 ["image/jpeg", "image/png"].includes(blob.content_type.toLowerCase()),
         });
     });
-    return { begin, status, part, complete, cancel, download };
+    const downloadFile = (...args) => Effect.gen(function* () {
+        const blob = yield* prepareDownload(...args);
+        const sha256 = yield* provider.sha256(blob.key, Number(blob.size));
+        // Recheck live access after hashing; no provider I/O holds a database transaction.
+        yield* prepareDownload(args[0], args[1], args[2], { revisionId: blob.id }, args[4]);
+        const grant = yield* provider.download({
+            key: blob.key,
+            filename: blob.filename,
+            contentType: blob.content_type,
+            inline: false,
+        });
+        return {
+            file: {
+                id: args[1],
+                entity: args[0],
+                property: args[2],
+                revision_id: blob.id,
+                filename: blob.filename,
+                content_type: blob.content_type,
+                size: Number(blob.size),
+                sha256,
+            },
+            download: grant,
+        };
+    });
+    return { begin, status, part, complete, cancel, download, downloadFile };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@segmentstream-cloud/ontology",
-  "version": "0.25.1",
+  "version": "0.26.1",
   "description": "Define a SegmentStream workspace app's ontology: entities, relationships, roles and actions, written with Effect.",
   "license": "Apache-2.0",
   "author": "SegmentStream",
@@ -45,7 +45,9 @@
     "lint": "eslint src tests --config ../../eslint.config.mjs",
     "test": "vitest run",
     "test:postgres": "vitest run --config vitest.postgres.config.ts",
-    "prepack": "npm run build"
+    "prepack": "npm run build",
+    "benchmark:batch": "tsx tests/batch/benchmark.ts",
+    "benchmark:batch:profile": "tsx tests/batch/profile.ts"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1148.0",