@pronto-tools-and-more/network-process 6.9.0 → 6.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/network-process",
-  "version": "6.9.0",
+  "version": "6.10.1",
   "description": "",
   "main": "src/networkProcessMain.js",
   "type": "module",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
     "@lvce-editor/ipc": "^11.0.1",
-    "@lvce-editor/json-rpc": "^4.0.0",
+    "@lvce-editor/json-rpc": "^4.1.0",
     "@lvce-editor/verror": "^1.4.0",
     "archiver": "^7.0.1",
     "extract-zip": "^2.0.1",

package/src/parts/CloudFront504Error/CloudFront504Error.js

@@ -0,0 +1,8 @@
+import * as ErrorCodes from "../ErrorCodes/ErrorCodes.js";
+
+export class CloudFront504Error extends Error {
+  constructor() {
+    super("Cloudfront 504 Error");
+    this.code = ErrorCodes.CloudFront504;
+  }
+}

package/src/parts/ErrorCodes/ErrorCodes.js

@@ -1 +1,2 @@
 export const ProcessingResources = "E_PROCESSING_RESOURCES";
+export const CloudFront504 = "E_CLOUDFRONT_504";

package/src/parts/HandleZipUploadError/HandleZipUploadError.js

@@ -0,0 +1,43 @@
+import { VError } from "@lvce-editor/verror";
+import * as IsCloudFront504Error from "../IsCloudFront504Error/IsCloudFront504Error.js";
+import { ProcessingResourcesError } from "../ProcessingResourcesError/ProcessingResourcesError.js";
+
+export const handleZipUploadError = async ({
+  error,
+  maxRetries,
+  waitBetweenRetries,
+}) => {
+  if (error && error.name === "HTTPError") {
+    const serverMessage = await error.response.text();
+    if (IsCloudFront504Error.isCloudFront504Error(serverMessage)) {
+      if (maxRetries > 0) {
+        console.info();
+        return {
+          retry: true,
+          retryMessage: `[pronto-network-process] Cloudfront 504 error, retrying ${maxRetries} more times in ${waitBetweenRetries}ms`,
+        };
+      } else {
+        throw new Error(`Failed to upload zip: Cloudfront 504 error`);
+      }
+    }
+    if (serverMessage === "INTERNAL_ERROR") {
+      throw new Error(
+        "Failed to list upload zip file: internal error. Hint: Check headers"
+      );
+    }
+    if (serverMessage) {
+      throw new Error(`Failed to upload zip file: Server ${serverMessage}`);
+    }
+  }
+  if (error && error instanceof ProcessingResourcesError) {
+    if (maxRetries > 0) {
+      return {
+        retry: true,
+        retryMessage: `[pronto-network-process] processing resources error, retrying ${maxRetries} more times in ${waitBetweenRetries}ms`,
+      };
+    } else {
+      throw new Error(`Failed to upload zip: Processing resources error`);
+    }
+  }
+  throw new VError(error, `Failed to upload zip`);
+};

package/src/parts/IsCloudFront504Error/IsCloudFront504Error.js

@@ -0,0 +1,3 @@
+export const isCloudFront504Error = (text) => {
+  return text.includes("<H1>504 ERROR</H1>");
+};

package/src/parts/ShouldRetryUpload/ShouldRetryUpload.js

@@ -0,0 +1,12 @@
+import { CloudFront504Error } from "../CloudFront504Error/CloudFront504Error.js";
+import { ProcessingResourcesError } from "../ProcessingResourcesError/ProcessingResourcesError.js";
+
+export const shouldRetryUpload = (error) => {
+  if (error && error instanceof ProcessingResourcesError) {
+    return true;
+  }
+  if (error && error instanceof CloudFront504Error) {
+    return true;
+  }
+  return false;
+};

package/src/parts/UploadZip/UploadZip.js

@@ -4,6 +4,7 @@ import { openAsBlob } from "node:fs";
 import * as Assert from "../Assert/Assert.js";
 import * as GetFormData from "../GetFormData/GetFormData.js";
 import * as GetXr from "../GetXr/GetXr.js";
+import * as HandleZipUploadError from "../HandleZipUploadError/HandleZipUploadError.js";
 import * as IsProcessingResourcesResponse from "../IsProcessingResourcesResponse/IsProcessingResourcesResponse.js";
 import { ProcessingResourcesError } from "../ProcessingResourcesError/ProcessingResourcesError.js";
 import * as Timeout from "../Timeout/Timeout.js";
@@ -57,40 +58,27 @@ export const uploadZip = async ({
     }
     return text;
   } catch (error) {
-    // @ts-ignore
-    if (error && error.name === "HTTPError") {
-      // @ts-ignore
-      const serverMessage = await error.response.text();
-      if (serverMessage === "INTERNAL_ERROR") {
-        throw new Error(
-          "Failed to list upload zip file: internal error. Hint: Check headers"
-        );
-      }
-      if (serverMessage) {
-        throw new Error(`Failed to upload zip file: Server ${serverMessage}`);
-      }
-    }
-    if (error && error instanceof ProcessingResourcesError) {
-      if (maxRetries > 0) {
-        console.info(
-          `[pronto-network-process] processing resources error, retrying ${maxRetries} more times in ${waitBetweenRetries}ms`
-        );
-        await Timeout.wait(waitBetweenRetries);
-        return uploadZip({
-          file,
-          uploadBaseUrl,
-          preview,
-          appId,
-          sessionId,
-          uploadTimeout,
-          message,
-          maxRetries: maxRetries - 1,
-          waitBetweenRetries,
-        });
-      } else {
-        throw new Error(`Failed to upload zip: Processing resources error`);
-      }
+    const { retry, retryMessage } =
+      await HandleZipUploadError.handleZipUploadError({
+        error,
+        maxRetries,
+        waitBetweenRetries,
+      });
+    if (retry) {
+      console.info(retryMessage);
+      await Timeout.wait(waitBetweenRetries);
+      return uploadZip({
+        file,
+        uploadBaseUrl,
+        preview,
+        appId,
+        sessionId,
+        uploadTimeout,
+        message,
+        maxRetries: maxRetries - 1,
+        waitBetweenRetries,
+      });
     }
-    throw new VError(error, `Failed to upload zip`);
+    throw new VError(`Failed to upload zip: invalid state`);
   }
 };