@fireota/cli 0.4.0 → 0.6.0

package/lib/project.mjs

@@ -1,78 +1,78 @@
-/** Reads facts about the React Native project the CLI runs in. */
-import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-
-/** android/app/build.gradle(.kts): versionName "1.3.3" / versionName = "1.3.3" */
-export function androidVersionName(root = ".") {
-  for (const file of ["android/app/build.gradle", "android/app/build.gradle.kts"]) {
-    const path = join(root, file);
-    if (!existsSync(path)) continue;
-    const match = /versionName\s*=?\s*["']([^"']+)["']/.exec(readFileSync(path, "utf8"));
-    if (match) return match[1];
-  }
-  return undefined;
-}
-
-/** ios/<App>.xcodeproj/project.pbxproj MARKETING_VERSION, or a literal CFBundleShortVersionString. */
-export function iosMarketingVersion(root = ".") {
-  const ios = join(root, "ios");
-  if (!existsSync(ios)) return undefined;
-  for (const entry of readdirSync(ios)) {
-    if (!entry.endsWith(".xcodeproj")) continue;
-    const pbx = join(ios, entry, "project.pbxproj");
-    if (!existsSync(pbx)) continue;
-    const match = /MARKETING_VERSION\s*=\s*"?([0-9][^";]*)"?;/.exec(readFileSync(pbx, "utf8"));
-    if (match) return match[1].trim();
-  }
-  for (const entry of readdirSync(ios)) {
-    const plist = join(ios, entry, "Info.plist");
-    if (!existsSync(plist)) continue;
-    const match = /<key>CFBundleShortVersionString<\/key>\s*<string>([^<$]+)<\/string>/.exec(readFileSync(plist, "utf8"));
-    if (match) return match[1].trim();
-  }
-  return undefined;
-}
-
-/** True for Expo projects (the `expo` package is a dependency). */
-export function isExpoProject(root = ".") {
-  const path = join(root, "package.json");
-  if (!existsSync(path)) return false;
-  const pkg = JSON.parse(readFileSync(path, "utf8"));
-  return Boolean(pkg.dependencies?.expo ?? pkg.devDependencies?.expo);
-}
-
-/** The `expo` object of app.json, or null (no app.json, or a dynamic app.config.js / .ts). */
-export function readExpoAppJson(root = ".") {
-  const path = join(root, "app.json");
-  if (!existsSync(path)) return null;
-  const json = JSON.parse(readFileSync(path, "utf8"));
-  return json.expo ?? json;
-}
-
-/** Expo writes `expo.version` into versionName / CFBundleShortVersionString at prebuild. */
-export function expoVersion(root = ".") {
-  const version = readExpoAppJson(root)?.version;
-  return typeof version === "string" && version ? version : undefined;
-}
-
-/** The app's store version for a platform — FireOTA's default runtime version. */
-export function storeVersion(platform, root = ".") {
-  const native = platform === "ios" ? iosMarketingVersion(root) : androidVersionName(root);
-  // Expo projects without android/ or ios/ yet (Continuous Native Generation): use app.json.
-  return native ?? (isExpoProject(root) ? expoVersion(root) : undefined);
-}
-
-/** Recursively finds the first file matching a name test below a directory. */
-export function findFile(dir, test, depth = 6) {
-  if (!existsSync(dir) || depth < 0) return undefined;
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    if (entry.name === "build" || entry.name === "Pods" || entry.name.startsWith(".")) continue;
-    const path = join(dir, entry.name);
-    if (entry.isFile() && test(entry.name)) return path;
-    if (entry.isDirectory()) {
-      const found = findFile(path, test, depth - 1);
-      if (found) return found;
-    }
-  }
-  return undefined;
-}
+/** Reads facts about the React Native project the CLI runs in. */
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+/** android/app/build.gradle(.kts): versionName "1.3.3" / versionName = "1.3.3" */
+export function androidVersionName(root = ".") {
+  for (const file of ["android/app/build.gradle", "android/app/build.gradle.kts"]) {
+    const path = join(root, file);
+    if (!existsSync(path)) continue;
+    const match = /versionName\s*=?\s*["']([^"']+)["']/.exec(readFileSync(path, "utf8"));
+    if (match) return match[1];
+  }
+  return undefined;
+}
+
+/** ios/<App>.xcodeproj/project.pbxproj MARKETING_VERSION, or a literal CFBundleShortVersionString. */
+export function iosMarketingVersion(root = ".") {
+  const ios = join(root, "ios");
+  if (!existsSync(ios)) return undefined;
+  for (const entry of readdirSync(ios)) {
+    if (!entry.endsWith(".xcodeproj")) continue;
+    const pbx = join(ios, entry, "project.pbxproj");
+    if (!existsSync(pbx)) continue;
+    const match = /MARKETING_VERSION\s*=\s*"?([0-9][^";]*)"?;/.exec(readFileSync(pbx, "utf8"));
+    if (match) return match[1].trim();
+  }
+  for (const entry of readdirSync(ios)) {
+    const plist = join(ios, entry, "Info.plist");
+    if (!existsSync(plist)) continue;
+    const match = /<key>CFBundleShortVersionString<\/key>\s*<string>([^<$]+)<\/string>/.exec(readFileSync(plist, "utf8"));
+    if (match) return match[1].trim();
+  }
+  return undefined;
+}
+
+/** True for Expo projects (the `expo` package is a dependency). */
+export function isExpoProject(root = ".") {
+  const path = join(root, "package.json");
+  if (!existsSync(path)) return false;
+  const pkg = JSON.parse(readFileSync(path, "utf8"));
+  return Boolean(pkg.dependencies?.expo ?? pkg.devDependencies?.expo);
+}
+
+/** The `expo` object of app.json, or null (no app.json, or a dynamic app.config.js / .ts). */
+export function readExpoAppJson(root = ".") {
+  const path = join(root, "app.json");
+  if (!existsSync(path)) return null;
+  const json = JSON.parse(readFileSync(path, "utf8"));
+  return json.expo ?? json;
+}
+
+/** Expo writes `expo.version` into versionName / CFBundleShortVersionString at prebuild. */
+export function expoVersion(root = ".") {
+  const version = readExpoAppJson(root)?.version;
+  return typeof version === "string" && version ? version : undefined;
+}
+
+/** The app's store version for a platform — FireOTA's default runtime version. */
+export function storeVersion(platform, root = ".") {
+  const native = platform === "ios" ? iosMarketingVersion(root) : androidVersionName(root);
+  // Expo projects without android/ or ios/ yet (Continuous Native Generation): use app.json.
+  return native ?? (isExpoProject(root) ? expoVersion(root) : undefined);
+}
+
+/** Recursively finds the first file matching a name test below a directory. */
+export function findFile(dir, test, depth = 6) {
+  if (!existsSync(dir) || depth < 0) return undefined;
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    if (entry.name === "build" || entry.name === "Pods" || entry.name.startsWith(".")) continue;
+    const path = join(dir, entry.name);
+    if (entry.isFile() && test(entry.name)) return path;
+    if (entry.isDirectory()) {
+      const found = findFile(path, test, depth - 1);
+      if (found) return found;
+    }
+  }
+  return undefined;
+}

package/lib/signing.mjs

@@ -1,48 +1,48 @@
-/**
- * Code signing (optional, per app). The private key stays on this machine or in your CI's
- * secret store; FireOTA and the app only ever see the public key.
- *
- * Signed message — identical in the server and the SDK:
- *   fireota-update-v1\n<runtimeVersion>\n<platform>\n<sha256 of the .fota package, hex>
- */
-import { createPrivateKey, generateKeyPairSync, sign } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { join, resolve } from "node:path";
-
-export function signatureMessage({ runtimeVersion, platform, sha256 }) {
-  return `fireota-update-v1\n${runtimeVersion}\n${platform}\n${sha256.toLowerCase()}`;
-}
-
-/** --private-key <file>, or FIREOTA_SIGNING_KEY (PEM text) / FIREOTA_SIGNING_KEY_PATH in CI. */
-export function loadPrivateKey(flagPath) {
-  const path = flagPath ?? process.env.FIREOTA_SIGNING_KEY_PATH;
-  const pem = path ? readFileSync(resolve(String(path)), "utf8") : process.env.FIREOTA_SIGNING_KEY;
-  if (!pem) return null;
-  // CI secret stores often turn newlines into literal "\n".
-  const key = createPrivateKey(pem.includes("\\n") ? pem.replace(/\\n/g, "\n") : pem);
-  if (key.asymmetricKeyType !== "rsa") throw new Error("The signing key must be an RSA private key.");
-  return key;
-}
-
-export function signUpdate(privateKey, input) {
-  return sign("sha256", Buffer.from(signatureMessage(input), "utf8"), privateKey).toString("base64");
-}
-
-export function generateKeys(outDir) {
-  const dir = resolve(outDir ?? "fireota-keys");
-  const privatePath = join(dir, "fireota-private.pem");
-  const publicPath = join(dir, "fireota-public.pem");
-  if (existsSync(privatePath) || existsSync(publicPath)) {
-    throw new Error(`${dir} already contains FireOTA keys. Refusing to overwrite them.`);
-  }
-  const { publicKey, privateKey } = generateKeyPairSync("rsa", {
-    modulusLength: 2048,
-    publicKeyEncoding: { type: "spki", format: "pem" },
-    privateKeyEncoding: { type: "pkcs8", format: "pem" },
-  });
-  mkdirSync(dir, { recursive: true });
-  writeFileSync(privatePath, privateKey, { mode: 0o600 });
-  writeFileSync(publicPath, publicKey);
-  writeFileSync(join(dir, ".gitignore"), "fireota-private.pem\n");
-  return { dir, privatePath, publicPath, publicKey };
-}
+/**
+ * Code signing (optional, per app). The private key stays on this machine or in your CI's
+ * secret store; FireOTA and the app only ever see the public key.
+ *
+ * Signed message — identical in the server and the SDK:
+ *   fireota-update-v1\n<runtimeVersion>\n<platform>\n<sha256 of the .fota package, hex>
+ */
+import { createPrivateKey, generateKeyPairSync, sign } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+
+export function signatureMessage({ runtimeVersion, platform, sha256 }) {
+  return `fireota-update-v1\n${runtimeVersion}\n${platform}\n${sha256.toLowerCase()}`;
+}
+
+/** --private-key <file>, or FIREOTA_SIGNING_KEY (PEM text) / FIREOTA_SIGNING_KEY_PATH in CI. */
+export function loadPrivateKey(flagPath) {
+  const path = flagPath ?? process.env.FIREOTA_SIGNING_KEY_PATH;
+  const pem = path ? readFileSync(resolve(String(path)), "utf8") : process.env.FIREOTA_SIGNING_KEY;
+  if (!pem) return null;
+  // CI secret stores often turn newlines into literal "\n".
+  const key = createPrivateKey(pem.includes("\\n") ? pem.replace(/\\n/g, "\n") : pem);
+  if (key.asymmetricKeyType !== "rsa") throw new Error("The signing key must be an RSA private key.");
+  return key;
+}
+
+export function signUpdate(privateKey, input) {
+  return sign("sha256", Buffer.from(signatureMessage(input), "utf8"), privateKey).toString("base64");
+}
+
+export function generateKeys(outDir) {
+  const dir = resolve(outDir ?? "fireota-keys");
+  const privatePath = join(dir, "fireota-private.pem");
+  const publicPath = join(dir, "fireota-public.pem");
+  if (existsSync(privatePath) || existsSync(publicPath)) {
+    throw new Error(`${dir} already contains FireOTA keys. Refusing to overwrite them.`);
+  }
+  const { publicKey, privateKey } = generateKeyPairSync("rsa", {
+    modulusLength: 2048,
+    publicKeyEncoding: { type: "spki", format: "pem" },
+    privateKeyEncoding: { type: "pkcs8", format: "pem" },
+  });
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(privatePath, privateKey, { mode: 0o600 });
+  writeFileSync(publicPath, publicKey);
+  writeFileSync(join(dir, ".gitignore"), "fireota-private.pem\n");
+  return { dir, privatePath, publicPath, publicKey };
+}

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@fireota/cli",
-  "version": "0.4.0",
-  "description": "Build FireOTA update packages and publish React Native OTA releases from a terminal or CI.",
-  "license": "MIT",
-  "type": "module",
-  "bin": {
-    "fireota": "bin/fireota.mjs"
-  },
-  "files": [
-    "bin",
-    "lib",
-    "README.md",
-    "LICENSE"
-  ],
-  "engines": {
-    "node": ">=18.17"
-  },
-  "keywords": [
-    "react-native",
-    "ota",
-    "over-the-air",
-    "fireota",
-    "cli",
-    "ci"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "author": "FireOTA",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Sujay-Dynamisch/FireOTA.git",
-    "directory": "packages/cli"
-  },
-  "homepage": "https://github.com/Sujay-Dynamisch/FireOTA/tree/main/packages/cli#readme",
-  "bugs": {
-    "url": "https://github.com/Sujay-Dynamisch/FireOTA/issues"
-  }
-}
+{
+  "name": "@fireota/cli",
+  "version": "0.6.0",
+  "description": "Build FireOTA update packages and publish React Native OTA releases from a terminal or CI.",
+  "license": "MIT",
+  "type": "module",
+  "bin": {
+    "fireota": "bin/fireota.mjs"
+  },
+  "files": [
+    "bin",
+    "lib",
+    "README.md",
+    "LICENSE"
+  ],
+  "engines": {
+    "node": ">=18.17"
+  },
+  "keywords": [
+    "react-native",
+    "ota",
+    "over-the-air",
+    "fireota",
+    "cli",
+    "ci"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "author": "FireOTA",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Sujay-Dynamisch/FireOTA.git",
+    "directory": "packages/cli"
+  },
+  "homepage": "https://github.com/Sujay-Dynamisch/FireOTA/tree/main/packages/cli#readme",
+  "bugs": {
+    "url": "https://github.com/Sujay-Dynamisch/FireOTA/issues"
+  }
+}