@beignet/core 0.0.41 → 0.0.43

package/src/server/hooks/idempotency.ts

@@ -58,8 +58,9 @@ export interface IdempotencyHooksOptions<Ctx> {
   /**
    * Build the idempotency scope after context exists.
    *
-   * Defaults to a scope derived from `meta.scope`: `"global"` stays global,
-   * `"actor"` scopes by `ctx.actor?.id`, `"tenant"` scopes by `ctx.tenant?.id`,
+   * Defaults to a scope derived from `meta.scope`: omitted metadata scopes by
+   * `ctx.actor?.id` and also `ctx.tenant?.id` when present, `"actor"` scopes by
+   * the actor only, `"global"` stays global, `"tenant"` scopes by the tenant,
    * and `"actor-tenant"` scopes by both.
    */
   scope?: (args: {
@@ -97,7 +98,7 @@ function defaultIdempotencyScope(
   ctx: CtxWithIdempotency,
   meta: IdempotencyMeta,
 ): IdempotencyScope {
-  const mode = meta.scope ?? "global";
+  const mode = meta.scope ?? (ctx.tenant?.id ? "actor-tenant" : "actor");
 
   switch (mode) {
     case "global":

package/src/uploads/index.ts

@@ -1037,63 +1037,69 @@ export function createUploadRouter<Ctx>(
 
       const completed: CompletedUploadFile[] = [];
       const storedKeys: string[] = [];
-      for (const [index, file] of webFiles.entries()) {
-        const intent = intents[index];
-        if (!intent) continue;
-        const verified = await verifyBlobUploadFile(definition, intent, file);
-        const verifiedIntent = {
-          ...intent,
-          ...(verified.checksum ? { checksum: verified.checksum } : {}),
-        };
-        const uploadId = id();
-        await assertAuthorized(definition, {
-          ctx,
-          metadata,
-          file: verifiedIntent,
-          uploadId,
-        });
-        const key = await definition.key({
-          ctx,
-          metadata,
-          file: verifiedIntent,
-          uploadId,
-        });
-        const storageMetadata =
-          (await definition.storageMetadata?.({
+      try {
+        for (const [index, file] of webFiles.entries()) {
+          const intent = intents[index];
+          if (!intent) continue;
+          const uploadId = id();
+          await assertAuthorized(definition, {
+            ctx,
+            metadata,
+            file: intent,
+            uploadId,
+          });
+          const verified = await verifyBlobUploadFile(definition, intent, file);
+          const verifiedIntent = {
+            ...intent,
+            ...(verified.checksum ? { checksum: verified.checksum } : {}),
+          };
+          const key = await definition.key({
             ctx,
             metadata,
             file: verifiedIntent,
             uploadId,
-          })) ?? {};
-        const object = await options.storage.put(key, file, {
-          contentType: verifiedIntent.contentType,
-          ...(definition.file.cacheControl !== undefined
-            ? { cacheControl: definition.file.cacheControl }
-            : {}),
-          metadata: storageMetadata,
-          visibility: definition.file.visibility ?? "private",
-        });
-        storedKeys.push(key);
-        const completedFile = {
-          ...verifiedIntent,
-          uploadId,
-          key,
-          object,
-        };
-        try {
+          });
+          const storageMetadata =
+            (await definition.storageMetadata?.({
+              ctx,
+              metadata,
+              file: verifiedIntent,
+              uploadId,
+            })) ?? {};
+          const object = await options.storage.put(key, file, {
+            contentType: verifiedIntent.contentType,
+            ...(definition.file.cacheControl !== undefined
+              ? { cacheControl: definition.file.cacheControl }
+              : {}),
+            metadata: storageMetadata,
+            visibility: definition.file.visibility ?? "private",
+          });
+          storedKeys.push(key);
+          const completedFile = {
+            ...verifiedIntent,
+            uploadId,
+            key,
+            object,
+          };
           await assertVerifiedFile(definition, {
             ctx,
             metadata,
             file: completedFile,
             storage: options.storage,
           });
-        } catch (error) {
+          completed.push(completedFile);
+        }
+      } catch (error) {
+        if (storedKeys.length > 0) {
           await cleanupRejectedServerUpload(uploadName, storedKeys);
-          throw error;
         }
-        completed.push(completedFile);
+        throw error;
       }
 
+      // Once app-owned completion begins, the app may persist durable references
+      // to these objects. The framework can no longer delete them safely if a
+      // later completion step fails; transaction or compensation belongs to the
+      // app from this point forward.
       const result = await definition.onComplete?.({
         ctx,
         metadata,