tidepush 0.1.0 → 0.2.0

package/dist/index.js

@@ -58,7 +58,11 @@ async function api(cfg, path, init = {}) {
     headers["content-type"] = "application/json";
     body = JSON.stringify(init.json);
   }
-  const res = await fetch(`${cfg.adminBase ?? `${cfg.server}/admin`}${path}`, { method: init.method ?? "GET", headers, body });
+  const res = await fetch(`${cfg.adminBase ?? `${cfg.server}/admin`}${path}`, {
+    method: init.method ?? "GET",
+    headers,
+    body
+  });
   const text = await res.text();
   if (!res.ok) {
     let message = text;
@@ -72,17 +76,26 @@ async function api(cfg, path, init = {}) {
 
 // src/commands.ts
 async function promote(cfg, id, channel, rolloutPct) {
-  const res = await api(cfg, appPath(cfg, `/updates/${encodeURIComponent(id)}/promote`), { method: "POST", json: { channel, ...rolloutPct !== undefined ? { rolloutPct } : {} } });
+  const res = await api(cfg, appPath(cfg, `/updates/${encodeURIComponent(id)}/promote`), {
+    method: "POST",
+    json: { channel, ...rolloutPct !== undefined ? { rolloutPct } : {} }
+  });
   console.log(`✔ Promoted ${id} to ${channel} (group ${res.groupId})`);
   for (const u of res.updates)
     console.log(`  ${u.platform.padEnd(8)} ${u.id}`);
 }
 async function rollout(cfg, id, pct) {
-  const res = await api(cfg, appPath(cfg, `/updates/${encodeURIComponent(id)}/rollout`), { method: "POST", json: { pct } });
+  const res = await api(cfg, appPath(cfg, `/updates/${encodeURIComponent(id)}/rollout`), {
+    method: "POST",
+    json: { pct }
+  });
   console.log(`✔ Rollout set to ${pct}% for ${res.updates.map((u) => `${u.platform} ${u.id}`).join(", ")}`);
 }
 async function rollback(cfg, id, toEmbedded) {
-  const res = await api(cfg, appPath(cfg, `/updates/${encodeURIComponent(id)}/rollback`), { method: "POST", json: { toEmbedded } });
+  const res = await api(cfg, appPath(cfg, `/updates/${encodeURIComponent(id)}/rollback`), {
+    method: "POST",
+    json: { toEmbedded }
+  });
   for (const r of res.results) {
     const what = r.outcome === "republished" ? `previous update republished as ${r.republishedId}` : r.outcome === "embedded" ? "devices will roll back to the embedded bundle" : "rolled back";
     console.log(`✔ ${r.platform.padEnd(8)} ${r.id}: ${what}`);
@@ -150,7 +163,8 @@ async function choose(question, items, label) {
   if (!process.stdin.isTTY) {
     throw new Error(`${question} There are several; pass it as a flag (see \`tidepush help\`).`);
   }
-  items.forEach((t, i) => console.log(`  ${i + 1}) ${label(t)}`));
+  for (const [i, t] of items.entries())
+    console.log(`  ${i + 1}) ${label(t)}`);
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   try {
     for (;; ) {
@@ -231,7 +245,10 @@ async function init(cfg, opts) {
   };
   if (!existsSync(appJsonPath)) {
     console.log("! No app.json here (app.config.ts?). Add these to your config's `expo` object:");
-    console.log(JSON.stringify({ runtimeVersion: { policy: "fingerprint" }, updates: { ...updates, requestHeaders: { "expo-channel-name": opts.channel ?? "production" } } }, null, 2));
+    console.log(JSON.stringify({
+      runtimeVersion: { policy: "fingerprint" },
+      updates: { ...updates, requestHeaders: { "expo-channel-name": opts.channel ?? "production" } }
+    }, null, 2));
     return;
   }
   const raw = JSON.parse(await readFile2(appJsonPath, "utf8"));
@@ -276,7 +293,9 @@ function openBrowser(url) {
 var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 async function login(opts = {}) {
   const web = (opts.webUrl ?? process.env.TIDEPUSH_WEB_URL ?? DEFAULT_WEB_URL).replace(/\/$/, "");
-  const start = await post(`${web}/api/auth/device/code`, { client_id: CLIENT_ID });
+  const start = await post(`${web}/api/auth/device/code`, {
+    client_id: CLIENT_ID
+  });
   if (start.status !== 200 || !start.data.device_code) {
     throw new Error(`Couldn't start signing in at ${web} (${start.status}). ${start.data.error_description ?? ""}`.trim());
   }
@@ -340,9 +359,12 @@ async function logout() {
 
 // src/publish.ts
 import { spawn as spawn2 } from "node:child_process";
-import { mkdtemp, readFile as readFile4, rm as rm2 } from "node:fs/promises";
+import { constants } from "node:fs";
+import { access, mkdtemp, readFile as readFile4, rm as rm2 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join4, resolve as resolve2 } from "node:path";
+import { dirname as dirname2, join as join4, resolve as resolve2 } from "node:path";
+import { promisify } from "node:util";
+import { gzip } from "node:zlib";
 
 // src/export.ts
 import { createHash } from "node:crypto";
@@ -369,30 +391,37 @@ var CONTENT_TYPES = {
 function contentTypeFor(ext) {
   return CONTENT_TYPES[ext.toLowerCase()] ?? "application/octet-stream";
 }
-async function hashFile(path) {
-  const bytes = await readFile3(path);
-  return { key: createHash("sha256").update(bytes).digest("hex"), size: bytes.byteLength };
-}
 async function readExport(distDir, platforms) {
   const metadata = JSON.parse(await readFile3(join3(distDir, "metadata.json"), "utf8"));
-  const bundles = [];
-  for (const platform of platforms) {
+  const hashes = new Map;
+  const hash = (path) => {
+    let h = hashes.get(path);
+    if (!h) {
+      h = readFile3(path).then((bytes) => ({
+        key: createHash("sha256").update(bytes).digest("hex"),
+        size: bytes.byteLength
+      }));
+      hashes.set(path, h);
+    }
+    return h;
+  };
+  return Promise.all(platforms.map(async (platform) => {
     const meta = metadata.fileMetadata[platform];
     if (!meta)
       throw new Error(`metadata.json has no ${platform} entry; was it exported?`);
     const bundlePath = join3(distDir, meta.bundle);
-    const launch = await hashFile(bundlePath);
+    const files = meta.assets.map((a) => ({ path: join3(distDir, a.path), ext: a.ext }));
+    const [launch, ...hashed] = await Promise.all([hash(bundlePath), ...files.map((f) => hash(f.path))]);
     const assets = [];
     const seen = new Set([launch.key]);
-    for (const a of meta.assets) {
-      const path = join3(distDir, a.path);
-      const { key, size } = await hashFile(path);
+    files.forEach(({ path, ext }, i) => {
+      const { key, size } = hashed[i];
       if (seen.has(key))
-        continue;
+        return;
       seen.add(key);
-      assets.push({ path, key, size, contentType: contentTypeFor(a.ext), fileExtension: `.${a.ext}` });
-    }
-    bundles.push({
+      assets.push({ path, key, size, contentType: contentTypeFor(ext), fileExtension: `.${ext}` });
+    });
+    return {
       platform,
       launchAsset: {
         path: bundlePath,
@@ -401,9 +430,8 @@ async function readExport(distDir, platforms) {
         fileExtension: ".bundle"
       },
       assets
-    });
-  }
-  return bundles;
+    };
+  }));
 }
 
 // src/publish.ts
@@ -441,10 +469,47 @@ async function git(appDir, args) {
     return;
   }
 }
+async function localCommand(appDir, pkg, args) {
+  if (process.platform !== "win32") {
+    for (let dir = appDir;; dir = dirname2(dir)) {
+      const bin = join4(dir, "node_modules", ".bin", pkg);
+      if (await access(bin, constants.X_OK).then(() => true, () => false))
+        return [bin, args];
+      if (dirname2(dir) === dir)
+        break;
+    }
+  }
+  return ["npx", [pkg, ...args]];
+}
+function literalRuntimeVersion(expoClient, platform) {
+  const platformValue = expoClient[platform]?.runtimeVersion;
+  const value = platformValue ?? expoClient.runtimeVersion;
+  return typeof value === "string" && value ? value : undefined;
+}
+var gzipAsync = promisify(gzip);
+var UPLOAD_CONCURRENCY = 12;
+var GZIP_MIN_BYTES = 1024;
+async function uploadBody(bytes, canGzip) {
+  if (canGzip && bytes.byteLength >= GZIP_MIN_BYTES) {
+    const compressed = await gzipAsync(bytes, { level: 6 });
+    if (compressed.byteLength < bytes.byteLength * 0.9) {
+      return {
+        body: compressed,
+        headers: { "x-upload-encoding": "gzip", "x-decoded-length": String(bytes.byteLength) }
+      };
+    }
+  }
+  return { body: bytes, headers: {} };
+}
 async function publish(cfg, opts) {
   const appDir = resolve2(opts.appDir);
+  const started = performance.now();
+  const elapsed = () => `${((performance.now() - started) / 1000).toFixed(1)}s`;
   const step = (msg) => console.log(`• ${msg}`);
-  const runIn = (cmd, args, quiet = true) => run(cmd, args, { cwd: appDir, channel: opts.channel, quiet });
+  const runIn = async (pkg2, args, quiet = true) => {
+    const [cmd, argv] = await localCommand(appDir, pkg2, args);
+    return run(cmd, argv, { cwd: appDir, channel: opts.channel, quiet });
+  };
   const pkg = JSON.parse(await readFile4(join4(appDir, "package.json"), "utf8"));
   if (!pkg.dependencies?.["expo-updates"])
     throw new Error(`${appDir} does not depend on expo-updates`);
@@ -453,12 +518,26 @@ async function publish(cfg, opts) {
   if (!distDir) {
     tempDir = await mkdtemp(join4(tmpdir(), "tidepush-export-"));
     distDir = tempDir;
-    step(`Exporting ${opts.platforms.join(" + ")} bundle(s)…`);
-    await runIn("npx", ["expo", "export", ...opts.platforms.flatMap((p) => ["--platform", p]), "--output-dir", distDir], false);
   }
   try {
-    step("Reading app config and runtime version…");
-    const expoClient = lastJson(await runIn("npx", ["expo", "config", "--type", "public", "--json"]));
+    step(opts.distDir ? "Reading app config and runtime version…" : `Exporting ${opts.platforms.join(" + ")} bundle(s) and reading the app config…`);
+    const exported = opts.distDir ? Promise.resolve() : runIn("expo", ["export", ...opts.platforms.flatMap((p) => ["--platform", p]), "--output-dir", distDir], false);
+    const config = runIn("expo", ["config", "--type", "public", "--json"]).then((out) => lastJson(out));
+    const runtimes = config.then(async (expoClient2) => new Map(await Promise.all(opts.platforms.map(async (platform) => {
+      const rv = opts.runtimeVersion ?? literalRuntimeVersion(expoClient2, platform) ?? lastJson(await runIn("expo-updates", ["runtimeversion:resolve", "--platform", platform])).runtimeVersion;
+      if (!rv)
+        throw new Error(`Could not resolve a runtime version for ${platform}`);
+      return [platform, rv];
+    }))));
+    const gitInfo = Promise.all([git(appDir, ["rev-parse", "HEAD"]), git(appDir, ["status", "--porcelain"])]);
+    const [, expoClient, runtimeVersions, [sha, status]] = await settleAll([
+      exported,
+      config,
+      runtimes,
+      gitInfo
+    ]);
+    if (!opts.distDir)
+      step(`Exported in ${elapsed()}`);
     if (cfg && !cfg.appId) {
       const fromConfig = appIdFromUpdatesUrl(expoClient.updates?.url);
       if (fromConfig)
@@ -466,15 +545,7 @@ async function publish(cfg, opts) {
     }
     if (cfg?.appId)
       console.log(`  app      ${cfg.appId}`);
-    const runtimeVersions = new Map;
-    for (const platform of opts.platforms) {
-      const rv = opts.runtimeVersion ?? lastJson(await runIn("npx", ["expo-updates", "runtimeversion:resolve", "--platform", platform])).runtimeVersion;
-      if (!rv)
-        throw new Error(`Could not resolve a runtime version for ${platform}`);
-      runtimeVersions.set(platform, rv);
-    }
-    const sha = await git(appDir, ["rev-parse", "HEAD"]);
-    const dirty = !!await git(appDir, ["status", "--porcelain"]);
+    const dirty = !!status;
     const gitSha = sha ? `${sha.slice(0, 12)}${dirty ? "-dirty" : ""}` : undefined;
     if (dirty)
       console.warn("! Working tree has uncommitted changes; they are included in this update.");
@@ -488,23 +559,28 @@ async function publish(cfg, opts) {
       console.log(`  ${b.platform.padEnd(8)} runtime ${runtimeVersions.get(b.platform)}  bundle ${kb(b.launchAsset.size)}  ${b.assets.length} assets`);
     }
     if (!cfg) {
-      console.log(`✔ Dry run: ${allAssets.size} unique files, ${kb(totalBytes)}. Nothing uploaded.`);
+      console.log(`✔ Dry run: ${allAssets.size} unique files, ${kb(totalBytes)}. Nothing uploaded. (${elapsed()})`);
       return;
     }
-    const { missing } = await api(cfg, appPath(cfg, "/assets/missing"), {
+    const { missing, uploadEncodings } = await api(cfg, appPath(cfg, "/assets/missing"), {
       method: "POST",
       json: { keys: [...allAssets.keys()] }
     });
+    const canGzip = uploadEncodings?.includes("gzip") ?? false;
     const toUpload = missing.map((k) => allAssets.get(k));
     step(`Uploading ${toUpload.length}/${allAssets.size} files (${kb(toUpload.reduce((n, a) => n + a.size, 0))})…`);
-    await pool(toUpload, 6, async (a) => {
-      const body = await readFile4(a.path);
+    let sentBytes = 0;
+    await pool(toUpload, UPLOAD_CONCURRENCY, async (a) => {
+      const { body, headers } = await uploadBody(await readFile4(a.path), canGzip);
+      sentBytes += body.byteLength;
       await retry(() => api(cfg, appPath(cfg, `/assets/${a.key}`), {
         method: "PUT",
         body,
-        headers: { "content-type": a.contentType, "x-file-extension": a.fileExtension }
+        headers: { "content-type": a.contentType, "x-file-extension": a.fileExtension, ...headers }
       }));
     });
+    if (toUpload.length)
+      step(`Uploaded ${kb(sentBytes)}${canGzip ? " (gzipped where it helps)" : ""} by ${elapsed()}`);
     const res = await api(cfg, appPath(cfg, "/updates"), {
       method: "POST",
       json: {
@@ -521,7 +597,7 @@ async function publish(cfg, opts) {
         }))
       }
     });
-    console.log(`✔ Published to ${opts.channel} at ${opts.rolloutPct}% (group ${res.groupId})`);
+    console.log(`✔ Published to ${opts.channel} at ${opts.rolloutPct}% (group ${res.groupId}) in ${elapsed()}`);
     for (const u of res.updates)
       console.log(`  ${u.platform.padEnd(8)} ${u.id}`);
   } finally {
@@ -541,6 +617,13 @@ async function retry(fn, attempts = 4, baseDelayMs = 1000) {
     }
   }
 }
+async function settleAll(promises) {
+  const settled = await Promise.allSettled(promises);
+  const failed = settled.find((r) => r.status === "rejected");
+  if (failed)
+    throw failed.reason;
+  return settled.map((r) => r.value);
+}
 async function pool(items, size, fn) {
   const queue = [...items];
   await Promise.all(Array.from({ length: Math.min(size, queue.length) }, async () => {
@@ -590,7 +673,7 @@ if (!("Bun" in globalThis)) {
 async function main(argv) {
   const [command, ...rest] = argv;
   if (command === "--version" || command === "-v" || command === "version") {
-    console.log("0.1.0");
+    console.log("0.2.0");
     return;
   }
   if (!command || command === "help" || command === "--help" || command === "-h") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidepush",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Publish and manage OTA updates for Expo apps with Tidepush.",
   "type": "module",
   "bin": {
@@ -33,7 +33,9 @@
   },
   "license": "AGPL-3.0-only",
   "devDependencies": {
+    "@tidepush/api": "workspace:*",
+    "@tidepush/tsconfig": "workspace:*",
     "@types/bun": "^1.4.3",
-    "typescript": "^7.0.2"
+    "typescript": "catalog:"
   }
 }