@strapi/data-transfer 5.48.0 → 5.49.0

package/dist/strapi/providers/local-destination/assets-destination-writable.js

@@ -5,9 +5,14 @@ var stream = require('stream');
 /**
  * Writable for restoring upload assets during a local push destination transfer.
  *
- * The Writable `write()` callback must return as soon as the chunk is accepted — **before**
- * `uploadStream` finishes — so the remote push handler can feed PassThrough data in the same
- * WebSocket batch after an asset `start` row (see `streamAsset` in remote `push` handler).
+ * Design constraints:
+ * 1. The `write()` callback must return **before** `uploadStream` finishes so the remote push
+ *    handler can continue feeding chunks to the PassThrough stream in the same WebSocket batch
+ *    (avoids deadlock — see `streamAsset` in the remote push handler).
+ * 2. `uploadStream` is only called **after** the PassThrough has been fully drained (all chunks
+ *    received and the stream ended). This gives the upload provider a pre-filled synchronous
+ *    Readable rather than a lazy async wrapper, which avoids `Buffer.from(undefined)` crashes
+ *    in upload providers that call `stream.read()` before any data has been buffered.
  */ function createAssetsDestinationWritable(options) {
     const { strapi, transaction, resolveUploadFileId, restoreMediaEntitiesContent, removeAssetsBackup } = options;
     let pendingUploads = 0;
@@ -23,29 +28,60 @@ var stream = require('stream');
             next();
         },
         write (chunk, _encoding, callback) {
-            const uploadData = {
-                ...chunk.metadata,
-                stream: stream.Readable.from(chunk.stream),
-                buffer: chunk?.buffer
-            };
             const provider = strapi.config.get('plugin::upload').provider;
-            const fileId = resolveUploadFileId(uploadData);
+            const fileId = resolveUploadFileId(chunk.metadata);
             if (!fileId) {
-                callback(new Error(`File ID not found for ID: ${uploadData.id}`));
+                callback(new Error(`File ID not found for ID: ${chunk.metadata.id}`));
                 return;
             }
             if (!transaction) {
                 callback(new Error('Transaction not available for asset upload'));
                 return;
             }
+            // Accumulate all binary chunks from the PassThrough as they arrive (flowing mode).
+            // uploadStream is only started once the stream ends — see constraint (2) above.
+            const bufferedChunks = [];
+            chunk.stream.on('data', (c)=>bufferedChunks.push(c));
             pendingUploads += 1;
-            transaction.attach(async ()=>{
-                try {
-                    await strapi.plugin('upload').provider.uploadStream(uploadData);
-                    if (!restoreMediaEntitiesContent) {
-                        return;
-                    }
-                    if (uploadData?.type) {
+            chunk.stream.once('end', ()=>{
+                // Build uploadData here so the stream is fully populated before the provider reads it.
+                const uploadData = {
+                    ...chunk.metadata,
+                    stream: stream.Readable.from(bufferedChunks),
+                    ...chunk.buffer != null ? {
+                        buffer: chunk.buffer
+                    } : {}
+                };
+                transaction.attach(async ()=>{
+                    try {
+                        await strapi.plugin('upload').provider.uploadStream(uploadData);
+                        if (!restoreMediaEntitiesContent) {
+                            return;
+                        }
+                        if (uploadData?.type) {
+                            const entry = await strapi.db.query('plugin::upload.file').findOne({
+                                where: {
+                                    id: fileId
+                                }
+                            });
+                            if (!entry) {
+                                throw new Error('file not found');
+                            }
+                            const specificFormat = entry?.formats?.[uploadData.type];
+                            if (specificFormat) {
+                                specificFormat.url = uploadData.url;
+                            }
+                            await strapi.db.query('plugin::upload.file').update({
+                                where: {
+                                    id: entry.id
+                                },
+                                data: {
+                                    formats: entry.formats,
+                                    provider
+                                }
+                            });
+                            return;
+                        }
                         const entry = await strapi.db.query('plugin::upload.file').findOne({
                             where: {
                                 id: fileId
@@ -54,50 +90,32 @@ var stream = require('stream');
                         if (!entry) {
                             throw new Error('file not found');
                         }
-                        const specificFormat = entry?.formats?.[uploadData.type];
-                        if (specificFormat) {
-                            specificFormat.url = uploadData.url;
-                        }
+                        entry.url = uploadData.url;
                         await strapi.db.query('plugin::upload.file').update({
                             where: {
                                 id: entry.id
                             },
                             data: {
-                                formats: entry.formats,
+                                url: entry.url,
                                 provider
                             }
                         });
-                        return;
+                    } catch (error) {
+                        throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);
                     }
-                    const entry = await strapi.db.query('plugin::upload.file').findOne({
-                        where: {
-                            id: fileId
-                        }
+                }).finally(()=>{
+                    pendingUploads -= 1;
+                }).catch((error)=>{
+                    const err = error instanceof Error ? error : new Error(String(error));
+                    process.nextTick(()=>{
+                        this.destroy(err);
                     });
-                    if (!entry) {
-                        throw new Error('file not found');
-                    }
-                    entry.url = uploadData.url;
-                    await strapi.db.query('plugin::upload.file').update({
-                        where: {
-                            id: entry.id
-                        },
-                        data: {
-                            url: entry.url,
-                            provider
-                        }
-                    });
-                } catch (error) {
-                    throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);
-                }
-            }).finally(()=>{
-                pendingUploads -= 1;
-            }).catch((error)=>{
-                const err = error instanceof Error ? error : new Error(String(error));
-                process.nextTick(()=>{
-                    this.destroy(err);
                 });
             });
+            chunk.stream.once('error', (err)=>{
+                pendingUploads -= 1;
+                process.nextTick(()=>this.destroy(err));
+            });
             callback();
         }
     });

package/dist/strapi/providers/local-destination/assets-destination-writable.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets-destination-writable.js","sources":["../../../../src/strapi/providers/local-destination/assets-destination-writable.ts"],"sourcesContent":["import { Writable, Readable } from 'stream';\nimport type { Core } from '@strapi/types';\n\nimport type { IAsset, IFile } from '../../../../types';\nimport type { Transaction } from '../../../../types/utils';\n\nexport interface CreateAssetsDestinationWritableOptions {\n  strapi: Core.Strapi;\n  transaction: Transaction;\n  resolveUploadFileId: (metadata: { id: number }) => number | undefined;\n  restoreMediaEntitiesContent: boolean;\n  removeAssetsBackup: () => Promise<void>;\n}\n\n/**\n * Writable for restoring upload assets during a local push destination transfer.\n *\n * The Writable `write()` callback must return as soon as the chunk is accepted — **before**\n * `uploadStream` finishes — so the remote push handler can feed PassThrough data in the same\n * WebSocket batch after an asset `start` row (see `streamAsset` in remote `push` handler).\n */\nexport function createAssetsDestinationWritable(\n  options: CreateAssetsDestinationWritableOptions\n): Writable {\n  const {\n    strapi,\n    transaction,\n    resolveUploadFileId,\n    restoreMediaEntitiesContent,\n    removeAssetsBackup,\n  } = options;\n\n  let pendingUploads = 0;\n\n  return new Writable({\n    objectMode: true,\n    async final(next) {\n      while (pendingUploads > 0) {\n        await new Promise<void>((resolve) => {\n          setImmediate(resolve);\n        });\n      }\n      await removeAssetsBackup();\n      next();\n    },\n    write(chunk: IAsset, _encoding, callback) {\n      const uploadData = {\n        ...chunk.metadata,\n        stream: Readable.from(chunk.stream),\n        buffer: chunk?.buffer,\n      };\n\n      const provider = strapi.config.get<{ provider: string }>('plugin::upload').provider;\n\n      const fileId = resolveUploadFileId(uploadData);\n      if (!fileId) {\n        callback(new Error(`File ID not found for ID: ${uploadData.id}`));\n        return;\n      }\n\n      if (!transaction) {\n        callback(new Error('Transaction not available for asset upload'));\n        return;\n      }\n\n      pendingUploads += 1;\n      transaction\n        .attach(async () => {\n          try {\n            await strapi.plugin('upload').provider.uploadStream(uploadData);\n\n            if (!restoreMediaEntitiesContent) {\n              return;\n            }\n\n            if (uploadData?.type) {\n              const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n                where: { id: fileId },\n              });\n              if (!entry) {\n                throw new Error('file not found');\n              }\n              const specificFormat = entry?.formats?.[uploadData.type];\n              if (specificFormat) {\n                specificFormat.url = uploadData.url;\n              }\n              await strapi.db.query('plugin::upload.file').update({\n                where: { id: entry.id },\n                data: {\n                  formats: entry.formats,\n                  provider,\n                },\n              });\n              return;\n            }\n\n            const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n              where: { id: fileId },\n            });\n            if (!entry) {\n              throw new Error('file not found');\n            }\n            entry.url = uploadData.url;\n            await strapi.db.query('plugin::upload.file').update({\n              where: { id: entry.id },\n              data: {\n                url: entry.url,\n                provider,\n              },\n            });\n          } catch (error) {\n            throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);\n          }\n        })\n        .finally(() => {\n          pendingUploads -= 1;\n        })\n        .catch((error: unknown) => {\n          const err = error instanceof Error ? error : new Error(String(error));\n          process.nextTick(() => {\n            this.destroy(err);\n          });\n        });\n\n      callback();\n    },\n  });\n}\n"],"names":["createAssetsDestinationWritable","options","strapi","transaction","resolveUploadFileId","restoreMediaEntitiesContent","removeAssetsBackup","pendingUploads","Writable","objectMode","final","next","Promise","resolve","setImmediate","write","chunk","_encoding","callback","uploadData","metadata","stream","Readable","from","buffer","provider","config","get","fileId","Error","id","attach","plugin","uploadStream","type","entry","db","query","findOne","where","specificFormat","formats","url","update","data","error","filename","finally","catch","err","String","process","nextTick","destroy"],"mappings":"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"}
+{"version":3,"file":"assets-destination-writable.js","sources":["../../../../src/strapi/providers/local-destination/assets-destination-writable.ts"],"sourcesContent":["import { Writable, Readable } from 'stream';\nimport type { Core } from '@strapi/types';\n\nimport type { IAsset, IFile } from '../../../types';\nimport type { Transaction } from '../../../types/utils';\n\nexport interface CreateAssetsDestinationWritableOptions {\n  strapi: Core.Strapi;\n  transaction: Transaction;\n  resolveUploadFileId: (metadata: { id: number }) => number | undefined;\n  restoreMediaEntitiesContent: boolean;\n  removeAssetsBackup: () => Promise<void>;\n}\n\n/**\n * Writable for restoring upload assets during a local push destination transfer.\n *\n * Design constraints:\n * 1. The `write()` callback must return **before** `uploadStream` finishes so the remote push\n *    handler can continue feeding chunks to the PassThrough stream in the same WebSocket batch\n *    (avoids deadlock — see `streamAsset` in the remote push handler).\n * 2. `uploadStream` is only called **after** the PassThrough has been fully drained (all chunks\n *    received and the stream ended). This gives the upload provider a pre-filled synchronous\n *    Readable rather than a lazy async wrapper, which avoids `Buffer.from(undefined)` crashes\n *    in upload providers that call `stream.read()` before any data has been buffered.\n */\nexport function createAssetsDestinationWritable(\n  options: CreateAssetsDestinationWritableOptions\n): Writable {\n  const {\n    strapi,\n    transaction,\n    resolveUploadFileId,\n    restoreMediaEntitiesContent,\n    removeAssetsBackup,\n  } = options;\n\n  let pendingUploads = 0;\n\n  return new Writable({\n    objectMode: true,\n    async final(next) {\n      while (pendingUploads > 0) {\n        await new Promise<void>((resolve) => {\n          setImmediate(resolve);\n        });\n      }\n      await removeAssetsBackup();\n      next();\n    },\n    write(chunk: IAsset, _encoding, callback) {\n      const provider = strapi.config.get<{ provider: string }>('plugin::upload').provider;\n\n      const fileId = resolveUploadFileId(chunk.metadata);\n      if (!fileId) {\n        callback(new Error(`File ID not found for ID: ${chunk.metadata.id}`));\n        return;\n      }\n\n      if (!transaction) {\n        callback(new Error('Transaction not available for asset upload'));\n        return;\n      }\n\n      // Accumulate all binary chunks from the PassThrough as they arrive (flowing mode).\n      // uploadStream is only started once the stream ends — see constraint (2) above.\n      const bufferedChunks: Buffer[] = [];\n      chunk.stream.on('data', (c: Buffer) => bufferedChunks.push(c));\n\n      pendingUploads += 1;\n\n      chunk.stream.once('end', () => {\n        // Build uploadData here so the stream is fully populated before the provider reads it.\n        const uploadData = {\n          ...chunk.metadata,\n          stream: Readable.from(bufferedChunks),\n          ...(chunk.buffer != null ? { buffer: chunk.buffer } : {}),\n        };\n\n        transaction\n          .attach(async () => {\n            try {\n              await strapi.plugin('upload').provider.uploadStream(uploadData);\n\n              if (!restoreMediaEntitiesContent) {\n                return;\n              }\n\n              if (uploadData?.type) {\n                const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n                  where: { id: fileId },\n                });\n                if (!entry) {\n                  throw new Error('file not found');\n                }\n                const specificFormat = entry?.formats?.[uploadData.type];\n                if (specificFormat) {\n                  specificFormat.url = uploadData.url;\n                }\n                await strapi.db.query('plugin::upload.file').update({\n                  where: { id: entry.id },\n                  data: {\n                    formats: entry.formats,\n                    provider,\n                  },\n                });\n                return;\n              }\n\n              const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n                where: { id: fileId },\n              });\n              if (!entry) {\n                throw new Error('file not found');\n              }\n              entry.url = uploadData.url;\n              await strapi.db.query('plugin::upload.file').update({\n                where: { id: entry.id },\n                data: {\n                  url: entry.url,\n                  provider,\n                },\n              });\n            } catch (error) {\n              throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);\n            }\n          })\n          .finally(() => {\n            pendingUploads -= 1;\n          })\n          .catch((error: unknown) => {\n            const err = error instanceof Error ? error : new Error(String(error));\n            process.nextTick(() => {\n              this.destroy(err);\n            });\n          });\n      });\n\n      chunk.stream.once('error', (err) => {\n        pendingUploads -= 1;\n        process.nextTick(() => this.destroy(err));\n      });\n\n      callback();\n    },\n  });\n}\n"],"names":["createAssetsDestinationWritable","options","strapi","transaction","resolveUploadFileId","restoreMediaEntitiesContent","removeAssetsBackup","pendingUploads","Writable","objectMode","final","next","Promise","resolve","setImmediate","write","chunk","_encoding","callback","provider","config","get","fileId","metadata","Error","id","bufferedChunks","stream","on","c","push","once","uploadData","Readable","from","buffer","attach","plugin","uploadStream","type","entry","db","query","findOne","where","specificFormat","formats","url","update","data","error","filename","finally","catch","err","String","process","nextTick","destroy"],"mappings":"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"}

package/dist/strapi/providers/local-destination/assets-destination-writable.mjs

@@ -3,9 +3,14 @@ import { Writable, Readable } from 'stream';
 /**
  * Writable for restoring upload assets during a local push destination transfer.
  *
- * The Writable `write()` callback must return as soon as the chunk is accepted — **before**
- * `uploadStream` finishes — so the remote push handler can feed PassThrough data in the same
- * WebSocket batch after an asset `start` row (see `streamAsset` in remote `push` handler).
+ * Design constraints:
+ * 1. The `write()` callback must return **before** `uploadStream` finishes so the remote push
+ *    handler can continue feeding chunks to the PassThrough stream in the same WebSocket batch
+ *    (avoids deadlock — see `streamAsset` in the remote push handler).
+ * 2. `uploadStream` is only called **after** the PassThrough has been fully drained (all chunks
+ *    received and the stream ended). This gives the upload provider a pre-filled synchronous
+ *    Readable rather than a lazy async wrapper, which avoids `Buffer.from(undefined)` crashes
+ *    in upload providers that call `stream.read()` before any data has been buffered.
  */ function createAssetsDestinationWritable(options) {
     const { strapi, transaction, resolveUploadFileId, restoreMediaEntitiesContent, removeAssetsBackup } = options;
     let pendingUploads = 0;
@@ -21,29 +26,60 @@ import { Writable, Readable } from 'stream';
             next();
         },
         write (chunk, _encoding, callback) {
-            const uploadData = {
-                ...chunk.metadata,
-                stream: Readable.from(chunk.stream),
-                buffer: chunk?.buffer
-            };
             const provider = strapi.config.get('plugin::upload').provider;
-            const fileId = resolveUploadFileId(uploadData);
+            const fileId = resolveUploadFileId(chunk.metadata);
             if (!fileId) {
-                callback(new Error(`File ID not found for ID: ${uploadData.id}`));
+                callback(new Error(`File ID not found for ID: ${chunk.metadata.id}`));
                 return;
             }
             if (!transaction) {
                 callback(new Error('Transaction not available for asset upload'));
                 return;
             }
+            // Accumulate all binary chunks from the PassThrough as they arrive (flowing mode).
+            // uploadStream is only started once the stream ends — see constraint (2) above.
+            const bufferedChunks = [];
+            chunk.stream.on('data', (c)=>bufferedChunks.push(c));
             pendingUploads += 1;
-            transaction.attach(async ()=>{
-                try {
-                    await strapi.plugin('upload').provider.uploadStream(uploadData);
-                    if (!restoreMediaEntitiesContent) {
-                        return;
-                    }
-                    if (uploadData?.type) {
+            chunk.stream.once('end', ()=>{
+                // Build uploadData here so the stream is fully populated before the provider reads it.
+                const uploadData = {
+                    ...chunk.metadata,
+                    stream: Readable.from(bufferedChunks),
+                    ...chunk.buffer != null ? {
+                        buffer: chunk.buffer
+                    } : {}
+                };
+                transaction.attach(async ()=>{
+                    try {
+                        await strapi.plugin('upload').provider.uploadStream(uploadData);
+                        if (!restoreMediaEntitiesContent) {
+                            return;
+                        }
+                        if (uploadData?.type) {
+                            const entry = await strapi.db.query('plugin::upload.file').findOne({
+                                where: {
+                                    id: fileId
+                                }
+                            });
+                            if (!entry) {
+                                throw new Error('file not found');
+                            }
+                            const specificFormat = entry?.formats?.[uploadData.type];
+                            if (specificFormat) {
+                                specificFormat.url = uploadData.url;
+                            }
+                            await strapi.db.query('plugin::upload.file').update({
+                                where: {
+                                    id: entry.id
+                                },
+                                data: {
+                                    formats: entry.formats,
+                                    provider
+                                }
+                            });
+                            return;
+                        }
                         const entry = await strapi.db.query('plugin::upload.file').findOne({
                             where: {
                                 id: fileId
@@ -52,50 +88,32 @@ import { Writable, Readable } from 'stream';
                         if (!entry) {
                             throw new Error('file not found');
                         }
-                        const specificFormat = entry?.formats?.[uploadData.type];
-                        if (specificFormat) {
-                            specificFormat.url = uploadData.url;
-                        }
+                        entry.url = uploadData.url;
                         await strapi.db.query('plugin::upload.file').update({
                             where: {
                                 id: entry.id
                             },
                             data: {
-                                formats: entry.formats,
+                                url: entry.url,
                                 provider
                             }
                         });
-                        return;
+                    } catch (error) {
+                        throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);
                     }
-                    const entry = await strapi.db.query('plugin::upload.file').findOne({
-                        where: {
-                            id: fileId
-                        }
+                }).finally(()=>{
+                    pendingUploads -= 1;
+                }).catch((error)=>{
+                    const err = error instanceof Error ? error : new Error(String(error));
+                    process.nextTick(()=>{
+                        this.destroy(err);
                     });
-                    if (!entry) {
-                        throw new Error('file not found');
-                    }
-                    entry.url = uploadData.url;
-                    await strapi.db.query('plugin::upload.file').update({
-                        where: {
-                            id: entry.id
-                        },
-                        data: {
-                            url: entry.url,
-                            provider
-                        }
-                    });
-                } catch (error) {
-                    throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);
-                }
-            }).finally(()=>{
-                pendingUploads -= 1;
-            }).catch((error)=>{
-                const err = error instanceof Error ? error : new Error(String(error));
-                process.nextTick(()=>{
-                    this.destroy(err);
                 });
             });
+            chunk.stream.once('error', (err)=>{
+                pendingUploads -= 1;
+                process.nextTick(()=>this.destroy(err));
+            });
             callback();
         }
     });

package/dist/strapi/providers/local-destination/assets-destination-writable.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"assets-destination-writable.mjs","sources":["../../../../src/strapi/providers/local-destination/assets-destination-writable.ts"],"sourcesContent":["import { Writable, Readable } from 'stream';\nimport type { Core } from '@strapi/types';\n\nimport type { IAsset, IFile } from '../../../../types';\nimport type { Transaction } from '../../../../types/utils';\n\nexport interface CreateAssetsDestinationWritableOptions {\n  strapi: Core.Strapi;\n  transaction: Transaction;\n  resolveUploadFileId: (metadata: { id: number }) => number | undefined;\n  restoreMediaEntitiesContent: boolean;\n  removeAssetsBackup: () => Promise<void>;\n}\n\n/**\n * Writable for restoring upload assets during a local push destination transfer.\n *\n * The Writable `write()` callback must return as soon as the chunk is accepted — **before**\n * `uploadStream` finishes — so the remote push handler can feed PassThrough data in the same\n * WebSocket batch after an asset `start` row (see `streamAsset` in remote `push` handler).\n */\nexport function createAssetsDestinationWritable(\n  options: CreateAssetsDestinationWritableOptions\n): Writable {\n  const {\n    strapi,\n    transaction,\n    resolveUploadFileId,\n    restoreMediaEntitiesContent,\n    removeAssetsBackup,\n  } = options;\n\n  let pendingUploads = 0;\n\n  return new Writable({\n    objectMode: true,\n    async final(next) {\n      while (pendingUploads > 0) {\n        await new Promise<void>((resolve) => {\n          setImmediate(resolve);\n        });\n      }\n      await removeAssetsBackup();\n      next();\n    },\n    write(chunk: IAsset, _encoding, callback) {\n      const uploadData = {\n        ...chunk.metadata,\n        stream: Readable.from(chunk.stream),\n        buffer: chunk?.buffer,\n      };\n\n      const provider = strapi.config.get<{ provider: string }>('plugin::upload').provider;\n\n      const fileId = resolveUploadFileId(uploadData);\n      if (!fileId) {\n        callback(new Error(`File ID not found for ID: ${uploadData.id}`));\n        return;\n      }\n\n      if (!transaction) {\n        callback(new Error('Transaction not available for asset upload'));\n        return;\n      }\n\n      pendingUploads += 1;\n      transaction\n        .attach(async () => {\n          try {\n            await strapi.plugin('upload').provider.uploadStream(uploadData);\n\n            if (!restoreMediaEntitiesContent) {\n              return;\n            }\n\n            if (uploadData?.type) {\n              const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n                where: { id: fileId },\n              });\n              if (!entry) {\n                throw new Error('file not found');\n              }\n              const specificFormat = entry?.formats?.[uploadData.type];\n              if (specificFormat) {\n                specificFormat.url = uploadData.url;\n              }\n              await strapi.db.query('plugin::upload.file').update({\n                where: { id: entry.id },\n                data: {\n                  formats: entry.formats,\n                  provider,\n                },\n              });\n              return;\n            }\n\n            const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n              where: { id: fileId },\n            });\n            if (!entry) {\n              throw new Error('file not found');\n            }\n            entry.url = uploadData.url;\n            await strapi.db.query('plugin::upload.file').update({\n              where: { id: entry.id },\n              data: {\n                url: entry.url,\n                provider,\n              },\n            });\n          } catch (error) {\n            throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);\n          }\n        })\n        .finally(() => {\n          pendingUploads -= 1;\n        })\n        .catch((error: unknown) => {\n          const err = error instanceof Error ? error : new Error(String(error));\n          process.nextTick(() => {\n            this.destroy(err);\n          });\n        });\n\n      callback();\n    },\n  });\n}\n"],"names":["createAssetsDestinationWritable","options","strapi","transaction","resolveUploadFileId","restoreMediaEntitiesContent","removeAssetsBackup","pendingUploads","Writable","objectMode","final","next","Promise","resolve","setImmediate","write","chunk","_encoding","callback","uploadData","metadata","stream","Readable","from","buffer","provider","config","get","fileId","Error","id","attach","plugin","uploadStream","type","entry","db","query","findOne","where","specificFormat","formats","url","update","data","error","filename","finally","catch","err","String","process","nextTick","destroy"],"mappings":"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"}
+{"version":3,"file":"assets-destination-writable.mjs","sources":["../../../../src/strapi/providers/local-destination/assets-destination-writable.ts"],"sourcesContent":["import { Writable, Readable } from 'stream';\nimport type { Core } from '@strapi/types';\n\nimport type { IAsset, IFile } from '../../../types';\nimport type { Transaction } from '../../../types/utils';\n\nexport interface CreateAssetsDestinationWritableOptions {\n  strapi: Core.Strapi;\n  transaction: Transaction;\n  resolveUploadFileId: (metadata: { id: number }) => number | undefined;\n  restoreMediaEntitiesContent: boolean;\n  removeAssetsBackup: () => Promise<void>;\n}\n\n/**\n * Writable for restoring upload assets during a local push destination transfer.\n *\n * Design constraints:\n * 1. The `write()` callback must return **before** `uploadStream` finishes so the remote push\n *    handler can continue feeding chunks to the PassThrough stream in the same WebSocket batch\n *    (avoids deadlock — see `streamAsset` in the remote push handler).\n * 2. `uploadStream` is only called **after** the PassThrough has been fully drained (all chunks\n *    received and the stream ended). This gives the upload provider a pre-filled synchronous\n *    Readable rather than a lazy async wrapper, which avoids `Buffer.from(undefined)` crashes\n *    in upload providers that call `stream.read()` before any data has been buffered.\n */\nexport function createAssetsDestinationWritable(\n  options: CreateAssetsDestinationWritableOptions\n): Writable {\n  const {\n    strapi,\n    transaction,\n    resolveUploadFileId,\n    restoreMediaEntitiesContent,\n    removeAssetsBackup,\n  } = options;\n\n  let pendingUploads = 0;\n\n  return new Writable({\n    objectMode: true,\n    async final(next) {\n      while (pendingUploads > 0) {\n        await new Promise<void>((resolve) => {\n          setImmediate(resolve);\n        });\n      }\n      await removeAssetsBackup();\n      next();\n    },\n    write(chunk: IAsset, _encoding, callback) {\n      const provider = strapi.config.get<{ provider: string }>('plugin::upload').provider;\n\n      const fileId = resolveUploadFileId(chunk.metadata);\n      if (!fileId) {\n        callback(new Error(`File ID not found for ID: ${chunk.metadata.id}`));\n        return;\n      }\n\n      if (!transaction) {\n        callback(new Error('Transaction not available for asset upload'));\n        return;\n      }\n\n      // Accumulate all binary chunks from the PassThrough as they arrive (flowing mode).\n      // uploadStream is only started once the stream ends — see constraint (2) above.\n      const bufferedChunks: Buffer[] = [];\n      chunk.stream.on('data', (c: Buffer) => bufferedChunks.push(c));\n\n      pendingUploads += 1;\n\n      chunk.stream.once('end', () => {\n        // Build uploadData here so the stream is fully populated before the provider reads it.\n        const uploadData = {\n          ...chunk.metadata,\n          stream: Readable.from(bufferedChunks),\n          ...(chunk.buffer != null ? { buffer: chunk.buffer } : {}),\n        };\n\n        transaction\n          .attach(async () => {\n            try {\n              await strapi.plugin('upload').provider.uploadStream(uploadData);\n\n              if (!restoreMediaEntitiesContent) {\n                return;\n              }\n\n              if (uploadData?.type) {\n                const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n                  where: { id: fileId },\n                });\n                if (!entry) {\n                  throw new Error('file not found');\n                }\n                const specificFormat = entry?.formats?.[uploadData.type];\n                if (specificFormat) {\n                  specificFormat.url = uploadData.url;\n                }\n                await strapi.db.query('plugin::upload.file').update({\n                  where: { id: entry.id },\n                  data: {\n                    formats: entry.formats,\n                    provider,\n                  },\n                });\n                return;\n              }\n\n              const entry: IFile = await strapi.db.query('plugin::upload.file').findOne({\n                where: { id: fileId },\n              });\n              if (!entry) {\n                throw new Error('file not found');\n              }\n              entry.url = uploadData.url;\n              await strapi.db.query('plugin::upload.file').update({\n                where: { id: entry.id },\n                data: {\n                  url: entry.url,\n                  provider,\n                },\n              });\n            } catch (error) {\n              throw new Error(`Error while uploading asset ${chunk.filename} ${error}`);\n            }\n          })\n          .finally(() => {\n            pendingUploads -= 1;\n          })\n          .catch((error: unknown) => {\n            const err = error instanceof Error ? error : new Error(String(error));\n            process.nextTick(() => {\n              this.destroy(err);\n            });\n          });\n      });\n\n      chunk.stream.once('error', (err) => {\n        pendingUploads -= 1;\n        process.nextTick(() => this.destroy(err));\n      });\n\n      callback();\n    },\n  });\n}\n"],"names":["createAssetsDestinationWritable","options","strapi","transaction","resolveUploadFileId","restoreMediaEntitiesContent","removeAssetsBackup","pendingUploads","Writable","objectMode","final","next","Promise","resolve","setImmediate","write","chunk","_encoding","callback","provider","config","get","fileId","metadata","Error","id","bufferedChunks","stream","on","c","push","once","uploadData","Readable","from","buffer","attach","plugin","uploadStream","type","entry","db","query","findOne","where","specificFormat","formats","url","update","data","error","filename","finally","catch","err","String","process","nextTick","destroy"],"mappings":"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"}

package/dist/strapi/providers/local-destination/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Writable } from 'stream';
 import type { Core, Struct } from '@strapi/types';
-import type { IDestinationProvider, IMetadata, ProviderType, Transaction } from '../../../../types';
+import type { IDestinationProvider, IMetadata, ProviderType, Transaction } from '../../../types';
 import type { IDiagnosticReporter } from '../../../utils/diagnostic';
 import { restore } from './strategies';
 export declare const VALID_CONFLICT_STRATEGIES: string[];

package/dist/strapi/providers/local-destination/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/strapi/providers/local-destination/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAY,MAAM,QAAQ,CAAC;AAI5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGrE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AASvC,eAAO,MAAM,yBAAyB,UAAc,CAAC;AACrD,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,MAAM,WAAW,sCAAsC;IACrD,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,sFAAsF;IACtF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C;AAED,cAAM,8BAA+B,YAAW,oBAAoB;;IAClE,IAAI,SAA+B;IAEnC,IAAI,EAAE,YAAY,CAAiB;IAEnC,OAAO,EAAE,sCAAsC,CAAC;IAEhD,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,0BAA0B,EAAE,MAAM,CAAC;IAEnC,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;gBASxC,OAAO,EAAE,sCAAsC;IAMrD,SAAS,CAAC,WAAW,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmEtB,QAAQ;IAMR,cAAc;IA2BpB,WAAW,IAAI,SAAS;IAcxB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;IAY3C,yBAAyB,IAAI,QAAQ;IA2F/B,uBAAuB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAoB5C,8BAA8B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAgBnD,sBAAsB,IAAI,OAAO,CAAC,QAAQ,CAAC;CAmBlD;AAED,eAAO,MAAM,oCAAoC,YACtC,sCAAsC,mCAGhD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/strapi/providers/local-destination/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAY,MAAM,QAAQ,CAAC;AAI5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGrE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AASvC,eAAO,MAAM,yBAAyB,UAAc,CAAC;AACrD,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,MAAM,WAAW,sCAAsC;IACrD,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,sFAAsF;IACtF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C;AAED,cAAM,8BAA+B,YAAW,oBAAoB;;IAClE,IAAI,SAA+B;IAEnC,IAAI,EAAE,YAAY,CAAiB;IAEnC,OAAO,EAAE,sCAAsC,CAAC;IAEhD,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,0BAA0B,EAAE,MAAM,CAAC;IAEnC,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;gBASxC,OAAO,EAAE,sCAAsC;IAMrD,SAAS,CAAC,WAAW,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmEtB,QAAQ;IAMR,cAAc;IA2BpB,WAAW,IAAI,SAAS;IAcxB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;IAY3C,yBAAyB,IAAI,QAAQ;IA2F/B,uBAAuB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAoB5C,8BAA8B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAgBnD,sBAAsB,IAAI,OAAO,CAAC,QAAQ,CAAC;CAmBlD;AAED,eAAO,MAAM,oCAAoC,YACtC,sCAAsC,mCAGhD,CAAC"}

package/dist/strapi/providers/local-destination/index.js

@@ -18,7 +18,10 @@ var entities = require('./strategies/restore/entities.js');
 var configuration = require('./strategies/restore/configuration.js');
 var links = require('./strategies/restore/links.js');
 
-function _interopNamespaceDefault(e) {
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
   var n = Object.create(null);
   if (e) {
     Object.keys(e).forEach(function (k) {
@@ -35,7 +38,8 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 
-var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
+var path__default = /*#__PURE__*/_interopDefault(path);
+var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
 function _class_private_field_loose_base(receiver, privateKey) {
     if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
@@ -309,18 +313,18 @@ async function handleAssetsBackup() {
     }
     if (this.strapi.config.get('plugin::upload').provider === 'local') {
         _class_private_field_loose_base(this, _reportInfo)[_reportInfo]('creating assets backup directory');
-        const assetsDirectory = path.join(this.strapi.dirs.static.public, 'uploads');
-        const backupDirectory = path.join(this.strapi.dirs.static.public, this.uploadsBackupDirectoryName);
+        const assetsDirectory = path__default.default.join(this.strapi.dirs.static.public, 'uploads');
+        const backupDirectory = path__default.default.join(this.strapi.dirs.static.public, this.uploadsBackupDirectoryName);
         try {
             // Check access before attempting to do anything
             await fs__namespace.access(assetsDirectory, // eslint-disable-next-line no-bitwise
             fs__namespace.constants.W_OK | fs__namespace.constants.R_OK | fs__namespace.constants.F_OK);
             // eslint-disable-next-line no-bitwise
-            await fs__namespace.access(path.join(assetsDirectory, '..'), fs__namespace.constants.W_OK | fs__namespace.constants.R_OK);
+            await fs__namespace.access(path__default.default.join(assetsDirectory, '..'), fs__namespace.constants.W_OK | fs__namespace.constants.R_OK);
             await fs__namespace.move(assetsDirectory, backupDirectory);
             await fs__namespace.mkdir(assetsDirectory);
             // Create a .gitkeep file to ensure the directory is not empty
-            await fs__namespace.outputFile(path.join(assetsDirectory, '.gitkeep'), '');
+            await fs__namespace.outputFile(path__default.default.join(assetsDirectory, '.gitkeep'), '');
             _class_private_field_loose_base(this, _reportInfo)[_reportInfo](`created assets backup directory ${backupDirectory}`);
         } catch (err) {
             throw new providers.ProviderTransferError('The backup folder for the assets could not be created inside the public folder. Please ensure Strapi has write permissions on the public directory', {
@@ -340,7 +344,7 @@ async function removeAssetsBackup() {
     if (this.strapi.config.get('plugin::upload').provider === 'local') {
         _class_private_field_loose_base(this, _reportInfo)[_reportInfo]('removing assets backup');
         providers$1.assertValidStrapi(this.strapi);
-        const backupDirectory = path.join(this.strapi.dirs.static.public, this.uploadsBackupDirectoryName);
+        const backupDirectory = path__default.default.join(this.strapi.dirs.static.public, this.uploadsBackupDirectoryName);
         await fs__namespace.rm(backupDirectory, {
             recursive: true,
             force: true