@payloadcms/storage-vercel-blob 3.40.0-canary.2 → 3.40.0-canary.4
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.
- package/dist/client/VercelBlobClientUploadHandler.d.ts.map +1 -1
- package/dist/client/VercelBlobClientUploadHandler.js +3 -0
- package/dist/client/VercelBlobClientUploadHandler.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/staticHandler.d.ts.map +1 -1
- package/dist/staticHandler.js +2 -1
- package/dist/staticHandler.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,OAAO,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,6BAA6B;;;;;;;aAkBzB,OAAO,
|
|
1
|
+
{"version":3,"file":"VercelBlobClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,OAAO,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,6BAA6B;;;;;;;aAkBzB,OAAO,aAOpB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { upload } from '@vercel/blob/client'\n\nexport type VercelBlobClientUploadHandlerExtra = {\n addRandomSuffix: boolean\n baseURL: string\n prefix: string\n}\n\nexport const VercelBlobClientUploadHandler =\n createClientUploadHandler<VercelBlobClientUploadHandlerExtra>({\n handler: async ({\n apiRoute,\n collectionSlug,\n extra: { addRandomSuffix, baseURL, prefix = '' },\n file,\n serverHandlerPath,\n serverURL,\n updateFilename,\n }) => {\n const result = await upload(`${prefix}${file.name}`, file, {\n access: 'public',\n clientPayload: collectionSlug,\n contentType: file.type,\n handleUploadUrl: `${serverURL}${apiRoute}${serverHandlerPath}`,\n })\n\n // Update filename with suffix from returned url\n if (addRandomSuffix) {\n updateFilename(result.url.replace(`${baseURL}/`, ''))\n }\n },\n })\n"],"names":["createClientUploadHandler","upload","VercelBlobClientUploadHandler","handler","apiRoute","collectionSlug","extra","addRandomSuffix","baseURL","prefix","file","serverHandlerPath","serverURL","updateFilename","result","name","access","clientPayload","contentType","type","handleUploadUrl","url","replace"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,MAAM,QAAQ,sBAAqB;AAQ5C,OAAO,MAAMC,gCACXF,0BAA8D;IAC5DG,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,OAAO,EAAEC,eAAe,EAAEC,OAAO,EAAEC,SAAS,EAAE,EAAE,EAChDC,IAAI,EACJC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,MAAMC,SAAS,MAAMb,OAAO,GAAGQ,SAASC,KAAKK,IAAI,EAAE,EAAEL,MAAM;YACzDM,QAAQ;YACRC,eAAeZ;YACfa,aAAaR,KAAKS,IAAI;YACtBC,iBAAiB,GAAGR,YAAYR,WAAWO,mBAAmB;QAChE;QAEA,gDAAgD;QAChD,IAAIJ,iBAAiB;YACnBM,eAAeC,OAAOO,GAAG,CAACC,OAAO,CAAC,GAAGd,QAAQ,CAAC,CAAC,EAAE;QACnD;
|
|
1
|
+
{"version":3,"sources":["../../src/client/VercelBlobClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { upload } from '@vercel/blob/client'\n\nexport type VercelBlobClientUploadHandlerExtra = {\n addRandomSuffix: boolean\n baseURL: string\n prefix: string\n}\n\nexport const VercelBlobClientUploadHandler =\n createClientUploadHandler<VercelBlobClientUploadHandlerExtra>({\n handler: async ({\n apiRoute,\n collectionSlug,\n extra: { addRandomSuffix, baseURL, prefix = '' },\n file,\n serverHandlerPath,\n serverURL,\n updateFilename,\n }) => {\n const result = await upload(`${prefix}${file.name}`, file, {\n access: 'public',\n clientPayload: collectionSlug,\n contentType: file.type,\n handleUploadUrl: `${serverURL}${apiRoute}${serverHandlerPath}`,\n })\n\n // Update filename with suffix from returned url\n if (addRandomSuffix) {\n updateFilename(result.url.replace(`${baseURL}/`, ''))\n }\n\n return { prefix }\n },\n })\n"],"names":["createClientUploadHandler","upload","VercelBlobClientUploadHandler","handler","apiRoute","collectionSlug","extra","addRandomSuffix","baseURL","prefix","file","serverHandlerPath","serverURL","updateFilename","result","name","access","clientPayload","contentType","type","handleUploadUrl","url","replace"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,MAAM,QAAQ,sBAAqB;AAQ5C,OAAO,MAAMC,gCACXF,0BAA8D;IAC5DG,SAAS,OAAO,EACdC,QAAQ,EACRC,cAAc,EACdC,OAAO,EAAEC,eAAe,EAAEC,OAAO,EAAEC,SAAS,EAAE,EAAE,EAChDC,IAAI,EACJC,iBAAiB,EACjBC,SAAS,EACTC,cAAc,EACf;QACC,MAAMC,SAAS,MAAMb,OAAO,GAAGQ,SAASC,KAAKK,IAAI,EAAE,EAAEL,MAAM;YACzDM,QAAQ;YACRC,eAAeZ;YACfa,aAAaR,KAAKS,IAAI;YACtBC,iBAAiB,GAAGR,YAAYR,WAAWO,mBAAmB;QAChE;QAEA,gDAAgD;QAChD,IAAIJ,iBAAiB;YACnBM,eAAeC,OAAOO,GAAG,CAACC,OAAO,CAAC,GAAGd,QAAQ,CAAC,CAAC,EAAE;QACnD;QAEA,OAAO;YAAEC;QAAO;IAClB;AACF,GAAE"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EAEnB,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAanE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AASD,KAAK,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EAEnB,iBAAiB,EAElB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,MAAM,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAanE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IAEnC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IAE7F;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AASD,KAAK,uBAAuB,GAAG,CAAC,qBAAqB,EAAE,wBAAwB,KAAK,MAAM,CAAA;AAE1F,eAAO,MAAM,iBAAiB,EAAE,uBA0F7B,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -32,7 +32,7 @@ export const vercelBlobStorage = (options)=>(incomingConfig)=>{
|
|
|
32
32
|
extraClientHandlerProps: (collection)=>({
|
|
33
33
|
addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,
|
|
34
34
|
baseURL: baseUrl,
|
|
35
|
-
prefix: typeof collection === 'object' && collection.prefix || ''
|
|
35
|
+
prefix: typeof collection === 'object' && collection.prefix && `${collection.prefix}/` || ''
|
|
36
36
|
}),
|
|
37
37
|
serverHandler: getClientUploadRoute({
|
|
38
38
|
access: typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { VercelBlobClientUploadHandlerExtra } from './client/VercelBlobClientUploadHandler.js'\n\nimport { getGenerateUrl } from './generateURL.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.js'\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getStaticHandler } from './staticHandler.js'\n\nexport type VercelBlobStorageOptions = {\n /**\n * Access control level. Currently, only 'public' is supported.\n * Vercel plans on adding support for private blobs in the future.\n *\n * @default 'public'\n */\n access?: 'public'\n\n /**\n * Add a random suffix to the uploaded file name in Vercel Blob storage\n *\n * @default false\n */\n addRandomSuffix?: boolean\n\n /**\n * Cache-Control max-age in seconds\n *\n * @default 365 * 24 * 60 * 60 // (1 Year)\n */\n cacheControlMaxAge?: number\n\n /**\n * Do uploads directly on the client, to bypass limits on Vercel.\n */\n clientUploads?: ClientUploadsConfig\n\n /**\n * Collections to apply the Vercel Blob adapter to\n */\n collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n /**\n * Whether or not to enable the plugin\n *\n * Default: true\n */\n enabled?: boolean\n\n /**\n * Vercel Blob storage read/write token\n *\n * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n *\n * If unset, the plugin will be disabled and will fallback to local storage\n */\n token: string | undefined\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n access: 'public',\n addRandomSuffix: false,\n cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n enabled: true,\n}\n\ntype VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n (options: VercelBlobStorageOptions) =>\n (incomingConfig: Config): Config => {\n // Parse storeId from token\n const storeId = options.token\n ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n ?.toLowerCase()\n\n const isPluginDisabled = options.enabled === false || !options.token\n\n // Don't throw if the plugin is disabled\n if (!storeId && !isPluginDisabled) {\n throw new Error(\n 'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n )\n }\n\n const optionsWithDefaults = {\n ...defaultUploadOptions,\n ...options,\n }\n\n const baseUrl = `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n initClientUploads<\n VercelBlobClientUploadHandlerExtra,\n VercelBlobStorageOptions['collections'][string]\n >({\n clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n collections: options.collections,\n config: incomingConfig,\n enabled: !isPluginDisabled && Boolean(options.clientUploads),\n extraClientHandlerProps: (collection) => ({\n addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,\n baseURL: baseUrl,\n prefix
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, Plugin, UploadCollectionSlug } from 'payload'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\n\nimport type { VercelBlobClientUploadHandlerExtra } from './client/VercelBlobClientUploadHandler.js'\n\nimport { getGenerateUrl } from './generateURL.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.js'\nimport { getHandleDelete } from './handleDelete.js'\nimport { getHandleUpload } from './handleUpload.js'\nimport { getStaticHandler } from './staticHandler.js'\n\nexport type VercelBlobStorageOptions = {\n /**\n * Access control level. Currently, only 'public' is supported.\n * Vercel plans on adding support for private blobs in the future.\n *\n * @default 'public'\n */\n access?: 'public'\n\n /**\n * Add a random suffix to the uploaded file name in Vercel Blob storage\n *\n * @default false\n */\n addRandomSuffix?: boolean\n\n /**\n * Cache-Control max-age in seconds\n *\n * @default 365 * 24 * 60 * 60 // (1 Year)\n */\n cacheControlMaxAge?: number\n\n /**\n * Do uploads directly on the client, to bypass limits on Vercel.\n */\n clientUploads?: ClientUploadsConfig\n\n /**\n * Collections to apply the Vercel Blob adapter to\n */\n collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>\n\n /**\n * Whether or not to enable the plugin\n *\n * Default: true\n */\n enabled?: boolean\n\n /**\n * Vercel Blob storage read/write token\n *\n * Usually process.env.BLOB_READ_WRITE_TOKEN set by Vercel\n *\n * If unset, the plugin will be disabled and will fallback to local storage\n */\n token: string | undefined\n}\n\nconst defaultUploadOptions: Partial<VercelBlobStorageOptions> = {\n access: 'public',\n addRandomSuffix: false,\n cacheControlMaxAge: 60 * 60 * 24 * 365, // 1 year\n enabled: true,\n}\n\ntype VercelBlobStoragePlugin = (vercelBlobStorageOpts: VercelBlobStorageOptions) => Plugin\n\nexport const vercelBlobStorage: VercelBlobStoragePlugin =\n (options: VercelBlobStorageOptions) =>\n (incomingConfig: Config): Config => {\n // Parse storeId from token\n const storeId = options.token\n ?.match(/^vercel_blob_rw_([a-z\\d]+)_[a-z\\d]+$/i)?.[1]\n ?.toLowerCase()\n\n const isPluginDisabled = options.enabled === false || !options.token\n\n // Don't throw if the plugin is disabled\n if (!storeId && !isPluginDisabled) {\n throw new Error(\n 'Invalid token format for Vercel Blob adapter. Should be vercel_blob_rw_<store_id>_<random_string>.',\n )\n }\n\n const optionsWithDefaults = {\n ...defaultUploadOptions,\n ...options,\n }\n\n const baseUrl = `https://${storeId}.${optionsWithDefaults.access}.blob.vercel-storage.com`\n\n initClientUploads<\n VercelBlobClientUploadHandlerExtra,\n VercelBlobStorageOptions['collections'][string]\n >({\n clientHandler: '@payloadcms/storage-vercel-blob/client#VercelBlobClientUploadHandler',\n collections: options.collections,\n config: incomingConfig,\n enabled: !isPluginDisabled && Boolean(options.clientUploads),\n extraClientHandlerProps: (collection) => ({\n addRandomSuffix: !!optionsWithDefaults.addRandomSuffix,\n baseURL: baseUrl,\n prefix:\n (typeof collection === 'object' && collection.prefix && `${collection.prefix}/`) || '',\n }),\n serverHandler: getClientUploadRoute({\n access:\n typeof options.clientUploads === 'object' ? options.clientUploads.access : undefined,\n addRandomSuffix: optionsWithDefaults.addRandomSuffix,\n cacheControlMaxAge: options.cacheControlMaxAge,\n token: options.token ?? '',\n }),\n serverHandlerPath: '/vercel-blob-client-upload-route',\n })\n\n // If the plugin is disabled or no token is provided, do not enable the plugin\n if (isPluginDisabled) {\n return incomingConfig\n }\n\n const adapter = vercelBlobStorageInternal({ ...optionsWithDefaults, baseUrl })\n\n // Add adapter to each collection option object\n const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n options.collections,\n ).reduce(\n (acc, [slug, collOptions]) => ({\n ...acc,\n [slug]: {\n ...(collOptions === true ? {} : collOptions),\n adapter,\n },\n }),\n {} as Record<string, CollectionOptions>,\n )\n\n // Set disableLocalStorage: true for collections specified in the plugin options\n const config = {\n ...incomingConfig,\n collections: (incomingConfig.collections || []).map((collection) => {\n if (!collectionsWithAdapter[collection.slug]) {\n return collection\n }\n\n return {\n ...collection,\n upload: {\n ...(typeof collection.upload === 'object' ? collection.upload : {}),\n disableLocalStorage: true,\n },\n }\n }),\n }\n\n return cloudStoragePlugin({\n collections: collectionsWithAdapter,\n })(config)\n }\n\nfunction vercelBlobStorageInternal(\n options: { baseUrl: string } & VercelBlobStorageOptions,\n): Adapter {\n return ({ collection, prefix }): GeneratedAdapter => {\n const { access, addRandomSuffix, baseUrl, cacheControlMaxAge, clientUploads, token } = options\n\n if (!token) {\n throw new Error('Vercel Blob storage token is required')\n }\n\n return {\n name: 'vercel-blob',\n clientUploads,\n generateURL: getGenerateUrl({ baseUrl, prefix }),\n handleDelete: getHandleDelete({ baseUrl, prefix, token }),\n handleUpload: getHandleUpload({\n access,\n addRandomSuffix,\n baseUrl,\n cacheControlMaxAge,\n prefix,\n token,\n }),\n staticHandler: getStaticHandler({ baseUrl, cacheControlMaxAge, token }, collection),\n }\n }\n}\n"],"names":["cloudStoragePlugin","initClientUploads","getGenerateUrl","getClientUploadRoute","getHandleDelete","getHandleUpload","getStaticHandler","defaultUploadOptions","access","addRandomSuffix","cacheControlMaxAge","enabled","vercelBlobStorage","options","incomingConfig","storeId","token","match","toLowerCase","isPluginDisabled","Error","optionsWithDefaults","baseUrl","clientHandler","collections","config","Boolean","clientUploads","extraClientHandlerProps","collection","baseURL","prefix","serverHandler","undefined","serverHandlerPath","adapter","vercelBlobStorageInternal","collectionsWithAdapter","Object","entries","reduce","acc","slug","collOptions","map","upload","disableLocalStorage","name","generateURL","handleDelete","handleUpload","staticHandler"],"mappings":"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"}
|
|
@@ -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,aAyDF,CAAA"}
|
package/dist/staticHandler.js
CHANGED
|
@@ -2,9 +2,10 @@ import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities';
|
|
|
2
2
|
import { BlobNotFoundError, head } from '@vercel/blob';
|
|
3
3
|
import path from 'path';
|
|
4
4
|
export const getStaticHandler = ({ baseUrl, cacheControlMaxAge = 0, token }, collection)=>{
|
|
5
|
-
return async (req, { params: { filename } })=>{
|
|
5
|
+
return async (req, { params: { clientUploadContext, filename } })=>{
|
|
6
6
|
try {
|
|
7
7
|
const prefix = await getFilePrefix({
|
|
8
|
+
clientUploadContext,
|
|
8
9
|
collection,
|
|
9
10
|
filename,
|
|
10
11
|
req
|
|
@@ -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 { BlobNotFoundError, 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, encodeURIComponent(filename))\n
|
|
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 { BlobNotFoundError, 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: { clientUploadContext, filename } }) => {\n try {\n const prefix = await getFilePrefix({ clientUploadContext, collection, filename, req })\n const fileKey = path.posix.join(prefix, encodeURIComponent(filename))\n const fileUrl = `${baseUrl}/${fileKey}`\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const blobMetadata = await head(fileUrl, { token })\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 if (err instanceof BlobNotFoundError) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\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","BlobNotFoundError","head","path","getStaticHandler","baseUrl","cacheControlMaxAge","token","collection","req","params","clientUploadContext","filename","prefix","fileKey","posix","join","encodeURIComponent","fileUrl","etagFromHeaders","headers","get","blobMetadata","uploadedAtString","uploadedAt","toISOString","ETag","contentDisposition","contentType","size","Response","Headers","String","status","response","fetch","cache","blob","statusText","bodyBuffer","arrayBuffer","toUTCString","err","payload","logger","error","msg"],"mappings":"AAGA,SAASA,aAAa,QAAQ,6CAA4C;AAC1E,SAASC,iBAAiB,EAAEC,IAAI,QAAQ,eAAc;AACtD,OAAOC,UAAU,OAAM;AAQvB,OAAO,MAAMC,mBAAmB,CAC9B,EAAEC,OAAO,EAAEC,qBAAqB,CAAC,EAAEC,KAAK,EAAqB,EAC7DC;IAEA,OAAO,OAAOC,KAAK,EAAEC,QAAQ,EAAEC,mBAAmB,EAAEC,QAAQ,EAAE,EAAE;QAC9D,IAAI;YACF,MAAMC,SAAS,MAAMb,cAAc;gBAAEW;gBAAqBH;gBAAYI;gBAAUH;YAAI;YACpF,MAAMK,UAAUX,KAAKY,KAAK,CAACC,IAAI,CAACH,QAAQI,mBAAmBL;YAC3D,MAAMM,UAAU,GAAGb,QAAQ,CAAC,EAAES,SAAS;YACvC,MAAMK,kBAAkBV,IAAIW,OAAO,CAACC,GAAG,CAAC,WAAWZ,IAAIW,OAAO,CAACC,GAAG,CAAC;YACnE,MAAMC,eAAe,MAAMpB,KAAKgB,SAAS;gBAAEX;YAAM;YACjD,MAAMgB,mBAAmBD,aAAaE,UAAU,CAACC,WAAW;YAC5D,MAAMC,OAAO,CAAC,CAAC,EAAEZ,QAAQ,CAAC,EAAES,iBAAiB,CAAC,CAAC;YAE/C,MAAM,EAAEI,kBAAkB,EAAEC,WAAW,EAAEC,IAAI,EAAE,GAAGP;YAElD,IAAIH,mBAAmBA,oBAAoBO,MAAM;gBAC/C,OAAO,IAAII,SAAS,MAAM;oBACxBV,SAAS,IAAIW,QAAQ;wBACnB,iBAAiB,CAAC,gBAAgB,EAAEzB,oBAAoB;wBACxD,uBAAuBqB;wBACvB,kBAAkBK,OAAOH;wBACzB,gBAAgBD;wBAChBF;oBACF;oBACAO,QAAQ;gBACV;YACF;YAEA,MAAMC,WAAW,MAAMC,MAAM,GAAGjB,QAAQ,CAAC,EAAEK,kBAAkB,EAAE;gBAC7Da,OAAO;YACT;YAEA,MAAMC,OAAO,MAAMH,SAASG,IAAI;YAEhC,IAAI,CAACA,MAAM;gBACT,OAAO,IAAIP,SAAS,MAAM;oBAAEG,QAAQ;oBAAKK,YAAY;gBAAa;YACpE;YAEA,MAAMC,aAAa,MAAMF,KAAKG,WAAW;YAEzC,OAAO,IAAIV,SAASS,YAAY;gBAC9BnB,SAAS,IAAIW,QAAQ;oBACnB,iBAAiB,CAAC,gBAAgB,EAAEzB,oBAAoB;oBACxD,uBAAuBqB;oBACvB,kBAAkBK,OAAOH;oBACzB,gBAAgBD;oBAChBF;oBACA,iBAAiBJ,aAAaE,UAAU,CAACiB,WAAW;gBACtD;gBACAR,QAAQ;YACV;QACF,EAAE,OAAOS,KAAc;YACrB,IAAIA,eAAezC,mBAAmB;gBACpC,OAAO,IAAI6B,SAAS,MAAM;oBAAEG,QAAQ;oBAAKK,YAAY;gBAAY;YACnE;YACA7B,IAAIkC,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBAAEH;gBAAKI,KAAK;YAAoC;YACzE,OAAO,IAAIhB,SAAS,yBAAyB;gBAAEG,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.40.0-canary.
|
|
3
|
+
"version": "3.40.0-canary.4",
|
|
4
4
|
"description": "Payload storage adapter for Vercel Blob Storage",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -37,13 +37,13 @@
|
|
|
37
37
|
],
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@vercel/blob": "^0.22.3",
|
|
40
|
-
"@payloadcms/plugin-cloud-storage": "3.40.0-canary.
|
|
40
|
+
"@payloadcms/plugin-cloud-storage": "3.40.0-canary.4"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"payload": "3.40.0-canary.
|
|
43
|
+
"payload": "3.40.0-canary.4"
|
|
44
44
|
},
|
|
45
45
|
"peerDependencies": {
|
|
46
|
-
"payload": "3.40.0-canary.
|
|
46
|
+
"payload": "3.40.0-canary.4"
|
|
47
47
|
},
|
|
48
48
|
"engines": {
|
|
49
49
|
"node": "^18.20.2 || >=20.9.0"
|