@promte/app-upload 0.1.2 → 0.1.5

package/README.md

@@ -11,11 +11,12 @@ npx promte-app-upload push
 ## Commands
 ```
 promte-app-upload config
-  - interactive setup for host/workspaceId/dist (stored in ~/.promte-app-upload.json)
+  - interactive setup for host/workspaceId/dist (stored in ./promte-app-upload.config.json)
 
-promte-app-upload push [--host ...] [--workspaceId ...] [--dist ...] [--serviceKey ...]
+promte-app-upload push [--host ...] [--workspaceId ...] [--dist ...] [--zip ...] [--serviceKey ...]
   - uploads ./dist by default
   - host defaults to https://app.promte.dk
+  - use --zip <file> to upload an existing zip
 ```
 
 Notes:

package/bin/promte-app-upload.js

@@ -10,14 +10,14 @@ const { FormData, File } = undici;
 
 const DEFAULT_HOST = "https://app.promte.dk";
 const DEFAULT_DIST = "./dist";
-const CONFIG_PATH = path.join(os.homedir(), ".promte-app-upload.json");
+const CONFIG_PATH = path.resolve(process.cwd(), "promte-app-upload.config.json");
 
 function usage() {
   console.log(
     [
       "Usage:",
       "  promte-app-upload config",
-      "  promte-app-upload push [--host <url>] [--workspaceId <id>] [--dist <path>] [--serviceKey <key>]",
+      "  promte-app-upload push [--host <url>] [--workspaceId <id>] [--dist <path>] [--zip <file>] [--serviceKey <key>]",
       "",
       "Defaults:",
       `  host: ${DEFAULT_HOST}`,
@@ -121,32 +121,86 @@ function ensureDist(distPath) {
   const indexPath = path.join(abs, "index.html");
   assert(
     fs.existsSync(indexPath),
-    `index.html not found in dist folder: ${indexPath}`,
+    `index.html not found in dist folder: ${indexPath}. Make sure you're pointing at the built output.`,
   );
   return abs;
 }
 
+function normalizeZipPath(p) {
+  return p.replace(/\\/g, "/").replace(/^\/+/, "");
+}
+
+function detectSingleRoot(entryNames) {
+  const roots = new Set(
+    entryNames
+      .map(normalizeZipPath)
+      .filter(Boolean)
+      .map((p) => p.split("/")[0]),
+  );
+  return roots.size === 1 ? [...roots][0] : null;
+}
+
+function ensureZipHasIndex(zipPath) {
+  const abs = path.resolve(process.cwd(), zipPath);
+  assert(fs.existsSync(abs), `Zip file not found: ${abs}`);
+  assert(fs.statSync(abs).isFile(), `Zip path is not a file: ${abs}`);
+  assert(/\.zip$/i.test(abs), `File must be a .zip: ${abs}`);
+
+  const zip = new AdmZip(abs);
+  const entries = zip.getEntries().filter((e) => !e.isDirectory);
+  assert(entries.length > 0, "Zip contains no files.");
+
+  const entryNames = entries.map((e) => e.entryName);
+  const singleRoot = detectSingleRoot(entryNames);
+
+  const normalized = entryNames
+    .map(normalizeZipPath)
+    .map((name) => {
+      if (singleRoot && name.startsWith(singleRoot + "/")) {
+        return name.slice(singleRoot.length + 1);
+      }
+      return name;
+    })
+    .filter(Boolean);
+
+  assert(
+    normalized.includes("index.html"),
+    "Zip is missing index.html at the root (after unzipping).",
+  );
+
+  return { abs, name: path.basename(abs) };
+}
+
 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;
 
   assert(workspaceId, "workspaceId is required (config or --workspaceId)");
-  const absDist = ensureDist(dist);
+  const absDist = zipPath ? null : ensureDist(dist);
 
   if (!serviceKey) {
     serviceKey = await promptSecret("Service key");
   }
   assert(serviceKey, "serviceKey is required");
 
-  const zip = new AdmZip();
-  zip.addLocalFolder(absDist, "");
-  const zipBuffer = zip.toBuffer();
+  let zipBuffer;
+  let zipName = "dist.zip";
+  if (zipPath) {
+    const { abs, name } = ensureZipHasIndex(zipPath);
+    zipBuffer = fs.readFileSync(abs);
+    zipName = name;
+  } else {
+    const zip = new AdmZip();
+    zip.addLocalFolder(absDist, "");
+    zipBuffer = zip.toBuffer();
+  }
 
   const form = new FormData();
-  const file = new File([zipBuffer], "dist.zip", {
+  const file = new File([zipBuffer], zipName, {
     type: "application/zip",
   });
   form.append("app", file);

package/package.json

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