@zuplo/cli 1.8.0 → 1.10.0

package/dist/common/output.js

@@ -1,4 +1,7 @@
-export function printToConsole(message, ...optionalParams) {
+export function logDiagnosticsToConsole(message, ...optionalParams) {
+    console.error(message, ...optionalParams);
+}
+export function outputResultToConsole(message, ...optionalParams) {
     console.log(message, ...optionalParams);
 }
 //# sourceMappingURL=output.js.map

package/dist/common/settings.js

@@ -2,6 +2,12 @@ class Settings {
     get ZUPLO_DEVELOPER_API_ENDPOINT() {
         return process.env.ZUPLO_DEVELOPER_API_ENDPOINT ?? "https://dev.zuplo.com";
     }
+    get MAX_POLL_RETRIES() {
+        return parseInt(process.env.MAX_POLL_RETRIES ?? "30");
+    }
+    get POLL_INTERVAL() {
+        return parseInt(process.env.POLL_INTERVAL ?? "1000");
+    }
 }
 const settings = new Settings();
 export default settings;

package/dist/deploy/archive.js

@@ -6,8 +6,9 @@ import * as tar from "tar";
 import * as temp from "temp";
 import { DEPLOYER_METADATA_FILE } from "../common/constants.js";
 import { logger } from "../common/logger.js";
+export const ARCHIVE_EXTENSION = ".tar.gz";
 export async function archive(dir) {
-    const tarball = temp.path({ suffix: ".tar.gz" });
+    const tarball = temp.path({ suffix: ARCHIVE_EXTENSION });
     const ignoreFn = createIgnoreFunction(dir);
     const normalizedDir = join(relative(process.cwd(), dir));
     const metadata = await prepareDeployerMetadata(dir);

package/dist/deploy/handler.js

@@ -1,9 +1,11 @@
 import chalk from "chalk";
+import { parse } from "path";
 import { logger } from "../common/logger.js";
-import { printToConsole } from "../common/output.js";
+import { logDiagnosticsToConsole, outputResultToConsole, } from "../common/output.js";
 import settings from "../common/settings.js";
-import { archive } from "./archive.js";
+import { archive, ARCHIVE_EXTENSION } from "./archive.js";
 import { upload } from "./file-upload.js";
+import { pollDeployment } from "./poll-deployment.js";
 export async function deploy(argv) {
     const archiveMetadata = await archive(argv.dir);
     logger.info(`Tarball created locally at ${archiveMetadata}`);
@@ -25,13 +27,22 @@ export async function deploy(argv) {
             const { uploadUrl } = await uploadUrlResponse.json();
             const uploadResponse = await upload(archiveMetadata.tarball, uploadUrl);
             if (uploadResponse.ok) {
-                printToConsole(chalk.green.bold(`Deploying the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}...`));
+                logDiagnosticsToConsole(chalk.green.bold(`Deploying the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}...`));
+                const fileId = parse(new URL(uploadUrl).pathname).base.replace(ARCHIVE_EXTENSION, "");
+                const { url } = await pollDeployment(argv, fileId, account, project);
+                if (url) {
+                    outputResultToConsole(chalk.green.bold(`Deployed to ${url}`));
+                }
+                else {
+                    logDiagnosticsToConsole(`Failed to deploy the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}`);
+                }
             }
             else {
                 logger.error({
                     status: uploadResponse.status,
                     statusText: uploadResponse.statusText,
                 }, "Failed to upload source to cloud storage");
+                process.exit(1);
             }
         }
         else {
@@ -39,10 +50,12 @@ export async function deploy(argv) {
                 status: uploadUrlResponse.status,
                 statusText: uploadUrlResponse.statusText,
             }, "Failed to retrieve uploadUrl");
+            process.exit(1);
         }
     }
     else {
         logger.error({ status: whoAmIResponse.status, statusText: whoAmIResponse.statusText }, "Failed to determine who-am-i");
+        process.exit();
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/deploy/poll-deployment.js

@@ -0,0 +1,50 @@
+import chalk from "chalk";
+import { logDiagnosticsToConsole } from "../common/output.js";
+import settings from "../common/settings.js";
+function wait(duration = settings.POLL_INTERVAL) {
+    return new Promise((resolve) => setTimeout(resolve, duration));
+}
+export async function pollDeployment(argv, fileId, account, project) {
+    for (let pollRetry = 0; pollRetry < settings.MAX_POLL_RETRIES; pollRetry++) {
+        logDiagnosticsToConsole(chalk.yellow(`Polling for deployment status... (${pollRetry}/${settings.MAX_POLL_RETRIES})`));
+        const response = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployment-status/${fileId}`, {
+            method: "GET",
+            headers: {
+                Authorization: `Bearer ${argv.apiKey}`,
+            },
+        });
+        if (response.ok) {
+            const { status, url } = await response.json();
+            switch (status) {
+                case "IN_PROGRESS":
+                    await wait();
+                    continue;
+                case "SUCCESS":
+                    const zupResponse = await fetch(`${url}/__zuplo/build`);
+                    if (zupResponse.ok) {
+                        return {
+                            url,
+                        };
+                    }
+                    else {
+                        continue;
+                    }
+                case "ERROR":
+                    return {
+                        url: undefined,
+                    };
+            }
+        }
+        else if (response.status === 404) {
+            await wait();
+            continue;
+        }
+        else {
+            throw new Error(`Unexpected response from server: ${response.status} ${response.statusText}`);
+        }
+    }
+    return {
+        url: undefined,
+    };
+}
+//# sourceMappingURL=poll-deployment.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "author": "Zuplo, Inc.",