@strapi/data-transfer 4.20.2 → 4.20.3

package/dist/index.mjs

@@ -2043,6 +2043,7 @@ class LocalStrapiDestinationProvider {
     const strapi2 = this.strapi;
     const transaction2 = this.transaction;
     const backupDirectory = this.uploadsBackupDirectoryName;
+    const fileEntitiesMapper = this.#entitiesMapper["plugin::upload.file"];
     const restoreMediaEntitiesContent = this.#isContentTypeIncluded("plugin::upload.file");
     return new Writable({
       objectMode: true,
@@ -2089,15 +2090,16 @@ class LocalStrapiDestinationProvider {
               return callback();
             }
             if (uploadData?.type) {
+              const condition = uploadData?.id ? { id: fileEntitiesMapper[uploadData.id] } : { hash: uploadData.mainHash };
               const entry2 = await strapi2.db.query("plugin::upload.file").findOne({
-                where: { hash: uploadData.mainHash }
+                where: condition
               });
               const specificFormat = entry2?.formats?.[uploadData.type];
               if (specificFormat) {
                 specificFormat.url = uploadData.url;
               }
               await strapi2.db.query("plugin::upload.file").update({
-                where: { hash: uploadData.mainHash },
+                where: { id: entry2.id },
                 data: {
                   formats: entry2.formats,
                   provider
@@ -2106,11 +2108,11 @@ class LocalStrapiDestinationProvider {
               return callback();
             }
             const entry = await strapi2.db.query("plugin::upload.file").findOne({
-              where: { hash: uploadData.hash }
+              where: { id: fileEntitiesMapper[uploadData.id] }
             });
             entry.url = uploadData.url;
             await strapi2.db.query("plugin::upload.file").update({
-              where: { hash: uploadData.hash },
+              where: { id: entry.id },
               data: {
                 url: entry.url,
                 provider
@@ -2295,7 +2297,7 @@ const createAssetsStream = (strapi2) => {
           const fileFormatFilepath = isLocalProvider ? join(strapi2.dirs.static.public, fileFormat.url) : fileFormat.url;
           const fileFormatStats = await getFileStats(fileFormatFilepath, isLocalProvider);
           const fileFormatStream = getFileStream(fileFormatFilepath, isLocalProvider);
-          const metadata = { ...fileFormat, type: format, mainHash: file2.hash };
+          const metadata = { ...fileFormat, type: format, id: file2.id, mainHash: file2.hash };
           yield {
             metadata,
             filepath: fileFormatFilepath,
@@ -2374,7 +2376,7 @@ class LocalStrapiSourceProvider {
 }
 const createDispatcher = (ws, retryMessageOptions = {
   retryMessageMaxRetries: 5,
-  retryMessageTimeout: 15e3
+  retryMessageTimeout: 3e4
 }) => {
   const state = {};
   const dispatch = async (message, options = {}) => {
@@ -2802,16 +2804,15 @@ class RemoteStrapiSourceProvider {
       }
       const { uuid, data: message } = parsed;
       const { ended, error, data } = message;
-      if (ended) {
+      if (error) {
         await this.#respond(uuid);
-        await this.#endStep(stage);
-        stream2.end();
+        stream2.destroy(error);
         return;
       }
-      if (error) {
+      if (ended) {
         await this.#respond(uuid);
         await this.#endStep(stage);
-        stream2.destroy(error);
+        stream2.end();
         return;
       }
       for (const item of castArray(data)) {
@@ -3719,13 +3720,23 @@ const createPullController = handlerControllerFactory((proto) => ({
     }
     try {
       for await (const chunk of stream2) {
-        batch.push(chunk);
-        if (batchLength() >= batchSize) {
-          await sendBatch();
-          batch = [];
+        if (stage !== "assets") {
+          batch.push(chunk);
+          if (batchLength() >= batchSize) {
+            await sendBatch();
+            batch = [];
+          }
+        } else {
+          await this.confirm({
+            type: "transfer",
+            data: [chunk],
+            ended: false,
+            error: null,
+            id
+          });
         }
       }
-      if (batch.length > 0) {
+      if (batch.length > 0 && stage !== "assets") {
         await sendBatch();
         batch = [];
       }