@payloadcms/storage-azure 3.47.0-canary.3 → 3.47.0-canary.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +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;AAQ/C,UAAU,IAAI;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,eAAe,CAAA;CACxC;AAED,eAAO,MAAM,UAAU,qCAAsC,IAAI,KAAG,
|
|
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;AAQ/C,UAAU,IAAI;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,EAAE,MAAM,eAAe,CAAA;CACxC;AAED,eAAO,MAAM,UAAU,qCAAsC,IAAI,KAAG,aAiFnE,CAAA"}
|
package/dist/staticHandler.js
CHANGED
|
@@ -3,7 +3,7 @@ import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities';
|
|
|
3
3
|
import path from 'path';
|
|
4
4
|
import { getRangeFromHeader } from './utils/getRangeFromHeader.js';
|
|
5
5
|
export const getHandler = ({ collection, getStorageClient })=>{
|
|
6
|
-
return async (req, { params: { clientUploadContext, filename } })=>{
|
|
6
|
+
return async (req, { headers: incomingHeaders, params: { clientUploadContext, filename } })=>{
|
|
7
7
|
try {
|
|
8
8
|
const prefix = await getFilePrefix({
|
|
9
9
|
clientUploadContext,
|
|
@@ -15,13 +15,27 @@ export const getHandler = ({ collection, getStorageClient })=>{
|
|
|
15
15
|
const { end, start } = await getRangeFromHeader(blockBlobClient, String(req.headers.get('range')));
|
|
16
16
|
const blob = await blockBlobClient.download(start, end);
|
|
17
17
|
const response = blob._response;
|
|
18
|
+
let initHeaders = {
|
|
19
|
+
...response.headers.rawHeaders()
|
|
20
|
+
};
|
|
21
|
+
// Typescript is difficult here with merging these types from Azure
|
|
22
|
+
if (incomingHeaders) {
|
|
23
|
+
initHeaders = {
|
|
24
|
+
...initHeaders,
|
|
25
|
+
...incomingHeaders
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
let headers = new Headers(initHeaders);
|
|
18
29
|
const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
|
|
19
30
|
const objectEtag = response.headers.get('etag');
|
|
31
|
+
if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
|
|
32
|
+
headers = collection.upload.modifyResponseHeaders({
|
|
33
|
+
headers
|
|
34
|
+
}) || headers;
|
|
35
|
+
}
|
|
20
36
|
if (etagFromHeaders && etagFromHeaders === objectEtag) {
|
|
21
37
|
return new Response(null, {
|
|
22
|
-
headers
|
|
23
|
-
...response.headers.rawHeaders()
|
|
24
|
-
}),
|
|
38
|
+
headers,
|
|
25
39
|
status: 304
|
|
26
40
|
});
|
|
27
41
|
}
|
|
@@ -44,7 +58,7 @@ export const getHandler = ({ collection, getStorageClient })=>{
|
|
|
44
58
|
}
|
|
45
59
|
});
|
|
46
60
|
return new Response(readableStream, {
|
|
47
|
-
headers
|
|
61
|
+
headers,
|
|
48
62
|
status: response.status
|
|
49
63
|
});
|
|
50
64
|
} catch (err) {
|
|
@@ -1 +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'\n\nimport { getRangeFromHeader } from './utils/getRangeFromHeader.js'\n\ninterface Args {\n collection: CollectionConfig\n getStorageClient: () => ContainerClient\n}\n\nexport const getHandler = ({ collection, getStorageClient }: Args): StaticHandler => {\n return async (req, { 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 const { end, start } = await getRangeFromHeader(\n blockBlobClient,\n String(req.headers.get('range')),\n )\n\n const blob = await blockBlobClient.download(start, end)\n\n const response = blob._response\n\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const objectEtag = response.headers.get('etag')\n\n if (etagFromHeaders && etagFromHeaders === objectEtag) {\n return new Response(null, {\n headers
|
|
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'\n\nimport { getRangeFromHeader } from './utils/getRangeFromHeader.js'\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 const { end, start } = await getRangeFromHeader(\n blockBlobClient,\n String(req.headers.get('range')),\n )\n\n const blob = await blockBlobClient.download(start, end)\n\n const response = blob._response\n\n let initHeaders: Headers = {\n ...(response.headers.rawHeaders() as unknown as Headers),\n }\n\n // Typescript is difficult here with merging these types from Azure\n if (incomingHeaders) {\n initHeaders = {\n ...initHeaders,\n ...incomingHeaders,\n }\n }\n\n let headers = new Headers(initHeaders)\n\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const objectEtag = response.headers.get('etag')\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 === objectEtag) {\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: response.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","getRangeFromHeader","getHandler","collection","getStorageClient","req","headers","incomingHeaders","params","clientUploadContext","filename","prefix","blockBlobClient","getBlockBlobClient","posix","join","end","start","String","get","blob","download","response","_response","initHeaders","rawHeaders","Headers","etagFromHeaders","objectEtag","upload","modifyResponseHeaders","Response","status","readableStream","ReadableStream","controller","nodeStream","readableStreamBody","Error","on","chunk","enqueue","Uint8Array","close","err","error","statusCode","statusText","payload","logger"],"mappings":"AAIA,SAASA,SAAS,QAAQ,sBAAqB;AAC/C,SAASC,aAAa,QAAQ,6CAA4C;AAC1E,OAAOC,UAAU,OAAM;AAEvB,SAASC,kBAAkB,QAAQ,gCAA+B;AAOlE,OAAO,MAAMC,aAAa,CAAC,EAAEC,UAAU,EAAEC,gBAAgB,EAAQ;IAC/D,OAAO,OAAOC,KAAK,EAAEC,SAASC,eAAe,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEC,QAAQ,EAAE,EAAE;QACxF,IAAI;YACF,MAAMC,SAAS,MAAMZ,cAAc;gBAAEU;gBAAqBN;gBAAYO;gBAAUL;YAAI;YACpF,MAAMO,kBAAkBR,mBAAmBS,kBAAkB,CAC3Db,KAAKc,KAAK,CAACC,IAAI,CAACJ,QAAQD;YAG1B,MAAM,EAAEM,GAAG,EAAEC,KAAK,EAAE,GAAG,MAAMhB,mBAC3BW,iBACAM,OAAOb,IAAIC,OAAO,CAACa,GAAG,CAAC;YAGzB,MAAMC,OAAO,MAAMR,gBAAgBS,QAAQ,CAACJ,OAAOD;YAEnD,MAAMM,WAAWF,KAAKG,SAAS;YAE/B,IAAIC,cAAuB;gBACzB,GAAIF,SAAShB,OAAO,CAACmB,UAAU,EAAE;YACnC;YAEA,mEAAmE;YACnE,IAAIlB,iBAAiB;gBACnBiB,cAAc;oBACZ,GAAGA,WAAW;oBACd,GAAGjB,eAAe;gBACpB;YACF;YAEA,IAAID,UAAU,IAAIoB,QAAQF;YAE1B,MAAMG,kBAAkBtB,IAAIC,OAAO,CAACa,GAAG,CAAC,WAAWd,IAAIC,OAAO,CAACa,GAAG,CAAC;YACnE,MAAMS,aAAaN,SAAShB,OAAO,CAACa,GAAG,CAAC;YAExC,IACEhB,WAAW0B,MAAM,IACjB,OAAO1B,WAAW0B,MAAM,KAAK,YAC7B,OAAO1B,WAAW0B,MAAM,CAACC,qBAAqB,KAAK,YACnD;gBACAxB,UAAUH,WAAW0B,MAAM,CAACC,qBAAqB,CAAC;oBAAExB;gBAAQ,MAAMA;YACpE;YAEA,IAAIqB,mBAAmBA,oBAAoBC,YAAY;gBACrD,OAAO,IAAIG,SAAS,MAAM;oBACxBzB;oBACA0B,QAAQ;gBACV;YACF;YAEA,sEAAsE;YACtE,MAAMC,iBAAiB,IAAIC,eAAe;gBACxCjB,OAAMkB,UAAU;oBACd,MAAMC,aAAahB,KAAKiB,kBAAkB;oBAC1C,IAAI,CAACD,YAAY;wBACf,MAAM,IAAIE,MAAM;oBAClB;oBAEAF,WAAWG,EAAE,CAAC,QAAQ,CAACC;wBACrBL,WAAWM,OAAO,CAAC,IAAIC,WAAWF;oBACpC;oBACAJ,WAAWG,EAAE,CAAC,OAAO;wBACnBJ,WAAWQ,KAAK;oBAClB;oBACAP,WAAWG,EAAE,CAAC,SAAS,CAACK;wBACtBT,WAAWU,KAAK,CAACD;oBACnB;gBACF;YACF;YAEA,OAAO,IAAIb,SAASE,gBAAgB;gBAClC3B;gBACA0B,QAAQV,SAASU,MAAM;YACzB;QACF,EAAE,OAAOY,KAAc;YACrB,IAAIA,eAAe9C,aAAa8C,IAAIE,UAAU,KAAK,KAAK;gBACtD,OAAO,IAAIf,SAAS,MAAM;oBAAEC,QAAQ;oBAAKe,YAAY;gBAAY;YACnE;YACA1C,IAAI2C,OAAO,CAACC,MAAM,CAACJ,KAAK,CAACD;YACzB,OAAO,IAAIb,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/storage-azure",
|
|
3
|
-
"version": "3.47.0-canary.
|
|
3
|
+
"version": "3.47.0-canary.5",
|
|
4
4
|
"description": "Payload storage adapter for Azure Blob Storage",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -40,14 +40,14 @@
|
|
|
40
40
|
"@azure/abort-controller": "^1.1.0",
|
|
41
41
|
"@azure/storage-blob": "^12.11.0",
|
|
42
42
|
"range-parser": "^1.2.1",
|
|
43
|
-
"@payloadcms/plugin-cloud-storage": "3.47.0-canary.
|
|
43
|
+
"@payloadcms/plugin-cloud-storage": "3.47.0-canary.5"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@types/range-parser": "^1.2.7",
|
|
47
|
-
"payload": "3.47.0-canary.
|
|
47
|
+
"payload": "3.47.0-canary.5"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"payload": "3.47.0-canary.
|
|
50
|
+
"payload": "3.47.0-canary.5"
|
|
51
51
|
},
|
|
52
52
|
"engines": {
|
|
53
53
|
"node": "^18.20.2 || >=20.9.0"
|