@payloadcms/storage-vercel-blob 3.8.0 → 3.9.0
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,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAM/C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,gBAAgB,2CACiB,iBAAiB,cACjD,gBAAgB,KAC3B,
|
|
1
|
+
{"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAM/C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,gBAAgB,2CACiB,iBAAiB,cACjD,gBAAgB,KAC3B,aA4DF,CAAA"}
|
package/dist/staticHandler.js
CHANGED
|
@@ -9,7 +9,9 @@ export const getStaticHandler = ({ baseUrl, cacheControlMaxAge = 0, token }, col
|
|
|
9
9
|
filename,
|
|
10
10
|
req
|
|
11
11
|
});
|
|
12
|
-
const
|
|
12
|
+
const fileKey = path.posix.join(prefix, filename);
|
|
13
|
+
const fileUrl = `${baseUrl}/${fileKey}`;
|
|
14
|
+
const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
|
|
13
15
|
const blobMetadata = await head(fileUrl, {
|
|
14
16
|
token
|
|
15
17
|
});
|
|
@@ -19,8 +21,24 @@ export const getStaticHandler = ({ baseUrl, cacheControlMaxAge = 0, token }, col
|
|
|
19
21
|
statusText: 'Not Found'
|
|
20
22
|
});
|
|
21
23
|
}
|
|
24
|
+
const uploadedAtString = blobMetadata.uploadedAt.toISOString();
|
|
25
|
+
const ETag = `"${fileKey}-${uploadedAtString}"`;
|
|
22
26
|
const { contentDisposition, contentType, size } = blobMetadata;
|
|
23
|
-
|
|
27
|
+
if (etagFromHeaders && etagFromHeaders === ETag) {
|
|
28
|
+
return new Response(null, {
|
|
29
|
+
headers: new Headers({
|
|
30
|
+
'Cache-Control': `public, max-age=${cacheControlMaxAge}`,
|
|
31
|
+
'Content-Disposition': contentDisposition,
|
|
32
|
+
'Content-Length': String(size),
|
|
33
|
+
'Content-Type': contentType,
|
|
34
|
+
ETag
|
|
35
|
+
}),
|
|
36
|
+
status: 304
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
const response = await fetch(`${fileUrl}?${uploadedAtString}`, {
|
|
40
|
+
cache: 'no-store'
|
|
41
|
+
});
|
|
24
42
|
const blob = await response.blob();
|
|
25
43
|
if (!blob) {
|
|
26
44
|
return new Response(null, {
|
|
@@ -34,7 +52,9 @@ export const getStaticHandler = ({ baseUrl, cacheControlMaxAge = 0, token }, col
|
|
|
34
52
|
'Cache-Control': `public, max-age=${cacheControlMaxAge}`,
|
|
35
53
|
'Content-Disposition': contentDisposition,
|
|
36
54
|
'Content-Length': String(size),
|
|
37
|
-
'Content-Type': contentType
|
|
55
|
+
'Content-Type': contentType,
|
|
56
|
+
ETag,
|
|
57
|
+
'Last-Modified': blobMetadata.uploadedAt.toUTCString()
|
|
38
58
|
}),
|
|
39
59
|
status: 200
|
|
40
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { head } from '@vercel/blob'\nimport path from 'path'\n\ntype StaticHandlerArgs = {\n baseUrl: string\n cacheControlMaxAge?: number\n token: string\n}\n\nexport const getStaticHandler = (\n { baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs,\n collection: CollectionConfig,\n): StaticHandler => {\n return async (req, { params: { filename } }) => {\n try {\n const prefix = await getFilePrefix({ collection, filename, req })\n\n const fileUrl = `${baseUrl}/${
|
|
1
|
+
{"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'\nimport type { CollectionConfig } from 'payload'\n\nimport { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { head } from '@vercel/blob'\nimport path from 'path'\n\ntype StaticHandlerArgs = {\n baseUrl: string\n cacheControlMaxAge?: number\n token: string\n}\n\nexport const getStaticHandler = (\n { baseUrl, cacheControlMaxAge = 0, token }: StaticHandlerArgs,\n collection: CollectionConfig,\n): StaticHandler => {\n return async (req, { params: { filename } }) => {\n try {\n const prefix = await getFilePrefix({ collection, filename, req })\n const fileKey = path.posix.join(prefix, filename)\n\n const fileUrl = `${baseUrl}/${fileKey}`\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n\n const blobMetadata = await head(fileUrl, { token })\n if (!blobMetadata) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n const uploadedAtString = blobMetadata.uploadedAt.toISOString()\n const ETag = `\"${fileKey}-${uploadedAtString}\"`\n\n const { contentDisposition, contentType, size } = blobMetadata\n\n if (etagFromHeaders && etagFromHeaders === ETag) {\n return new Response(null, {\n headers: new Headers({\n 'Cache-Control': `public, max-age=${cacheControlMaxAge}`,\n 'Content-Disposition': contentDisposition,\n 'Content-Length': String(size),\n 'Content-Type': contentType,\n ETag,\n }),\n status: 304,\n })\n }\n\n const response = await fetch(`${fileUrl}?${uploadedAtString}`, {\n cache: 'no-store',\n })\n\n const blob = await response.blob()\n\n if (!blob) {\n return new Response(null, { status: 204, statusText: 'No Content' })\n }\n\n const bodyBuffer = await blob.arrayBuffer()\n\n return new Response(bodyBuffer, {\n headers: new Headers({\n 'Cache-Control': `public, max-age=${cacheControlMaxAge}`,\n 'Content-Disposition': contentDisposition,\n 'Content-Length': String(size),\n 'Content-Type': contentType,\n ETag,\n 'Last-Modified': blobMetadata.uploadedAt.toUTCString(),\n }),\n status: 200,\n })\n } catch (err: unknown) {\n req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n return new Response('Internal Server Error', { status: 500 })\n }\n }\n}\n"],"names":["getFilePrefix","head","path","getStaticHandler","baseUrl","cacheControlMaxAge","token","collection","req","params","filename","prefix","fileKey","posix","join","fileUrl","etagFromHeaders","headers","get","blobMetadata","Response","status","statusText","uploadedAtString","uploadedAt","toISOString","ETag","contentDisposition","contentType","size","Headers","String","response","fetch","cache","blob","bodyBuffer","arrayBuffer","toUTCString","err","payload","logger","error","msg"],"mappings":"AAGA,SAASA,aAAa,QAAQ,6CAA4C;AAC1E,SAASC,IAAI,QAAQ,eAAc;AACnC,OAAOC,UAAU,OAAM;AAQvB,OAAO,MAAMC,mBAAmB,CAC9B,EAAEC,OAAO,EAAEC,qBAAqB,CAAC,EAAEC,KAAK,EAAqB,EAC7DC;IAEA,OAAO,OAAOC,KAAK,EAAEC,QAAQ,EAAEC,QAAQ,EAAE,EAAE;QACzC,IAAI;YACF,MAAMC,SAAS,MAAMX,cAAc;gBAAEO;gBAAYG;gBAAUF;YAAI;YAC/D,MAAMI,UAAUV,KAAKW,KAAK,CAACC,IAAI,CAACH,QAAQD;YAExC,MAAMK,UAAU,GAAGX,QAAQ,CAAC,EAAEQ,SAAS;YACvC,MAAMI,kBAAkBR,IAAIS,OAAO,CAACC,GAAG,CAAC,WAAWV,IAAIS,OAAO,CAACC,GAAG,CAAC;YAEnE,MAAMC,eAAe,MAAMlB,KAAKc,SAAS;gBAAET;YAAM;YACjD,IAAI,CAACa,cAAc;gBACjB,OAAO,IAAIC,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,MAAMC,mBAAmBJ,aAAaK,UAAU,CAACC,WAAW;YAC5D,MAAMC,OAAO,CAAC,CAAC,EAAEd,QAAQ,CAAC,EAAEW,iBAAiB,CAAC,CAAC;YAE/C,MAAM,EAAEI,kBAAkB,EAAEC,WAAW,EAAEC,IAAI,EAAE,GAAGV;YAElD,IAAIH,mBAAmBA,oBAAoBU,MAAM;gBAC/C,OAAO,IAAIN,SAAS,MAAM;oBACxBH,SAAS,IAAIa,QAAQ;wBACnB,iBAAiB,CAAC,gBAAgB,EAAEzB,oBAAoB;wBACxD,uBAAuBsB;wBACvB,kBAAkBI,OAAOF;wBACzB,gBAAgBD;wBAChBF;oBACF;oBACAL,QAAQ;gBACV;YACF;YAEA,MAAMW,WAAW,MAAMC,MAAM,GAAGlB,QAAQ,CAAC,EAAEQ,kBAAkB,EAAE;gBAC7DW,OAAO;YACT;YAEA,MAAMC,OAAO,MAAMH,SAASG,IAAI;YAEhC,IAAI,CAACA,MAAM;gBACT,OAAO,IAAIf,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAa;YACpE;YAEA,MAAMc,aAAa,MAAMD,KAAKE,WAAW;YAEzC,OAAO,IAAIjB,SAASgB,YAAY;gBAC9BnB,SAAS,IAAIa,QAAQ;oBACnB,iBAAiB,CAAC,gBAAgB,EAAEzB,oBAAoB;oBACxD,uBAAuBsB;oBACvB,kBAAkBI,OAAOF;oBACzB,gBAAgBD;oBAChBF;oBACA,iBAAiBP,aAAaK,UAAU,CAACc,WAAW;gBACtD;gBACAjB,QAAQ;YACV;QACF,EAAE,OAAOkB,KAAc;YACrB/B,IAAIgC,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBAAEH;gBAAKI,KAAK;YAAoC;YACzE,OAAO,IAAIvB,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/storage-vercel-blob",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.9.0",
|
|
4
4
|
"description": "Payload storage adapter for Vercel Blob Storage",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -32,13 +32,13 @@
|
|
|
32
32
|
],
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@vercel/blob": "^0.22.3",
|
|
35
|
-
"@payloadcms/plugin-cloud-storage": "3.
|
|
35
|
+
"@payloadcms/plugin-cloud-storage": "3.9.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"payload": "3.
|
|
38
|
+
"payload": "3.9.0"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"payload": "3.
|
|
41
|
+
"payload": "3.9.0"
|
|
42
42
|
},
|
|
43
43
|
"engines": {
|
|
44
44
|
"node": "^18.20.2 || >=20.9.0"
|