@payloadcms/storage-azure 3.78.0-internal-debug.f663370 → 3.78.0-internal.ab11ffa

package/dist/generateSignedURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAM7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,WAAW,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAA;IAC/C,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,eAAe,CAAA;CACxC;AAID,eAAO,MAAM,2BAA2B,8DAKrC,IAAI,KAAG,cAyCT,CAAA"}
+{"version":3,"file":"generateSignedURL.d.ts","sourceRoot":"","sources":["../src/generateSignedURL.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAO7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErD,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,WAAW,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAA;IAC/C,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,eAAe,CAAA;CACxC;AAID,eAAO,MAAM,2BAA2B,8DAKrC,IAAI,KAAG,cA0CT,CAAA"}

package/dist/generateSignedURL.js

@@ -1,6 +1,7 @@
 import { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob';
 import path from 'path';
 import { APIError, Forbidden } from 'payload';
+import { sanitizeFilename } from 'payload/shared';
 const defaultAccess = ({ req })=>!!req.user;
 export const getGenerateSignedURLHandler = ({ access = defaultAccess, collections, containerName, getStorageClient })=>{
     return async (req)=>{
@@ -19,7 +20,8 @@ export const getGenerateSignedURLHandler = ({ access = defaultAccess, collection
         })) {
             throw new Forbidden();
         }
-        const fileKey = path.posix.join(prefix, filename);
+        const sanitizedFilename = sanitizeFilename(filename);
+        const fileKey = path.posix.join(prefix, sanitizedFilename);
         const blobClient = getStorageClient().getBlobClient(fileKey);
         const sasToken = generateBlobSASQueryParameters({
             blobName: fileKey,

package/dist/generateSignedURL.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { ContainerClient, StorageSharedKeyCredential } from '@azure/storage-blob'\nimport type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob'\nimport path from 'path'\nimport { APIError, Forbidden } from 'payload'\n\nimport type { AzureStorageOptions } from './index.js'\n\ninterface Args {\n  access?: ClientUploadsAccess\n  collections: AzureStorageOptions['collections']\n  containerName: string\n  getStorageClient: () => ContainerClient\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  collections,\n  containerName,\n  getStorageClient,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Unreachable')\n    }\n\n    const { collectionSlug, filename, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      filename: string\n      mimeType: string\n    }\n\n    const collectionS3Config = collections[collectionSlug]\n    if (!collectionS3Config) {\n      throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n    }\n\n    const prefix = (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    const fileKey = path.posix.join(prefix, filename)\n\n    const blobClient = getStorageClient().getBlobClient(fileKey)\n\n    const sasToken = generateBlobSASQueryParameters(\n      {\n        blobName: fileKey,\n        containerName,\n        contentType: mimeType,\n        expiresOn: new Date(Date.now() + 30 * 60 * 1000),\n        permissions: BlobSASPermissions.parse('w'),\n        startsOn: new Date(),\n      },\n      getStorageClient().credential as StorageSharedKeyCredential,\n    )\n\n    return Response.json({ url: `${blobClient.url}?${sasToken.toString()}` })\n  }\n}\n"],"names":["BlobSASPermissions","generateBlobSASQueryParameters","path","APIError","Forbidden","defaultAccess","req","user","getGenerateSignedURLHandler","access","collections","containerName","getStorageClient","json","collectionSlug","filename","mimeType","collectionS3Config","prefix","fileKey","posix","join","blobClient","getBlobClient","sasToken","blobName","contentType","expiresOn","Date","now","permissions","parse","startsOn","credential","Response","url","toString"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,8BAA8B,QAAQ,sBAAqB;AACxF,OAAOC,UAAU,OAAM;AACvB,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAW7C,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,WAAW,EACXC,aAAa,EACbC,gBAAgB,EACX;IACL,OAAO,OAAON;QACZ,IAAI,CAACA,IAAIO,IAAI,EAAE;YACb,MAAM,IAAIV,SAAS;QACrB;QAEA,MAAM,EAAEW,cAAc,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMV,IAAIO,IAAI;QAM9D,MAAMI,qBAAqBP,WAAW,CAACI,eAAe;QACtD,IAAI,CAACG,oBAAoB;YACvB,MAAM,IAAId,SAAS,CAAC,WAAW,EAAEW,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMI,SAAS,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBC,MAAM,IAAK;QAExF,IAAI,CAAE,MAAMT,OAAO;YAAEK;YAAgBR;QAAI,IAAK;YAC5C,MAAM,IAAIF;QACZ;QAEA,MAAMe,UAAUjB,KAAKkB,KAAK,CAACC,IAAI,CAACH,QAAQH;QAExC,MAAMO,aAAaV,mBAAmBW,aAAa,CAACJ;QAEpD,MAAMK,WAAWvB,+BACf;YACEwB,UAAUN;YACVR;YACAe,aAAaV;YACbW,WAAW,IAAIC,KAAKA,KAAKC,GAAG,KAAK,KAAK,KAAK;YAC3CC,aAAa9B,mBAAmB+B,KAAK,CAAC;YACtCC,UAAU,IAAIJ;QAChB,GACAhB,mBAAmBqB,UAAU;QAG/B,OAAOC,SAASrB,IAAI,CAAC;YAAEsB,KAAK,GAAGb,WAAWa,GAAG,CAAC,CAAC,EAAEX,SAASY,QAAQ,IAAI;QAAC;IACzE;AACF,EAAC"}
+{"version":3,"sources":["../src/generateSignedURL.ts"],"sourcesContent":["import type { ContainerClient, StorageSharedKeyCredential } from '@azure/storage-blob'\nimport type { ClientUploadsAccess } from '@payloadcms/plugin-cloud-storage/types'\nimport type { PayloadHandler } from 'payload'\n\nimport { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob'\nimport path from 'path'\nimport { APIError, Forbidden } from 'payload'\nimport { sanitizeFilename } from 'payload/shared'\n\nimport type { AzureStorageOptions } from './index.js'\n\ninterface Args {\n  access?: ClientUploadsAccess\n  collections: AzureStorageOptions['collections']\n  containerName: string\n  getStorageClient: () => ContainerClient\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nexport const getGenerateSignedURLHandler = ({\n  access = defaultAccess,\n  collections,\n  containerName,\n  getStorageClient,\n}: Args): PayloadHandler => {\n  return async (req) => {\n    if (!req.json) {\n      throw new APIError('Unreachable')\n    }\n\n    const { collectionSlug, filename, mimeType } = (await req.json()) as {\n      collectionSlug: string\n      filename: string\n      mimeType: string\n    }\n\n    const collectionS3Config = collections[collectionSlug]\n    if (!collectionS3Config) {\n      throw new APIError(`Collection ${collectionSlug} was not found in S3 options`)\n    }\n\n    const prefix = (typeof collectionS3Config === 'object' && collectionS3Config.prefix) || ''\n\n    if (!(await access({ collectionSlug, req }))) {\n      throw new Forbidden()\n    }\n\n    const sanitizedFilename = sanitizeFilename(filename)\n    const fileKey = path.posix.join(prefix, sanitizedFilename)\n\n    const blobClient = getStorageClient().getBlobClient(fileKey)\n\n    const sasToken = generateBlobSASQueryParameters(\n      {\n        blobName: fileKey,\n        containerName,\n        contentType: mimeType,\n        expiresOn: new Date(Date.now() + 30 * 60 * 1000),\n        permissions: BlobSASPermissions.parse('w'),\n        startsOn: new Date(),\n      },\n      getStorageClient().credential as StorageSharedKeyCredential,\n    )\n\n    return Response.json({ url: `${blobClient.url}?${sasToken.toString()}` })\n  }\n}\n"],"names":["BlobSASPermissions","generateBlobSASQueryParameters","path","APIError","Forbidden","sanitizeFilename","defaultAccess","req","user","getGenerateSignedURLHandler","access","collections","containerName","getStorageClient","json","collectionSlug","filename","mimeType","collectionS3Config","prefix","sanitizedFilename","fileKey","posix","join","blobClient","getBlobClient","sasToken","blobName","contentType","expiresOn","Date","now","permissions","parse","startsOn","credential","Response","url","toString"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,8BAA8B,QAAQ,sBAAqB;AACxF,OAAOC,UAAU,OAAM;AACvB,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAC7C,SAASC,gBAAgB,QAAQ,iBAAgB;AAWjD,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAE7D,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,SAASJ,aAAa,EACtBK,WAAW,EACXC,aAAa,EACbC,gBAAgB,EACX;IACL,OAAO,OAAON;QACZ,IAAI,CAACA,IAAIO,IAAI,EAAE;YACb,MAAM,IAAIX,SAAS;QACrB;QAEA,MAAM,EAAEY,cAAc,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,GAAI,MAAMV,IAAIO,IAAI;QAM9D,MAAMI,qBAAqBP,WAAW,CAACI,eAAe;QACtD,IAAI,CAACG,oBAAoB;YACvB,MAAM,IAAIf,SAAS,CAAC,WAAW,EAAEY,eAAe,4BAA4B,CAAC;QAC/E;QAEA,MAAMI,SAAS,AAAC,OAAOD,uBAAuB,YAAYA,mBAAmBC,MAAM,IAAK;QAExF,IAAI,CAAE,MAAMT,OAAO;YAAEK;YAAgBR;QAAI,IAAK;YAC5C,MAAM,IAAIH;QACZ;QAEA,MAAMgB,oBAAoBf,iBAAiBW;QAC3C,MAAMK,UAAUnB,KAAKoB,KAAK,CAACC,IAAI,CAACJ,QAAQC;QAExC,MAAMI,aAAaX,mBAAmBY,aAAa,CAACJ;QAEpD,MAAMK,WAAWzB,+BACf;YACE0B,UAAUN;YACVT;YACAgB,aAAaX;YACbY,WAAW,IAAIC,KAAKA,KAAKC,GAAG,KAAK,KAAK,KAAK;YAC3CC,aAAahC,mBAAmBiC,KAAK,CAAC;YACtCC,UAAU,IAAIJ;QAChB,GACAjB,mBAAmBsB,UAAU;QAG/B,OAAOC,SAAStB,IAAI,CAAC;YAAEuB,KAAK,GAAGb,WAAWa,GAAG,CAAC,CAAC,EAAEX,SAASY,QAAQ,IAAI;QAAC;IACzE;AACF,EAAC"}

package/dist/staticHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAO/C,UAAU,IAAI;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,eAAe,CAAA;CACxC;AAED,eAAO,MAAM,UAAU,qCAAsC,IAAI,KAAG,aAuGnE,CAAA"}
+{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA8B,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAsC/C,UAAU,IAAI;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,eAAe,CAAA;CACxC;AAED,eAAO,MAAM,UAAU,qCAAsC,IAAI,KAAG,aA6GnE,CAAA"}

package/dist/staticHandler.js

@@ -2,8 +2,31 @@ import { RestError } from '@azure/storage-blob';
 import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities';
 import path from 'path';
 import { getRangeRequestInfo } from 'payload/internal';
+const isNodeReadableStream = (body)=>{
+    return typeof body === 'object' && body !== null && 'pipe' in body && typeof body.pipe === 'function' && 'destroy' in body && typeof body.destroy === 'function';
+};
+const abortRequestAndDestroyStream = ({ abortController, blob })=>{
+    try {
+        abortController.abort();
+    } catch  {
+    /* noop */ }
+    if (blob?.readableStreamBody && isNodeReadableStream(blob.readableStreamBody)) {
+        blob.readableStreamBody.destroy();
+    }
+};
 export const getHandler = ({ collection, getStorageClient })=>{
     return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } })=>{
+        let blob = undefined;
+        let streamed = false;
+        const abortController = new AbortController();
+        if (req.signal) {
+            req.signal.addEventListener('abort', ()=>{
+                abortRequestAndDestroyStream({
+                    abortController,
+                    blob
+                });
+            });
+        }
         try {
             const prefix = await getFilePrefix({
                 clientUploadContext,
@@ -33,7 +56,11 @@ export const getHandler = ({ collection, getStorageClient })=>{
                 });
             }
             // Download with range if partial
-            const blob = rangeResult.type === 'partial' ? await blockBlobClient.download(rangeResult.rangeStart, rangeResult.rangeEnd - rangeResult.rangeStart + 1) : await blockBlobClient.download();
+            blob = rangeResult.type === 'partial' ? await blockBlobClient.download(rangeResult.rangeStart, rangeResult.rangeEnd - rangeResult.rangeStart + 1, {
+                abortSignal: abortController.signal
+            }) : await blockBlobClient.download(0, undefined, {
+                abortSignal: abortController.signal
+            });
             let headers = new Headers(incomingHeaders);
             // Add range-related headers from the result
             for (const [key, value] of Object.entries(rangeResult.headers)){
@@ -60,25 +87,24 @@ export const getHandler = ({ collection, getStorageClient })=>{
                     status: 304
                 });
             }
-            // Manually create a ReadableStream for the web from a Node.js stream.
-            const readableStream = new ReadableStream({
-                start (controller) {
-                    const nodeStream = blob.readableStreamBody;
-                    if (!nodeStream) {
-                        throw new Error('No readable stream body');
-                    }
-                    nodeStream.on('data', (chunk)=>{
-                        controller.enqueue(new Uint8Array(chunk));
-                    });
-                    nodeStream.on('end', ()=>{
-                        controller.close();
-                    });
-                    nodeStream.on('error', (err)=>{
-                        controller.error(err);
-                    });
-                }
+            if (!blob.readableStreamBody || !isNodeReadableStream(blob.readableStreamBody)) {
+                return new Response('Internal Server Error', {
+                    status: 500
+                });
+            }
+            const stream = blob.readableStreamBody;
+            stream.on('error', (err)=>{
+                req.payload.logger.error({
+                    err,
+                    msg: 'Error while streaming Azure blob (aborting)'
+                });
+                abortRequestAndDestroyStream({
+                    abortController,
+                    blob
+                });
             });
-            return new Response(readableStream, {
+            streamed = true;
+            return new Response(stream, {
                 headers,
                 status: rangeResult.status
             });
@@ -93,6 +119,13 @@ export const getHandler = ({ collection, getStorageClient })=>{
             return new Response('Internal Server Error', {
                 status: 500
             });
+        } finally{
+            if (!streamed) {
+                abortRequestAndDestroyStream({
+                    abortController,
+                    blob
+                });
+            }
         }
     };
 };

package/dist/staticHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport { RestError } from '@azure/storage-blob'\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\nimport { getRangeRequestInfo } from 'payload/internal'\n\ninterface Args {\n  collection: CollectionConfig\n  getStorageClient: () => ContainerClient\n}\n\nexport const getHandler = ({ collection, getStorageClient }: Args): StaticHandler => {\n  return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } }) => {\n    try {\n      const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n      const blockBlobClient = getStorageClient().getBlockBlobClient(\n        path.posix.join(prefix, filename),\n      )\n\n      // Get file size for range validation\n      const properties = await blockBlobClient.getProperties()\n      const fileSize = properties.contentLength\n\n      if (!fileSize) {\n        return new Response('Internal Server Error', { status: 500 })\n      }\n\n      // Handle range request\n      const rangeHeader = req.headers.get('range')\n      const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n      if (rangeResult.type === 'invalid') {\n        return new Response(null, {\n          headers: new Headers(rangeResult.headers),\n          status: rangeResult.status,\n        })\n      }\n\n      // Download with range if partial\n      const blob =\n        rangeResult.type === 'partial'\n          ? await blockBlobClient.download(\n              rangeResult.rangeStart,\n              rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n            )\n          : await blockBlobClient.download()\n\n      let headers = new Headers(incomingHeaders)\n\n      // Add range-related headers from the result\n      for (const [key, value] of Object.entries(rangeResult.headers)) {\n        headers.append(key, value)\n      }\n\n      // Add Azure-specific headers\n      headers.append('Content-Type', String(properties.contentType))\n      if (properties.etag) {\n        headers.append('ETag', String(properties.etag))\n      }\n\n      // Add Content-Security-Policy header for SVG files to prevent executable code\n      if (properties.contentType === 'image/svg+xml') {\n        headers.append('Content-Security-Policy', \"script-src 'none'\")\n      }\n\n      const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n\n      if (\n        collection.upload &&\n        typeof collection.upload === 'object' &&\n        typeof collection.upload.modifyResponseHeaders === 'function'\n      ) {\n        headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n      }\n\n      if (etagFromHeaders && etagFromHeaders === properties.etag) {\n        return new Response(null, {\n          headers,\n          status: 304,\n        })\n      }\n\n      // Manually create a ReadableStream for the web from a Node.js stream.\n      const readableStream = new ReadableStream({\n        start(controller) {\n          const nodeStream = blob.readableStreamBody\n          if (!nodeStream) {\n            throw new Error('No readable stream body')\n          }\n\n          nodeStream.on('data', (chunk) => {\n            controller.enqueue(new Uint8Array(chunk))\n          })\n          nodeStream.on('end', () => {\n            controller.close()\n          })\n          nodeStream.on('error', (err) => {\n            controller.error(err)\n          })\n        },\n      })\n\n      return new Response(readableStream, {\n        headers,\n        status: rangeResult.status,\n      })\n    } catch (err: unknown) {\n      if (err instanceof RestError && err.statusCode === 404) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n      req.payload.logger.error(err)\n      return new Response('Internal Server Error', { status: 500 })\n    }\n  }\n}\n"],"names":["RestError","getFilePrefix","path","getRangeRequestInfo","getHandler","collection","getStorageClient","req","headers","incomingHeaders","params","clientUploadContext","filename","prefix","blockBlobClient","getBlockBlobClient","posix","join","properties","getProperties","fileSize","contentLength","Response","status","rangeHeader","get","rangeResult","type","Headers","blob","download","rangeStart","rangeEnd","key","value","Object","entries","append","String","contentType","etag","etagFromHeaders","upload","modifyResponseHeaders","readableStream","ReadableStream","start","controller","nodeStream","readableStreamBody","Error","on","chunk","enqueue","Uint8Array","close","err","error","statusCode","statusText","payload","logger"],"mappings":"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"}
+{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { BlobDownloadResponseParsed, ContainerClient } from '@azure/storage-blob'\nimport type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { RestError } from '@azure/storage-blob'\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport path from 'path'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nconst isNodeReadableStream = (\n  body: BlobDownloadResponseParsed['readableStreamBody'],\n): body is Readable => {\n  return (\n    typeof body === 'object' &&\n    body !== null &&\n    'pipe' in body &&\n    typeof body.pipe === 'function' &&\n    'destroy' in body &&\n    typeof body.destroy === 'function'\n  )\n}\n\nconst abortRequestAndDestroyStream = ({\n  abortController,\n  blob,\n}: {\n  abortController: AbortController\n  blob?: BlobDownloadResponseParsed\n}) => {\n  try {\n    abortController.abort()\n  } catch {\n    /* noop */\n  }\n  if (blob?.readableStreamBody && isNodeReadableStream(blob.readableStreamBody)) {\n    blob.readableStreamBody.destroy()\n  }\n}\n\ninterface Args {\n  collection: CollectionConfig\n  getStorageClient: () => ContainerClient\n}\n\nexport const getHandler = ({ collection, getStorageClient }: Args): StaticHandler => {\n  return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } }) => {\n    let blob: BlobDownloadResponseParsed | undefined = undefined\n    let streamed = false\n\n    const abortController = new AbortController()\n    if (req.signal) {\n      req.signal.addEventListener('abort', () => {\n        abortRequestAndDestroyStream({ abortController, blob })\n      })\n    }\n\n    try {\n      const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n      const blockBlobClient = getStorageClient().getBlockBlobClient(\n        path.posix.join(prefix, filename),\n      )\n\n      // Get file size for range validation\n      const properties = await blockBlobClient.getProperties()\n      const fileSize = properties.contentLength\n\n      if (!fileSize) {\n        return new Response('Internal Server Error', { status: 500 })\n      }\n\n      // Handle range request\n      const rangeHeader = req.headers.get('range')\n      const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n      if (rangeResult.type === 'invalid') {\n        return new Response(null, {\n          headers: new Headers(rangeResult.headers),\n          status: rangeResult.status,\n        })\n      }\n\n      // Download with range if partial\n      blob =\n        rangeResult.type === 'partial'\n          ? await blockBlobClient.download(\n              rangeResult.rangeStart,\n              rangeResult.rangeEnd - rangeResult.rangeStart + 1,\n              { abortSignal: abortController.signal },\n            )\n          : await blockBlobClient.download(0, undefined, { abortSignal: abortController.signal })\n\n      let headers = new Headers(incomingHeaders)\n\n      // Add range-related headers from the result\n      for (const [key, value] of Object.entries(rangeResult.headers)) {\n        headers.append(key, value)\n      }\n\n      // Add Azure-specific headers\n      headers.append('Content-Type', String(properties.contentType))\n      if (properties.etag) {\n        headers.append('ETag', String(properties.etag))\n      }\n\n      // Add Content-Security-Policy header for SVG files to prevent executable code\n      if (properties.contentType === 'image/svg+xml') {\n        headers.append('Content-Security-Policy', \"script-src 'none'\")\n      }\n\n      const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n\n      if (\n        collection.upload &&\n        typeof collection.upload === 'object' &&\n        typeof collection.upload.modifyResponseHeaders === 'function'\n      ) {\n        headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n      }\n\n      if (etagFromHeaders && etagFromHeaders === properties.etag) {\n        return new Response(null, {\n          headers,\n          status: 304,\n        })\n      }\n\n      if (!blob.readableStreamBody || !isNodeReadableStream(blob.readableStreamBody)) {\n        return new Response('Internal Server Error', { status: 500 })\n      }\n\n      const stream = blob.readableStreamBody\n      stream.on('error', (err: Error) => {\n        req.payload.logger.error({\n          err,\n          msg: 'Error while streaming Azure blob (aborting)',\n        })\n        abortRequestAndDestroyStream({ abortController, blob })\n      })\n\n      streamed = true\n      return new Response(stream, { headers, status: rangeResult.status })\n    } catch (err: unknown) {\n      if (err instanceof RestError && err.statusCode === 404) {\n        return new Response(null, { status: 404, statusText: 'Not Found' })\n      }\n      req.payload.logger.error(err)\n      return new Response('Internal Server Error', { status: 500 })\n    } finally {\n      if (!streamed) {\n        abortRequestAndDestroyStream({ abortController, blob })\n      }\n    }\n  }\n}\n"],"names":["RestError","getFilePrefix","path","getRangeRequestInfo","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","blob","abort","readableStreamBody","getHandler","collection","getStorageClient","req","headers","incomingHeaders","params","clientUploadContext","filename","undefined","streamed","AbortController","signal","addEventListener","prefix","blockBlobClient","getBlockBlobClient","posix","join","properties","getProperties","fileSize","contentLength","Response","status","rangeHeader","get","rangeResult","type","Headers","download","rangeStart","rangeEnd","abortSignal","key","value","Object","entries","append","String","contentType","etag","etagFromHeaders","upload","modifyResponseHeaders","stream","on","err","payload","logger","error","msg","statusCode","statusText"],"mappings":"AAKA,SAASA,SAAS,QAAQ,sBAAqB;AAC/C,SAASC,aAAa,QAAQ,6CAA4C;AAC1E,OAAOC,UAAU,OAAM;AACvB,SAASC,mBAAmB,QAAQ,mBAAkB;AAEtD,MAAMC,uBAAuB,CAC3BC;IAEA,OACE,OAAOA,SAAS,YAChBA,SAAS,QACT,UAAUA,QACV,OAAOA,KAAKC,IAAI,KAAK,cACrB,aAAaD,QACb,OAAOA,KAAKE,OAAO,KAAK;AAE5B;AAEA,MAAMC,+BAA+B,CAAC,EACpCC,eAAe,EACfC,IAAI,EAIL;IACC,IAAI;QACFD,gBAAgBE,KAAK;IACvB,EAAE,OAAM;IACN,QAAQ,GACV;IACA,IAAID,MAAME,sBAAsBR,qBAAqBM,KAAKE,kBAAkB,GAAG;QAC7EF,KAAKE,kBAAkB,CAACL,OAAO;IACjC;AACF;AAOA,OAAO,MAAMM,aAAa,CAAC,EAAEC,UAAU,EAAEC,gBAAgB,EAAQ;IAC/D,OAAO,OAAOC,KAAK,EAAEC,SAASC,eAAe,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEC,QAAQ,EAAE,EAAE;QACxF,IAAIX,OAA+CY;QACnD,IAAIC,WAAW;QAEf,MAAMd,kBAAkB,IAAIe;QAC5B,IAAIR,IAAIS,MAAM,EAAE;YACdT,IAAIS,MAAM,CAACC,gBAAgB,CAAC,SAAS;gBACnClB,6BAA6B;oBAAEC;oBAAiBC;gBAAK;YACvD;QACF;QAEA,IAAI;YACF,MAAMiB,SAAS,MAAM1B,cAAc;gBAAEmB;gBAAqBN;gBAAYO;gBAAUL;YAAI;YACpF,MAAMY,kBAAkBb,mBAAmBc,kBAAkB,CAC3D3B,KAAK4B,KAAK,CAACC,IAAI,CAACJ,QAAQN;YAG1B,qCAAqC;YACrC,MAAMW,aAAa,MAAMJ,gBAAgBK,aAAa;YACtD,MAAMC,WAAWF,WAAWG,aAAa;YAEzC,IAAI,CAACD,UAAU;gBACb,OAAO,IAAIE,SAAS,yBAAyB;oBAAEC,QAAQ;gBAAI;YAC7D;YAEA,uBAAuB;YACvB,MAAMC,cAActB,IAAIC,OAAO,CAACsB,GAAG,CAAC;YACpC,MAAMC,cAAcrC,oBAAoB;gBAAE+B;gBAAUI;YAAY;YAEhE,IAAIE,YAAYC,IAAI,KAAK,WAAW;gBAClC,OAAO,IAAIL,SAAS,MAAM;oBACxBnB,SAAS,IAAIyB,QAAQF,YAAYvB,OAAO;oBACxCoB,QAAQG,YAAYH,MAAM;gBAC5B;YACF;YAEA,iCAAiC;YACjC3B,OACE8B,YAAYC,IAAI,KAAK,YACjB,MAAMb,gBAAgBe,QAAQ,CAC5BH,YAAYI,UAAU,EACtBJ,YAAYK,QAAQ,GAAGL,YAAYI,UAAU,GAAG,GAChD;gBAAEE,aAAarC,gBAAgBgB,MAAM;YAAC,KAExC,MAAMG,gBAAgBe,QAAQ,CAAC,GAAGrB,WAAW;gBAAEwB,aAAarC,gBAAgBgB,MAAM;YAAC;YAEzF,IAAIR,UAAU,IAAIyB,QAAQxB;YAE1B,4CAA4C;YAC5C,KAAK,MAAM,CAAC6B,KAAKC,MAAM,IAAIC,OAAOC,OAAO,CAACV,YAAYvB,OAAO,EAAG;gBAC9DA,QAAQkC,MAAM,CAACJ,KAAKC;YACtB;YAEA,6BAA6B;YAC7B/B,QAAQkC,MAAM,CAAC,gBAAgBC,OAAOpB,WAAWqB,WAAW;YAC5D,IAAIrB,WAAWsB,IAAI,EAAE;gBACnBrC,QAAQkC,MAAM,CAAC,QAAQC,OAAOpB,WAAWsB,IAAI;YAC/C;YAEA,8EAA8E;YAC9E,IAAItB,WAAWqB,WAAW,KAAK,iBAAiB;gBAC9CpC,QAAQkC,MAAM,CAAC,2BAA2B;YAC5C;YAEA,MAAMI,kBAAkBvC,IAAIC,OAAO,CAACsB,GAAG,CAAC,WAAWvB,IAAIC,OAAO,CAACsB,GAAG,CAAC;YAEnE,IACEzB,WAAW0C,MAAM,IACjB,OAAO1C,WAAW0C,MAAM,KAAK,YAC7B,OAAO1C,WAAW0C,MAAM,CAACC,qBAAqB,KAAK,YACnD;gBACAxC,UAAUH,WAAW0C,MAAM,CAACC,qBAAqB,CAAC;oBAAExC;gBAAQ,MAAMA;YACpE;YAEA,IAAIsC,mBAAmBA,oBAAoBvB,WAAWsB,IAAI,EAAE;gBAC1D,OAAO,IAAIlB,SAAS,MAAM;oBACxBnB;oBACAoB,QAAQ;gBACV;YACF;YAEA,IAAI,CAAC3B,KAAKE,kBAAkB,IAAI,CAACR,qBAAqBM,KAAKE,kBAAkB,GAAG;gBAC9E,OAAO,IAAIwB,SAAS,yBAAyB;oBAAEC,QAAQ;gBAAI;YAC7D;YAEA,MAAMqB,SAAShD,KAAKE,kBAAkB;YACtC8C,OAAOC,EAAE,CAAC,SAAS,CAACC;gBAClB5C,IAAI6C,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;oBACvBH;oBACAI,KAAK;gBACP;gBACAxD,6BAA6B;oBAAEC;oBAAiBC;gBAAK;YACvD;YAEAa,WAAW;YACX,OAAO,IAAIa,SAASsB,QAAQ;gBAAEzC;gBAASoB,QAAQG,YAAYH,MAAM;YAAC;QACpE,EAAE,OAAOuB,KAAc;YACrB,IAAIA,eAAe5D,aAAa4D,IAAIK,UAAU,KAAK,KAAK;gBACtD,OAAO,IAAI7B,SAAS,MAAM;oBAAEC,QAAQ;oBAAK6B,YAAY;gBAAY;YACnE;YACAlD,IAAI6C,OAAO,CAACC,MAAM,CAACC,KAAK,CAACH;YACzB,OAAO,IAAIxB,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D,SAAU;YACR,IAAI,CAACd,UAAU;gBACbf,6BAA6B;oBAAEC;oBAAiBC;gBAAK;YACvD;QACF;IACF;AACF,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-azure",
-  "version": "3.78.0-internal-debug.f663370",
+  "version": "3.78.0-internal.ab11ffa",
   "description": "Payload storage adapter for Azure Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -39,13 +39,13 @@
   "dependencies": {
     "@azure/abort-controller": "^1.1.0",
     "@azure/storage-blob": "^12.11.0",
-    "@payloadcms/plugin-cloud-storage": "3.78.0-internal-debug.f663370"
+    "@payloadcms/plugin-cloud-storage": "3.78.0-internal.ab11ffa"
   },
   "devDependencies": {
-    "payload": "3.78.0-internal-debug.f663370"
+    "payload": "3.78.0-internal.ab11ffa"
   },
   "peerDependencies": {
-    "payload": "3.78.0-internal-debug.f663370"
+    "payload": "3.78.0-internal.ab11ffa"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"