@todesktop/cli 1.7.6 → 1.7.7

package/README.md

@@ -989,7 +989,11 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
-### v.7.6
+### v1.7.7
+
+- Report errors when S3 upload fails and retry 3 times
+
+### v1.7.6
 
 - Add support for multiple app protocol schemes
 

package/dist/cli.js

@@ -1931,35 +1931,55 @@ var generateS3Key_default = ({ appId, buildId, filenameSuffix }) => `${appId}/so
 
 // src/utilities/uploadToS3.ts
 var import_superagent = __toESM(require("superagent"));
-var import_util = __toESM(require("util"));
 var import_stream_to_array = __toESM(require("stream-to-array"));
 var { TODESKTOP_CLI_S3_BUCKET } = getEnvironmentVariables_default();
-var uploadToS3_default = async ({
+var MAX_RETRIES = 3;
+var RETRY_DELAY = 2e3;
+var delay = (ms) => new Promise((resolve4) => setTimeout(resolve4, ms));
+var uploadToS3WithRetry = async (input, retries = MAX_RETRIES) => {
+  try {
+    return await uploadToS3(input);
+  } catch (error) {
+    if (retries > 0) {
+      logger_default.warn(
+        `Upload failed. Retrying... (${MAX_RETRIES - retries + 1} of ${MAX_RETRIES})`
+      );
+      await delay(RETRY_DELAY);
+      return uploadToS3WithRetry(input, retries - 1);
+    } else {
+      logger_default.error("All retries exhausted. Upload failed.");
+      throw error;
+    }
+  }
+};
+var uploadToS3 = async ({
   bucket = TODESKTOP_CLI_S3_BUCKET,
   inputStream,
   key,
   onProgress = () => {
   }
 }) => {
-  const { data } = await getCallableFirebaseFunction_default("getSignedURL")({
+  const getSignedURL = getCallableFirebaseFunction_default("getSignedURL");
+  const { data } = await getSignedURL({
     key
   });
-  const body = await new Promise((resolve4) => {
-    (0, import_stream_to_array.default)(inputStream).then(function(parts) {
-      const buffers = parts.map(
-        (part) => import_util.default.isBuffer(part) ? part : Buffer.from(part)
-      );
-      return resolve4(Buffer.concat(buffers));
-    });
-  });
-  return new Promise((resolve4) => {
-    import_superagent.default.put(data.signedURL).send(body).set("content-type", "application/zip").on("progress", (event) => onProgress(event)).end(() => {
+  const parts = await (0, import_stream_to_array.default)(inputStream);
+  const buffers = parts.map(
+    (part) => Buffer.isBuffer(part) ? part : Buffer.from(part)
+  );
+  const body = Buffer.concat(buffers);
+  return new Promise((resolve4, reject) => {
+    import_superagent.default.put(data.signedURL).send(body).set("content-type", "application/zip").on("progress", onProgress).end((err) => {
       logger_default.debug({ bucket, key, url: data.uploadURL }, "uploadToS3");
-      resolve4({ bucket, key, url: data.uploadURL });
+      if (err) {
+        logger_default.error({ err }, "uploadToS3");
+        return reject(err);
+      }
+      return resolve4({ bucket, key, url: data.uploadURL });
     });
-    return { bucket, key, url: data.uploadURL };
   });
 };
+var uploadToS3_default = uploadToS3WithRetry;
 
 // src/utilities/zip.ts
 var import_archiver = __toESM(require("archiver"));
@@ -3389,7 +3409,7 @@ var getRelativeDateFromDateString_default = (input) => dateFns.formatDistance(ne
 var import_chalk2 = __toESM(require("chalk"));
 var React3 = __toESM(require("react"));
 var import_ink25 = require("ink");
-var import_util2 = __toESM(require("util"));
+var import_util = __toESM(require("util"));
 var import_jsx_runtime28 = require("react/jsx-runtime");
 var supportsColor = import_chalk2.default.stderr.supportsColor;
 var SyntaxHighlight = ({
@@ -3398,7 +3418,7 @@ var SyntaxHighlight = ({
 }) => {
   const { stdout } = (0, import_ink25.useStdout)();
   const highlightedCode = React3.useMemo(() => {
-    return stdout.isTTY ? import_util2.default.inspect(object, { colors, depth: 6 }) : JSON.stringify(object, null, 2);
+    return stdout.isTTY ? import_util.default.inspect(object, { colors, depth: 6 }) : JSON.stringify(object, null, 2);
   }, [colors, object, stdout.isTTY]);
   return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(import_ink25.Text, { wrap: "end", children: highlightedCode });
 };
@@ -4800,7 +4820,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.7.5",
+  version: "1.7.6",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -4882,6 +4902,7 @@ var package_default = {
   devDependencies: {
     "@todesktop/shared": "^7.186.6",
     "@types/bunyan": "^1.8.6",
+    "@types/node": "^20.8.4",
     "@types/react": "^18.0.26",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",