@payloadcms/storage-azure 4.0.0-canary.20 → 4.0.0-canary.20261117
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 +12 -9
- package/dist/adapter.d.ts +1 -1
- package/dist/adapter.d.ts.map +1 -1
- package/dist/adapter.js +33 -16
- package/dist/adapter.js.map +1 -1
- package/dist/copyFile.d.ts +11 -0
- package/dist/copyFile.d.ts.map +1 -0
- package/dist/copyFile.js +52 -0
- package/dist/copyFile.js.map +1 -0
- package/dist/deleteFile.d.ts +2 -5
- package/dist/deleteFile.d.ts.map +1 -1
- package/dist/deleteFile.js +2 -9
- package/dist/deleteFile.js.map +1 -1
- package/dist/generateURL.js +3 -3
- package/dist/generateURL.js.map +1 -1
- package/dist/generateUploadInstructions.d.ts.map +1 -1
- package/dist/generateUploadInstructions.js +19 -9
- package/dist/generateUploadInstructions.js.map +1 -1
- package/dist/getFile.d.ts +5 -3
- package/dist/getFile.d.ts.map +1 -1
- package/dist/getFile.js +17 -18
- package/dist/getFile.js.map +1 -1
- package/dist/index.d.ts +27 -17
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +25 -6
- package/dist/index.js.map +1 -1
- package/dist/isClientUploadAllowed.d.ts +6 -0
- package/dist/isClientUploadAllowed.d.ts.map +1 -0
- package/dist/isClientUploadAllowed.js +3 -0
- package/dist/isClientUploadAllowed.js.map +1 -0
- package/dist/segmentedUpload.d.ts +23 -0
- package/dist/segmentedUpload.d.ts.map +1 -0
- package/dist/segmentedUpload.js +265 -0
- package/dist/segmentedUpload.js.map +1 -0
- package/dist/uploadFile.d.ts +2 -5
- package/dist/uploadFile.d.ts.map +1 -1
- package/dist/uploadFile.js +2 -9
- package/dist/uploadFile.js.map +1 -1
- package/package.json +18 -20
- package/dist/client/handleAzureUpload.spec.d.ts +0 -2
- package/dist/client/handleAzureUpload.spec.d.ts.map +0 -1
- package/dist/client/handleAzureUpload.spec.js +0 -65
- package/dist/client/handleAzureUpload.spec.js.map +0 -1
package/README.md
CHANGED
|
@@ -58,12 +58,15 @@ export default buildConfig({
|
|
|
58
58
|
|
|
59
59
|
### Configuration Options
|
|
60
60
|
|
|
61
|
-
| Option | Description
|
|
62
|
-
| ---------------------- |
|
|
63
|
-
| `enabled` | Whether or not to enable the plugin
|
|
64
|
-
| `collections` | Collections to apply the Azure Blob adapter to
|
|
65
|
-
| `allowContainerCreate` | Whether or not to allow the container to be created if it does not exist
|
|
66
|
-
| `
|
|
67
|
-
| `
|
|
68
|
-
| `
|
|
69
|
-
| `
|
|
61
|
+
| Option | Description | Default |
|
|
62
|
+
| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
|
|
63
|
+
| `enabled` | Whether or not to enable the plugin | `true` |
|
|
64
|
+
| `collections` | Collections to apply the Azure Blob adapter to | |
|
|
65
|
+
| `allowContainerCreate` | Whether or not to allow the container to be created if it does not exist | `false` |
|
|
66
|
+
| `containerAccess` | Public access level for a container the plugin creates. `'private'` (default) serves blobs only through Payload's access-controlled route; `'blob'` / `'container'` expose them to anonymous clients directly from Azure. Has no effect on containers that already exist. | `'private'` |
|
|
67
|
+
| `baseURL` | Base URL for the Azure Blob storage account | |
|
|
68
|
+
| `connectionString` | Azure Blob storage connection string | |
|
|
69
|
+
| `containerName` | Azure Blob storage container name | |
|
|
70
|
+
| `clientUploads` | Upload directly to Azure instead of through Payload. | |
|
|
71
|
+
|
|
72
|
+
> **Breaking change (private by default):** When `allowContainerCreate: true`, the plugin now creates containers with **private** access. Previously it created them with public `blob` access. If you relied on files being served directly from the anonymous Azure blob URL (typically alongside `disablePayloadAccessControl: true`), set `containerAccess: 'blob'` to restore the old behaviour. This only affects **newly created** containers — existing containers keep their current access level, so you must flip their ACL manually if needed.
|
package/dist/adapter.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ interface CreateAzureAdapterArgs {
|
|
|
5
5
|
baseURL: string;
|
|
6
6
|
clientUploads?: ClientUploadsConfig;
|
|
7
7
|
containerName: string;
|
|
8
|
-
createContainerIfNotExists: () => void;
|
|
8
|
+
createContainerIfNotExists: () => Promise<void> | void;
|
|
9
9
|
getStorageClient: () => ContainerClient;
|
|
10
10
|
useCompositePrefixes?: boolean;
|
|
11
11
|
}
|
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,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAGpB,MAAM,wCAAwC,CAAA;AAW/C,UAAU,sBAAsB;IAC9B,oBAAoB,EAAE,OAAO,CAAA;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,aAAa,EAAE,MAAM,CAAA;IACrB,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACtD,gBAAgB,EAAE,MAAM,eAAe,CAAA;IACvC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,kBAAkB,CAAC,EACjC,oBAAoB,EACpB,OAAO,EACP,aAAa,EACb,aAAa,EACb,0BAA0B,EAC1B,gBAAgB,EAChB,oBAA4B,GAC7B,EAAE,sBAAsB,GAAG,OAAO,CAgFlC"}
|
package/dist/adapter.js
CHANGED
|
@@ -1,11 +1,27 @@
|
|
|
1
|
+
import { copyAzureFile } from './copyFile.js';
|
|
1
2
|
import { deleteFile } from './deleteFile.js';
|
|
2
3
|
import { generateUploadInstructions } from './generateUploadInstructions.js';
|
|
3
4
|
import { generateURL } from './generateURL.js';
|
|
4
5
|
import { getFile } from './getFile.js';
|
|
6
|
+
import { isClientUploadAllowed } from './isClientUploadAllowed.js';
|
|
7
|
+
import { createSegmentedUpload } from './segmentedUpload.js';
|
|
5
8
|
import { uploadFile } from './uploadFile.js';
|
|
6
9
|
export function createAzureAdapter({ allowContainerCreate, baseURL, clientUploads, containerName, createContainerIfNotExists, getStorageClient, useCompositePrefixes = false }) {
|
|
10
|
+
const clientUploadsAccess = typeof clientUploads === 'object' ? clientUploads.access : undefined;
|
|
11
|
+
const deleteStoredFile = ({ storageFilePath })=>deleteFile({
|
|
12
|
+
client: getStorageClient(),
|
|
13
|
+
storageFilePath
|
|
14
|
+
});
|
|
7
15
|
return ({ collection, prefix = '' })=>({
|
|
8
16
|
name: 'azure',
|
|
17
|
+
supportsTempFiles: true,
|
|
18
|
+
copyFile: ({ from, req, to })=>copyAzureFile({
|
|
19
|
+
client: getStorageClient(),
|
|
20
|
+
from,
|
|
21
|
+
req,
|
|
22
|
+
to
|
|
23
|
+
}),
|
|
24
|
+
deleteFile: deleteStoredFile,
|
|
9
25
|
generateURL: ({ filename, prefix: urlPrefix = '' })=>generateURL({
|
|
10
26
|
baseURL,
|
|
11
27
|
collectionPrefix: prefix,
|
|
@@ -18,43 +34,44 @@ export function createAzureAdapter({ allowContainerCreate, baseURL, clientUpload
|
|
|
18
34
|
adminHandler: {
|
|
19
35
|
path: '@payloadcms/storage-azure/client#AzureClientUploadHandler'
|
|
20
36
|
},
|
|
21
|
-
enabled: Boolean(clientUploads),
|
|
37
|
+
enabled: Boolean(clientUploads) && isClientUploadAllowed(collection),
|
|
22
38
|
generate: generateUploadInstructions({
|
|
23
|
-
access:
|
|
39
|
+
access: clientUploadsAccess,
|
|
24
40
|
collectionPrefix: prefix,
|
|
25
41
|
containerName,
|
|
26
42
|
getStorageClient,
|
|
27
43
|
useCompositePrefixes
|
|
28
44
|
}),
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
client: getStorageClient(),
|
|
45
|
+
requiresUploadReceipt: true,
|
|
46
|
+
segmented: createSegmentedUpload({
|
|
47
|
+
access: clientUploadsAccess,
|
|
33
48
|
collectionPrefix: prefix,
|
|
34
|
-
|
|
35
|
-
|
|
49
|
+
containerName,
|
|
50
|
+
getStorageClient,
|
|
36
51
|
useCompositePrefixes
|
|
37
52
|
}),
|
|
38
|
-
|
|
53
|
+
useInAdmin: true
|
|
54
|
+
},
|
|
55
|
+
handleDelete: deleteStoredFile,
|
|
56
|
+
handleUpload: async ({ data, file, storageFilePath })=>{
|
|
39
57
|
await uploadFile({
|
|
40
58
|
buffer: file.buffer,
|
|
41
59
|
client: getStorageClient(),
|
|
42
|
-
collectionPrefix: prefix,
|
|
43
|
-
docPrefix: data.prefix,
|
|
44
|
-
filename: file.filename,
|
|
45
60
|
mimeType: file.mimeType,
|
|
46
|
-
|
|
47
|
-
|
|
61
|
+
storageFilePath,
|
|
62
|
+
tempFilePath: file.tempFilePath
|
|
48
63
|
});
|
|
49
64
|
return data;
|
|
50
65
|
},
|
|
51
|
-
staticHandler: (req, { headers, params: { filename,
|
|
66
|
+
staticHandler: (req, { doc, headers, params: { filename, isOriginal, operation, uploadReference } })=>getFile({
|
|
52
67
|
client: getStorageClient(),
|
|
53
68
|
collection,
|
|
54
69
|
collectionPrefix: prefix,
|
|
70
|
+
doc,
|
|
55
71
|
filename,
|
|
56
72
|
incomingHeaders: headers,
|
|
57
|
-
|
|
73
|
+
isOriginal,
|
|
74
|
+
operation,
|
|
58
75
|
req,
|
|
59
76
|
uploadReference,
|
|
60
77
|
useCompositePrefixes
|
package/dist/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type {\n Adapter,\n ClientUploadsConfig,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { deleteFile } from './deleteFile.js'\nimport { generateUploadInstructions } from './generateUploadInstructions.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateAzureAdapterArgs {\n allowContainerCreate: boolean\n baseURL: string\n clientUploads?: ClientUploadsConfig\n containerName: string\n createContainerIfNotExists: () => void\n getStorageClient: () => ContainerClient\n useCompositePrefixes?: boolean\n}\n\nexport function createAzureAdapter({\n allowContainerCreate,\n baseURL,\n clientUploads,\n containerName,\n createContainerIfNotExists,\n getStorageClient,\n useCompositePrefixes = false,\n}: CreateAzureAdapterArgs): Adapter {\n return ({ collection, prefix = '' }): GeneratedAdapter => ({\n name: 'azure',\n\n generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n generateURL({\n baseURL,\n collectionPrefix: prefix,\n containerName,\n filename,\n prefix: urlPrefix,\n useCompositePrefixes,\n }),\n\n uploadInstructions: {\n adminHandler: {\n path: '@payloadcms/storage-azure/client#AzureClientUploadHandler',\n },\n enabled: Boolean(clientUploads),\n generate: generateUploadInstructions({\n access:
|
|
1
|
+
{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type {\n Adapter,\n ClientUploadsConfig,\n DeleteFile,\n GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport { copyAzureFile } from './copyFile.js'\nimport { deleteFile } from './deleteFile.js'\nimport { generateUploadInstructions } from './generateUploadInstructions.js'\nimport { generateURL } from './generateURL.js'\nimport { getFile } from './getFile.js'\nimport { isClientUploadAllowed } from './isClientUploadAllowed.js'\nimport { createSegmentedUpload } from './segmentedUpload.js'\nimport { uploadFile } from './uploadFile.js'\n\ninterface CreateAzureAdapterArgs {\n allowContainerCreate: boolean\n baseURL: string\n clientUploads?: ClientUploadsConfig\n containerName: string\n createContainerIfNotExists: () => Promise<void> | void\n getStorageClient: () => ContainerClient\n useCompositePrefixes?: boolean\n}\n\nexport function createAzureAdapter({\n allowContainerCreate,\n baseURL,\n clientUploads,\n containerName,\n createContainerIfNotExists,\n getStorageClient,\n useCompositePrefixes = false,\n}: CreateAzureAdapterArgs): Adapter {\n const clientUploadsAccess = typeof clientUploads === 'object' ? clientUploads.access : undefined\n\n const deleteStoredFile: DeleteFile = ({ storageFilePath }) =>\n deleteFile({ client: getStorageClient(), storageFilePath })\n\n return ({ collection, prefix = '' }): GeneratedAdapter => ({\n name: 'azure',\n supportsTempFiles: true,\n\n copyFile: ({ from, req, to }) => copyAzureFile({ client: getStorageClient(), from, req, to }),\n deleteFile: deleteStoredFile,\n\n generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n generateURL({\n baseURL,\n collectionPrefix: prefix,\n containerName,\n filename,\n prefix: urlPrefix,\n useCompositePrefixes,\n }),\n\n uploadInstructions: {\n adminHandler: {\n path: '@payloadcms/storage-azure/client#AzureClientUploadHandler',\n },\n enabled: Boolean(clientUploads) && isClientUploadAllowed(collection),\n generate: generateUploadInstructions({\n access: clientUploadsAccess,\n collectionPrefix: prefix,\n containerName,\n getStorageClient,\n useCompositePrefixes,\n }),\n requiresUploadReceipt: true,\n segmented: createSegmentedUpload({\n access: clientUploadsAccess,\n collectionPrefix: prefix,\n containerName,\n getStorageClient,\n useCompositePrefixes,\n }),\n useInAdmin: true,\n },\n\n handleDelete: deleteStoredFile,\n\n handleUpload: async ({ data, file, storageFilePath }) => {\n await uploadFile({\n buffer: file.buffer,\n client: getStorageClient(),\n mimeType: file.mimeType,\n storageFilePath,\n tempFilePath: file.tempFilePath,\n })\n\n return data\n },\n\n staticHandler: (\n req,\n { doc, headers, params: { filename, isOriginal, operation, uploadReference } },\n ) =>\n getFile({\n client: getStorageClient(),\n collection,\n collectionPrefix: prefix,\n doc,\n filename,\n incomingHeaders: headers,\n isOriginal,\n operation,\n req,\n uploadReference,\n useCompositePrefixes,\n }),\n\n ...(allowContainerCreate && { onInit: createContainerIfNotExists }),\n })\n}\n"],"names":["copyAzureFile","deleteFile","generateUploadInstructions","generateURL","getFile","isClientUploadAllowed","createSegmentedUpload","uploadFile","createAzureAdapter","allowContainerCreate","baseURL","clientUploads","containerName","createContainerIfNotExists","getStorageClient","useCompositePrefixes","clientUploadsAccess","access","undefined","deleteStoredFile","storageFilePath","client","collection","prefix","name","supportsTempFiles","copyFile","from","req","to","filename","urlPrefix","collectionPrefix","uploadInstructions","adminHandler","path","enabled","Boolean","generate","requiresUploadReceipt","segmented","useInAdmin","handleDelete","handleUpload","data","file","buffer","mimeType","tempFilePath","staticHandler","doc","headers","params","isOriginal","operation","uploadReference","incomingHeaders","onInit"],"mappings":"AAQA,SAASA,aAAa,QAAQ,gBAAe;AAC7C,SAASC,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,0BAA0B,QAAQ,kCAAiC;AAC5E,SAASC,WAAW,QAAQ,mBAAkB;AAC9C,SAASC,OAAO,QAAQ,eAAc;AACtC,SAASC,qBAAqB,QAAQ,6BAA4B;AAClE,SAASC,qBAAqB,QAAQ,uBAAsB;AAC5D,SAASC,UAAU,QAAQ,kBAAiB;AAY5C,OAAO,SAASC,mBAAmB,EACjCC,oBAAoB,EACpBC,OAAO,EACPC,aAAa,EACbC,aAAa,EACbC,0BAA0B,EAC1BC,gBAAgB,EAChBC,uBAAuB,KAAK,EACL;IACvB,MAAMC,sBAAsB,OAAOL,kBAAkB,WAAWA,cAAcM,MAAM,GAAGC;IAEvF,MAAMC,mBAA+B,CAAC,EAAEC,eAAe,EAAE,GACvDnB,WAAW;YAAEoB,QAAQP;YAAoBM;QAAgB;IAE3D,OAAO,CAAC,EAAEE,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNC,mBAAmB;YAEnBC,UAAU,CAAC,EAAEC,IAAI,EAAEC,GAAG,EAAEC,EAAE,EAAE,GAAK7B,cAAc;oBAAEqB,QAAQP;oBAAoBa;oBAAMC;oBAAKC;gBAAG;YAC3F5B,YAAYkB;YAEZhB,aAAa,CAAC,EAAE2B,QAAQ,EAAEP,QAAQQ,YAAY,EAAE,EAAE,GAChD5B,YAAY;oBACVO;oBACAsB,kBAAkBT;oBAClBX;oBACAkB;oBACAP,QAAQQ;oBACRhB;gBACF;YAEFkB,oBAAoB;gBAClBC,cAAc;oBACZC,MAAM;gBACR;gBACAC,SAASC,QAAQ1B,kBAAkBN,sBAAsBiB;gBACzDgB,UAAUpC,2BAA2B;oBACnCe,QAAQD;oBACRgB,kBAAkBT;oBAClBX;oBACAE;oBACAC;gBACF;gBACAwB,uBAAuB;gBACvBC,WAAWlC,sBAAsB;oBAC/BW,QAAQD;oBACRgB,kBAAkBT;oBAClBX;oBACAE;oBACAC;gBACF;gBACA0B,YAAY;YACd;YAEAC,cAAcvB;YAEdwB,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAEzB,eAAe,EAAE;gBAClD,MAAMb,WAAW;oBACfuC,QAAQD,KAAKC,MAAM;oBACnBzB,QAAQP;oBACRiC,UAAUF,KAAKE,QAAQ;oBACvB3B;oBACA4B,cAAcH,KAAKG,YAAY;gBACjC;gBAEA,OAAOJ;YACT;YAEAK,eAAe,CACbrB,KACA,EAAEsB,GAAG,EAAEC,OAAO,EAAEC,QAAQ,EAAEtB,QAAQ,EAAEuB,UAAU,EAAEC,SAAS,EAAEC,eAAe,EAAE,EAAE,GAE9EnD,QAAQ;oBACNiB,QAAQP;oBACRQ;oBACAU,kBAAkBT;oBAClB2B;oBACApB;oBACA0B,iBAAiBL;oBACjBE;oBACAC;oBACA1B;oBACA2B;oBACAxC;gBACF;YAEF,GAAIN,wBAAwB;gBAAEgD,QAAQ5C;YAA2B,CAAC;QACpE,CAAA;AACF"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { ContainerClient } from '@azure/storage-blob';
|
|
2
|
+
import type { PayloadRequest } from 'payload';
|
|
3
|
+
type Args = {
|
|
4
|
+
client: ContainerClient;
|
|
5
|
+
from: string;
|
|
6
|
+
req?: PayloadRequest;
|
|
7
|
+
to: string;
|
|
8
|
+
};
|
|
9
|
+
export declare const copyAzureFile: ({ client, from, req, to }: Args) => Promise<void>;
|
|
10
|
+
export {};
|
|
11
|
+
//# sourceMappingURL=copyFile.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"copyFile.d.ts","sourceRoot":"","sources":["../src/copyFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,KAAK,IAAI,GAAG;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,cAAc,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvF,eAAO,MAAM,aAAa,8BAAqC,IAAI,KAAG,OAAO,CAAC,IAAI,CAqDjF,CAAA"}
|
package/dist/copyFile.js
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
export const copyAzureFile = async ({ client, from, req, to })=>{
|
|
2
|
+
if (from === to) {
|
|
3
|
+
throw new Error('Storage copy requires different source and destination keys');
|
|
4
|
+
}
|
|
5
|
+
const source = client.getBlockBlobClient(from);
|
|
6
|
+
const destination = client.getBlockBlobClient(to);
|
|
7
|
+
const properties = await source.getProperties();
|
|
8
|
+
const { tags } = await source.getTags();
|
|
9
|
+
const download = await source.download();
|
|
10
|
+
if (!download.readableStreamBody) {
|
|
11
|
+
throw new Error(`Azure storage source is not readable: ${from}`);
|
|
12
|
+
}
|
|
13
|
+
const uploaded = await destination.uploadStream(download.readableStreamBody, 4 * 1024 * 1024, 4, {
|
|
14
|
+
blobHTTPHeaders: {
|
|
15
|
+
blobCacheControl: properties.cacheControl,
|
|
16
|
+
blobContentDisposition: properties.contentDisposition,
|
|
17
|
+
blobContentEncoding: properties.contentEncoding,
|
|
18
|
+
blobContentLanguage: properties.contentLanguage,
|
|
19
|
+
blobContentType: properties.contentType
|
|
20
|
+
},
|
|
21
|
+
conditions: {
|
|
22
|
+
ifNoneMatch: '*'
|
|
23
|
+
},
|
|
24
|
+
metadata: properties.metadata,
|
|
25
|
+
tags
|
|
26
|
+
});
|
|
27
|
+
try {
|
|
28
|
+
const copied = await destination.getProperties();
|
|
29
|
+
if (copied.contentLength !== properties.contentLength) {
|
|
30
|
+
throw new Error(`Copied Azure object is not readable at its expected length: ${to}`);
|
|
31
|
+
}
|
|
32
|
+
} catch (err) {
|
|
33
|
+
try {
|
|
34
|
+
if (!uploaded.etag) {
|
|
35
|
+
throw new Error('Azure copy did not return an ETag for safe cleanup');
|
|
36
|
+
}
|
|
37
|
+
await destination.deleteIfExists({
|
|
38
|
+
conditions: {
|
|
39
|
+
ifMatch: uploaded.etag
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
} catch (cleanupError) {
|
|
43
|
+
req?.payload.logger.error({
|
|
44
|
+
err: cleanupError,
|
|
45
|
+
msg: `Failed to remove unsuccessful Azure copy at ${client.containerName}/${to}`
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
throw err;
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
//# sourceMappingURL=copyFile.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/copyFile.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\nimport type { Readable } from 'node:stream'\nimport type { PayloadRequest } from 'payload'\n\ntype Args = { client: ContainerClient; from: string; req?: PayloadRequest; to: string }\n\nexport const copyAzureFile = async ({ client, from, req, to }: Args): Promise<void> => {\n if (from === to) {\n throw new Error('Storage copy requires different source and destination keys')\n }\n\n const source = client.getBlockBlobClient(from)\n const destination = client.getBlockBlobClient(to)\n const properties = await source.getProperties()\n const { tags } = await source.getTags()\n const download = await source.download()\n\n if (!download.readableStreamBody) {\n throw new Error(`Azure storage source is not readable: ${from}`)\n }\n\n const uploaded = await destination.uploadStream(\n download.readableStreamBody as Readable,\n 4 * 1024 * 1024,\n 4,\n {\n blobHTTPHeaders: {\n blobCacheControl: properties.cacheControl,\n blobContentDisposition: properties.contentDisposition,\n blobContentEncoding: properties.contentEncoding,\n blobContentLanguage: properties.contentLanguage,\n blobContentType: properties.contentType,\n },\n conditions: { ifNoneMatch: '*' },\n metadata: properties.metadata,\n tags,\n },\n )\n\n try {\n const copied = await destination.getProperties()\n\n if (copied.contentLength !== properties.contentLength) {\n throw new Error(`Copied Azure object is not readable at its expected length: ${to}`)\n }\n } catch (err) {\n try {\n if (!uploaded.etag) {\n throw new Error('Azure copy did not return an ETag for safe cleanup')\n }\n await destination.deleteIfExists({ conditions: { ifMatch: uploaded.etag } })\n } catch (cleanupError) {\n req?.payload.logger.error({\n err: cleanupError,\n msg: `Failed to remove unsuccessful Azure copy at ${client.containerName}/${to}`,\n })\n }\n throw err\n }\n}\n"],"names":["copyAzureFile","client","from","req","to","Error","source","getBlockBlobClient","destination","properties","getProperties","tags","getTags","download","readableStreamBody","uploaded","uploadStream","blobHTTPHeaders","blobCacheControl","cacheControl","blobContentDisposition","contentDisposition","blobContentEncoding","contentEncoding","blobContentLanguage","contentLanguage","blobContentType","contentType","conditions","ifNoneMatch","metadata","copied","contentLength","err","etag","deleteIfExists","ifMatch","cleanupError","payload","logger","error","msg","containerName"],"mappings":"AAMA,OAAO,MAAMA,gBAAgB,OAAO,EAAEC,MAAM,EAAEC,IAAI,EAAEC,GAAG,EAAEC,EAAE,EAAQ;IACjE,IAAIF,SAASE,IAAI;QACf,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,SAASL,OAAOM,kBAAkB,CAACL;IACzC,MAAMM,cAAcP,OAAOM,kBAAkB,CAACH;IAC9C,MAAMK,aAAa,MAAMH,OAAOI,aAAa;IAC7C,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAML,OAAOM,OAAO;IACrC,MAAMC,WAAW,MAAMP,OAAOO,QAAQ;IAEtC,IAAI,CAACA,SAASC,kBAAkB,EAAE;QAChC,MAAM,IAAIT,MAAM,CAAC,sCAAsC,EAAEH,MAAM;IACjE;IAEA,MAAMa,WAAW,MAAMP,YAAYQ,YAAY,CAC7CH,SAASC,kBAAkB,EAC3B,IAAI,OAAO,MACX,GACA;QACEG,iBAAiB;YACfC,kBAAkBT,WAAWU,YAAY;YACzCC,wBAAwBX,WAAWY,kBAAkB;YACrDC,qBAAqBb,WAAWc,eAAe;YAC/CC,qBAAqBf,WAAWgB,eAAe;YAC/CC,iBAAiBjB,WAAWkB,WAAW;QACzC;QACAC,YAAY;YAAEC,aAAa;QAAI;QAC/BC,UAAUrB,WAAWqB,QAAQ;QAC7BnB;IACF;IAGF,IAAI;QACF,MAAMoB,SAAS,MAAMvB,YAAYE,aAAa;QAE9C,IAAIqB,OAAOC,aAAa,KAAKvB,WAAWuB,aAAa,EAAE;YACrD,MAAM,IAAI3B,MAAM,CAAC,4DAA4D,EAAED,IAAI;QACrF;IACF,EAAE,OAAO6B,KAAK;QACZ,IAAI;YACF,IAAI,CAAClB,SAASmB,IAAI,EAAE;gBAClB,MAAM,IAAI7B,MAAM;YAClB;YACA,MAAMG,YAAY2B,cAAc,CAAC;gBAAEP,YAAY;oBAAEQ,SAASrB,SAASmB,IAAI;gBAAC;YAAE;QAC5E,EAAE,OAAOG,cAAc;YACrBlC,KAAKmC,QAAQC,OAAOC,MAAM;gBACxBP,KAAKI;gBACLI,KAAK,CAAC,4CAA4C,EAAExC,OAAOyC,aAAa,CAAC,CAAC,EAAEtC,IAAI;YAClF;QACF;QACA,MAAM6B;IACR;AACF,EAAC"}
|
package/dist/deleteFile.d.ts
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import type { ContainerClient } from '@azure/storage-blob';
|
|
2
2
|
interface DeleteArgs {
|
|
3
3
|
client: ContainerClient;
|
|
4
|
-
|
|
5
|
-
docPrefix: string;
|
|
6
|
-
filename: string;
|
|
7
|
-
useCompositePrefixes?: boolean;
|
|
4
|
+
storageFilePath: string;
|
|
8
5
|
}
|
|
9
|
-
export declare function deleteFile({ client,
|
|
6
|
+
export declare function deleteFile({ client, storageFilePath }: DeleteArgs): Promise<void>;
|
|
10
7
|
export {};
|
|
11
8
|
//# sourceMappingURL=deleteFile.d.ts.map
|
package/dist/deleteFile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"deleteFile.d.ts","sourceRoot":"","sources":["../src/deleteFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE1D,UAAU,UAAU;IAClB,MAAM,EAAE,eAAe,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,wBAAsB,UAAU,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvF"}
|
package/dist/deleteFile.js
CHANGED
|
@@ -1,12 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const { fileKey } = getFileKey({
|
|
4
|
-
collectionPrefix,
|
|
5
|
-
docPrefix,
|
|
6
|
-
filename,
|
|
7
|
-
useCompositePrefixes
|
|
8
|
-
});
|
|
9
|
-
const blockBlobClient = client.getBlockBlobClient(fileKey);
|
|
1
|
+
export async function deleteFile({ client, storageFilePath }) {
|
|
2
|
+
const blockBlobClient = client.getBlockBlobClient(storageFilePath);
|
|
10
3
|
await blockBlobClient.deleteIfExists();
|
|
11
4
|
}
|
|
12
5
|
|
package/dist/deleteFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\n\
|
|
1
|
+
{"version":3,"sources":["../src/deleteFile.ts"],"sourcesContent":["import type { ContainerClient } from '@azure/storage-blob'\n\ninterface DeleteArgs {\n client: ContainerClient\n storageFilePath: string\n}\n\nexport async function deleteFile({ client, storageFilePath }: DeleteArgs): Promise<void> {\n const blockBlobClient = client.getBlockBlobClient(storageFilePath)\n\n await blockBlobClient.deleteIfExists()\n}\n"],"names":["deleteFile","client","storageFilePath","blockBlobClient","getBlockBlobClient","deleteIfExists"],"mappings":"AAOA,OAAO,eAAeA,WAAW,EAAEC,MAAM,EAAEC,eAAe,EAAc;IACtE,MAAMC,kBAAkBF,OAAOG,kBAAkB,CAACF;IAElD,MAAMC,gBAAgBE,cAAc;AACtC"}
|
package/dist/generateURL.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities';
|
|
2
2
|
export function generateURL({ baseURL, collectionPrefix = '', containerName, filename, prefix, useCompositePrefixes = false }) {
|
|
3
|
-
const {
|
|
3
|
+
const { storageFilePath } = buildStoragePathData({
|
|
4
4
|
collectionPrefix,
|
|
5
5
|
docPrefix: prefix,
|
|
6
6
|
filename,
|
|
7
7
|
useCompositePrefixes
|
|
8
8
|
});
|
|
9
|
-
return `${baseURL}/${containerName}/${
|
|
9
|
+
return `${baseURL}/${containerName}/${storageFilePath}`;
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
//# sourceMappingURL=generateURL.js.map
|
package/dist/generateURL.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"sources":["../src/generateURL.ts"],"sourcesContent":["import { buildStoragePathData } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface GenerateURLArgs {\n baseURL: string\n collectionPrefix?: string\n containerName: string\n filename: string\n prefix: string\n useCompositePrefixes?: boolean\n}\n\nexport function generateURL({\n baseURL,\n collectionPrefix = '',\n containerName,\n filename,\n prefix,\n useCompositePrefixes = false,\n}: GenerateURLArgs): string {\n const { storageFilePath } = buildStoragePathData({\n collectionPrefix,\n docPrefix: prefix,\n filename,\n useCompositePrefixes,\n })\n\n return `${baseURL}/${containerName}/${storageFilePath}`\n}\n"],"names":["buildStoragePathData","generateURL","baseURL","collectionPrefix","containerName","filename","prefix","useCompositePrefixes","storageFilePath","docPrefix"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,6CAA4C;AAWjF,OAAO,SAASC,YAAY,EAC1BC,OAAO,EACPC,mBAAmB,EAAE,EACrBC,aAAa,EACbC,QAAQ,EACRC,MAAM,EACNC,uBAAuB,KAAK,EACZ;IAChB,MAAM,EAAEC,eAAe,EAAE,GAAGR,qBAAqB;QAC/CG;QACAM,WAAWH;QACXD;QACAE;IACF;IAEA,OAAO,GAAGL,QAAQ,CAAC,EAAEE,cAAc,CAAC,EAAEI,iBAAiB;AACzD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateUploadInstructions.d.ts","sourceRoot":"","sources":["../src/generateUploadInstructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"generateUploadInstructions.d.ts","sourceRoot":"","sources":["../src/generateUploadInstructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AASnF,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,wBAAwB,CAAA;IACjC,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,eAAe,CAAA;IACvC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,0BAA0B,yFAMpC,IAAI,KAAG,0BA8DT,CAAA"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob';
|
|
2
2
|
import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
|
|
3
|
-
import { Forbidden } from 'payload';
|
|
3
|
+
import { APIError, Forbidden } from 'payload';
|
|
4
|
+
import { assertClientUploadAllowed } from 'payload/internal';
|
|
5
|
+
import { isClientUploadAllowed } from './isClientUploadAllowed.js';
|
|
4
6
|
export const generateUploadInstructions = ({ access, collectionPrefix, containerName, getStorageClient, useCompositePrefixes = false })=>{
|
|
5
7
|
return async ({ collectionSlug, docPrefix, filename, filesize, mimeType, overrideAccess, req })=>{
|
|
6
8
|
if (!overrideAccess && (access ? !await access({
|
|
@@ -9,7 +11,16 @@ export const generateUploadInstructions = ({ access, collectionPrefix, container
|
|
|
9
11
|
}) : !req.user)) {
|
|
10
12
|
throw new Forbidden(req.t);
|
|
11
13
|
}
|
|
12
|
-
const
|
|
14
|
+
const collection = req.payload.collections[collectionSlug]?.config;
|
|
15
|
+
if (!isClientUploadAllowed(collection)) {
|
|
16
|
+
throw new APIError('Azure client uploads require allowRestrictedFileTypes to be enabled.', 400);
|
|
17
|
+
}
|
|
18
|
+
assertClientUploadAllowed({
|
|
19
|
+
collection,
|
|
20
|
+
filename,
|
|
21
|
+
mimeType
|
|
22
|
+
});
|
|
23
|
+
const { sanitizedFilename, storageFilePath, uploadReference } = await resolveSignedURLKey({
|
|
13
24
|
collectionPrefix,
|
|
14
25
|
collectionSlug,
|
|
15
26
|
docPrefix,
|
|
@@ -17,14 +28,15 @@ export const generateUploadInstructions = ({ access, collectionPrefix, container
|
|
|
17
28
|
req,
|
|
18
29
|
useCompositePrefixes
|
|
19
30
|
});
|
|
20
|
-
const blobClient = getStorageClient().getBlobClient(
|
|
31
|
+
const blobClient = getStorageClient().getBlobClient(storageFilePath);
|
|
21
32
|
const sasToken = generateBlobSASQueryParameters({
|
|
22
|
-
blobName:
|
|
33
|
+
blobName: storageFilePath,
|
|
23
34
|
containerName,
|
|
24
35
|
contentType: mimeType,
|
|
25
36
|
expiresOn: new Date(Date.now() + 3 * 60 * 60 * 1000),
|
|
26
|
-
permissions: BlobSASPermissions.parse('
|
|
27
|
-
startsOn: new Date()
|
|
37
|
+
permissions: BlobSASPermissions.parse('c'),
|
|
38
|
+
startsOn: new Date(),
|
|
39
|
+
version: '2026-04-06'
|
|
28
40
|
}, getStorageClient().credential);
|
|
29
41
|
return {
|
|
30
42
|
name: 'uploadToAzure',
|
|
@@ -36,9 +48,7 @@ export const generateUploadInstructions = ({ access, collectionPrefix, container
|
|
|
36
48
|
filename: sanitizedFilename,
|
|
37
49
|
mimeType,
|
|
38
50
|
size: filesize,
|
|
39
|
-
uploadReference
|
|
40
|
-
prefix: sanitizedDocPrefix
|
|
41
|
-
}
|
|
51
|
+
uploadReference
|
|
42
52
|
}
|
|
43
53
|
};
|
|
44
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/generateUploadInstructions.ts"],"sourcesContent":["import type { ContainerClient, StorageSharedKeyCredential } from '@azure/storage-blob'\nimport type { GenerateUploadInstructions, UploadInstructionsAccess } from 'payload'\n\nimport { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { Forbidden } from 'payload'\n\ninterface Args {\n access?: UploadInstructionsAccess\n collectionPrefix: string\n containerName: string\n getStorageClient: () => ContainerClient\n useCompositePrefixes?: boolean\n}\n\nexport const generateUploadInstructions = ({\n access,\n collectionPrefix,\n containerName,\n getStorageClient,\n useCompositePrefixes = false,\n}: Args): GenerateUploadInstructions => {\n return async ({\n collectionSlug,\n docPrefix,\n filename,\n filesize,\n mimeType,\n overrideAccess,\n req,\n }) => {\n if (!overrideAccess && (access ? !(await access({ collectionSlug, req })) : !req.user)) {\n throw new Forbidden(req.t)\n }\n\n const {
|
|
1
|
+
{"version":3,"sources":["../src/generateUploadInstructions.ts"],"sourcesContent":["import type { ContainerClient, StorageSharedKeyCredential } from '@azure/storage-blob'\nimport type { GenerateUploadInstructions, UploadInstructionsAccess } from 'payload'\n\nimport { BlobSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { APIError, Forbidden } from 'payload'\nimport { assertClientUploadAllowed } from 'payload/internal'\n\nimport { isClientUploadAllowed } from './isClientUploadAllowed.js'\n\ninterface Args {\n access?: UploadInstructionsAccess\n collectionPrefix: string\n containerName: string\n getStorageClient: () => ContainerClient\n useCompositePrefixes?: boolean\n}\n\nexport const generateUploadInstructions = ({\n access,\n collectionPrefix,\n containerName,\n getStorageClient,\n useCompositePrefixes = false,\n}: Args): GenerateUploadInstructions => {\n return async ({\n collectionSlug,\n docPrefix,\n filename,\n filesize,\n mimeType,\n overrideAccess,\n req,\n }) => {\n if (!overrideAccess && (access ? !(await access({ collectionSlug, req })) : !req.user)) {\n throw new Forbidden(req.t)\n }\n\n const collection = req.payload.collections[collectionSlug]?.config\n if (!isClientUploadAllowed(collection)) {\n throw new APIError(\n 'Azure client uploads require allowRestrictedFileTypes to be enabled.',\n 400,\n )\n }\n\n assertClientUploadAllowed({ collection, filename, mimeType })\n\n const { sanitizedFilename, storageFilePath, uploadReference } = await resolveSignedURLKey({\n collectionPrefix,\n collectionSlug,\n docPrefix,\n filename,\n req,\n useCompositePrefixes,\n })\n\n const blobClient = getStorageClient().getBlobClient(storageFilePath)\n\n const sasToken = generateBlobSASQueryParameters(\n {\n blobName: storageFilePath,\n containerName,\n contentType: mimeType,\n expiresOn: new Date(Date.now() + 3 * 60 * 60 * 1000),\n permissions: BlobSASPermissions.parse('c'),\n startsOn: new Date(),\n version: '2026-04-06',\n },\n getStorageClient().credential as StorageSharedKeyCredential,\n )\n\n return {\n name: 'uploadToAzure',\n type: 'dispatch',\n data: {\n url: `${blobClient.url}?${sasToken.toString()}`,\n },\n file: {\n filename: sanitizedFilename,\n mimeType,\n size: filesize,\n uploadReference,\n },\n }\n }\n}\n"],"names":["BlobSASPermissions","generateBlobSASQueryParameters","resolveSignedURLKey","APIError","Forbidden","assertClientUploadAllowed","isClientUploadAllowed","generateUploadInstructions","access","collectionPrefix","containerName","getStorageClient","useCompositePrefixes","collectionSlug","docPrefix","filename","filesize","mimeType","overrideAccess","req","user","t","collection","payload","collections","config","sanitizedFilename","storageFilePath","uploadReference","blobClient","getBlobClient","sasToken","blobName","contentType","expiresOn","Date","now","permissions","parse","startsOn","version","credential","name","type","data","url","toString","file","size"],"mappings":"AAGA,SAASA,kBAAkB,EAAEC,8BAA8B,QAAQ,sBAAqB;AACxF,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,QAAQ,EAAEC,SAAS,QAAQ,UAAS;AAC7C,SAASC,yBAAyB,QAAQ,mBAAkB;AAE5D,SAASC,qBAAqB,QAAQ,6BAA4B;AAUlE,OAAO,MAAMC,6BAA6B,CAAC,EACzCC,MAAM,EACNC,gBAAgB,EAChBC,aAAa,EACbC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAO,EACZC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,QAAQ,EACRC,cAAc,EACdC,GAAG,EACJ;QACC,IAAI,CAACD,kBAAmBV,CAAAA,SAAS,CAAE,MAAMA,OAAO;YAAEK;YAAgBM;QAAI,KAAM,CAACA,IAAIC,IAAI,AAAD,GAAI;YACtF,MAAM,IAAIhB,UAAUe,IAAIE,CAAC;QAC3B;QAEA,MAAMC,aAAaH,IAAII,OAAO,CAACC,WAAW,CAACX,eAAe,EAAEY;QAC5D,IAAI,CAACnB,sBAAsBgB,aAAa;YACtC,MAAM,IAAInB,SACR,wEACA;QAEJ;QAEAE,0BAA0B;YAAEiB;YAAYP;YAAUE;QAAS;QAE3D,MAAM,EAAES,iBAAiB,EAAEC,eAAe,EAAEC,eAAe,EAAE,GAAG,MAAM1B,oBAAoB;YACxFO;YACAI;YACAC;YACAC;YACAI;YACAP;QACF;QAEA,MAAMiB,aAAalB,mBAAmBmB,aAAa,CAACH;QAEpD,MAAMI,WAAW9B,+BACf;YACE+B,UAAUL;YACVjB;YACAuB,aAAahB;YACbiB,WAAW,IAAIC,KAAKA,KAAKC,GAAG,KAAK,IAAI,KAAK,KAAK;YAC/CC,aAAarC,mBAAmBsC,KAAK,CAAC;YACtCC,UAAU,IAAIJ;YACdK,SAAS;QACX,GACA7B,mBAAmB8B,UAAU;QAG/B,OAAO;YACLC,MAAM;YACNC,MAAM;YACNC,MAAM;gBACJC,KAAK,GAAGhB,WAAWgB,GAAG,CAAC,CAAC,EAAEd,SAASe,QAAQ,IAAI;YACjD;YACAC,MAAM;gBACJhC,UAAUW;gBACVT;gBACA+B,MAAMhC;gBACNY;YACF;QACF;IACF;AACF,EAAC"}
|
package/dist/getFile.d.ts
CHANGED
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
import type { ContainerClient } from '@azure/storage-blob';
|
|
2
|
-
import type { CollectionConfig, PayloadRequest } from 'payload';
|
|
2
|
+
import type { CollectionConfig, FileHandlerOperation, PayloadRequest, TypeWithID } from 'payload';
|
|
3
3
|
interface GetFileArgs {
|
|
4
4
|
client: ContainerClient;
|
|
5
5
|
collection: CollectionConfig;
|
|
6
6
|
collectionPrefix?: string;
|
|
7
|
+
doc?: TypeWithID;
|
|
7
8
|
filename: string;
|
|
8
9
|
incomingHeaders?: Headers;
|
|
9
|
-
|
|
10
|
+
isOriginal?: boolean;
|
|
11
|
+
operation?: FileHandlerOperation;
|
|
10
12
|
req: PayloadRequest;
|
|
11
13
|
uploadReference?: unknown;
|
|
12
14
|
useCompositePrefixes?: boolean;
|
|
13
15
|
}
|
|
14
|
-
export declare function getFile({ client, collection, collectionPrefix, filename, incomingHeaders,
|
|
16
|
+
export declare function getFile({ client, collection, collectionPrefix, doc, filename, incomingHeaders, isOriginal, operation, req, uploadReference, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
|
|
15
17
|
export {};
|
|
16
18
|
//# 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,EAA8B,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA8B,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAUjG,UAAU,WAAW;IACnB,MAAM,EAAE,eAAe,CAAA;IACvB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,CAAC,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,GAAG,EAAE,cAAc,CAAA;IACnB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAgCD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,UAAU,EACV,gBAAqB,EACrB,GAAG,EACH,QAAQ,EACR,eAAe,EACf,UAAU,EACV,SAAkB,EAClB,GAAG,EACH,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuHjC"}
|
package/dist/getFile.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RestError } from '@azure/storage-blob';
|
|
2
|
-
import { getFilePrefix as getDocPrefix
|
|
3
|
-
import { getRangeRequestInfo } from 'payload/internal';
|
|
2
|
+
import { buildStoragePathData, getFilePrefix as getDocPrefix } from '@payloadcms/plugin-cloud-storage/utilities';
|
|
3
|
+
import { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal';
|
|
4
4
|
const isNodeReadableStream = (body)=>{
|
|
5
5
|
return typeof body === 'object' && body !== null && 'pipe' in body && typeof body.pipe === 'function' && 'destroy' in body && typeof body.destroy === 'function';
|
|
6
6
|
};
|
|
@@ -13,7 +13,8 @@ const abortRequestAndDestroyStream = ({ abortController, blob })=>{
|
|
|
13
13
|
blob.readableStreamBody.destroy();
|
|
14
14
|
}
|
|
15
15
|
};
|
|
16
|
-
export async function getFile({ client, collection, collectionPrefix = '', filename, incomingHeaders,
|
|
16
|
+
export async function getFile({ client, collection, collectionPrefix = '', doc, filename, incomingHeaders, isOriginal, operation = 'read', req, uploadReference, useCompositePrefixes = false }) {
|
|
17
|
+
const isTransformSource = operation === 'transform';
|
|
17
18
|
let blob = undefined;
|
|
18
19
|
let streamed = false;
|
|
19
20
|
const abortController = new AbortController();
|
|
@@ -28,19 +29,21 @@ export async function getFile({ client, collection, collectionPrefix = '', filen
|
|
|
28
29
|
try {
|
|
29
30
|
const docPrefix = await getDocPrefix({
|
|
30
31
|
collection,
|
|
32
|
+
collectionPrefix,
|
|
33
|
+
doc,
|
|
31
34
|
filename,
|
|
32
|
-
|
|
35
|
+
isOriginal,
|
|
33
36
|
req,
|
|
34
|
-
uploadReference
|
|
37
|
+
uploadReference,
|
|
38
|
+
useCompositePrefixes
|
|
35
39
|
});
|
|
36
|
-
const {
|
|
40
|
+
const { storageFilePath } = buildStoragePathData({
|
|
37
41
|
collectionPrefix,
|
|
38
42
|
docPrefix,
|
|
39
43
|
filename,
|
|
40
44
|
useCompositePrefixes
|
|
41
45
|
});
|
|
42
|
-
const blockBlobClient = client.getBlockBlobClient(
|
|
43
|
-
// Get file size for range validation
|
|
46
|
+
const blockBlobClient = client.getBlockBlobClient(storageFilePath);
|
|
44
47
|
const properties = await blockBlobClient.getProperties();
|
|
45
48
|
const fileSize = properties.contentLength;
|
|
46
49
|
if (!fileSize) {
|
|
@@ -48,8 +51,7 @@ export async function getFile({ client, collection, collectionPrefix = '', filen
|
|
|
48
51
|
status: 500
|
|
49
52
|
});
|
|
50
53
|
}
|
|
51
|
-
|
|
52
|
-
const rangeHeader = req.headers.get('range');
|
|
54
|
+
const rangeHeader = isTransformSource ? null : req.headers.get('range');
|
|
53
55
|
const rangeResult = getRangeRequestInfo({
|
|
54
56
|
fileSize,
|
|
55
57
|
rangeHeader
|
|
@@ -60,33 +62,30 @@ export async function getFile({ client, collection, collectionPrefix = '', filen
|
|
|
60
62
|
status: rangeResult.status
|
|
61
63
|
});
|
|
62
64
|
}
|
|
63
|
-
// Download with range if partial
|
|
64
65
|
blob = rangeResult.type === 'partial' ? await blockBlobClient.download(rangeResult.rangeStart, rangeResult.rangeEnd - rangeResult.rangeStart + 1, {
|
|
65
66
|
abortSignal: abortController.signal
|
|
66
67
|
}) : await blockBlobClient.download(0, undefined, {
|
|
67
68
|
abortSignal: abortController.signal
|
|
68
69
|
});
|
|
69
70
|
let headers = new Headers(incomingHeaders);
|
|
70
|
-
// Add range-related headers from the result
|
|
71
71
|
for (const [key, value] of Object.entries(rangeResult.headers)){
|
|
72
72
|
headers.append(key, value);
|
|
73
73
|
}
|
|
74
|
-
// Add Azure-specific headers
|
|
75
74
|
headers.append('Content-Type', String(properties.contentType));
|
|
76
75
|
if (properties.etag) {
|
|
77
76
|
headers.append('ETag', String(properties.etag));
|
|
78
77
|
}
|
|
79
|
-
//
|
|
80
|
-
if (properties.contentType
|
|
81
|
-
headers.append('Content-Security-Policy',
|
|
78
|
+
// Apply a restrictive policy to XML-family responses served through Payload.
|
|
79
|
+
if (isXmlMimeType(properties.contentType)) {
|
|
80
|
+
headers.append('Content-Security-Policy', uploadContentSecurityPolicy);
|
|
82
81
|
}
|
|
83
82
|
const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match');
|
|
84
|
-
if (collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
|
|
83
|
+
if (!isTransformSource && collection.upload && typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
|
|
85
84
|
headers = collection.upload.modifyResponseHeaders({
|
|
86
85
|
headers
|
|
87
86
|
}) || headers;
|
|
88
87
|
}
|
|
89
|
-
if (etagFromHeaders && etagFromHeaders === properties.etag) {
|
|
88
|
+
if (!isTransformSource && etagFromHeaders && etagFromHeaders === properties.etag) {
|
|
90
89
|
return new Response(null, {
|
|
91
90
|
headers,
|
|
92
91
|
status: 304
|
package/dist/getFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { BlobDownloadResponseParsed, ContainerClient } from '@azure/storage-blob'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { RestError } from '@azure/storage-blob'\nimport {\n getFilePrefix as getDocPrefix,\n
|
|
1
|
+
{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type { BlobDownloadResponseParsed, ContainerClient } from '@azure/storage-blob'\nimport type { CollectionConfig, FileHandlerOperation, PayloadRequest, TypeWithID } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { RestError } from '@azure/storage-blob'\nimport {\n buildStoragePathData,\n getFilePrefix as getDocPrefix,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo, isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal'\n\ninterface GetFileArgs {\n client: ContainerClient\n collection: CollectionConfig\n collectionPrefix?: string\n doc?: TypeWithID\n filename: string\n incomingHeaders?: Headers\n isOriginal?: boolean\n operation?: FileHandlerOperation\n req: PayloadRequest\n uploadReference?: unknown\n useCompositePrefixes?: boolean\n}\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\nexport async function getFile({\n client,\n collection,\n collectionPrefix = '',\n doc,\n filename,\n incomingHeaders,\n isOriginal,\n operation = 'read',\n req,\n uploadReference,\n useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n const isTransformSource = operation === 'transform'\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 docPrefix = await getDocPrefix({\n collection,\n collectionPrefix,\n doc,\n filename,\n isOriginal,\n req,\n uploadReference,\n useCompositePrefixes,\n })\n\n const { storageFilePath } = buildStoragePathData({\n collectionPrefix,\n docPrefix,\n filename,\n useCompositePrefixes,\n })\n\n const blockBlobClient = client.getBlockBlobClient(storageFilePath)\n\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 const rangeHeader = isTransformSource ? null : 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 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 for (const [key, value] of Object.entries(rangeResult.headers)) {\n headers.append(key, value)\n }\n\n headers.append('Content-Type', String(properties.contentType))\n if (properties.etag) {\n headers.append('ETag', String(properties.etag))\n }\n\n // Apply a restrictive policy to XML-family responses served through Payload.\n if (isXmlMimeType(properties.contentType)) {\n headers.append('Content-Security-Policy', uploadContentSecurityPolicy)\n }\n\n const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n\n if (\n !isTransformSource &&\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 (!isTransformSource && 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"],"names":["RestError","buildStoragePathData","getFilePrefix","getDocPrefix","getRangeRequestInfo","isXmlMimeType","uploadContentSecurityPolicy","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","blob","abort","readableStreamBody","getFile","client","collection","collectionPrefix","doc","filename","incomingHeaders","isOriginal","operation","req","uploadReference","useCompositePrefixes","isTransformSource","undefined","streamed","AbortController","signal","addEventListener","docPrefix","storageFilePath","blockBlobClient","getBlockBlobClient","properties","getProperties","fileSize","contentLength","Response","status","rangeHeader","headers","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":"AAIA,SAASA,SAAS,QAAQ,sBAAqB;AAC/C,SACEC,oBAAoB,EACpBC,iBAAiBC,YAAY,QACxB,6CAA4C;AACnD,SAASC,mBAAmB,EAAEC,aAAa,EAAEC,2BAA2B,QAAQ,mBAAkB;AAgBlG,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;AAEA,OAAO,eAAeM,QAAQ,EAC5BC,MAAM,EACNC,UAAU,EACVC,mBAAmB,EAAE,EACrBC,GAAG,EACHC,QAAQ,EACRC,eAAe,EACfC,UAAU,EACVC,YAAY,MAAM,EAClBC,GAAG,EACHC,eAAe,EACfC,uBAAuB,KAAK,EAChB;IACZ,MAAMC,oBAAoBJ,cAAc;IACxC,IAAIX,OAA+CgB;IACnD,IAAIC,WAAW;IAEf,MAAMlB,kBAAkB,IAAImB;IAC5B,IAAIN,IAAIO,MAAM,EAAE;QACdP,IAAIO,MAAM,CAACC,gBAAgB,CAAC,SAAS;YACnCtB,6BAA6B;gBAAEC;gBAAiBC;YAAK;QACvD;IACF;IAEA,IAAI;QACF,MAAMqB,YAAY,MAAM/B,aAAa;YACnCe;YACAC;YACAC;YACAC;YACAE;YACAE;YACAC;YACAC;QACF;QAEA,MAAM,EAAEQ,eAAe,EAAE,GAAGlC,qBAAqB;YAC/CkB;YACAe;YACAb;YACAM;QACF;QAEA,MAAMS,kBAAkBnB,OAAOoB,kBAAkB,CAACF;QAElD,MAAMG,aAAa,MAAMF,gBAAgBG,aAAa;QACtD,MAAMC,WAAWF,WAAWG,aAAa;QAEzC,IAAI,CAACD,UAAU;YACb,OAAO,IAAIE,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;QAEA,MAAMC,cAAchB,oBAAoB,OAAOH,IAAIoB,OAAO,CAACC,GAAG,CAAC;QAC/D,MAAMC,cAAc3C,oBAAoB;YAAEoC;YAAUI;QAAY;QAEhE,IAAIG,YAAYC,IAAI,KAAK,WAAW;YAClC,OAAO,IAAIN,SAAS,MAAM;gBACxBG,SAAS,IAAII,QAAQF,YAAYF,OAAO;gBACxCF,QAAQI,YAAYJ,MAAM;YAC5B;QACF;QAEA9B,OACEkC,YAAYC,IAAI,KAAK,YACjB,MAAMZ,gBAAgBc,QAAQ,CAC5BH,YAAYI,UAAU,EACtBJ,YAAYK,QAAQ,GAAGL,YAAYI,UAAU,GAAG,GAChD;YAAEE,aAAazC,gBAAgBoB,MAAM;QAAC,KAExC,MAAMI,gBAAgBc,QAAQ,CAAC,GAAGrB,WAAW;YAAEwB,aAAazC,gBAAgBoB,MAAM;QAAC;QAEzF,IAAIa,UAAU,IAAII,QAAQ3B;QAE1B,KAAK,MAAM,CAACgC,KAAKC,MAAM,IAAIC,OAAOC,OAAO,CAACV,YAAYF,OAAO,EAAG;YAC9DA,QAAQa,MAAM,CAACJ,KAAKC;QACtB;QAEAV,QAAQa,MAAM,CAAC,gBAAgBC,OAAOrB,WAAWsB,WAAW;QAC5D,IAAItB,WAAWuB,IAAI,EAAE;YACnBhB,QAAQa,MAAM,CAAC,QAAQC,OAAOrB,WAAWuB,IAAI;QAC/C;QAEA,6EAA6E;QAC7E,IAAIxD,cAAciC,WAAWsB,WAAW,GAAG;YACzCf,QAAQa,MAAM,CAAC,2BAA2BpD;QAC5C;QAEA,MAAMwD,kBAAkBrC,IAAIoB,OAAO,CAACC,GAAG,CAAC,WAAWrB,IAAIoB,OAAO,CAACC,GAAG,CAAC;QAEnE,IACE,CAAClB,qBACDV,WAAW6C,MAAM,IACjB,OAAO7C,WAAW6C,MAAM,KAAK,YAC7B,OAAO7C,WAAW6C,MAAM,CAACC,qBAAqB,KAAK,YACnD;YACAnB,UAAU3B,WAAW6C,MAAM,CAACC,qBAAqB,CAAC;gBAAEnB;YAAQ,MAAMA;QACpE;QAEA,IAAI,CAACjB,qBAAqBkC,mBAAmBA,oBAAoBxB,WAAWuB,IAAI,EAAE;YAChF,OAAO,IAAInB,SAAS,MAAM;gBACxBG;gBACAF,QAAQ;YACV;QACF;QAEA,IAAI,CAAC9B,KAAKE,kBAAkB,IAAI,CAACR,qBAAqBM,KAAKE,kBAAkB,GAAG;YAC9E,OAAO,IAAI2B,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;QAEA,MAAMsB,SAASpD,KAAKE,kBAAkB;QACtCkD,OAAOC,EAAE,CAAC,SAAS,CAACC;YAClB1C,IAAI2C,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBACvBH;gBACAI,KAAK;YACP;YACA5D,6BAA6B;gBAAEC;gBAAiBC;YAAK;QACvD;QAEAiB,WAAW;QACX,OAAO,IAAIY,SAASuB,QAAQ;YAAEpB;YAASF,QAAQI,YAAYJ,MAAM;QAAC;IACpE,EAAE,OAAOwB,KAAc;QACrB,IAAIA,eAAenE,aAAamE,IAAIK,UAAU,KAAK,KAAK;YACtD,OAAO,IAAI9B,SAAS,MAAM;gBAAEC,QAAQ;gBAAK8B,YAAY;YAAY;QACnE;QACAhD,IAAI2C,OAAO,CAACC,MAAM,CAACC,KAAK,CAACH;QACzB,OAAO,IAAIzB,SAAS,yBAAyB;YAAEC,QAAQ;QAAI;IAC7D,SAAU;QACR,IAAI,CAACb,UAAU;YACbnB,6BAA6B;gBAAEC;gBAAiBC;YAAK;QACvD;IACF;AACF"}
|