@payloadcms/storage-uploadthing 4.0.0-internal.cd69eef → 4.0.0-internal.cea8867
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/README.md +1 -1
- package/dist/adapter.d.ts.map +1 -1
- package/dist/adapter.js +5 -16
- package/dist/adapter.js.map +1 -1
- package/dist/client/UploadthingClientUploadHandler.d.ts.map +1 -1
- package/dist/client/UploadthingClientUploadHandler.js +0 -1
- package/dist/client/UploadthingClientUploadHandler.js.map +1 -1
- package/dist/getClientUploadRoute.d.ts +5 -2
- package/dist/getClientUploadRoute.d.ts.map +1 -1
- package/dist/getClientUploadRoute.js.map +1 -1
- package/dist/getFile.d.ts +2 -2
- package/dist/getFile.d.ts.map +1 -1
- package/dist/getFile.js +3 -3
- package/dist/getFile.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/uploadFile.d.ts +2 -1
- package/dist/uploadFile.d.ts.map +1 -1
- package/dist/uploadFile.js +4 -1
- package/dist/uploadFile.js.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -13,7 +13,7 @@ pnpm add @payloadcms/storage-uploadthing
|
|
|
13
13
|
- Configure the `collections` object to specify which collections should use uploadthing. The slug _must_ match one of your existing collection slugs and be an `upload` type.
|
|
14
14
|
- Get an API key from Uploadthing and set it as `apiKey` in the `options` object.
|
|
15
15
|
- `acl` is optional and defaults to `public-read`.
|
|
16
|
-
- When deploying to Vercel, server uploads are limited
|
|
16
|
+
- When deploying to Vercel, server uploads are limited with 4.5MB. Set `clientUploads` to `true` to do uploads directly on the client.
|
|
17
17
|
|
|
18
18
|
```ts
|
|
19
19
|
export default buildConfig({
|
package/dist/adapter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAOrC,UAAU,4BAA4B;IACpC,GAAG,EAAE,GAAG,CAAA;IACR,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAgB,wBAAwB,CAAC,EACvC,GAAG,EACH,aAAa,EACb,KAAK,GACN,EAAE,4BAA4B,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAOrC,UAAU,4BAA4B;IACpC,GAAG,EAAE,GAAG,CAAA;IACR,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAgB,wBAAwB,CAAC,EACvC,GAAG,EACH,aAAa,EACb,KAAK,GACN,EAAE,4BAA4B,GAAG,OAAO,CA+CxC"}
|
package/dist/adapter.js
CHANGED
|
@@ -19,20 +19,8 @@ export function createUploadthingAdapter({ acl, clientUploads, utApi }) {
|
|
|
19
19
|
];
|
|
20
20
|
return ()=>({
|
|
21
21
|
name: 'uploadthing',
|
|
22
|
+
clientUploads,
|
|
22
23
|
fields,
|
|
23
|
-
uploadInstructions: clientUploads ? {
|
|
24
|
-
access: typeof clientUploads === 'object' ? clientUploads.access : undefined,
|
|
25
|
-
generate: ({ filename, filesize, mimeType })=>({
|
|
26
|
-
name: 'uploadToUploadThing',
|
|
27
|
-
type: 'dispatch',
|
|
28
|
-
file: {
|
|
29
|
-
directUpload: {},
|
|
30
|
-
filename,
|
|
31
|
-
mimeType,
|
|
32
|
-
size: filesize
|
|
33
|
-
}
|
|
34
|
-
})
|
|
35
|
-
} : undefined,
|
|
36
24
|
generateURL,
|
|
37
25
|
handleDelete: ({ doc, filename, req })=>deleteFile({
|
|
38
26
|
doc: doc,
|
|
@@ -40,10 +28,11 @@ export function createUploadthingAdapter({ acl, clientUploads, utApi }) {
|
|
|
40
28
|
req,
|
|
41
29
|
utApi
|
|
42
30
|
}),
|
|
43
|
-
handleUpload: async ({ data, file })=>{
|
|
31
|
+
handleUpload: async ({ clientUploadContext, data, file })=>{
|
|
44
32
|
const result = await uploadFile({
|
|
45
33
|
acl,
|
|
46
34
|
buffer: file.buffer,
|
|
35
|
+
clientUploadContext,
|
|
47
36
|
data,
|
|
48
37
|
filename: file.filename,
|
|
49
38
|
mimeType: file.mimeType,
|
|
@@ -51,9 +40,9 @@ export function createUploadthingAdapter({ acl, clientUploads, utApi }) {
|
|
|
51
40
|
});
|
|
52
41
|
return result;
|
|
53
42
|
},
|
|
54
|
-
staticHandler: (req, { doc, headers, params: {
|
|
43
|
+
staticHandler: (req, { doc, headers, params: { clientUploadContext, collection, filename } })=>getFile({
|
|
44
|
+
clientUploadContext,
|
|
55
45
|
collection,
|
|
56
|
-
directUpload,
|
|
57
46
|
doc: doc,
|
|
58
47
|
filename,
|
|
59
48
|
incomingHeaders: headers || new Headers(),
|
package/dist/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Field } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport type { ACL } from './index.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateUploadthingAdapterArgs {\n acl: ACL\n clientUploads?: ClientUploadsConfig\n utApi: UTApi\n}\n\nexport function createUploadthingAdapter({\n acl,\n clientUploads,\n utApi,\n}: CreateUploadthingAdapterArgs): Adapter {\n const fields: Field[] = [\n {\n name: '_key',\n type: 'text',\n admin: {\n disabled: { bulkEdit: true, column: true, filter: true },\n hidden: true,\n },\n },\n ]\n\n return (): GeneratedAdapter => ({\n name: 'uploadthing',\n
|
|
1
|
+
{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type {\n Adapter,\n ClientUploadsConfig,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Field } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport type { ACL } from './index.js'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateUploadthingAdapterArgs {\n acl: ACL\n clientUploads?: ClientUploadsConfig\n utApi: UTApi\n}\n\nexport function createUploadthingAdapter({\n acl,\n clientUploads,\n utApi,\n}: CreateUploadthingAdapterArgs): Adapter {\n const fields: Field[] = [\n {\n name: '_key',\n type: 'text',\n admin: {\n disabled: { bulkEdit: true, column: true, filter: true },\n hidden: true,\n },\n },\n ]\n\n return (): GeneratedAdapter => ({\n name: 'uploadthing',\n clientUploads,\n fields,\n\n generateURL,\n\n handleDelete: ({ doc, filename, req }) =>\n deleteFile({ doc: doc as unknown as Record<string, unknown>, filename, req, utApi }),\n\n handleUpload: async ({ clientUploadContext, data, file }) => {\n const result = await uploadFile({\n acl,\n buffer: file.buffer,\n clientUploadContext,\n data,\n filename: file.filename,\n mimeType: file.mimeType,\n utApi,\n })\n\n return result\n },\n\n staticHandler: (req, { doc, headers, params: { clientUploadContext, collection, filename } }) =>\n getFile({\n clientUploadContext,\n collection,\n doc: doc as unknown as Record<string, unknown> | undefined,\n filename,\n incomingHeaders: headers || new Headers(),\n req,\n utApi,\n }),\n })\n}\n"],"names":["deleteFile","generateURL","getFile","uploadFile","createUploadthingAdapter","acl","clientUploads","utApi","fields","name","type","admin","disabled","bulkEdit","column","filter","hidden","handleDelete","doc","filename","req","handleUpload","clientUploadContext","data","file","result","buffer","mimeType","staticHandler","headers","params","collection","incomingHeaders","Headers"],"mappings":"AAUA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,UAAU,QAAQ,kBAAiB;AAQ5C,OAAO,SAASC,yBAAyB,EACvCC,GAAG,EACHC,aAAa,EACbC,KAAK,EACwB;IAC7B,MAAMC,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;oBAAEC,UAAU;oBAAMC,QAAQ;oBAAMC,QAAQ;gBAAK;gBACvDC,QAAQ;YACV;QACF;KACD;IAED,OAAO,IAAyB,CAAA;YAC9BP,MAAM;YACNH;YACAE;YAEAP;YAEAgB,cAAc,CAAC,EAAEC,GAAG,EAAEC,QAAQ,EAAEC,GAAG,EAAE,GACnCpB,WAAW;oBAAEkB,KAAKA;oBAA2CC;oBAAUC;oBAAKb;gBAAM;YAEpFc,cAAc,OAAO,EAAEC,mBAAmB,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACtD,MAAMC,SAAS,MAAMtB,WAAW;oBAC9BE;oBACAqB,QAAQF,KAAKE,MAAM;oBACnBJ;oBACAC;oBACAJ,UAAUK,KAAKL,QAAQ;oBACvBQ,UAAUH,KAAKG,QAAQ;oBACvBpB;gBACF;gBAEA,OAAOkB;YACT;YAEAG,eAAe,CAACR,KAAK,EAAEF,GAAG,EAAEW,OAAO,EAAEC,QAAQ,EAAER,mBAAmB,EAAES,UAAU,EAAEZ,QAAQ,EAAE,EAAE,GAC1FjB,QAAQ;oBACNoB;oBACAS;oBACAb,KAAKA;oBACLC;oBACAa,iBAAiBH,WAAW,IAAII;oBAChCb;oBACAb;gBACF;QACJ,CAAA;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploadthingClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/UploadthingClientUploadHandler.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,8BAA8B;;;;;;;
|
|
1
|
+
{"version":3,"file":"UploadthingClientUploadHandler.d.ts","sourceRoot":"","sources":["../../src/client/UploadthingClientUploadHandler.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,8BAA8B;;;;;;;iCAkBzC,CAAA"}
|
|
@@ -3,7 +3,6 @@ import { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/clie
|
|
|
3
3
|
import { formatAdminURL } from 'payload/shared';
|
|
4
4
|
import { genUploader } from 'uploadthing/client';
|
|
5
5
|
export const UploadthingClientUploadHandler = createClientUploadHandler({
|
|
6
|
-
name: 'uploadToUploadThing',
|
|
7
6
|
handler: async ({ apiRoute, collectionSlug, file, serverHandlerPath, serverURL })=>{
|
|
8
7
|
const endpointRoute = formatAdminURL({
|
|
9
8
|
apiRoute,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/client/UploadthingClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { formatAdminURL } from 'payload/shared'\nimport { genUploader } from 'uploadthing/client'\n\nexport const UploadthingClientUploadHandler = createClientUploadHandler({\n
|
|
1
|
+
{"version":3,"sources":["../../src/client/UploadthingClientUploadHandler.ts"],"sourcesContent":["'use client'\nimport { createClientUploadHandler } from '@payloadcms/plugin-cloud-storage/client'\nimport { formatAdminURL } from 'payload/shared'\nimport { genUploader } from 'uploadthing/client'\n\nexport const UploadthingClientUploadHandler = createClientUploadHandler({\n handler: async ({ apiRoute, collectionSlug, file, serverHandlerPath, serverURL }) => {\n const endpointRoute = formatAdminURL({\n apiRoute,\n path: `${serverHandlerPath}?collectionSlug=${collectionSlug}`,\n serverURL,\n })\n const { uploadFiles } = genUploader({\n package: 'storage-uploadthing',\n url: endpointRoute,\n })\n\n const res = await uploadFiles('uploader', {\n files: [file],\n })\n\n return { key: res[0]?.key }\n },\n})\n"],"names":["createClientUploadHandler","formatAdminURL","genUploader","UploadthingClientUploadHandler","handler","apiRoute","collectionSlug","file","serverHandlerPath","serverURL","endpointRoute","path","uploadFiles","package","url","res","files","key"],"mappings":"AAAA;AACA,SAASA,yBAAyB,QAAQ,0CAAyC;AACnF,SAASC,cAAc,QAAQ,iBAAgB;AAC/C,SAASC,WAAW,QAAQ,qBAAoB;AAEhD,OAAO,MAAMC,iCAAiCH,0BAA0B;IACtEI,SAAS,OAAO,EAAEC,QAAQ,EAAEC,cAAc,EAAEC,IAAI,EAAEC,iBAAiB,EAAEC,SAAS,EAAE;QAC9E,MAAMC,gBAAgBT,eAAe;YACnCI;YACAM,MAAM,GAAGH,kBAAkB,gBAAgB,EAAEF,gBAAgB;YAC7DG;QACF;QACA,MAAM,EAAEG,WAAW,EAAE,GAAGV,YAAY;YAClCW,SAAS;YACTC,KAAKJ;QACP;QAEA,MAAMK,MAAM,MAAMH,YAAY,YAAY;YACxCI,OAAO;gBAACT;aAAK;QACf;QAEA,OAAO;YAAEU,KAAKF,GAAG,CAAC,EAAE,EAAEE;QAAI;IAC5B;AACF,GAAE"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { type PayloadHandler, type
|
|
1
|
+
import { type PayloadHandler, type PayloadRequest, type UploadCollectionSlug } from 'payload';
|
|
2
2
|
type Args = {
|
|
3
|
-
access?:
|
|
3
|
+
access?: (args: {
|
|
4
|
+
collectionSlug: UploadCollectionSlug;
|
|
5
|
+
req: PayloadRequest;
|
|
6
|
+
}) => boolean | Promise<boolean>;
|
|
4
7
|
acl: 'private' | 'public-read';
|
|
5
8
|
routerInputConfig?: FileRouterInputConfig;
|
|
6
9
|
token?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientUploadRoute.d.ts","sourceRoot":"","sources":["../src/getClientUploadRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"getClientUploadRoute.d.ts","sourceRoot":"","sources":["../src/getClientUploadRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EAC1B,MAAM,SAAS,CAAA;AAEhB,KAAK,IAAI,GAAG;IACV,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QACd,cAAc,EAAE,oBAAoB,CAAA;QACpC,GAAG,EAAE,cAAc,CAAA;KACpB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAChC,GAAG,EAAE,SAAS,GAAG,aAAa,CAAA;IAC9B,iBAAiB,CAAC,EAAE,qBAAqB,CAAA;IACzC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AASD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEvD,eAAO,MAAM,oBAAoB,+CAK9B,IAAI,KAAG,cAoCT,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/getClientUploadRoute.ts"],"sourcesContent":["import {\n APIError,\n Forbidden,\n type PayloadHandler,\n type PayloadRequest,\n type
|
|
1
|
+
{"version":3,"sources":["../src/getClientUploadRoute.ts"],"sourcesContent":["import {\n APIError,\n Forbidden,\n type PayloadHandler,\n type PayloadRequest,\n type UploadCollectionSlug,\n} from 'payload'\n\ntype Args = {\n access?: (args: {\n collectionSlug: UploadCollectionSlug\n req: PayloadRequest\n }) => boolean | Promise<boolean>\n acl: 'private' | 'public-read'\n routerInputConfig?: FileRouterInputConfig\n token?: string\n}\n\nconst defaultAccess: Args['access'] = ({ req }) => !!req.user\n\nimport type { FileRouter } from 'uploadthing/server'\n\nimport { createRouteHandler } from 'uploadthing/next'\nimport { createUploadthing } from 'uploadthing/server'\n\nimport type { FileRouterInputConfig } from './index.js'\n\nexport const getClientUploadRoute = ({\n access = defaultAccess,\n acl,\n routerInputConfig = {},\n token,\n}: Args): PayloadHandler => {\n const f = createUploadthing()\n\n const uploadRouter = {\n uploader: f({\n ...routerInputConfig,\n blob: {\n acl,\n maxFileCount: 1,\n maxFileSize: '512MB',\n ...('blob' in routerInputConfig ? routerInputConfig.blob : {}),\n },\n })\n .middleware(async ({ req: rawReq }) => {\n const req = rawReq as PayloadRequest\n\n const collectionSlug = req.searchParams.get('collectionSlug')\n\n if (!collectionSlug) {\n throw new APIError('No payload was provided')\n }\n\n if (!(await access({ collectionSlug, req }))) {\n throw new Forbidden()\n }\n\n return {}\n })\n .onUploadComplete(() => {}),\n } satisfies FileRouter\n\n const { POST } = createRouteHandler({ config: { token }, router: uploadRouter })\n\n return async (req) => {\n return POST(req)\n }\n}\n"],"names":["APIError","Forbidden","defaultAccess","req","user","createRouteHandler","createUploadthing","getClientUploadRoute","access","acl","routerInputConfig","token","f","uploadRouter","uploader","blob","maxFileCount","maxFileSize","middleware","rawReq","collectionSlug","searchParams","get","onUploadComplete","POST","config","router"],"mappings":"AAAA,SACEA,QAAQ,EACRC,SAAS,QAIJ,UAAS;AAYhB,MAAMC,gBAAgC,CAAC,EAAEC,GAAG,EAAE,GAAK,CAAC,CAACA,IAAIC,IAAI;AAI7D,SAASC,kBAAkB,QAAQ,mBAAkB;AACrD,SAASC,iBAAiB,QAAQ,qBAAoB;AAItD,OAAO,MAAMC,uBAAuB,CAAC,EACnCC,SAASN,aAAa,EACtBO,GAAG,EACHC,oBAAoB,CAAC,CAAC,EACtBC,KAAK,EACA;IACL,MAAMC,IAAIN;IAEV,MAAMO,eAAe;QACnBC,UAAUF,EAAE;YACV,GAAGF,iBAAiB;YACpBK,MAAM;gBACJN;gBACAO,cAAc;gBACdC,aAAa;gBACb,GAAI,UAAUP,oBAAoBA,kBAAkBK,IAAI,GAAG,CAAC,CAAC;YAC/D;QACF,GACGG,UAAU,CAAC,OAAO,EAAEf,KAAKgB,MAAM,EAAE;YAChC,MAAMhB,MAAMgB;YAEZ,MAAMC,iBAAiBjB,IAAIkB,YAAY,CAACC,GAAG,CAAC;YAE5C,IAAI,CAACF,gBAAgB;gBACnB,MAAM,IAAIpB,SAAS;YACrB;YAEA,IAAI,CAAE,MAAMQ,OAAO;gBAAEY;gBAAgBjB;YAAI,IAAK;gBAC5C,MAAM,IAAIF;YACZ;YAEA,OAAO,CAAC;QACV,GACCsB,gBAAgB,CAAC,KAAO;IAC7B;IAEA,MAAM,EAAEC,IAAI,EAAE,GAAGnB,mBAAmB;QAAEoB,QAAQ;YAAEd;QAAM;QAAGe,QAAQb;IAAa;IAE9E,OAAO,OAAOV;QACZ,OAAOqB,KAAKrB;IACd;AACF,EAAC"}
|
package/dist/getFile.d.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import type { PayloadRequest } from 'payload';
|
|
2
2
|
import type { UTApi } from 'uploadthing/server';
|
|
3
3
|
interface GetFileArgs {
|
|
4
|
+
clientUploadContext?: unknown;
|
|
4
5
|
collection: string;
|
|
5
|
-
directUpload?: unknown;
|
|
6
6
|
doc?: Record<string, unknown>;
|
|
7
7
|
filename: string;
|
|
8
8
|
incomingHeaders: Headers;
|
|
9
9
|
req: PayloadRequest;
|
|
10
10
|
utApi: UTApi;
|
|
11
11
|
}
|
|
12
|
-
export declare function getFile({
|
|
12
|
+
export declare function getFile({ clientUploadContext, collection, doc, filename, incomingHeaders, req, utApi, }: GetFileArgs): Promise<Response>;
|
|
13
13
|
export {};
|
|
14
14
|
//# sourceMappingURL=getFile.d.ts.map
|
package/dist/getFile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAM/C,UAAU,WAAW;IACnB,
|
|
1
|
+
{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAM/C,UAAU,WAAW;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAsB,OAAO,CAAC,EAC5B,mBAAmB,EACnB,UAAU,EACV,GAAG,EACH,QAAQ,EACR,eAAe,EACf,GAAG,EACH,KAAK,GACN,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuIjC"}
|
package/dist/getFile.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { getRangeRequestInfo } from 'payload/internal';
|
|
2
2
|
import { getKeyFromFilename } from './utilities.js';
|
|
3
|
-
export async function getFile({
|
|
3
|
+
export async function getFile({ clientUploadContext, collection, doc, filename, incomingHeaders, req, utApi }) {
|
|
4
4
|
try {
|
|
5
5
|
let key;
|
|
6
6
|
const collectionConfig = req.payload.collections[collection]?.config;
|
|
7
|
-
if (
|
|
8
|
-
key =
|
|
7
|
+
if (clientUploadContext && typeof clientUploadContext === 'object' && 'key' in clientUploadContext && typeof clientUploadContext.key === 'string') {
|
|
8
|
+
key = clientUploadContext.key;
|
|
9
9
|
} else {
|
|
10
10
|
let retrievedDoc = doc;
|
|
11
11
|
if (!retrievedDoc) {
|
package/dist/getFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { PayloadRequest, Where } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { getKeyFromFilename } from './utilities.js'\n\ninterface GetFileArgs {\n
|
|
1
|
+
{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { PayloadRequest, Where } from 'payload'\nimport type { UTApi } from 'uploadthing/server'\n\nimport { getRangeRequestInfo } from 'payload/internal'\n\nimport { getKeyFromFilename } from './utilities.js'\n\ninterface GetFileArgs {\n clientUploadContext?: unknown\n collection: string\n doc?: Record<string, unknown>\n filename: string\n incomingHeaders: Headers\n req: PayloadRequest\n utApi: UTApi\n}\n\nexport async function getFile({\n clientUploadContext,\n collection,\n doc,\n filename,\n incomingHeaders,\n req,\n utApi,\n}: GetFileArgs): Promise<Response> {\n try {\n let key: string\n const collectionConfig = req.payload.collections[collection]?.config\n\n if (\n clientUploadContext &&\n typeof clientUploadContext === 'object' &&\n 'key' in clientUploadContext &&\n typeof clientUploadContext.key === 'string'\n ) {\n key = clientUploadContext.key\n } else {\n let retrievedDoc = doc\n\n if (!retrievedDoc) {\n const or: Where[] = [\n {\n filename: {\n equals: filename,\n },\n },\n ]\n\n if (collectionConfig?.upload.imageSizes) {\n collectionConfig.upload.imageSizes.forEach(({ name }) => {\n or.push({\n [`sizes.${name}.filename`]: {\n equals: filename,\n },\n })\n })\n }\n\n const result = await req.payload.db.findOne({\n collection,\n req,\n where: { or },\n })\n\n if (result) {\n retrievedDoc = result as Record<string, unknown>\n }\n }\n\n if (!retrievedDoc) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n key = getKeyFromFilename(retrievedDoc, filename)!\n }\n\n if (!key) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n const { url: signedURL } = await utApi.getSignedURL(key)\n\n if (!signedURL) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n const headResponse = await fetch(signedURL, { method: 'HEAD' })\n if (!headResponse.ok) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n const fileSize = Number(headResponse.headers.get('content-length'))\n\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 const response = await fetch(signedURL, {\n headers:\n rangeResult.type === 'partial'\n ? { Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}` }\n : undefined,\n })\n\n if (!response.ok || !response.body) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n const objectEtag = response.headers.get('etag')\n\n let headers = new Headers(incomingHeaders)\n\n for (const [headerKey, value] of Object.entries(rangeResult.headers)) {\n headers.append(headerKey, value)\n }\n\n const contentType = response.headers.get('content-type')\n if (contentType) {\n headers.append('Content-Type', contentType)\n }\n\n if (objectEtag) {\n headers.append('ETag', objectEtag)\n }\n\n if (contentType === 'image/svg+xml') {\n headers.append('Content-Security-Policy', \"script-src 'none'\")\n }\n\n if (\n collectionConfig?.upload &&\n typeof collectionConfig.upload === 'object' &&\n typeof collectionConfig.upload.modifyResponseHeaders === 'function'\n ) {\n headers = collectionConfig.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 return new Response(response.body, {\n headers,\n status: rangeResult.status,\n })\n } catch (err) {\n req.payload.logger.error({ err, msg: 'Unexpected error in staticHandler' })\n return new Response('Internal Server Error', { status: 500 })\n }\n}\n"],"names":["getRangeRequestInfo","getKeyFromFilename","getFile","clientUploadContext","collection","doc","filename","incomingHeaders","req","utApi","key","collectionConfig","payload","collections","config","retrievedDoc","or","equals","upload","imageSizes","forEach","name","push","result","db","findOne","where","Response","status","statusText","url","signedURL","getSignedURL","headResponse","fetch","method","ok","fileSize","Number","headers","get","rangeHeader","rangeResult","type","Headers","response","Range","rangeStart","rangeEnd","undefined","body","etagFromHeaders","objectEtag","headerKey","value","Object","entries","append","contentType","modifyResponseHeaders","err","logger","error","msg"],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { CollectionOptions } from '@payloadcms/plugin-cloud-storage/types';
|
|
2
|
-
import type { StorageAdapter, UploadCollectionSlug
|
|
1
|
+
import type { ClientUploadsAccess, CollectionOptions } from '@payloadcms/plugin-cloud-storage/types';
|
|
2
|
+
import type { StorageAdapter, UploadCollectionSlug } from 'payload';
|
|
3
3
|
import type { createUploadthing } from 'uploadthing/server';
|
|
4
4
|
import type { UTApiOptions } from 'uploadthing/types';
|
|
5
5
|
export type FileRouterInputConfig = Parameters<ReturnType<typeof createUploadthing>>[0];
|
|
@@ -15,10 +15,10 @@ export type UploadthingStorageOptions = {
|
|
|
15
15
|
*/
|
|
16
16
|
alwaysInsertFields?: boolean;
|
|
17
17
|
/**
|
|
18
|
-
*
|
|
18
|
+
* Do uploads directly on the client, to bypass limits on Vercel.
|
|
19
19
|
*/
|
|
20
20
|
clientUploads?: {
|
|
21
|
-
access?:
|
|
21
|
+
access?: ClientUploadsAccess;
|
|
22
22
|
routerInputConfig?: FileRouterInputConfig;
|
|
23
23
|
} | boolean;
|
|
24
24
|
/**
|
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,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAU,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AASrD,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAEvF,MAAM,MAAM,yBAAyB,GAAG;IACtC;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,aAAa,CAAC,EACV;QACE,MAAM,CAAC,EAAE,mBAAmB,CAAA;QAC5B,iBAAiB,CAAC,EAAE,qBAAqB,CAAA;KAC1C,GACD,OAAO,CAAA;IAEX;;;;OAIG;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;;OAEG;IACH,OAAO,EAAE;QACP;;WAEG;QACH,GAAG,CAAC,EAAE,GAAG,CAAA;KACV,GAAG,YAAY,CAAA;CACjB,CAAA;AAED,KAAK,yBAAyB,GAAG,CAC/B,yBAAyB,EAAE,yBAAyB,KACjD,cAAc,CAAA;AAEnB,+FAA+F;AAC/F,MAAM,MAAM,GAAG,GAAG,SAAS,GAAG,aAAa,CAAA;AAE3C,eAAO,MAAM,kBAAkB,EAAE,yBAiF/B,CAAA"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type {
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type {\n ClientUploadsAccess,\n PluginOptions as CloudStoragePluginOptions,\n CollectionOptions,\n} from '@payloadcms/plugin-cloud-storage/types'\nimport type { Config, StorageAdapter, UploadCollectionSlug } from 'payload'\nimport type { createUploadthing } from 'uploadthing/server'\nimport type { UTApiOptions } from 'uploadthing/types'\n\nimport { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'\nimport { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { UTApi } from 'uploadthing/server'\n\nimport { createUploadthingAdapter } from './adapter.js'\nimport { getClientUploadRoute } from './getClientUploadRoute.js'\n\nexport type FileRouterInputConfig = Parameters<ReturnType<typeof createUploadthing>>[0]\n\nexport type UploadthingStorageOptions = {\n /**\n * When enabled, fields (like the prefix field) will always be inserted into\n * the collection schema regardless of whether the plugin is enabled. This\n * ensures a consistent schema across all environments.\n *\n * This will be enabled by default in Payload v4.\n *\n * @default false\n */\n alwaysInsertFields?: boolean\n\n /**\n * Do uploads directly on the client, to bypass limits on Vercel.\n */\n clientUploads?:\n | {\n access?: ClientUploadsAccess\n routerInputConfig?: FileRouterInputConfig\n }\n | boolean\n\n /**\n * Collection options to apply the adapter to.\n *\n * TODO V4: OMIT 'prefix' from the collection options - uploadthing does not support prefixes\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 * Uploadthing Options\n */\n options: {\n /**\n * @default 'public-read'\n */\n acl?: ACL\n } & UTApiOptions\n}\n\ntype UploadthingStorageFactory = (\n uploadthingStorageOptions: UploadthingStorageOptions,\n) => StorageAdapter\n\n/** NOTE: not synced with uploadthing's internal types. Need to modify if more options added */\nexport type ACL = 'private' | 'public-read'\n\nexport const uploadthingStorage: UploadthingStorageFactory = (\n uploadthingStorageOptions: UploadthingStorageOptions,\n): StorageAdapter => ({\n name: 'uploadthing',\n collections: Object.keys(uploadthingStorageOptions.collections),\n init: (incomingConfig: Config): Config => {\n const isPluginDisabled = uploadthingStorageOptions.enabled === false\n\n initClientUploads({\n clientHandler: '@payloadcms/storage-uploadthing/client#UploadthingClientUploadHandler',\n collections: uploadthingStorageOptions.collections,\n config: incomingConfig,\n enabled: !isPluginDisabled && Boolean(uploadthingStorageOptions.clientUploads),\n serverHandler: getClientUploadRoute({\n access:\n typeof uploadthingStorageOptions.clientUploads === 'object'\n ? uploadthingStorageOptions.clientUploads.access\n : undefined,\n acl: uploadthingStorageOptions.options.acl || 'public-read',\n routerInputConfig:\n typeof uploadthingStorageOptions.clientUploads === 'object'\n ? uploadthingStorageOptions.clientUploads.routerInputConfig\n : undefined,\n token: uploadthingStorageOptions.options.token,\n }),\n serverHandlerPath: '/storage-uploadthing-client-upload-route',\n })\n\n if (isPluginDisabled) {\n return incomingConfig\n }\n\n const { acl = 'public-read', ...utOptions } = uploadthingStorageOptions.options\n const utApi = new UTApi(utOptions)\n\n const adapter = createUploadthingAdapter({\n acl,\n clientUploads: uploadthingStorageOptions.clientUploads,\n utApi,\n })\n\n const collectionsWithAdapter: CloudStoragePluginOptions['collections'] = Object.entries(\n uploadthingStorageOptions.collections,\n ).reduce(\n (acc, [slug, collOptions]) => {\n const mergedOptions = {\n ...(collOptions === true ? {} : collOptions),\n adapter,\n prefix: '', // upload thing does not support prefixes\n }\n return {\n ...acc,\n [slug]: mergedOptions,\n }\n },\n {} as Record<string, CollectionOptions>,\n )\n\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 alwaysInsertFields: uploadthingStorageOptions.alwaysInsertFields,\n collections: collectionsWithAdapter,\n useCompositePrefixes: false, // uploadthing does not support prefixes\n })(config)\n },\n})\n"],"names":["cloudStoragePlugin","initClientUploads","UTApi","createUploadthingAdapter","getClientUploadRoute","uploadthingStorage","uploadthingStorageOptions","name","collections","Object","keys","init","incomingConfig","isPluginDisabled","enabled","clientHandler","config","Boolean","clientUploads","serverHandler","access","undefined","acl","options","routerInputConfig","token","serverHandlerPath","utOptions","utApi","adapter","collectionsWithAdapter","entries","reduce","acc","slug","collOptions","mergedOptions","prefix","map","collection","upload","disableLocalStorage","alwaysInsertFields","useCompositePrefixes"],"mappings":"AASA,SAASA,kBAAkB,QAAQ,mCAAkC;AACrE,SAASC,iBAAiB,QAAQ,6CAA4C;AAC9E,SAASC,KAAK,QAAQ,qBAAoB;AAE1C,SAASC,wBAAwB,QAAQ,eAAc;AACvD,SAASC,oBAAoB,QAAQ,4BAA2B;AA0DhE,OAAO,MAAMC,qBAAgD,CAC3DC,4BACoB,CAAA;QACpBC,MAAM;QACNC,aAAaC,OAAOC,IAAI,CAACJ,0BAA0BE,WAAW;QAC9DG,MAAM,CAACC;YACL,MAAMC,mBAAmBP,0BAA0BQ,OAAO,KAAK;YAE/Db,kBAAkB;gBAChBc,eAAe;gBACfP,aAAaF,0BAA0BE,WAAW;gBAClDQ,QAAQJ;gBACRE,SAAS,CAACD,oBAAoBI,QAAQX,0BAA0BY,aAAa;gBAC7EC,eAAef,qBAAqB;oBAClCgB,QACE,OAAOd,0BAA0BY,aAAa,KAAK,WAC/CZ,0BAA0BY,aAAa,CAACE,MAAM,GAC9CC;oBACNC,KAAKhB,0BAA0BiB,OAAO,CAACD,GAAG,IAAI;oBAC9CE,mBACE,OAAOlB,0BAA0BY,aAAa,KAAK,WAC/CZ,0BAA0BY,aAAa,CAACM,iBAAiB,GACzDH;oBACNI,OAAOnB,0BAA0BiB,OAAO,CAACE,KAAK;gBAChD;gBACAC,mBAAmB;YACrB;YAEA,IAAIb,kBAAkB;gBACpB,OAAOD;YACT;YAEA,MAAM,EAAEU,MAAM,aAAa,EAAE,GAAGK,WAAW,GAAGrB,0BAA0BiB,OAAO;YAC/E,MAAMK,QAAQ,IAAI1B,MAAMyB;YAExB,MAAME,UAAU1B,yBAAyB;gBACvCmB;gBACAJ,eAAeZ,0BAA0BY,aAAa;gBACtDU;YACF;YAEA,MAAME,yBAAmErB,OAAOsB,OAAO,CACrFzB,0BAA0BE,WAAW,EACrCwB,MAAM,CACN,CAACC,KAAK,CAACC,MAAMC,YAAY;gBACvB,MAAMC,gBAAgB;oBACpB,GAAID,gBAAgB,OAAO,CAAC,IAAIA,WAAW;oBAC3CN;oBACAQ,QAAQ;gBACV;gBACA,OAAO;oBACL,GAAGJ,GAAG;oBACN,CAACC,KAAK,EAAEE;gBACV;YACF,GACA,CAAC;YAGH,MAAMpB,SAAS;gBACb,GAAGJ,cAAc;gBACjBJ,aAAa,AAACI,CAAAA,eAAeJ,WAAW,IAAI,EAAE,AAAD,EAAG8B,GAAG,CAAC,CAACC;oBACnD,IAAI,CAACT,sBAAsB,CAACS,WAAWL,IAAI,CAAC,EAAE;wBAC5C,OAAOK;oBACT;oBAEA,OAAO;wBACL,GAAGA,UAAU;wBACbC,QAAQ;4BACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;4BAClEC,qBAAqB;wBACvB;oBACF;gBACF;YACF;YAEA,OAAOzC,mBAAmB;gBACxB0C,oBAAoBpC,0BAA0BoC,kBAAkB;gBAChElC,aAAasB;gBACba,sBAAsB;YACxB,GAAG3B;QACL;IACF,CAAA,EAAE"}
|
package/dist/uploadFile.d.ts
CHANGED
|
@@ -3,11 +3,12 @@ import type { ACL } from './index.js';
|
|
|
3
3
|
interface UploadFileArgs {
|
|
4
4
|
acl: ACL;
|
|
5
5
|
buffer: Buffer;
|
|
6
|
+
clientUploadContext?: unknown;
|
|
6
7
|
data: Record<string, unknown>;
|
|
7
8
|
filename: string;
|
|
8
9
|
mimeType: string;
|
|
9
10
|
utApi: UTApi;
|
|
10
11
|
}
|
|
11
|
-
export declare function uploadFile({ acl, buffer, data, filename, mimeType, utApi, }: UploadFileArgs): Promise<Record<string, unknown>>;
|
|
12
|
+
export declare function uploadFile({ acl, buffer, clientUploadContext, data, filename, mimeType, utApi, }: UploadFileArgs): Promise<Record<string, unknown>>;
|
|
12
13
|
export {};
|
|
13
14
|
//# sourceMappingURL=uploadFile.d.ts.map
|
package/dist/uploadFile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAK/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAErC,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAsB,UAAU,CAAC,EAC/B,GAAG,EACH,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../src/uploadFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAK/C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAErC,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,wBAAsB,UAAU,CAAC,EAC/B,GAAG,EACH,MAAM,EACN,mBAAmB,EACnB,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,KAAK,GACN,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAkDnD"}
|
package/dist/uploadFile.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { APIError } from 'payload';
|
|
2
2
|
import { UTFile } from 'uploadthing/server';
|
|
3
|
-
export async function uploadFile({ acl, buffer, data, filename, mimeType, utApi }) {
|
|
3
|
+
export async function uploadFile({ acl, buffer, clientUploadContext, data, filename, mimeType, utApi }) {
|
|
4
4
|
try {
|
|
5
|
+
if (clientUploadContext && typeof clientUploadContext === 'object' && 'key' in clientUploadContext && typeof clientUploadContext.key === 'string') {
|
|
6
|
+
await utApi.deleteFiles(clientUploadContext.key);
|
|
7
|
+
}
|
|
5
8
|
const blob = new Blob([
|
|
6
9
|
buffer
|
|
7
10
|
], {
|
package/dist/uploadFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import type { UTApi } from 'uploadthing/server'\n\nimport { APIError } from 'payload'\nimport { UTFile } from 'uploadthing/server'\n\nimport type { ACL } from './index.js'\n\ninterface UploadFileArgs {\n acl: ACL\n buffer: Buffer\n data: Record<string, unknown>\n filename: string\n mimeType: string\n utApi: UTApi\n}\n\nexport async function uploadFile({\n acl,\n buffer,\n data,\n filename,\n mimeType,\n utApi,\n}: UploadFileArgs): Promise<Record<string, unknown>> {\n try {\n const blob = new Blob([buffer], { type: mimeType })\n const res = await utApi.uploadFiles(new UTFile([blob], filename), { acl })\n\n if (res.error) {\n throw new APIError(`Error uploading file: ${res.error.code} - ${res.error.message}`)\n }\n\n const sizes = data.sizes as Record<string, { _key?: string; filename?: string }> | undefined\n const foundSize = Object.keys(sizes || {}).find((key) => sizes?.[key]?.filename === filename)\n\n if (foundSize && sizes && sizes[foundSize]) {\n sizes[foundSize]._key = res.data?.key\n } else {\n data._key = res.data?.key\n data.filename = res.data?.name\n }\n\n return data\n } catch (error: unknown) {\n if (error instanceof APIError) {\n throw error\n }\n\n if (error instanceof Error) {\n if ('toJSON' in error && typeof error.toJSON === 'function') {\n const json = error.toJSON() as {\n cause?: { defect?: { _id?: string; data?: { error?: string }; error?: string } }\n }\n if (json.cause?.defect?.error && json.cause.defect.data?.error) {\n throw new APIError(\n `Error uploading file with uploadthing: ${json.cause.defect.error} - ${json.cause.defect.data.error}`,\n )\n }\n }\n throw new APIError(`Error uploading file with uploadthing: ${error.message}`)\n }\n\n throw new APIError('Error uploading file with uploadthing: Unknown error')\n }\n}\n"],"names":["APIError","UTFile","uploadFile","acl","buffer","data","filename","mimeType","utApi","blob","Blob","type","res","uploadFiles","error","code","message","sizes","foundSize","Object","keys","find","
|
|
1
|
+
{"version":3,"sources":["../src/uploadFile.ts"],"sourcesContent":["import type { UTApi } from 'uploadthing/server'\n\nimport { APIError } from 'payload'\nimport { UTFile } from 'uploadthing/server'\n\nimport type { ACL } from './index.js'\n\ninterface UploadFileArgs {\n acl: ACL\n buffer: Buffer\n clientUploadContext?: unknown\n data: Record<string, unknown>\n filename: string\n mimeType: string\n utApi: UTApi\n}\n\nexport async function uploadFile({\n acl,\n buffer,\n clientUploadContext,\n data,\n filename,\n mimeType,\n utApi,\n}: UploadFileArgs): Promise<Record<string, unknown>> {\n try {\n if (\n clientUploadContext &&\n typeof clientUploadContext === 'object' &&\n 'key' in clientUploadContext &&\n typeof clientUploadContext.key === 'string'\n ) {\n await utApi.deleteFiles(clientUploadContext.key)\n }\n\n const blob = new Blob([buffer], { type: mimeType })\n const res = await utApi.uploadFiles(new UTFile([blob], filename), { acl })\n\n if (res.error) {\n throw new APIError(`Error uploading file: ${res.error.code} - ${res.error.message}`)\n }\n\n const sizes = data.sizes as Record<string, { _key?: string; filename?: string }> | undefined\n const foundSize = Object.keys(sizes || {}).find((key) => sizes?.[key]?.filename === filename)\n\n if (foundSize && sizes && sizes[foundSize]) {\n sizes[foundSize]._key = res.data?.key\n } else {\n data._key = res.data?.key\n data.filename = res.data?.name\n }\n\n return data\n } catch (error: unknown) {\n if (error instanceof APIError) {\n throw error\n }\n\n if (error instanceof Error) {\n if ('toJSON' in error && typeof error.toJSON === 'function') {\n const json = error.toJSON() as {\n cause?: { defect?: { _id?: string; data?: { error?: string }; error?: string } }\n }\n if (json.cause?.defect?.error && json.cause.defect.data?.error) {\n throw new APIError(\n `Error uploading file with uploadthing: ${json.cause.defect.error} - ${json.cause.defect.data.error}`,\n )\n }\n }\n throw new APIError(`Error uploading file with uploadthing: ${error.message}`)\n }\n\n throw new APIError('Error uploading file with uploadthing: Unknown error')\n }\n}\n"],"names":["APIError","UTFile","uploadFile","acl","buffer","clientUploadContext","data","filename","mimeType","utApi","key","deleteFiles","blob","Blob","type","res","uploadFiles","error","code","message","sizes","foundSize","Object","keys","find","_key","name","Error","toJSON","json","cause","defect"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,UAAS;AAClC,SAASC,MAAM,QAAQ,qBAAoB;AAc3C,OAAO,eAAeC,WAAW,EAC/BC,GAAG,EACHC,MAAM,EACNC,mBAAmB,EACnBC,IAAI,EACJC,QAAQ,EACRC,QAAQ,EACRC,KAAK,EACU;IACf,IAAI;QACF,IACEJ,uBACA,OAAOA,wBAAwB,YAC/B,SAASA,uBACT,OAAOA,oBAAoBK,GAAG,KAAK,UACnC;YACA,MAAMD,MAAME,WAAW,CAACN,oBAAoBK,GAAG;QACjD;QAEA,MAAME,OAAO,IAAIC,KAAK;YAACT;SAAO,EAAE;YAAEU,MAAMN;QAAS;QACjD,MAAMO,MAAM,MAAMN,MAAMO,WAAW,CAAC,IAAIf,OAAO;YAACW;SAAK,EAAEL,WAAW;YAAEJ;QAAI;QAExE,IAAIY,IAAIE,KAAK,EAAE;YACb,MAAM,IAAIjB,SAAS,CAAC,sBAAsB,EAAEe,IAAIE,KAAK,CAACC,IAAI,CAAC,GAAG,EAAEH,IAAIE,KAAK,CAACE,OAAO,EAAE;QACrF;QAEA,MAAMC,QAAQd,KAAKc,KAAK;QACxB,MAAMC,YAAYC,OAAOC,IAAI,CAACH,SAAS,CAAC,GAAGI,IAAI,CAAC,CAACd,MAAQU,OAAO,CAACV,IAAI,EAAEH,aAAaA;QAEpF,IAAIc,aAAaD,SAASA,KAAK,CAACC,UAAU,EAAE;YAC1CD,KAAK,CAACC,UAAU,CAACI,IAAI,GAAGV,IAAIT,IAAI,EAAEI;QACpC,OAAO;YACLJ,KAAKmB,IAAI,GAAGV,IAAIT,IAAI,EAAEI;YACtBJ,KAAKC,QAAQ,GAAGQ,IAAIT,IAAI,EAAEoB;QAC5B;QAEA,OAAOpB;IACT,EAAE,OAAOW,OAAgB;QACvB,IAAIA,iBAAiBjB,UAAU;YAC7B,MAAMiB;QACR;QAEA,IAAIA,iBAAiBU,OAAO;YAC1B,IAAI,YAAYV,SAAS,OAAOA,MAAMW,MAAM,KAAK,YAAY;gBAC3D,MAAMC,OAAOZ,MAAMW,MAAM;gBAGzB,IAAIC,KAAKC,KAAK,EAAEC,QAAQd,SAASY,KAAKC,KAAK,CAACC,MAAM,CAACzB,IAAI,EAAEW,OAAO;oBAC9D,MAAM,IAAIjB,SACR,CAAC,uCAAuC,EAAE6B,KAAKC,KAAK,CAACC,MAAM,CAACd,KAAK,CAAC,GAAG,EAAEY,KAAKC,KAAK,CAACC,MAAM,CAACzB,IAAI,CAACW,KAAK,EAAE;gBAEzG;YACF;YACA,MAAM,IAAIjB,SAAS,CAAC,uCAAuC,EAAEiB,MAAME,OAAO,EAAE;QAC9E;QAEA,MAAM,IAAInB,SAAS;IACrB;AACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/storage-uploadthing",
|
|
3
|
-
"version": "4.0.0-internal.
|
|
3
|
+
"version": "4.0.0-internal.cea8867",
|
|
4
4
|
"description": "Payload storage adapter for uploadthing",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -38,13 +38,13 @@
|
|
|
38
38
|
],
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"uploadthing": "7.3.0",
|
|
41
|
-
"@payloadcms/plugin-cloud-storage": "4.0.0-internal.
|
|
41
|
+
"@payloadcms/plugin-cloud-storage": "4.0.0-internal.cea8867"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"payload": "4.0.0-internal.
|
|
44
|
+
"payload": "4.0.0-internal.cea8867"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
|
-
"payload": "4.0.0-internal.
|
|
47
|
+
"payload": "4.0.0-internal.cea8867"
|
|
48
48
|
},
|
|
49
49
|
"engines": {
|
|
50
50
|
"node": ">=24.15.0"
|