react-native-update-cli 2.0.0 → 2.1.0

package/lib/package.js

@@ -82,13 +82,13 @@ async function choosePackage(appId) {
     }
 }
 const packageCommands = {
-    uploadIpa: async ({ args })=>{
+    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, buildTime } = ipaInfo;
+        const { versionName: extractedVersionName, buildTime } = ipaInfo;
         const appIdInPkg = ipaInfo.appId;
         const appKeyInPkg = ipaInfo.appKey;
         const { appId, appKey } = await (0, _app.getSelectedApp)('ios');
@@ -104,6 +104,13 @@ const packageCommands = {
                 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,
@@ -119,13 +126,13 @@ const packageCommands = {
             buildTime
         }));
     },
-    uploadApk: async ({ args })=>{
+    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, buildTime } = apkInfo;
+        const { versionName: extractedVersionName, buildTime } = apkInfo;
         const appIdInPkg = apkInfo.appId;
         const appKeyInPkg = apkInfo.appKey;
         const { appId, appKey } = await (0, _app.getSelectedApp)('android');
@@ -141,6 +148,13 @@ const packageCommands = {
                 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,
@@ -156,13 +170,13 @@ const packageCommands = {
             buildTime
         }));
     },
-    uploadApp: async ({ args })=>{
+    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, buildTime } = appInfo;
+        const { versionName: extractedVersionName, buildTime } = appInfo;
         const appIdInPkg = appInfo.appId;
         const appKeyInPkg = appInfo.appKey;
         const { appId, appKey } = await (0, _app.getSelectedApp)('harmony');
@@ -178,6 +192,13 @@ const packageCommands = {
                 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,
@@ -218,5 +239,40 @@ const packageCommands = {
         const platform = await (0, _app.getPlatform)(options.platform);
         const { appId } = await (0, _app.getSelectedApp)(platform);
         await listPackage(appId);
+    },
+    deletePackage: async ({ args, options })=>{
+        let packageId = args[0];
+        let { appId } = options;
+        if (!appId) {
+            const platform = await (0, _app.getPlatform)();
+            appId = (await (0, _app.getSelectedApp)(platform)).appId;
+        }
+        // If no packageId provided as argument, let user choose from list
+        if (!packageId) {
+            const selectedPackage = await choosePackage(appId);
+            packageId = selectedPackage.id;
+        }
+        // Confirm deletion
+        // const confirmDelete = await question(
+        //   t('confirmDeletePackage', { packageId }),
+        // );
+        // if (
+        //   confirmDelete.toLowerCase() !== 'y' &&
+        //   confirmDelete.toLowerCase() !== 'yes'
+        // ) {
+        //   console.log(t('cancelled'));
+        //   return;
+        // }
+        try {
+            await (0, _api.doDelete)(`/app/${appId}/package/${packageId}`);
+            console.log((0, _i18n.t)('deletePackageSuccess', {
+                packageId
+            }));
+        } catch (error) {
+            throw new Error((0, _i18n.t)('deletePackageError', {
+                packageId,
+                error: error.message
+            }));
+        }
     }
 };

package/lib/provider.js

@@ -135,7 +135,8 @@ class CLIProviderImpl {
                 ],
                 options: {
                     platform,
-                    appId
+                    appId,
+                    version: options.version
                 }
             };
             const { packageCommands } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("./package")));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {

package/src/locales/en.ts

@@ -130,4 +130,11 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
   updateNativePackageQuestion: 'Bind to native package now?(Y/N)',
   unnamed: '(Unnamed)',
   dryRun: 'Below is the dry-run result, no actual operation will be performed:',
+  usingCustomVersion: 'Using custom version: {{version}}',
+  confirmDeletePackage:
+    'Confirm delete native package {{packageId}}? This operation cannot be undone (Y/N):',
+  deletePackageSuccess: 'Native package {{packageId}} deleted successfully',
+  deletePackageError:
+    'Failed to delete native package {{packageId}}: {{error}}',
+  usageDeletePackage: 'Usage: cresc deletePackage [packageId] --appId [appId]',
 };

package/src/locales/zh.ts

@@ -123,4 +123,10 @@ export default {
   updateNativePackageQuestion: '是否现在将此热更应用到原生包上？(Y/N)',
   unnamed: '(未命名)',
   dryRun: '以下是 dry-run 模拟运行结果，不会实际执行任何操作：',
+  usingCustomVersion: '使用自定义版本：{{version}}',
+  confirmDeletePackage: '确认删除原生包 {{packageId}}? 此操作不可撤销 (Y/N):',
+  deletePackageSuccess: '原生包 {{packageId}} 删除成功',
+  deletePackageError: '删除原生包 {{packageId}} 失败: {{error}}',
+  usageDeletePackage:
+    '使用方法: pushy deletePackage [packageId] --appId [appId]',
 };

package/src/package.ts

@@ -1,4 +1,4 @@
-import { get, getAllPackages, post, uploadFile } from './api';
+import { get, getAllPackages, post, uploadFile, doDelete } from './api';
 import { question, saveToLocal } from './utils';
 import { t } from './utils/i18n';
 
@@ -23,9 +23,9 @@ export async function listPackage(appId: string) {
     let versionInfo = '';
     if (version) {
       const versionObj = version as any;
-      versionInfo = t('boundTo', { 
-        name: versionObj.name || version, 
-        id: versionObj.id || version 
+      versionInfo = t('boundTo', {
+        name: versionObj.name || version,
+        id: versionObj.id || version,
       });
     }
     let output = pkg.name;
@@ -57,16 +57,19 @@ export async function choosePackage(appId: string) {
 }
 
 export const packageCommands = {
-  uploadIpa: async ({ args }: { args: string[] }) => {
+  uploadIpa: async ({
+    args,
+    options,
+  }: {
+    args: string[];
+    options: Record<string, any>;
+  }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {
       throw new Error(t('usageUploadIpa'));
     }
     const ipaInfo = await getIpaInfo(fn);
-    const {
-      versionName,
-      buildTime,
-    } = ipaInfo;
+    const { versionName: extractedVersionName, buildTime } = ipaInfo;
     const appIdInPkg = (ipaInfo as any).appId;
     const appKeyInPkg = (ipaInfo as any).appKey;
     const { appId, appKey } = await getSelectedApp('ios');
@@ -79,6 +82,12 @@ export const packageCommands = {
       throw new Error(t('appKeyMismatchIpa', { appKeyInPkg, appKey }));
     }
 
+    // Use custom version if provided, otherwise use extracted version
+    const versionName = options.version || extractedVersionName;
+    if (options.version) {
+      console.log(t('usingCustomVersion', { version: versionName }));
+    }
+
     const { hash } = await uploadFile(fn);
 
     const { id } = await post(`/app/${appId}/package/create`, {
@@ -89,20 +98,21 @@ export const packageCommands = {
       commit: await getCommitInfo(),
     });
     saveToLocal(fn, `${appId}/package/${id}.ipa`);
-    console.log(
-      t('ipaUploadSuccess', { id, version: versionName, buildTime }),
-    );
+    console.log(t('ipaUploadSuccess', { id, version: versionName, buildTime }));
   },
-  uploadApk: async ({ args }: { args: string[] }) => {
+  uploadApk: async ({
+    args,
+    options,
+  }: {
+    args: string[];
+    options: Record<string, any>;
+  }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
       throw new Error(t('usageUploadApk'));
     }
     const apkInfo = await getApkInfo(fn);
-    const {
-      versionName,
-      buildTime,
-    } = apkInfo;
+    const { versionName: extractedVersionName, buildTime } = apkInfo;
     const appIdInPkg = (apkInfo as any).appId;
     const appKeyInPkg = (apkInfo as any).appKey;
     const { appId, appKey } = await getSelectedApp('android');
@@ -115,6 +125,12 @@ export const packageCommands = {
       throw new Error(t('appKeyMismatchApk', { appKeyInPkg, appKey }));
     }
 
+    // Use custom version if provided, otherwise use extracted version
+    const versionName = options.version || extractedVersionName;
+    if (options.version) {
+      console.log(t('usingCustomVersion', { version: versionName }));
+    }
+
     const { hash } = await uploadFile(fn);
 
     const { id } = await post(`/app/${appId}/package/create`, {
@@ -125,20 +141,21 @@ export const packageCommands = {
       commit: await getCommitInfo(),
     });
     saveToLocal(fn, `${appId}/package/${id}.apk`);
-    console.log(
-      t('apkUploadSuccess', { id, version: versionName, buildTime }),
-    );
+    console.log(t('apkUploadSuccess', { id, version: versionName, buildTime }));
   },
-  uploadApp: async ({ args }: { args: string[] }) => {
+  uploadApp: async ({
+    args,
+    options,
+  }: {
+    args: string[];
+    options: Record<string, any>;
+  }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.app')) {
       throw new Error(t('usageUploadApp'));
     }
     const appInfo = await getAppInfo(fn);
-    const {
-      versionName,
-      buildTime,
-    } = appInfo;
+    const { versionName: extractedVersionName, buildTime } = appInfo;
     const appIdInPkg = (appInfo as any).appId;
     const appKeyInPkg = (appInfo as any).appKey;
     const { appId, appKey } = await getSelectedApp('harmony');
@@ -151,6 +168,12 @@ export const packageCommands = {
       throw new Error(t('appKeyMismatchApp', { appKeyInPkg, appKey }));
     }
 
+    // Use custom version if provided, otherwise use extracted version
+    const versionName = options.version || extractedVersionName;
+    if (options.version) {
+      console.log(t('usingCustomVersion', { version: versionName }));
+    }
+
     const { hash } = await uploadFile(fn);
 
     const { id } = await post(`/app/${appId}/package/create`, {
@@ -161,9 +184,7 @@ export const packageCommands = {
       commit: await getCommitInfo(),
     });
     saveToLocal(fn, `${appId}/package/${id}.app`);
-    console.log(
-      t('appUploadSuccess', { id, version: versionName, buildTime }),
-    );
+    console.log(t('appUploadSuccess', { id, version: versionName, buildTime }));
   },
   parseApp: async ({ args }: { args: string[] }) => {
     const fn = args[0];
@@ -191,4 +212,47 @@ export const packageCommands = {
     const { appId } = await getSelectedApp(platform);
     await listPackage(appId);
   },
+  deletePackage: async ({
+    args,
+    options,
+  }: {
+    args: string[];
+    options: { appId?: string };
+  }) => {
+    let packageId = args[0];
+    let { appId } = options;
+
+    if (!appId) {
+      const platform = await getPlatform();
+      appId = (await getSelectedApp(platform)).appId as string;
+    }
+
+    // If no packageId provided as argument, let user choose from list
+    if (!packageId) {
+      const selectedPackage = await choosePackage(appId);
+      packageId = selectedPackage.id;
+    }
+
+    // Confirm deletion
+    // const confirmDelete = await question(
+    //   t('confirmDeletePackage', { packageId }),
+    // );
+
+    // if (
+    //   confirmDelete.toLowerCase() !== 'y' &&
+    //   confirmDelete.toLowerCase() !== 'yes'
+    // ) {
+    //   console.log(t('cancelled'));
+    //   return;
+    // }
+
+    try {
+      await doDelete(`/app/${appId}/package/${packageId}`);
+      console.log(t('deletePackageSuccess', { packageId }));
+    } catch (error: any) {
+      throw new Error(
+        t('deletePackageError', { packageId, error: error.message }),
+      );
+    }
+  },
 };

package/src/provider.ts

@@ -110,7 +110,7 @@ export class CLIProviderImpl implements CLIProvider {
 
       const context: CommandContext = {
         args: [filePath],
-        options: { platform, appId },
+        options: { platform, appId, version: options.version },
       };
 
       const { packageCommands } = await import('./package');

package/src/types.ts

@@ -85,6 +85,7 @@ export interface UploadOptions {
   platform?: Platform;
   filePath: string;
   appId?: string;
+  version?: string;
 }
 
 export interface WorkflowStep {