@upfluxhq/cli 1.3.1 → 1.4.0

package/dist/commands/init.js

@@ -36,7 +36,7 @@ function buildUpfluxJson(appId, serverUrl, runtimeVersion, profiles) {
     }
     return {
         version: 1,
-        app: Object.assign({ id: appId, buildNumber: 0, runtimeVersion }, (serverUrl !== DEFAULT_SERVER_URL ? { serverUrl } : {})),
+        app: Object.assign({ id: appId, runtimeVersion }, (serverUrl !== DEFAULT_SERVER_URL ? { serverUrl } : {})),
         deployments,
     };
 }
@@ -44,7 +44,7 @@ const init = new commander_1.Command("init")
     .description("Scaffold upflux.json in your project root")
     .option("--force", "Overwrite existing upflux.json")
     .action(async (opts) => {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     console.log(chalk_1.default.bold("\n🚀 Upflux Project Setup\n"));
     // Detect Expo project
     let isExpo = false;
@@ -57,10 +57,67 @@ const init = new commander_1.Command("init")
                 expoAppJson = parsed;
             }
         }
-        catch (_c) {
+        catch (_k) {
             // Ignore parse errors
         }
     }
+    // Expo projects configure app.json directly + track buildNumber in .upflux (no upflux.json)
+    if (isExpo && expoAppJson) {
+        console.log(chalk_1.default.blue("📱 Detected Expo project (configuring app.json)\n"));
+        const existingUrl = (_b = (_a = expoAppJson.expo) === null || _a === void 0 ? void 0 : _a.updates) === null || _b === void 0 ? void 0 : _b.url;
+        const defaultServerUrl = existingUrl
+            ? existingUrl.replace(/\/api\/updates\/check\/?$/, "")
+            : DEFAULT_SERVER_URL;
+        const { serverUrl } = await inquirer_1.default.prompt([
+            {
+                type: "input",
+                name: "serverUrl",
+                message: `Server URL (press Enter for ${defaultServerUrl}):`,
+                default: defaultServerUrl,
+            },
+        ]);
+        const defaultRuntimeVersion = (typeof ((_c = expoAppJson.expo) === null || _c === void 0 ? void 0 : _c.runtimeVersion) === "string" && expoAppJson.expo.runtimeVersion) ||
+            ((_d = expoAppJson.expo) === null || _d === void 0 ? void 0 : _d.version) ||
+            "1.0.0";
+        const { runtimeVersion } = await inquirer_1.default.prompt([
+            {
+                type: "input",
+                name: "runtimeVersion",
+                message: "Runtime version (e.g. 1.0.0 — update when shipping a new binary):",
+                default: defaultRuntimeVersion,
+                validate: (val) => {
+                    if (!val.trim())
+                        return "Runtime version is required";
+                    if (!/^\d+\.\d+\.\d+/.test(val.trim()))
+                        return "Use semver format, e.g. 1.0.0";
+                    return true;
+                },
+            },
+        ]);
+        const existingClientKey = ((_g = (_f = (_e = expoAppJson.expo) === null || _e === void 0 ? void 0 : _e.updates) === null || _f === void 0 ? void 0 : _f.requestHeaders) === null || _g === void 0 ? void 0 : _g["x-client-key"]) || "";
+        const { clientKey } = await inquirer_1.default.prompt([
+            Object.assign(Object.assign({ type: "input", name: "clientKey", message: `Client key ${chalk_1.default.gray("(UPX-CLT-... or upx_cli_...)")}:` }, (existingClientKey ? { default: existingClientKey } : {})), { validate: (val) => {
+                    if (!val.trim())
+                        return "Client key is required";
+                    if (val.trim().length < 10)
+                        return "Client key looks too short";
+                    return true;
+                } }),
+        ]);
+        expoAppJson.expo = expoAppJson.expo || {};
+        expoAppJson.expo.runtimeVersion = runtimeVersion.trim();
+        expoAppJson.expo.updates = Object.assign(Object.assign({ enabled: true, checkAutomatically: "ON_LOAD", fallbackToCacheTimeout: 0 }, (expoAppJson.expo.updates || {})), { url: `${serverUrl.trim().replace(/\/+$/, "")}/api/updates/check`, requestHeaders: Object.assign(Object.assign({}, (((_h = expoAppJson.expo.updates) === null || _h === void 0 ? void 0 : _h.requestHeaders) || {})), { "x-client-key": clientKey.trim() }) });
+        fs_1.default.writeFileSync(APP_JSON_FILE, JSON.stringify(expoAppJson, null, 2));
+        console.log(chalk_1.default.green("\n✓ Updated app.json with Expo Updates config\n"));
+        console.log(chalk_1.default.bold("📱 Expo Next Steps:\n"));
+        console.log(chalk_1.default.white(`  1. Install expo-updates:\n` +
+            `     npx expo install expo-updates\n\n` +
+            `  2. Authenticate CLI with your publish key:\n` +
+            `     upflux login\n\n` +
+            `  3. Publish an OTA release:\n` +
+            `     upflux release\n`));
+        return;
+    }
     // Check if upflux.json already exists
     if (fs_1.default.existsSync(UPFLUX_JSON_FILE) && !opts.force) {
         console.log(chalk_1.default.yellow("⚠️  upflux.json already exists."));
@@ -96,7 +153,7 @@ const init = new commander_1.Command("init")
         },
     ]);
     // Step 3: Runtime version (semver, used to form auto release labels)
-    const defaultRuntimeVersion = (isExpo && ((_a = expoAppJson === null || expoAppJson === void 0 ? void 0 : expoAppJson.expo) === null || _a === void 0 ? void 0 : _a.version))
+    const defaultRuntimeVersion = (isExpo && ((_j = expoAppJson === null || expoAppJson === void 0 ? void 0 : expoAppJson.expo) === null || _j === void 0 ? void 0 : _j.version))
         ? expoAppJson.expo.version
         : "1.0.0";
     const { runtimeVersion } = await inquirer_1.default.prompt([
@@ -153,41 +210,14 @@ const init = new commander_1.Command("init")
     // Show what was created
     console.log(chalk_1.default.gray("Preview:"));
     console.log(chalk_1.default.gray(JSON.stringify(content, null, 2)));
-    if (isExpo && expoAppJson) {
-        const primaryProfile = profiles.find(p => p.name === "production") || profiles[0];
-        if (primaryProfile) {
-            const { updateAppJson } = await inquirer_1.default.prompt([
-                {
-                    type: "confirm",
-                    name: "updateAppJson",
-                    message: `Configure app.json with Expo Updates URL and client key for "${primaryProfile.name}"?`,
-                    default: true,
-                },
-            ]);
-            if (updateAppJson) {
-                expoAppJson.expo = expoAppJson.expo || {};
-                expoAppJson.expo.runtimeVersion = runtimeVersion.trim();
-                expoAppJson.expo.updates = Object.assign(Object.assign({ enabled: true, checkAutomatically: "ON_LOAD", fallbackToCacheTimeout: 0 }, (expoAppJson.expo.updates || {})), { url: `${serverUrl.trim()}/api/updates/check`, requestHeaders: Object.assign(Object.assign({}, (((_b = expoAppJson.expo.updates) === null || _b === void 0 ? void 0 : _b.requestHeaders) || {})), { "x-client-key": primaryProfile.clientKey.trim() }) });
-                fs_1.default.writeFileSync(APP_JSON_FILE, JSON.stringify(expoAppJson, null, 2));
-                console.log(chalk_1.default.green("✓ Updated app.json with Expo Updates config\n"));
-            }
-        }
-        console.log(chalk_1.default.bold("\n📱 Expo Usage:\n"));
-        console.log(chalk_1.default.white(`  1. Install expo-updates:\n` +
-            `     npx expo install expo-updates\n\n` +
-            `  2. Publish a release:\n` +
-            `     upflux release\n`));
-    }
-    else {
-        // Usage hint
-        console.log(chalk_1.default.bold("\n📦 SDK Usage:\n"));
-        console.log(chalk_1.default.white(`  import { Upflux } from '@upfluxhq/react-native';\n\n` +
-            `  // Auto-selects 'development' in dev, 'production' in release\n` +
-            `  // Auto-increments buildNumber on every release\n` +
-            `  await Upflux.init();\n\n` +
-            `  // Or specify a profile:\n` +
-            `  await Upflux.init('production');`));
-    }
+    // Usage hint
+    console.log(chalk_1.default.bold("\n📦 SDK Usage:\n"));
+    console.log(chalk_1.default.white(`  import { Upflux } from '@upfluxhq/react-native';\n\n` +
+        `  // Auto-selects 'development' in dev, 'production' in release\n` +
+        `  // Auto-increments buildNumber on every release\n` +
+        `  await Upflux.init();\n\n` +
+        `  // Or specify a profile:\n` +
+        `  await Upflux.init('production');`));
     // Security note about committing the file
     console.log(chalk_1.default.cyan("\n💡 Tip: upflux.json is safe to commit to git.\n" +
         "   upx_cli_* keys are read-only — they cannot publish releases.\n" +

package/dist/commands/release.js

@@ -198,13 +198,56 @@ function readRootUpfluxJson() {
         return null;
     }
 }
-/** Increment app.buildNumber, write back to upflux.json, return new value. */
-function incrementBuildNumber(json) {
-    var _a;
-    const next = ((_a = json.app.buildNumber) !== null && _a !== void 0 ? _a : 0) + 1;
-    json.app.buildNumber = next;
-    fs.writeFileSync(path.resolve('upflux.json'), JSON.stringify(json, null, 2));
-    return next;
+/** Get version from package.json as fallback when upflux.json / app.json is absent */
+function getPackageJsonVersion() {
+    const pkgPath = path.resolve('package.json');
+    if (!fs.existsSync(pkgPath))
+        return undefined;
+    try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+        return typeof pkg.version === 'string' && pkg.version.trim() ? pkg.version.trim() : undefined;
+    }
+    catch (_a) {
+        return undefined;
+    }
+}
+/**
+ * Query GET /cli/status on the Upflux server to find the highest +N build number
+ * for the given runtimeVersion on the target deployment, and return maxN + 1.
+ * Starts at 1 if no matching releases exist (or if all were deleted in the Dashboard).
+ */
+async function resolveNextBuildNumberFromServer(runtimeVersion, authKey) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    try {
+        const res = await apiClient_1.apiClient.get('/cli/status', {
+            headers: { 'x-publish-key': authKey },
+        });
+        const labels = new Set();
+        for (const r of ((_a = res.data) === null || _a === void 0 ? void 0 : _a.releases) || []) {
+            if (r === null || r === void 0 ? void 0 : r.releaseLabel)
+                labels.add(r.releaseLabel);
+        }
+        if ((_d = (_c = (_b = res.data) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.ios) === null || _d === void 0 ? void 0 : _d.releaseLabel) {
+            labels.add(res.data.current.ios.releaseLabel);
+        }
+        if ((_g = (_f = (_e = res.data) === null || _e === void 0 ? void 0 : _e.current) === null || _f === void 0 ? void 0 : _f.android) === null || _g === void 0 ? void 0 : _g.releaseLabel) {
+            labels.add(res.data.current.android.releaseLabel);
+        }
+        let maxBuild = 0;
+        const prefix = `${runtimeVersion}+`;
+        for (const label of labels) {
+            if (label.startsWith(prefix)) {
+                const num = parseInt(label.slice(prefix.length), 10);
+                if (!isNaN(num) && num > maxBuild) {
+                    maxBuild = num;
+                }
+            }
+        }
+        return maxBuild + 1;
+    }
+    catch (_h) {
+        return 1;
+    }
 }
 /**
  * Generate an auto release label.
@@ -350,40 +393,6 @@ function writeUpfluxConfig(outputDir, releaseLabel, appId, buildNumber) {
     const configPath = path.join(outputDir, "upflux.json");
     fs.writeFileSync(configPath, configContent);
     console.log(chalk_1.default.gray(`   Created upflux.json (label: ${releaseLabel}${buildNumber !== undefined ? `, build: ${buildNumber}` : ''})`));
-    copyUpfluxConfigToNativeAssets(configContent);
-}
-/**
- * Copy upflux.json to native platform asset directories
- *
- * The React Native SDK reads upflux.json from native assets at runtime to detect
- * which OTA version is embedded in the binary. Without this file in the right place,
- * the SDK cannot compare embedded vs server versions, causing unnecessary downloads
- * even when the Play Store / App Store binary already has the latest code.
- *
- * Android: android/app/src/main/assets/upflux.json
- * iOS: ios/ (added to Xcode project bundle resources manually by developer)
- *
- * @param configContent - The JSON string content of upflux.json
- */
-function copyUpfluxConfigToNativeAssets(configContent) {
-    // Android: copy to assets directory where UpfluxModule.readAsset() can find it
-    const androidAssetsDir = path.resolve("android", "app", "src", "main", "assets");
-    if (fs.existsSync(path.resolve("android"))) {
-        // Ensure assets directory exists
-        if (!fs.existsSync(androidAssetsDir)) {
-            fs.mkdirSync(androidAssetsDir, { recursive: true });
-        }
-        const androidConfigPath = path.join(androidAssetsDir, "upflux.json");
-        fs.writeFileSync(androidConfigPath, configContent);
-        console.log(chalk_1.default.gray(`   Copied upflux.json → android/app/src/main/assets/`));
-    }
-    // iOS: copy to ios/ project root (developer adds to Xcode bundle resources)
-    const iosDir = path.resolve("ios");
-    if (fs.existsSync(iosDir)) {
-        const iosConfigPath = path.join(iosDir, "upflux.json");
-        fs.writeFileSync(iosConfigPath, configContent);
-        console.log(chalk_1.default.gray(`   Copied upflux.json → ios/`));
-    }
 }
 const release = new commander_1.Command("release")
     .description("Bundle and upload a new release to Upflux")
@@ -407,7 +416,7 @@ const release = new commander_1.Command("release")
     .option("--capacitor", "Force Capacitor mode (auto-detected if capacitor.config exists)")
     .option("--web-dir <path>", "Web directory to bundle for Capacitor (default: from config or www)")
     .action(async (opts) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
         // ========================================
         // VALIDATION PHASE
@@ -479,50 +488,29 @@ const release = new commander_1.Command("release")
             process.exit(1);
         }
         // ── Label Resolution ─────────────────────────────────────────────
-        // Two paths: manual (--label provided) or auto (buildNumber from upflux.json)
+        // Two paths: manual (--label provided) or auto (derived from server deployment releases)
         let resolvedLabel;
         const rootJson = readRootUpfluxJson();
-        const currentBuildNumber = rootJson === null || rootJson === void 0 ? void 0 : rootJson.app.buildNumber;
+        const isExpo = opts.expo || isExpoProject();
         if (opts.label) {
-            // Manual mode: validate semver (now allows + notation), still increment buildNumber for tracking
             if (!isValidReleaseLabel(opts.label)) {
                 console.error(chalk_1.default.red("✗ Invalid release label format"));
                 console.error(chalk_1.default.gray("Use semantic versioning: v1.0.0, 1.0.0-beta, 1.0.0+5, etc."));
                 process.exit(1);
             }
             resolvedLabel = opts.label;
-            if (rootJson && currentBuildNumber !== undefined) {
-                const tracked = incrementBuildNumber(rootJson);
-                console.log(chalk_1.default.gray(`  buildNumber → ${tracked} (tracking)`));
-            }
             console.log(chalk_1.default.gray(`  Label: ${resolvedLabel} (manual)`));
         }
         else {
-            // Auto mode: require upflux.json with buildNumber field (or auto-generate for Expo)
-            if (!rootJson) {
-                if (isExpoProject() || opts.expo) {
-                    const rv = getExpoRuntimeVersion() || '1.0.0';
-                    resolvedLabel = `${rv}+${Math.floor(Date.now() / 1000)}`;
-                    console.log(chalk_1.default.gray(`  Label: ${resolvedLabel} (auto from Expo runtimeVersion)`));
-                }
-                else {
-                    console.error(chalk_1.default.red("✗ No upflux.json found and no --label provided"));
-                    console.error(chalk_1.default.gray("Run: upflux init   OR   upflux release --label v1.0.0"));
-                    process.exit(1);
-                }
-            }
-            else {
-                if (rootJson.app.buildNumber === undefined) {
-                    console.error(chalk_1.default.red("✗ upflux.json is missing app.buildNumber"));
-                    console.error(chalk_1.default.gray('Add "buildNumber": 0 to the app section, or use --label'));
-                    process.exit(1);
-                }
-                const nextBuild = incrementBuildNumber(rootJson);
-                const effectiveRuntimeVersion = rootJson.app.runtimeVersion || getExpoRuntimeVersion();
-                resolvedLabel = generateReleaseLabel(nextBuild, effectiveRuntimeVersion);
-                console.log(chalk_1.default.green(`  ✓ buildNumber: ${nextBuild - 1} → ${nextBuild}`));
-                console.log(chalk_1.default.gray(`  Label: ${resolvedLabel} (auto)`));
-            }
+            const effectiveRuntimeVersion = (isExpo ? getExpoRuntimeVersion() : undefined) ||
+                ((_b = rootJson === null || rootJson === void 0 ? void 0 : rootJson.app) === null || _b === void 0 ? void 0 : _b.runtimeVersion) ||
+                getExpoRuntimeVersion() ||
+                getPackageJsonVersion() ||
+                "1.0.0";
+            const nextBuild = await resolveNextBuildNumberFromServer(effectiveRuntimeVersion, authKey);
+            resolvedLabel = generateReleaseLabel(nextBuild, effectiveRuntimeVersion);
+            console.log(chalk_1.default.green(`  ✓ Release build #${nextBuild} for runtime ${effectiveRuntimeVersion}`));
+            console.log(chalk_1.default.gray(`  Label: ${resolvedLabel} (auto)`));
         }
         // Validation 6: Rollout percentage
         const rolloutValidation = isValidRollout(opts.rollout);
@@ -558,7 +546,6 @@ const release = new commander_1.Command("release")
         let expoBundleExt = "hbc";
         // Detect project type
         const isCapacitor = opts.capacitor || isCapacitorProject();
-        const isExpo = opts.expo || isExpoProject();
         if (isExpo) {
             // ========================================
             // EXPO BUNDLING
@@ -588,7 +575,7 @@ const release = new commander_1.Command("release")
             }
             const expoMeta = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
             if (platform === 'all') {
-                if (!((_b = expoMeta.fileMetadata) === null || _b === void 0 ? void 0 : _b.ios) || !((_c = expoMeta.fileMetadata) === null || _c === void 0 ? void 0 : _c.android)) {
+                if (!((_c = expoMeta.fileMetadata) === null || _c === void 0 ? void 0 : _c.ios) || !((_d = expoMeta.fileMetadata) === null || _d === void 0 ? void 0 : _d.android)) {
                     console.error(chalk_1.default.red("✗ Expo metadata must contain fileMetadata for both ios and android when platform is 'all'"));
                     process.exit(1);
                 }
@@ -625,7 +612,7 @@ const release = new commander_1.Command("release")
                 console.log(chalk_1.default.gray(`   Android: ${androidBundlePath}`));
             }
             else {
-                const platformMeta = (_d = expoMeta.fileMetadata) === null || _d === void 0 ? void 0 : _d[platform];
+                const platformMeta = (_e = expoMeta.fileMetadata) === null || _e === void 0 ? void 0 : _e[platform];
                 if (!platformMeta) {
                     console.error(chalk_1.default.red(`✗ No Expo metadata found for platform: ${platform}`));
                     process.exit(1);
@@ -710,7 +697,7 @@ const release = new commander_1.Command("release")
             try {
                 fs.accessSync(bundlePath, fs.constants.R_OK);
             }
-            catch (_g) {
+            catch (_h) {
                 console.error(chalk_1.default.red(`✗ Cannot read bundle file: ${bundlePath}`));
                 process.exit(1);
             }
@@ -1008,7 +995,7 @@ const release = new commander_1.Command("release")
         let androidExpoMetadata;
         let runtimeVersion = undefined;
         if (isExpo) {
-            runtimeVersion = getExpoRuntimeVersion() || ((_e = rootJson === null || rootJson === void 0 ? void 0 : rootJson.app) === null || _e === void 0 ? void 0 : _e.runtimeVersion) || "1.0.0";
+            runtimeVersion = getExpoRuntimeVersion() || ((_f = rootJson === null || rootJson === void 0 ? void 0 : rootJson.app) === null || _f === void 0 ? void 0 : _f.runtimeVersion) || "1.0.0";
             const outputDir = path.resolve(opts.outputDir);
             const buildPlatformExpoMetadata = (targetPlatform, targetBundlePath, targetAssetsConfig) => {
                 const manifestId = crypto.randomUUID();
@@ -1130,7 +1117,7 @@ const release = new commander_1.Command("release")
     }
     catch (error) {
         console.error(chalk_1.default.red(`\n✗ Failed to upload release: ${error.message}`));
-        if ((_f = error.response) === null || _f === void 0 ? void 0 : _f.data) {
+        if ((_g = error.response) === null || _g === void 0 ? void 0 : _g.data) {
             console.error(chalk_1.default.gray(JSON.stringify(error.response.data, null, 2)));
         }
         process.exit(1);

package/dist/index.js

@@ -15,7 +15,7 @@ const program = new commander_1.Command();
 program
     .name("upflux")
     .description("Upflux CLI for OTA updates")
-    .version("1.0.0");
+    .version("1.4.0");
 program.addCommand(init_1.default);
 program.addCommand(login_1.default);
 program.addCommand(logout_1.default);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@upfluxhq/cli",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "description": "Upflux CLI for managing OTA updates",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",