react-native-update-cli 2.8.5 → 2.9.0

package/lib/modules/user-module.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "userModule", {
 });
 const _api = require("../api");
 const _user = require("../user");
+const _options = require("../utils/options");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -78,21 +79,20 @@ const userModule = {
                         try {
                             await (0, _api.loadSession)();
                             const session = (0, _api.getSession)();
-                            if (session && session.token) {
+                            if (session == null ? void 0 : session.token) {
                                 console.log('✓ Session found in local storage');
                                 return {
                                     sessionLoaded: true,
                                     hasToken: true,
                                     session
                                 };
-                            } else {
-                                console.log('✗ No valid session found in local storage');
-                                return {
-                                    sessionLoaded: true,
-                                    hasToken: false,
-                                    session: null
-                                };
                             }
+                            console.log('✗ No valid session found in local storage');
+                            return {
+                                sessionLoaded: true,
+                                hasToken: false,
+                                session: null
+                            };
                         } catch (error) {
                             console.log('✗ Failed to load session:', error instanceof Error ? error.message : 'Unknown error');
                             return {
@@ -108,10 +108,11 @@ const userModule = {
                     name: 'validate-session',
                     description: 'Validate session by calling API',
                     execute: async (context, previousResult)=>{
-                        if (!previousResult.hasToken) {
+                        const state = (0, _options.toObjectState)(previousResult, {});
+                        if (!state.hasToken) {
                             console.log('No token available, skipping validation');
                             return {
-                                ...previousResult,
+                                ...state,
                                 validated: false,
                                 reason: 'No token available'
                             };
@@ -121,14 +122,14 @@ const userModule = {
                             await _user.userCommands.me();
                             console.log('✓ Session is valid');
                             return {
-                                ...previousResult,
+                                ...state,
                                 validated: true,
                                 reason: 'Session validated successfully'
                             };
                         } catch (error) {
                             console.log('✗ Session validation failed:', error instanceof Error ? error.message : 'Unknown error');
                             return {
-                                ...previousResult,
+                                ...state,
                                 validated: false,
                                 reason: error instanceof Error ? error.message : 'Unknown error'
                             };
@@ -139,10 +140,11 @@ const userModule = {
                     name: 'get-user-info',
                     description: 'Get current user information',
                     execute: async (context, previousResult)=>{
-                        if (!previousResult.validated) {
+                        const state = (0, _options.toObjectState)(previousResult, {});
+                        if (!state.validated) {
                             console.log('Session not valid, cannot get user info');
                             return {
-                                ...previousResult,
+                                ...state,
                                 userInfo: null,
                                 reason: 'Session not valid'
                             };
@@ -152,7 +154,8 @@ const userModule = {
                             const { get } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../api")));
                             const userInfo = await get('/user/me');
                             console.log('✓ User information retrieved successfully');
-                            if (context.options.showDetails !== false) {
+                            const showDetails = (0, _options.getBooleanOption)(context.options, 'showDetails', true);
+                            if (showDetails) {
                                 console.log('\n=== User Information ===');
                                 for (const [key, value] of Object.entries(userInfo)){
                                     if (key !== 'ok') {
@@ -162,14 +165,14 @@ const userModule = {
                                 console.log('========================\n');
                             }
                             return {
-                                ...previousResult,
+                                ...state,
                                 userInfo,
                                 reason: 'User info retrieved successfully'
                             };
                         } catch (error) {
                             console.log('✗ Failed to get user info:', error instanceof Error ? error.message : 'Unknown error');
                             return {
-                                ...previousResult,
+                                ...state,
                                 userInfo: null,
                                 reason: error instanceof Error ? error.message : 'Unknown error'
                             };
@@ -180,16 +183,18 @@ const userModule = {
                     name: 'handle-auth-failure',
                     description: 'Handle authentication failure',
                     execute: async (context, previousResult)=>{
-                        if (previousResult.validated) {
+                        const state = (0, _options.toObjectState)(previousResult, {});
+                        if (state.validated) {
                             console.log('✓ Authentication check completed successfully');
                             return {
-                                ...previousResult,
+                                ...state,
                                 authCheckComplete: true,
                                 status: 'authenticated'
                             };
                         }
                         console.log('✗ Authentication check failed');
-                        if (context.options.autoLogin) {
+                        const autoLogin = (0, _options.getBooleanOption)(context.options, 'autoLogin', false);
+                        if (autoLogin) {
                             console.log('Attempting automatic login...');
                             try {
                                 await _user.userCommands.login({
@@ -197,7 +202,7 @@ const userModule = {
                                 });
                                 console.log('✓ Automatic login successful');
                                 return {
-                                    ...previousResult,
+                                    ...state,
                                     authCheckComplete: true,
                                     status: 'auto-logged-in',
                                     autoLoginSuccess: true
@@ -205,7 +210,7 @@ const userModule = {
                             } catch (error) {
                                 console.log('✗ Automatic login failed:', error instanceof Error ? error.message : 'Unknown error');
                                 return {
-                                    ...previousResult,
+                                    ...state,
                                     authCheckComplete: true,
                                     status: 'failed',
                                     autoLoginSuccess: false,
@@ -215,7 +220,7 @@ const userModule = {
                         } else {
                             console.log('Please run login command to authenticate');
                             return {
-                                ...previousResult,
+                                ...state,
                                 authCheckComplete: true,
                                 status: 'unauthenticated',
                                 suggestion: 'Run login command to authenticate'
@@ -251,7 +256,7 @@ const userModule = {
                         try {
                             await (0, _api.loadSession)();
                             const session = (0, _api.getSession)();
-                            if (session && session.token) {
+                            if (session == null ? void 0 : session.token) {
                                 try {
                                     await _user.userCommands.me();
                                     console.log('✓ User is already logged in');
@@ -291,10 +296,11 @@ const userModule = {
                     name: 'perform-login',
                     description: 'Perform user login',
                     execute: async (context, previousResult)=>{
-                        if (previousResult.alreadyLoggedIn) {
+                        const state = (0, _options.toObjectState)(previousResult, {});
+                        if (state.alreadyLoggedIn) {
                             console.log('Skipping login - user already authenticated');
                             return {
-                                ...previousResult,
+                                ...state,
                                 loginPerformed: false,
                                 loginSuccess: true
                             };
@@ -302,25 +308,27 @@ const userModule = {
                         console.log('Performing login...');
                         try {
                             const loginArgs = [];
-                            if (context.options.email) {
-                                loginArgs.push(context.options.email);
+                            const email = (0, _options.getOptionalStringOption)(context.options, 'email');
+                            if (email) {
+                                loginArgs.push(email);
                             }
-                            if (context.options.password) {
-                                loginArgs.push(context.options.password);
+                            const password = (0, _options.getOptionalStringOption)(context.options, 'password');
+                            if (password) {
+                                loginArgs.push(password);
                             }
                             await _user.userCommands.login({
                                 args: loginArgs
                             });
                             console.log('✓ Login successful');
                             return {
-                                ...previousResult,
+                                ...state,
                                 loginPerformed: true,
                                 loginSuccess: true
                             };
                         } catch (error) {
                             console.log('✗ Login failed:', error instanceof Error ? error.message : 'Unknown error');
                             return {
-                                ...previousResult,
+                                ...state,
                                 loginPerformed: true,
                                 loginSuccess: false,
                                 loginError: error instanceof Error ? error.message : 'Unknown error'
@@ -332,18 +340,20 @@ const userModule = {
                     name: 'validate-login',
                     description: 'Validate login by getting user info',
                     execute: async (context, previousResult)=>{
-                        if (!previousResult.loginSuccess && !previousResult.alreadyLoggedIn) {
+                        const state = (0, _options.toObjectState)(previousResult, {});
+                        if (!state.loginSuccess && !state.alreadyLoggedIn) {
                             console.log('Login failed, skipping validation');
                             return {
-                                ...previousResult,
+                                ...state,
                                 validationPerformed: false,
                                 validationSuccess: false
                             };
                         }
-                        if (context.options.validateAfterLogin === false) {
+                        const validateAfterLogin = (0, _options.getBooleanOption)(context.options, 'validateAfterLogin', true);
+                        if (!validateAfterLogin) {
                             console.log('Skipping validation as requested');
                             return {
-                                ...previousResult,
+                                ...state,
                                 validationPerformed: false,
                                 validationSuccess: true
                             };
@@ -353,7 +363,7 @@ const userModule = {
                             const userInfo = await _user.userCommands.me();
                             console.log('✓ Login validation successful');
                             return {
-                                ...previousResult,
+                                ...state,
                                 validationPerformed: true,
                                 validationSuccess: true,
                                 userInfo
@@ -361,7 +371,7 @@ const userModule = {
                         } catch (error) {
                             console.log('✗ Login validation failed:', error instanceof Error ? error.message : 'Unknown error');
                             return {
-                                ...previousResult,
+                                ...state,
                                 validationPerformed: true,
                                 validationSuccess: false,
                                 validationError: error instanceof Error ? error.message : 'Unknown error'
@@ -373,26 +383,27 @@ const userModule = {
                     name: 'login-summary',
                     description: 'Provide login flow summary',
                     execute: async (context, previousResult)=>{
+                        const state = (0, _options.toObjectState)(previousResult, {});
                         console.log('\n=== Login Flow Summary ===');
-                        if (previousResult.alreadyLoggedIn) {
+                        if (state.alreadyLoggedIn) {
                             console.log('Status: Already logged in');
                             console.log('Session: Valid');
-                        } else if (previousResult.loginSuccess) {
+                        } else if (state.loginSuccess) {
                             console.log('Status: Login successful');
-                            if (previousResult.validationSuccess) {
+                            if (state.validationSuccess) {
                                 console.log('Validation: Passed');
                             } else {
                                 console.log('Validation: Failed');
                             }
                         } else {
                             console.log('Status: Login failed');
-                            console.log('Error:', previousResult.loginError || 'Unknown error');
+                            console.log('Error:', state.loginError || 'Unknown error');
                         }
                         console.log('==========================\n');
                         return {
-                            ...previousResult,
+                            ...state,
                             flowComplete: true,
-                            finalStatus: previousResult.alreadyLoggedIn || previousResult.loginSuccess ? 'success' : 'failed'
+                            finalStatus: state.alreadyLoggedIn || state.loginSuccess ? 'success' : 'failed'
                         };
                     }
                 }

package/lib/modules/version-module.d.ts

@@ -0,0 +1,2 @@
+import type { CLIModule } from '../types';
+export declare const versionModule: CLIModule;

package/lib/package.d.ts

@@ -0,0 +1,58 @@
+import type { Platform } from './types';
+type PackageCommandOptions = Record<string, unknown> & {
+    version?: string;
+    includeAllSplits?: boolean | string;
+    splits?: string;
+    output?: string;
+};
+export declare function listPackage(appId: string): Promise<import("./types").Package[]>;
+export declare function choosePackage(appId: string): Promise<import("./types").Package>;
+export declare const packageCommands: {
+    uploadIpa: ({ args, options, }: {
+        args: string[];
+        options: PackageCommandOptions;
+    }) => Promise<void>;
+    uploadApk: ({ args, options, }: {
+        args: string[];
+        options: PackageCommandOptions;
+    }) => Promise<void>;
+    uploadAab: ({ args, options, }: {
+        args: string[];
+        options: PackageCommandOptions;
+    }) => Promise<void>;
+    uploadApp: ({ args, options, }: {
+        args: string[];
+        options: PackageCommandOptions;
+    }) => Promise<void>;
+    parseApp: ({ args }: {
+        args: string[];
+    }) => Promise<void>;
+    parseIpa: ({ args }: {
+        args: string[];
+    }) => Promise<void>;
+    parseApk: ({ args }: {
+        args: string[];
+    }) => Promise<void>;
+    parseAab: ({ args }: {
+        args: string[];
+    }) => Promise<void>;
+    extractApk: ({ args, options, }: {
+        args: string[];
+        options: PackageCommandOptions;
+    }) => Promise<void>;
+    packages: ({ options }: {
+        options: {
+            platform: Platform;
+        };
+    }) => Promise<void>;
+    deletePackage: ({ args, options, }: {
+        args: string[];
+        options: {
+            appId?: string;
+            packageId?: string;
+            packageVersion?: string;
+            platform?: Platform;
+        };
+    }) => Promise<void>;
+};
+export {};

package/lib/package.js

@@ -35,6 +35,72 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
+function ensureFileByExt(filePath, extension, usageKey) {
+    if (!filePath || !filePath.endsWith(extension)) {
+        throw new Error((0, _i18n.t)(usageKey));
+    }
+    return filePath;
+}
+function parseBooleanOption(value) {
+    return value === true || value === 'true';
+}
+function parseCsvOption(value) {
+    if (typeof value !== 'string') {
+        return null;
+    }
+    const parsed = value.split(',').map((item)=>item.trim()).filter(Boolean);
+    return parsed.length > 0 ? parsed : null;
+}
+function getVersionBinding(version) {
+    if (!version || typeof version !== 'object') {
+        return undefined;
+    }
+    const v = version;
+    return {
+        id: v.id,
+        name: v.name
+    };
+}
+async function uploadNativePackage(filePath, options, config) {
+    const info = await config.getInfo(filePath);
+    const { versionName: extractedVersionName, buildTime } = info;
+    const { appId: appIdInPkg, appKey: appKeyInPkg } = info;
+    const { appId, appKey } = await (0, _app.getSelectedApp)(config.platform);
+    if (appIdInPkg && appIdInPkg != appId) {
+        throw new Error((0, _i18n.t)(config.appIdMismatchKey, {
+            appIdInPkg,
+            appId
+        }));
+    }
+    if (appKeyInPkg && appKeyInPkg !== appKey) {
+        throw new Error((0, _i18n.t)(config.appKeyMismatchKey, {
+            appKeyInPkg,
+            appKey
+        }));
+    }
+    const customVersion = typeof options.version === 'string' && options.version ? options.version : undefined;
+    const versionName = customVersion != null ? customVersion : extractedVersionName;
+    if (customVersion !== undefined) {
+        console.log((0, _i18n.t)('usingCustomVersion', {
+            version: versionName
+        }));
+    }
+    const { hash } = await (0, _api.uploadFile)(filePath);
+    const normalizedBuildTime = config.normalizeBuildTime ? config.normalizeBuildTime(buildTime) : buildTime;
+    const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
+        name: versionName,
+        hash,
+        buildTime: normalizedBuildTime,
+        deps: _depversions.depVersions,
+        commit: await (0, _git.getCommitInfo)()
+    });
+    (0, _utils.saveToLocal)(filePath, `${appId}/package/${id}${config.extension}`);
+    console.log((0, _i18n.t)(config.successKey, {
+        id,
+        version: versionName,
+        buildTime: normalizedBuildTime
+    }));
+}
 async function listPackage(appId) {
     const allPkgs = await (0, _api.getAllPackages)(appId) || [];
     const header = [
@@ -50,10 +116,11 @@ async function listPackage(appId) {
         const { version } = pkg;
         let versionInfo = '';
         if (version) {
-            const versionObj = version;
+            const versionObj = getVersionBinding(version);
+            var _versionObj_name, _versionObj_id;
             versionInfo = (0, _i18n.t)('boundTo', {
-                name: versionObj.name || version,
-                id: versionObj.id || version
+                name: (_versionObj_name = versionObj == null ? void 0 : versionObj.name) != null ? _versionObj_name : version,
+                id: (_versionObj_id = versionObj == null ? void 0 : versionObj.id) != null ? _versionObj_id : version
             });
         }
         let output = pkg.name;
@@ -87,101 +154,32 @@ async function choosePackage(appId) {
 }
 const packageCommands = {
     uploadIpa: async ({ args, options })=>{
-        const fn = args[0];
-        if (!fn || !fn.endsWith('.ipa')) {
-            throw new Error((0, _i18n.t)('usageUploadIpa'));
-        }
-        const ipaInfo = await (0, _utils.getIpaInfo)(fn);
-        const { versionName: extractedVersionName, buildTime } = ipaInfo;
-        const appIdInPkg = ipaInfo.appId;
-        const appKeyInPkg = ipaInfo.appKey;
-        const { appId, appKey } = await (0, _app.getSelectedApp)('ios');
-        if (appIdInPkg && appIdInPkg != appId) {
-            throw new Error((0, _i18n.t)('appIdMismatchIpa', {
-                appIdInPkg,
-                appId
-            }));
-        }
-        if (appKeyInPkg && appKeyInPkg !== appKey) {
-            throw new Error((0, _i18n.t)('appKeyMismatchIpa', {
-                appKeyInPkg,
-                appKey
-            }));
-        }
-        // Use custom version if provided, otherwise use extracted version
-        const versionName = options.version || extractedVersionName;
-        if (options.version) {
-            console.log((0, _i18n.t)('usingCustomVersion', {
-                version: versionName
-            }));
-        }
-        const { hash } = await (0, _api.uploadFile)(fn);
-        const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
-            name: versionName,
-            hash,
-            buildTime,
-            deps: _depversions.depVersions,
-            commit: await (0, _git.getCommitInfo)()
+        const fn = ensureFileByExt(args[0], '.ipa', 'usageUploadIpa');
+        await uploadNativePackage(fn, options, {
+            extension: '.ipa',
+            platform: 'ios',
+            appIdMismatchKey: 'appIdMismatchIpa',
+            appKeyMismatchKey: 'appKeyMismatchIpa',
+            successKey: 'ipaUploadSuccess',
+            getInfo: (filePath)=>(0, _utils.getIpaInfo)(filePath)
         });
-        (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.ipa`);
-        console.log((0, _i18n.t)('ipaUploadSuccess', {
-            id,
-            version: versionName,
-            buildTime
-        }));
     },
     uploadApk: async ({ args, options })=>{
-        const fn = args[0];
-        if (!fn || !fn.endsWith('.apk')) {
-            throw new Error((0, _i18n.t)('usageUploadApk'));
-        }
-        const apkInfo = await (0, _utils.getApkInfo)(fn);
-        const { versionName: extractedVersionName, buildTime } = apkInfo;
-        const appIdInPkg = apkInfo.appId;
-        const appKeyInPkg = apkInfo.appKey;
-        const { appId, appKey } = await (0, _app.getSelectedApp)('android');
-        if (appIdInPkg && appIdInPkg != appId) {
-            throw new Error((0, _i18n.t)('appIdMismatchApk', {
-                appIdInPkg,
-                appId
-            }));
-        }
-        if (appKeyInPkg && appKeyInPkg !== appKey) {
-            throw new Error((0, _i18n.t)('appKeyMismatchApk', {
-                appKeyInPkg,
-                appKey
-            }));
-        }
-        // Use custom version if provided, otherwise use extracted version
-        const versionName = options.version || extractedVersionName;
-        if (options.version) {
-            console.log((0, _i18n.t)('usingCustomVersion', {
-                version: versionName
-            }));
-        }
-        const { hash } = await (0, _api.uploadFile)(fn);
-        const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
-            name: versionName,
-            hash,
-            buildTime,
-            deps: _depversions.depVersions,
-            commit: await (0, _git.getCommitInfo)()
+        const fn = ensureFileByExt(args[0], '.apk', 'usageUploadApk');
+        await uploadNativePackage(fn, options, {
+            extension: '.apk',
+            platform: 'android',
+            appIdMismatchKey: 'appIdMismatchApk',
+            appKeyMismatchKey: 'appKeyMismatchApk',
+            successKey: 'apkUploadSuccess',
+            getInfo: (filePath)=>(0, _utils.getApkInfo)(filePath)
         });
-        (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.apk`);
-        console.log((0, _i18n.t)('apkUploadSuccess', {
-            id,
-            version: versionName,
-            buildTime
-        }));
     },
     uploadAab: async ({ args, options })=>{
-        const source = args[0];
-        if (!source || !source.endsWith('.aab')) {
-            throw new Error((0, _i18n.t)('usageUploadAab'));
-        }
+        const source = ensureFileByExt(args[0], '.aab', 'usageUploadAab');
         const output = _path.default.join(_os.default.tmpdir(), `${_path.default.basename(source, _path.default.extname(source))}-${Date.now()}.apk`);
-        const includeAllSplits = options.includeAllSplits === true || options.includeAllSplits === 'true';
-        const splits = options.splits ? String(options.splits).split(',').map((item)=>item.trim()).filter(Boolean) : null;
+        const includeAllSplits = parseBooleanOption(options.includeAllSplits);
+        const splits = parseCsvOption(options.splits);
         const parser = new _aab.AabParser(source);
         try {
             await parser.extractApk(output, {
@@ -201,48 +199,16 @@ const packageCommands = {
         }
     },
     uploadApp: async ({ args, options })=>{
-        const fn = args[0];
-        if (!fn || !fn.endsWith('.app')) {
-            throw new Error((0, _i18n.t)('usageUploadApp'));
-        }
-        const appInfo = await (0, _utils.getAppInfo)(fn);
-        const { versionName: extractedVersionName, buildTime } = appInfo;
-        const appIdInPkg = appInfo.appId;
-        const appKeyInPkg = appInfo.appKey;
-        const { appId, appKey } = await (0, _app.getSelectedApp)('harmony');
-        if (appIdInPkg && appIdInPkg != appId) {
-            throw new Error((0, _i18n.t)('appIdMismatchApp', {
-                appIdInPkg,
-                appId
-            }));
-        }
-        if (appKeyInPkg && appKeyInPkg !== appKey) {
-            throw new Error((0, _i18n.t)('appKeyMismatchApp', {
-                appKeyInPkg,
-                appKey
-            }));
-        }
-        // Use custom version if provided, otherwise use extracted version
-        const versionName = options.version || extractedVersionName;
-        if (options.version) {
-            console.log((0, _i18n.t)('usingCustomVersion', {
-                version: versionName
-            }));
-        }
-        const { hash } = await (0, _api.uploadFile)(fn);
-        const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
-            name: versionName,
-            hash,
-            buildTime: String(buildTime),
-            deps: _depversions.depVersions,
-            commit: await (0, _git.getCommitInfo)()
+        const fn = ensureFileByExt(args[0], '.app', 'usageUploadApp');
+        await uploadNativePackage(fn, options, {
+            extension: '.app',
+            platform: 'harmony',
+            appIdMismatchKey: 'appIdMismatchApp',
+            appKeyMismatchKey: 'appKeyMismatchApp',
+            successKey: 'appUploadSuccess',
+            getInfo: (filePath)=>(0, _utils.getAppInfo)(filePath),
+            normalizeBuildTime: (buildTime)=>String(buildTime)
         });
-        (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.app`);
-        console.log((0, _i18n.t)('appUploadSuccess', {
-            id,
-            version: versionName,
-            buildTime
-        }));
     },
     parseApp: async ({ args })=>{
         const fn = args[0];
@@ -273,13 +239,10 @@ const packageCommands = {
         console.log(await (0, _utils.getAabInfo)(fn));
     },
     extractApk: async ({ args, options })=>{
-        const source = args[0];
-        if (!source || !source.endsWith('.aab')) {
-            throw new Error((0, _i18n.t)('usageExtractApk'));
-        }
+        const source = ensureFileByExt(args[0], '.aab', 'usageExtractApk');
         const output = options.output || _path.default.join(_path.default.dirname(source), `${_path.default.basename(source, _path.default.extname(source))}.apk`);
-        const includeAllSplits = options.includeAllSplits === true || options.includeAllSplits === 'true';
-        const splits = options.splits ? String(options.splits).split(',').map((item)=>item.trim()).filter(Boolean) : null;
+        const includeAllSplits = parseBooleanOption(options.includeAllSplits);
+        const splits = parseCsvOption(options.splits);
         const parser = new _aab.AabParser(source);
         await parser.extractApk(output, {
             includeAllSplits,
@@ -333,9 +296,10 @@ const packageCommands = {
                 packageId
             }));
         } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
             throw new Error((0, _i18n.t)('deletePackageError', {
                 packageId,
-                error: error.message
+                error: message
             }));
         }
     }