@norrix/cli 0.0.32 → 0.0.34

package/README.md

@@ -0,0 +1,63 @@
+# @norrix/cli
+
+Cloud build, OTA updates, and app store submissions for NativeScript apps.
+
+## Installation
+
+```bash
+npm install -g @norrix/cli
+```
+
+## Quick Start
+
+```bash
+# Sign in to your account
+norrix sign-in
+
+# Build your app
+norrix build android release
+norrix build ios release appstore
+norrix build visionos release appstore
+
+# Publish OTA updates
+norrix update android
+norrix update ios
+norrix update visionos
+
+# Submit to app stores
+norrix submit android production
+norrix submit ios
+norrix submit visionos
+```
+
+## Commands
+
+| Command | Description |
+|---------|-------------|
+| `build` | Build your app in the cloud |
+| `update` | Publish OTA updates |
+| `submit` | Submit to App Store / Google Play |
+| `fingerprint` | Print or compare native fingerprints |
+| `env` | Manage build environment variables |
+| `orgs` | Manage organizations |
+| `sign-in` | Authenticate with Norrix |
+| `sign-out` | Sign out |
+| `whoami` | Show current user |
+
+## Global Options
+
+```
+--env <env>    Target environment (prod, dev)
+--dev          Shortcut for --env dev
+--verbose      Enable verbose output
+--help         Display help
+--version      Display version
+```
+
+## Documentation
+
+Full CLI reference and guides: **[docs.norrix.net/cli](https://docs.norrix.net/cli/)**
+
+## License
+
+MIT

package/dist/lib/commands.js

@@ -8,7 +8,7 @@ import { fileURLToPath } from 'url';
 import archiver from 'archiver';
 // import FormData from 'form-data';
 import { configureAmplify, loadCliEnvFiles } from './amplify-config.js';
-import { computeFingerprint, writeRuntimeFingerprintFile } from './fingerprinting.js';
+import { computeFingerprint, embedFingerprintInNativeResources, embedVersionInNativeResources } from './fingerprinting.js';
 import { loadNorrixConfig, hasNorrixConfig, saveNorrixConfig } from './config.js';
 import { detectWorkspaceContext, getNxProjectDependencies, getWorkspaceDependenciesFallback, createWorkspaceManifest, logWorkspaceContext, isAtWorkspaceRoot, discoverNativeScriptApps, getWorkspaceContextForApp, detectNxBuildConfigurations, } from './workspace.js';
 import { signIn as amplifySignIn, signOut as amplifySignOut, getCurrentUser, fetchAuthSession, } from 'aws-amplify/auth';
@@ -205,14 +205,16 @@ async function ensureOrgSelected(params) {
 export async function orgsList(verbose = false) {
     ensureInitialized();
     try {
-        const { organizations, selectedOrganizationId } = await fetchOrganizations(verbose);
+        const { organizations } = await fetchOrganizations(verbose);
         if (!organizations.length) {
             console.log('No organizations found.');
             return;
         }
+        // Use locally stored org selection (same source as orgsCurrent)
+        const localSelectedOrgId = CURRENT_ORG_ID || getSelectedOrgId(CURRENT_ENV, API_URL);
         console.log('Organizations:');
         for (const o of organizations) {
-            const selectedMark = selectedOrganizationId && o.id === selectedOrganizationId ? ' (selected)' : '';
+            const selectedMark = localSelectedOrgId && o.id === localSelectedOrgId ? ' (selected)' : '';
             console.log(`- ${o.name} [${o.role}] ${o.id}${selectedMark}`);
         }
     }
@@ -1424,9 +1426,9 @@ export async function build(cliPlatformArg, cliConfigurationArg, cliDistribution
             ]);
             platform = chosenPlatform;
         }
-        // 2.1 Determine configuration (CLI arg preferred, otherwise prompt)
+        // 2.1 Determine configuration (CLI arg preferred, then config, otherwise prompt)
         const validConfigurations = ['debug', 'release'];
-        let configuration = (cliConfigurationArg || '').toLowerCase();
+        let configuration = (cliConfigurationArg || norrixConfig.defaultConfiguration || '').toLowerCase();
         if (!validConfigurations.includes(configuration)) {
             if (opts.nonInteractive) {
                 // Default to 'debug' in non-interactive mode if not specified
@@ -1440,7 +1442,7 @@ export async function build(cliPlatformArg, cliConfigurationArg, cliDistribution
                         name: 'configuration',
                         message: 'Build configuration:',
                         choices: validConfigurations,
-                        default: 'debug',
+                        default: norrixConfig.defaultConfiguration || 'debug',
                     },
                 ]);
                 configuration = answer.configuration;
@@ -1908,7 +1910,33 @@ export async function build(cliPlatformArg, cliConfigurationArg, cliDistribution
             projectRoot,
             platform,
         });
-        writeRuntimeFingerprintFile(projectRoot, fingerprint, platform);
+        // Embed fingerprint in native resources (Info.plist for iOS, app.gradle for Android)
+        // This ensures the fingerprint is baked into the binary and cannot diverge from
+        // what's recorded in the database. The fingerprint in native resources is the
+        // single source of truth that the client SDK will read at runtime.
+        const embeddedPaths = embedFingerprintInNativeResources(projectRoot, fingerprint, platform);
+        if (verbose) {
+            if (embeddedPaths.infoPlistPath) {
+                console.log(`[fingerprint] Embedded hash in Info.plist: ${embeddedPaths.infoPlistPath}`);
+            }
+            if (embeddedPaths.appGradlePath) {
+                console.log(`[fingerprint] Embedded hash in app.gradle: ${embeddedPaths.appGradlePath}`);
+            }
+        }
+        // Embed version and build number in native resources
+        // This ensures the binary (IPA/APK/AAB) reflects the version specified at build time.
+        // The fingerprint remains stable because version fields are normalized out during hashing.
+        if (version && buildNumber) {
+            const versionEmbedPaths = embedVersionInNativeResources(projectRoot, version, buildNumber, platform);
+            if (verbose) {
+                if (versionEmbedPaths.infoPlistPath) {
+                    console.log(`[version] Embedded v${version} (${buildNumber}) in Info.plist: ${versionEmbedPaths.infoPlistPath}`);
+                }
+                if (versionEmbedPaths.appGradlePath) {
+                    console.log(`[version] Embedded v${version} (${buildNumber}) in app.gradle: ${versionEmbedPaths.appGradlePath}`);
+                }
+            }
+        }
         spinner.start('Creating project archive...');
         // 3. Zip the project (workspace-aware)
         const { zipPath, workspaceContext } = await zipProject(projectName, workspaceCtx, false, verbose);