runcloud 0.1.134 → 0.1.135

package/dist/commands/website.js

@@ -4,6 +4,7 @@ import { create as tarCreate } from 'tar';
 import { ApiClient, friendlyApiError } from '../api.js';
 import { createSnapshot } from '../archive.js';
 import { requireCredentials, resolveProject } from '../config.js';
+import { isBundleDeployMode } from './deploy.js';
 function makeClient(project) {
     const creds = requireCredentials();
     return {
@@ -12,6 +13,8 @@ function makeClient(project) {
     };
 }
 const BUILD_ENV_KEY = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const PUBLISH_POLL_INTERVAL_MS = 3_000;
+const PUBLISH_POLL_TIMEOUT_MS = 10 * 60 * 1000;
 export function renderDeployment(d) {
     const at = d.published_at ?? d.created_at ?? '';
     const suffix = d.error_message ? ` (${d.error_message})` : '';
@@ -100,8 +103,39 @@ export async function createStaticSiteArchive(dir) {
     }
     return Buffer.concat(chunks);
 }
-export async function runWebsitePublish(client, projectId, opts = {}, log = console.log) {
-    let result;
+function assertBundleModeExport(dir) {
+    if (!existsSync(`${resolve(dir)}/index.html`)) {
+        throw new Error(`No static export at ${dir}. Build it first, then run \`newly website publish ${dir}\`.`);
+    }
+}
+async function finishPublish(client, projectId, result, log, pollOpts = {}) {
+    if (result.deployment.status !== 'building') {
+        log(`Published ${result.deployment.id}`);
+        log(`URL: ${result.default_url}`);
+        return;
+    }
+    const intervalMs = pollOpts.intervalMs ?? PUBLISH_POLL_INTERVAL_MS;
+    const timeoutMs = pollOpts.timeoutMs ?? PUBLISH_POLL_TIMEOUT_MS;
+    log(`Publishing ${result.deployment.id}...`);
+    const deadline = Date.now() + timeoutMs;
+    for (;;) {
+        const { deployments = [] } = (await client.get(`/projects/${projectId}/website/deployments`));
+        const match = deployments.find((d) => d.id === result.deployment.id);
+        if (match?.status === 'active') {
+            log(`Published ${match.id}`);
+            log(`URL: ${result.default_url}`);
+            return;
+        }
+        if (match?.status === 'failed') {
+            throw new Error(match.error_message ?? `Publish ${result.deployment.id} failed.`);
+        }
+        if (Date.now() > deadline) {
+            throw new Error(`Publish ${result.deployment.id} timed out after ${timeoutMs / 1000}s`);
+        }
+        await new Promise((r) => setTimeout(r, intervalMs));
+    }
+}
+export async function runWebsitePublish(client, projectId, opts = {}, log = console.log, pollOpts = {}) {
     if (opts.remoteBuild) {
         const sourceDir = opts.localPath ?? '.';
         assertDirectory(sourceDir, 'Website source directory');
@@ -115,19 +149,33 @@ export async function runWebsitePublish(client, projectId, opts = {}, log = cons
             output_dir: opts.outputDir,
         }));
         form.set('source', new Blob([new Uint8Array(archive)], { type: 'application/gzip' }), 'source.tar.gz');
-        result = (await client.uploadForm(`/projects/${projectId}/website/build-upload`, form));
+        const result = (await client.uploadForm(`/projects/${projectId}/website/build-upload`, form));
+        log(`Published ${result.deployment.id}`);
+        log(`URL: ${result.default_url}`);
+        return;
     }
-    else if (opts.localPath) {
+    if (opts.localPath) {
         log('Packaging static site...');
         const archive = await createStaticSiteArchive(opts.localPath);
         log(`Uploading static site (${archiveKib(archive.length)} KiB)...`);
-        result = (await client.upload(`/projects/${projectId}/website/publish-upload`, archive, 'application/gzip'));
+        const result = (await client.upload(`/projects/${projectId}/website/publish-upload`, archive, 'application/gzip'));
+        await finishPublish(client, projectId, result, log, pollOpts);
+        return;
     }
-    else {
-        result = (await client.post(`/projects/${projectId}/website/publish`, {
-            source_path: opts.sourcePath ?? 'website/out',
-        }));
+    const stackInfo = (await client.get(`/newly_backend/stack/${projectId}`));
+    if (isBundleDeployMode(stackInfo)) {
+        const dir = opts.sourcePath ?? 'website/out';
+        assertBundleModeExport(dir);
+        log('Packaging static site...');
+        const archive = await createStaticSiteArchive(dir);
+        log(`Uploading static site (${archiveKib(archive.length)} KiB)...`);
+        const result = (await client.upload(`/projects/${projectId}/website/publish-upload`, archive, 'application/gzip'));
+        await finishPublish(client, projectId, result, log, pollOpts);
+        return;
     }
+    const result = (await client.post(`/projects/${projectId}/website/publish`, {
+        source_path: opts.sourcePath ?? 'website/out',
+    }));
     log(`Published ${result.deployment.id}`);
     log(`URL: ${result.default_url}`);
 }

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.1.134';
+export const CLI_VERSION = '0.1.135';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcloud",
-  "version": "0.1.134",
+  "version": "0.1.135",
   "description": "Create and control run.cloud remote mobile simulators and cloud sandboxes",
   "license": "Apache-2.0",
   "keywords": [