@promte/app-upload 0.1.10 → 0.1.12

package/README.md

@@ -11,14 +11,15 @@ npx @promte/app-upload push
 ## Commands
 ```
 npx @promte/app-upload config
-  - interactive setup for host/workspaceId/dist (stored in ./promte-app-upload.config.json)
+  - interactive setup for backend host/workspaceId/dist (stored in ./promte-app-upload.config.json)
 
-npx @promte/app-upload push [--host ...] [--workspaceId ...] [--dist ...] [--zip ...] [--serviceKey ...]
+npx @promte/app-upload push [--host ...] [--workspaceId ...] [--dist ...] [--zip ...] [--token ...]
   - uploads ./dist by default
-  - host defaults to https://app.promte.dk
+  - host is the workspace backend URL used for prepare/finalize
+  - assets upload to app.promte.dk (or backend-provided uploadHost)
   - use --zip <file> to upload an existing zip
 ```
 
 Notes:
-- Service key is never stored in the config file.
-- If no service key is provided, the CLI will prompt for it.
+- Tokens are never stored in the config file.
+- If no token is provided, the CLI will prompt for it.

package/bin/promte-app-upload.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import AdmZip from "adm-zip";
 import undici from "undici";
@@ -10,6 +9,7 @@ const { FormData, Blob, fetch: undiciFetch } = undici;
 const BlobCtor = globalThis.Blob || Blob;
 
 const DEFAULT_HOST = "https://app.promte.dk";
+const DEFAULT_UPLOAD_HOST = "https://app.promte.dk";
 const DEFAULT_DIST = "./dist";
 const CONFIG_PATH = path.resolve(process.cwd(), "promte-app-upload.config.json");
 
@@ -18,10 +18,11 @@ function usage() {
     [
       "Usage:",
       "  promte-app-upload config",
-      "  promte-app-upload push [--host <url>] [--workspaceId <id>] [--dist <path>] [--zip <file>] [--serviceKey <key>]",
+      "  promte-app-upload push [--host <url>] [--workspaceId <id>] [--dist <path>] [--zip <file>] [--token <token>]",
       "",
       "Defaults:",
-      `  host: ${DEFAULT_HOST}`,
+      `  host (backend URL): ${DEFAULT_HOST}`,
+      `  upload host: ${DEFAULT_UPLOAD_HOST}`,
       `  dist: ${DEFAULT_DIST}`,
       `  config: ${CONFIG_PATH}`,
     ].join("\n"),
@@ -104,7 +105,7 @@ function assert(condition, message) {
 
 async function runConfig() {
   const current = loadConfig();
-  const host = await prompt("Host", current.host || DEFAULT_HOST);
+  const host = await prompt("Backend host", current.host || DEFAULT_HOST);
   const workspaceId = await prompt("Workspace ID", current.workspaceId || "");
   const dist = await prompt("Dist path", current.dist || DEFAULT_DIST);
   assert(workspaceId, "workspaceId is required");
@@ -172,21 +173,37 @@ function ensureZipHasIndex(zipPath) {
   return { abs, name: path.basename(abs) };
 }
 
+async function parseResponseBody(res) {
+  const text = await res.text();
+  try {
+    return { text, json: JSON.parse(text) };
+  } catch {
+    return { text, json: null };
+  }
+}
+
 async function runPush(args) {
   const config = loadConfig();
   const host = args.host || config.host || DEFAULT_HOST;
   const workspaceId = args.workspaceId || config.workspaceId;
   const dist = args.dist || config.dist || DEFAULT_DIST;
   const zipPath = args.zip;
-  let serviceKey = args.serviceKey;
+  let token = args.token;
+  const requestedVersion = args.version ? Number(args.version) : null;
+  if (args.version) {
+    assert(
+      Number.isFinite(requestedVersion) && requestedVersion > 0,
+      "--version must be a positive number",
+    );
+  }
 
   assert(workspaceId, "workspaceId is required (config or --workspaceId)");
   const absDist = zipPath ? null : ensureDist(dist);
 
-  if (!serviceKey) {
-    serviceKey = await promptSecret("Service key");
+  if (!token) {
+    token = await promptSecret("Workspace token");
   }
-  assert(serviceKey, "serviceKey is required");
+  assert(token, "token is required");
 
   let zipBuffer;
   let zipName = "dist.zip";
@@ -205,40 +222,91 @@ async function runPush(args) {
   const blob = new BlobCtor([zipBuffer], { type: "application/zip" });
   form.append("app", blob, zipName);
 
-  const url = new URL("/api/upload-app-version", host);
-  url.searchParams.set("workspaceId", workspaceId);
-  if (args.version) url.searchParams.set("version", args.version);
+  const prepareUrl = new URL("/api/app-upload/prepare", host);
+  const prepareRes = await undiciFetch(prepareUrl.toString(), {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      workspaceId,
+      ...(Number.isFinite(requestedVersion) && requestedVersion > 0
+        ? { version: requestedVersion }
+        : {}),
+    }),
+  });
+  const prepareBody = await parseResponseBody(prepareRes);
+  if (!prepareRes.ok) {
+    if (prepareRes.status === 404) {
+      console.error(
+        "Prepare endpoint not found on backend host. Deploy backend with /api/app-upload/prepare support.",
+      );
+    }
+    console.error(
+      `Prepare failed (${prepareRes.status}): ${prepareBody.text || "Unknown error"}`,
+    );
+    process.exit(1);
+  }
+
+  const uploadToken = prepareBody.json?.uploadToken;
+  const version = Number(prepareBody.json?.version);
+  const uploadHost =
+    String(prepareBody.json?.uploadHost || "").trim() || DEFAULT_UPLOAD_HOST;
+
+  assert(uploadToken, "Prepare response is missing uploadToken");
+  assert(
+    Number.isFinite(version) && version > 0,
+    "Prepare response has invalid version",
+  );
 
-  const res = await undiciFetch(url.toString(), {
+  const uploadUrl = new URL("/api/upload-app", uploadHost);
+  uploadUrl.searchParams.set("workspaceId", workspaceId);
+  uploadUrl.searchParams.set("version", String(version));
+
+  const uploadRes = await undiciFetch(uploadUrl.toString(), {
     method: "POST",
     headers: {
-      "service-key": serviceKey,
+      Authorization: `Bearer ${uploadToken}`,
     },
     body: form,
   });
-
-  const text = await res.text();
-  if (!res.ok) {
-    console.error(`Upload failed (${res.status}): ${text}`);
+  const uploadBody = await parseResponseBody(uploadRes);
+  if (!uploadRes.ok) {
+    console.error(
+      `Upload failed (${uploadRes.status}): ${uploadBody.text || "Unknown error"}`,
+    );
     process.exit(1);
   }
-  let payload = null;
-  try {
-    payload = JSON.parse(text);
-  } catch {
-    console.log(text);
-    return;
-  }
 
-  if (payload?.ok) {
-    console.log("Upload complete ✅");
-    console.log(`Workspace: ${payload.workspaceId}`);
-    console.log(`Version:   ${payload.version}`);
-    console.log(`Files:     ${payload.filesWritten}`);
-    return;
+  const finalizeUrl = new URL("/api/app-upload/finalize", host);
+  const finalizeRes = await undiciFetch(finalizeUrl.toString(), {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      workspaceId,
+      version,
+      zipName,
+      zipSize: zipBuffer.length,
+    }),
+  });
+  const finalizeBody = await parseResponseBody(finalizeRes);
+  if (!finalizeRes.ok) {
+    console.error(
+      `Finalize failed (${finalizeRes.status}): ${finalizeBody.text || "Unknown error"}`,
+    );
+    process.exit(1);
   }
 
-  console.log(text);
+  console.log("Upload complete ✅");
+  console.log(`Workspace: ${workspaceId}`);
+  console.log(`Version:   ${version}`);
+  if (uploadBody.json?.filesWritten != null) {
+    console.log(`Files:     ${uploadBody.json.filesWritten}`);
+  }
 }
 
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promte/app-upload",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "CLI to upload Promte app bundles",
   "type": "module",
   "bin": {