@dimah-s3/server 1.4.0 → 1.4.2

package/dist/helpers/finalize-confirmed.d.ts

@@ -12,8 +12,8 @@ export type FinalizeConfirmedInput = {
 };
 /**
  * HeadObject constraints, `onConfirmed`, then compensating `DeleteObject`
- * (and `previousKey` cleanup) so a thrown lifecycle hook cannot leave an
- * orphan object.
+ * (and `previousKey` cleanup) so a thrown check or lifecycle hook cannot
+ * leave an orphan object.
  */
 export declare function finalizeConfirmedObject(client: S3Client, bucket: string, key: string, input: FinalizeConfirmedInput): Promise<ConfirmedObjectResponse>;
 //# sourceMappingURL=finalize-confirmed.d.ts.map

package/dist/helpers/finalize-confirmed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finalize-confirmed.d.ts","sourceRoot":"","sources":["../../src/helpers/finalize-confirmed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAU5E,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,mBAAmB,EAEpB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,qBAAqB,CAAC;IAC9B,KAAK,EAAE,WAAW,CAAC,QAAQ,GAAG,WAAW,CAAC,CAAC;IAC3C,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,GAAG,CAAC,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,uBAAuB,CAAC,CA4DlC"}
+{"version":3,"file":"finalize-confirmed.d.ts","sourceRoot":"","sources":["../../src/helpers/finalize-confirmed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAU5E,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,mBAAmB,EAEpB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,qBAAqB,CAAC;IAC9B,KAAK,EAAE,WAAW,CAAC,QAAQ,GAAG,WAAW,CAAC,CAAC;IAC3C,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,GAAG,CAAC,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,uBAAuB,CAAC,CAwDlC"}

package/dist/index.js

@@ -516,33 +516,29 @@ function listedPartsByteSize(parts, excludePartNumber) {
 }
 async function finalizeConfirmedObject(client, bucket, key, input) {
   const { config, route: route2, stored, head, uploadId, acl } = input;
-  const contentLength = requireContentLength(head);
-  const fileName = resolveStoredFileName(head.ContentDisposition, key);
   const rawMetadata = head.Metadata ?? {};
+  const fileName = resolveStoredFileName(head.ContentDisposition, key);
+  let context;
   try {
+    const contentLength = requireContentLength(head);
     assertVerifiedConstraints(route2.upload, {
       fileName,
       contentType: head.ContentType,
       contentLength
     });
-  } catch (err) {
-    await deleteObjectBestEffort(client, bucket, key);
-    throw err;
-  }
-  const metadata = stripPreviousKeyMeta(rawMetadata);
-  const context = {
-    ...stored,
-    contentType: head.ContentType,
-    contentLength,
-    eTag: head.ETag?.replace(/"/g, ""),
-    metadata,
-    acl,
-    fileName,
-    versionId: head.VersionId,
-    lastModified: head.LastModified?.toISOString(),
-    uploadId
-  };
-  try {
+    const metadata = stripPreviousKeyMeta(rawMetadata);
+    context = {
+      ...stored,
+      contentType: head.ContentType,
+      contentLength,
+      eTag: head.ETag?.replace(/"/g, ""),
+      metadata,
+      acl,
+      fileName,
+      versionId: head.VersionId,
+      lastModified: head.LastModified?.toISOString(),
+      uploadId
+    };
     await runLifecycleHook(route2.upload.onConfirmed, context, config);
   } catch (err) {
     await deleteObjectBestEffort(client, bucket, key);
@@ -1084,23 +1080,39 @@ async function handleMultipartInit(config, input, request) {
   if (!UploadId) {
     throw errors.internalError();
   }
-  await runLifecycleHook(
-    route2.upload.multipart.onInit,
-    {
-      ...stored,
-      uploadId: UploadId,
-      file: {
-        name: fileName,
-        size: fileSize,
-        type: input.contentType
+  try {
+    await runLifecycleHook(
+      route2.upload.multipart.onInit,
+      {
+        ...stored,
+        uploadId: UploadId,
+        file: {
+          name: fileName,
+          size: fileSize,
+          type: input.contentType
+        },
+        metadata,
+        clientMetadata: input.metadata,
+        acl,
+        replace: route2.upload.replace
       },
-      metadata,
-      clientMetadata: input.metadata,
-      acl,
-      replace: route2.upload.replace
-    },
-    config
-  );
+      config
+    );
+  } catch (err) {
+    await abortMultipartBestEffort(route2.client, bucket, key, UploadId);
+    try {
+      await runLifecycleHook(
+        route2.upload.multipart.onAbort,
+        {
+          ...stored,
+          uploadId: UploadId
+        },
+        config
+      );
+    } catch {
+    }
+    throw err;
+  }
   return { bucket, key, uploadId: UploadId };
 }
 var multipartInit = createS3Endpoint(