@glash/cli 0.2.29 → 0.2.30

package/commands/deploy.mjs

@@ -134,10 +134,11 @@ export async function deploy({ flags }) {
   const commitHash = flags.commit || (remoteDeploy ? undefined : currentCommit());
   const gitBranch = flags.branch || currentBranch();
   const target = flags.prod || flags.production ? 'production' : (flags.target || 'production');
+  const requestedAssetMode = assetMode(flags);
 
   let dep;
   let envSummary = { count: 0, skipped: Boolean(flags['no-env']) };
-  let assetSummary = { mode: assetMode(flags), offloaded: false, count: 0, bytes: 0, skipped: 0 };
+  let assetSummary = { mode: requestedAssetMode, status: requestedAssetMode === 'inline' ? 'inline' : 'pending', offloaded: false, count: 0, bytes: 0, skipped: 0 };
   let currentPhase = 'doing';
   const start = Date.now();
   const indicator = createDeployIndicator();
@@ -177,8 +178,11 @@ export async function deploy({ flags }) {
       assetSummary = await offloadPublicAssetsBeforeDeploy(projectId, flags);
       report.assetSummary = assetSummary;
     } catch (e) {
+      const failedAssetSummary = e.assetSummary ?? { ...assetSummary, status: 'failed', error: e.message };
+      assetSummary = failedAssetSummary;
+      report.assetSummary = failedAssetSummary;
       indicator.fail('failed');
-      printDeployReport({ ...report, assetSummary, status: 'failed', error: `Public asset offload failed: ${e.message}` });
+      printDeployReport({ ...report, assetSummary: failedAssetSummary, status: 'failed', error: `Public asset offload failed: ${e.message}` });
       return fail(`Public asset offload failed: ${e.message}`);
     }
   } else if (assetSummary.mode !== 'inline') {
@@ -335,16 +339,16 @@ async function syncEnvBeforeDeploy(projectId, target, flags) {
 
 async function offloadPublicAssetsBeforeDeploy(projectId, flags) {
   const mode = assetMode(flags);
-  const empty = { mode, offloaded: false, count: 0, bytes: 0, skipped: 0 };
+  const empty = { mode, status: mode === 'inline' ? 'inline' : 'pending', offloaded: false, count: 0, bytes: 0, skipped: 0 };
   if (mode === 'inline') return empty;
 
   const files = await publicAssetFiles(process.cwd());
-  if (!files.length) return empty;
+  if (!files.length) return { ...empty, status: 'no-public-assets' };
 
   const totalBytes = files.reduce((sum, file) => sum + file.sizeBytes, 0);
   const threshold = assetOffloadThresholdBytes(flags);
   if (mode === 'auto' && totalBytes < threshold) {
-    return { ...empty, bytes: totalBytes };
+    return { ...empty, status: 'below-threshold', count: files.length, bytes: totalBytes, thresholdBytes: threshold };
   }
 
   const assets = [];
@@ -360,7 +364,12 @@ async function offloadPublicAssetsBeforeDeploy(projectId, flags) {
   let uploaded = 0;
   let skipped = 0;
   for (const batch of chunk(assets, 100)) {
-    const prepared = await apiPost(`/projects/${projectId}/public-assets/prepare`, { assets: batch });
+    let prepared;
+    try {
+      prepared = await apiPost(`/projects/${projectId}/public-assets/prepare`, { assets: batch });
+    } catch (e) {
+      throw assetOffloadFailure(e, { mode, status: 'prepare-failed', offloaded: false, count: assets.length, uploaded, skipped, bytes: totalBytes });
+    }
     for (const asset of prepared.assets ?? []) {
       if (asset.skipped) {
         skipped += 1;
@@ -377,15 +386,23 @@ async function offloadPublicAssetsBeforeDeploy(projectId, flags) {
       });
       if (!res.ok) {
         const detail = await res.text().catch(() => '');
-        throw new Error(`Upload ${asset.path} failed with HTTP ${res.status}${detail ? `: ${detail.slice(0, 200)}` : ''}`);
+        throw assetOffloadFailure(
+          new Error(`Upload ${asset.path} failed with HTTP ${res.status}${detail ? `: ${detail.slice(0, 200)}` : ''}`),
+          { mode, status: 'upload-failed', offloaded: false, count: assets.length, uploaded, skipped, bytes: totalBytes },
+        );
       }
       uploaded += 1;
     }
-    await apiPost(`/projects/${projectId}/public-assets/complete`, { assets: batch });
+    try {
+      await apiPost(`/projects/${projectId}/public-assets/complete`, { assets: batch });
+    } catch (e) {
+      throw assetOffloadFailure(e, { mode, status: 'complete-failed', offloaded: false, count: assets.length, uploaded, skipped, bytes: totalBytes });
+    }
   }
 
   return {
     mode,
+    status: 'offloaded',
     offloaded: true,
     count: assets.length,
     uploaded,
@@ -394,6 +411,26 @@ async function offloadPublicAssetsBeforeDeploy(projectId, flags) {
   };
 }
 
+function assetOffloadFailure(error, assetSummary) {
+  const message = friendlyAssetOffloadError(error);
+  const wrapped = new Error(message);
+  wrapped.cause = error;
+  wrapped.status = error?.status;
+  wrapped.assetSummary = { ...assetSummary, error: message };
+  return wrapped;
+}
+
+function friendlyAssetOffloadError(error) {
+  const message = error?.message || String(error);
+  if (error?.status === 404 && /public-assets\/prepare|public-assets/i.test(message)) {
+    return 'This GlashDB API does not support public asset offload yet. Deploy the backend public-assets route and router update, then retry.';
+  }
+  if (error?.status === 503 && /Public asset storage is not configured|storage is not configured/i.test(message)) {
+    return 'Public asset storage is not configured on this GlashDB API. Set the R2 asset storage secrets, redeploy the backend, then retry.';
+  }
+  return message;
+}
+
 function assetMode(flags) {
   const raw = String(flags['asset-mode'] ?? flags.assets ?? flags['public-assets'] ?? 'inline').toLowerCase();
   if (['inline', 'offload', 'auto'].includes(raw)) return raw;
@@ -635,6 +672,7 @@ function printDeployReport(report) {
   const liveUrl = report.liveUrl ? terminalLink(report.liveUrl) : '-';
   const rows = [
     ['Status', formatReportStatus(report.status)],
+    ['Project ID', report.projectId || '-'],
     ['Deployment ID', report.deploymentId || '-'],
     ['Target', report.target || 'production'],
     ['Source', report.source || '-'],
@@ -673,14 +711,29 @@ function formatPackagesUploaded(report) {
 }
 
 function formatAssetSummary(assetSummary) {
-  if (!assetSummary || assetSummary.mode === 'inline') return 'inline';
+  if (!assetSummary || assetSummary.mode === 'inline') return 'inline (bundled with source)';
+  if (assetSummary.status === 'pending') return `${assetSummary.mode} requested`;
+  if (assetSummary.status === 'no-public-assets') return `${assetSummary.mode}, no public assets found`;
+  if (assetSummary.status === 'below-threshold') {
+    return `auto kept inline (${formatBytes(assetSummary.bytes)} below ${formatBytes(assetSummary.thresholdBytes)})`;
+  }
+  if (assetSummary.status === 'prepare-failed') {
+    return `prepare failed (${(assetSummary.count ?? 0).toLocaleString()} assets, ${formatBytes(assetSummary.bytes)})`;
+  }
+  if (assetSummary.status === 'upload-failed') {
+    return `upload failed (${(assetSummary.uploaded ?? 0).toLocaleString()}/${(assetSummary.count ?? 0).toLocaleString()} uploaded, ${formatBytes(assetSummary.bytes)})`;
+  }
+  if (assetSummary.status === 'complete-failed') {
+    return `activation failed (${(assetSummary.uploaded ?? 0).toLocaleString()} uploaded, ${formatBytes(assetSummary.bytes)})`;
+  }
+  if (assetSummary.status === 'failed') return `failed${assetSummary.error ? ` (${assetSummary.error})` : ''}`;
   if (!assetSummary.offloaded) {
     const size = assetSummary.bytes ? ` (${formatBytes(assetSummary.bytes)})` : '';
     return `${assetSummary.mode}, no offload${size}`;
   }
   const uploaded = assetSummary.uploaded ?? Math.max(0, (assetSummary.count ?? 0) - (assetSummary.skipped ?? 0));
   const skipped = assetSummary.skipped ? `, ${assetSummary.skipped.toLocaleString()} reused` : '';
-  return `${assetSummary.count.toLocaleString()} offloaded (${formatBytes(assetSummary.bytes)}; ${uploaded.toLocaleString()} uploaded${skipped})`;
+  return `${assetSummary.count.toLocaleString()} assets offloaded (${formatBytes(assetSummary.bytes)}; ${uploaded.toLocaleString()} uploaded${skipped})`;
 }
 
 function formatDeploymentSize(report) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glash/cli",
-  "version": "0.2.29",
+  "version": "0.2.30",
   "description": "glashDB command-line interface — deploy projects, pull source + env, manage env vars.",
   "license": "Apache-2.0",
   "homepage": "https://glashdb.com",