Refactor bundle file handling by introducing isPPKBundleFileName utility; streamline diff logic for bundle files in bundle.ts.

cli.json

@@ -213,7 +213,7 @@
         "rncli": {
           "default": false
         },
-        "disableHermes": {
+        "hermes": {
           "default": false
         },
         "name": {
@@ -299,15 +299,6 @@
         }
       }
     },
-    "hdiffFromPPK": {
-      "description": "Create hdiff patch from a Prepare package(.ppk)",
-      "options": {
-        "output": {
-          "default": "${tempDir}/output/hdiff-${time}.ppk-patch",
-          "hasValue": true
-        }
-      }
-    },
     "hdiffFromApp": {
       "description": "Create hdiff patch from a Harmony package(.app)",
       "options": {
@@ -343,6 +334,10 @@
           "hasValue": true
         }
       }
+    },
+    "install": {
+      "description": "Install optional dependencies to the CLI",
+      "options": {}
     }
   },
   "globalOptions": {

package.json

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

src/bundle.ts

@@ -16,7 +16,7 @@ import os from 'os';
 const properties = require('properties');
 import { addGitIgnore } from './utils/add-gitignore';
 import { checkLockFiles } from './utils/check-lockfile';
-import { tempDir } from './utils/constants';
+import { isPPKBundleFileName, scriptName, tempDir } from './utils/constants';
 import { depVersions } from './utils/dep-versions';
 import { t } from './utils/i18n';
 import { versionCommands } from './versions';
@@ -42,7 +42,7 @@ async function runReactNativeBundleCommand({
   platform,
   sourcemapOutput,
   config,
-  disableHermes,
+  forceHermes,
   cli,
 }: {
   bundleName: string;
@@ -52,7 +52,7 @@ async function runReactNativeBundleCommand({
   platform: string;
   sourcemapOutput: string;
   config?: string;
-  disableHermes?: boolean;
+  forceHermes?: boolean;
   cli: {
     taro?: boolean;
     expo?: boolean;
@@ -75,15 +75,12 @@ async function runReactNativeBundleCommand({
   const envArgs = process.env.PUSHY_ENV_ARGS;
 
   if (envArgs) {
-    Array.prototype.push.apply(
+    reactNativeBundleArgs.push(...envArgs.trim().split(/\s+/));
-      reactNativeBundleArgs,
-      envArgs.trim().split(/\s+/),
-    );
   }
 
   fs.emptyDirSync(outputFolder);
 
-  let cliPath: string | undefined;
+  let cliPath = '';
   let usingExpo = false;
 
   const getExpoCli = () => {
@@ -104,7 +101,7 @@ async function runReactNativeBundleCommand({
       if (satisfies(expoCliVersion, '>= 0.10.17')) {
         usingExpo = true;
       } else {
-        cliPath = undefined;
+        cliPath = '';
       }
     } catch (e) {}
   };
@@ -167,48 +164,38 @@ async function runReactNativeBundleCommand({
   }
 
   if (platform === 'harmony') {
-    Array.prototype.push.apply(reactNativeBundleArgs, [
+    bundleName = 'bundle.harmony.js';
-      cliPath,
+    if (forceHermes === undefined) {
-      bundleCommand,
+      // enable hermes by default for harmony
-      '--dev',
+      forceHermes = true;
-      dev,
-      '--entry-file',
-      entryFile,
-    ]);
-
-    if (sourcemapOutput) {
-      reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
     }
+  }
 
-    if (config) {
+  reactNativeBundleArgs.push(
-      reactNativeBundleArgs.push('--config', config);
+    cliPath,
-    }
+    bundleCommand,
+    '--assets-dest',
+    outputFolder,
+    '--bundle-output',
+    path.join(outputFolder, bundleName),
+  );
+
+  if (platform !== 'harmony') {
+    reactNativeBundleArgs.push('--platform', platform, '--reset-cache');
+  }
+
+  if (cli.taro) {
+    reactNativeBundleArgs.push('--type', 'rn');
   } else {
-    Array.prototype.push.apply(reactNativeBundleArgs, [
+    reactNativeBundleArgs.push('--dev', dev, '--entry-file', entryFile);
-      cliPath,
+  }
-      bundleCommand,
-      '--assets-dest',
-      outputFolder,
-      '--bundle-output',
-      path.join(outputFolder, bundleName),
-      '--platform',
-      platform,
-      '--reset-cache',
-    ]);
 
-    if (cli.taro) {
+  if (sourcemapOutput) {
-      reactNativeBundleArgs.push(...['--type', 'rn']);
+    reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
-    } else {
+  }
-      reactNativeBundleArgs.push(...['--dev', dev, '--entry-file', entryFile]);
-    }
 
-    if (sourcemapOutput) {
+  if (config) {
-      reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
+    reactNativeBundleArgs.push('--config', config);
-    }
-
-    if (config) {
-      reactNativeBundleArgs.push('--config', config);
-    }
   }
 
   const reactNativeBundleProcess = spawn('node', reactNativeBundleArgs);
@@ -231,9 +218,9 @@ async function runReactNativeBundleCommand({
       } else {
         let hermesEnabled: boolean | undefined = false;
 
-        if (disableHermes) {
+        if (forceHermes) {
-          hermesEnabled = false;
+          hermesEnabled = true;
-          console.log(t('hermesDisabled'));
+          console.log(t('forceHermes'));
         } else if (platform === 'android') {
           const gradlePropeties = await new Promise<{
             hermesEnabled?: boolean;
@@ -260,8 +247,6 @@ async function runReactNativeBundleCommand({
           fs.existsSync('ios/Pods/hermes-engine')
         ) {
           hermesEnabled = true;
-        } else if (platform === 'harmony') {
-          await copyHarmonyBundle(outputFolder);
         }
         if (hermesEnabled) {
           await compileHermesByteCode(
@@ -277,39 +262,6 @@ async function runReactNativeBundleCommand({
   });
 }
 
-async function copyHarmonyBundle(outputFolder: string) {
-  const harmonyRawPath = 'harmony/entry/src/main/resources/rawfile';
-  try {
-    await fs.ensureDir(harmonyRawPath);
-    try {
-      await fs.access(harmonyRawPath, fs.constants.W_OK);
-    } catch (error) {
-      await fs.chmod(harmonyRawPath, 0o755);
-    }
-    await fs.remove(path.join(harmonyRawPath, 'update.json'));
-    await fs.copy('update.json', path.join(harmonyRawPath, 'update.json'));
-    await fs.ensureDir(outputFolder);
-
-    const files = await fs.readdir(harmonyRawPath);
-    for (const file of files) {
-      if (file !== 'update.json' && file !== 'meta.json') {
-        const sourcePath = path.join(harmonyRawPath, file);
-        const destPath = path.join(outputFolder, file);
-        const stat = await fs.stat(sourcePath);
-
-        if (stat.isFile()) {
-          await fs.copy(sourcePath, destPath);
-        } else if (stat.isDirectory()) {
-          await fs.copy(sourcePath, destPath);
-        }
-      }
-    }
-  } catch (error: any) {
-    console.error(t('copyHarmonyBundleError', { error }));
-    throw new Error(t('copyFileFailed', { error: error.message }));
-  }
-}
-
 function getHermesOSBin() {
   if (os.platform() === 'win32') return 'win64-bin';
   if (os.platform() === 'darwin') return 'osx-bin';
@@ -498,7 +450,12 @@ async function uploadSourcemapForSentry(
   }
 }
 
-const ignorePackingFileNames = ['.', '..', 'index.bundlejs.map'];
+const ignorePackingFileNames = [
+  '.',
+  '..',
+  'index.bundlejs.map',
+  'bundle.harmony.js.map',
+];
 const ignorePackingExtensions = ['DS_Store', 'txt.map'];
 async function pack(dir: string, output: string) {
   console.log(t('packing'));
@@ -580,10 +537,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
       // isFile
       originMap[entry.crc32] = entry.fileName;
 
-      if (
+      if (isPPKBundleFileName(entry.fileName)) {
-        entry.fileName === 'index.bundlejs' ||
-        entry.fileName === 'bundle.harmony.js'
-      ) {
         // This is source.
         return readEntry(entry, zipFile).then((v) => (originSource = v));
       }
@@ -591,9 +545,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
   });
 
   if (!originSource) {
-    throw new Error(
+    throw new Error(t('bundleFileNotFound'));
-      'Bundle file not found! Please use default bundle file name and path.',
-    );
   }
 
   const copies = {};
@@ -634,23 +586,13 @@ async function diffFromPPK(origin: string, next: string, output: string) {
       if (!originEntries[entry.fileName]) {
         addEntry(entry.fileName);
       }
-    } else if (entry.fileName === 'index.bundlejs') {
+    } else if (isPPKBundleFileName(entry.fileName)) {
       //console.log('Found bundle');
       return readEntry(entry, nextZipfile).then((newSource) => {
         //console.log('Begin diff');
         zipfile.addBuffer(
           diff(originSource, newSource),
-          'index.bundlejs.patch',
+          `${entry.fileName}.patch`,
-        );
-        //console.log('End diff');
-      });
-    } else if (entry.fileName === 'bundle.harmony.js') {
-      //console.log('Found bundle');
-      return readEntry(entry, nextZipfile).then((newSource) => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(
-          diff(originSource, newSource),
-          'bundle.harmony.js.patch',
         );
         //console.log('End diff');
       });
@@ -743,9 +685,7 @@ async function diffFromPackage(
   });
 
   if (!originSource) {
-    throw new Error(
+    throw new Error(t('bundleFileNotFound'));
-      'Bundle file not found! Please use default bundle file name and path.',
-    );
   }
 
   const copies = {};
@@ -766,23 +706,13 @@ async function diffFromPackage(
     if (/\/$/.test(entry.fileName)) {
       // Directory
       zipfile.addEmptyDirectory(entry.fileName);
-    } else if (entry.fileName === 'index.bundlejs') {
+    } else if (isPPKBundleFileName(entry.fileName)) {
       //console.log('Found bundle');
       return readEntry(entry, nextZipfile).then((newSource) => {
         //console.log('Begin diff');
         zipfile.addBuffer(
           diff(originSource, newSource),
-          'index.bundlejs.patch',
+          `${entry.fileName}.patch`,
-        );
-        //console.log('End diff');
-      });
-    } else if (entry.fileName === 'bundle.harmony.js') {
-      //console.log('Found bundle');
-      return readEntry(entry, nextZipfile).then((newSource) => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(
-          diff(originSource, newSource),
-          'bundle.harmony.js.patch',
         );
         //console.log('End diff');
       });
@@ -814,7 +744,10 @@ async function diffFromPackage(
     }
   });
 
-  zipfile.addBuffer(Buffer.from(JSON.stringify({ copies, copiesv2 })), '__diff.json');
+  zipfile.addBuffer(
+    Buffer.from(JSON.stringify({ copies, copiesv2 })),
+    '__diff.json',
+  );
   zipfile.end();
   await writePromise;
 }
@@ -896,24 +829,21 @@ function diffArgsCheck(args: string[], options: any, diffFn: string) {
 
   if (diffFn.startsWith('hdiff')) {
     if (!hdiff) {
-      console.error(
+      console.error(t('nodeHdiffpatchRequired', { scriptName }));
-        `This function needs "node-hdiffpatch". 
-        Please run "npm i node-hdiffpatch" to install`,
-      );
       process.exit(1);
     }
     diff = hdiff;
   } else {
     if (!bsdiff) {
-      console.error(
+      console.error(t('nodeBsdiffRequired', { scriptName }));
-        `This function needs "node-bsdiff". 
-        Please run "npm i node-bsdiff" to install`,
-      );
       process.exit(1);
     }
     diff = bsdiff;
   }
-  const { output } = options;
+  const { output } = translateOptions({
+    ...options,
+    tempDir,
+  });
 
   return {
     origin,
@@ -936,7 +866,7 @@ export const bundleCommands = {
       taro,
       expo,
       rncli,
-      disableHermes,
+      hermes,
       name,
       description,
       metaInfo,
@@ -977,7 +907,7 @@ export const bundleCommands = {
       outputFolder: intermediaDir,
       platform,
       sourcemapOutput: sourcemap || sourcemapPlugin ? sourcemapOutput : '',
-      disableHermes: !!disableHermes,
+      forceHermes: hermes as unknown as boolean,
       cli: {
         taro: !!taro,
         expo: !!expo,
@@ -1044,14 +974,14 @@ export const bundleCommands = {
     const { origin, next, realOutput } = diffArgsCheck(args, options, 'diff');
 
     await diffFromPPK(origin, next, realOutput);
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 
   async hdiff({ args, options }) {
     const { origin, next, realOutput } = diffArgsCheck(args, options, 'hdiff');
 
     await diffFromPPK(origin, next, realOutput);
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 
   async diffFromApk({ args, options }) {
@@ -1067,7 +997,7 @@ export const bundleCommands = {
       realOutput,
       'assets/index.android.bundle',
     );
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 
   async hdiffFromApk({ args, options }) {
@@ -1083,7 +1013,7 @@ export const bundleCommands = {
       realOutput,
       'assets/index.android.bundle',
     );
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 
   async diffFromApp({ args, options }) {
@@ -1098,7 +1028,7 @@ export const bundleCommands = {
       realOutput,
       'resources/rawfile/bundle.harmony.js',
     );
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 
   async hdiffFromApp({ args, options }) {
@@ -1113,7 +1043,7 @@ export const bundleCommands = {
       realOutput,
       'resources/rawfile/bundle.harmony.js',
     );
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 
   async diffFromIpa({ args, options }) {
@@ -1128,7 +1058,7 @@ export const bundleCommands = {
       return m?.[1];
     });
 
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 
   async hdiffFromIpa({ args, options }) {
@@ -1143,6 +1073,6 @@ export const bundleCommands = {
       return m?.[1];
     });
 
-    console.log(`${realOutput} generated.`);
+    console.log(t('diffPackageGenerated', { output: realOutput }));
   },
 };

src/index.ts

@@ -3,6 +3,7 @@
 import { loadSession } from './api';
 import { appCommands } from './app';
 import { bundleCommands } from './bundle';
+import { installCommands } from './install';
 import { moduleManager } from './module-manager';
 import { builtinModules } from './modules';
 import { packageCommands } from './package';
@@ -33,6 +34,7 @@ function printUsage() {
     ...appCommands,
     ...packageCommands,
     ...versionCommands,
+    ...installCommands,
   };
 
   for (const [name, handler] of Object.entries(legacyCommands)) {
@@ -76,6 +78,7 @@ const legacyCommands = {
   ...appCommands,
   ...packageCommands,
   ...versionCommands,
+  ...installCommands,
   help: printUsage,
 };
 

src/install.ts

@@ -0,0 +1,19 @@
+import { spawnSync } from 'child_process';
+import path from 'path';
+import type { CommandContext } from './types';
+
+export const installCommands = {
+  install: async ({ args }: CommandContext) => {
+    if (args.length === 0) {
+      return;
+    }
+
+    const cliDir = path.resolve(__dirname, '..');
+
+    spawnSync('npm', ['install', ...args], {
+      cwd: cliDir,
+      stdio: 'inherit',
+      shell: true,
+    });
+  },
+};

src/locales/en.ts

@@ -49,7 +49,7 @@ export default {
   fileGenerated: '{{- file}} generated.',
   fileSizeExceeded:
     'This file size is {{fileSize}} , exceeding the current quota {{maxSize}} . You may consider upgrading to a higher plan to increase this quota. Details can be found at: {{- pricingPageUrl}}',
-  hermesDisabled: 'Hermes disabled',
+  forceHermes: 'Forcing Hermes enabled for this build',
   hermesEnabledCompiling: 'Hermes enabled, now compiling to hermes bytecode:\n',
   ipaUploadSuccess:
     'Successfully uploaded IPA native package (id: {{id}}, version: {{version}}, buildTime: {{buildTime}})',
@@ -137,4 +137,11 @@ This can reduce the risk of inconsistent dependencies and supply chain attacks.
   deletePackageError:
     'Failed to delete native package {{packageId}}: {{error}}',
   usageDeletePackage: 'Usage: cresc deletePackage [packageId] --appId [appId]',
+  bundleFileNotFound:
+    'Bundle file not found! Please use default bundle file name and path.',
+  diffPackageGenerated: '{{- output}} generated.',
+  nodeBsdiffRequired:
+    'This function needs "node-bsdiff". Please run "{{scriptName}} install node-bsdiff" to install',
+  nodeHdiffpatchRequired:
+    'This function needs "node-hdiffpatch". Please run "{{scriptName}} install node-hdiffpatch" to install',
 };

src/locales/zh.ts

@@ -47,7 +47,7 @@ export default {
   fileGenerated: '已生成 {{- file}}',
   fileSizeExceeded:
     '此文件大小 {{fileSize}} , 超出当前额度 {{maxSize}} 。您可以考虑升级付费业务以提升此额度。详情请访问: {{- pricingPageUrl}}',
-  hermesDisabled: 'Hermes 已禁用',
+  forceHermes: '强制启用 Hermes 编译',
   hermesEnabledCompiling: 'Hermes 已启用，正在编译为 hermes 字节码：\n',
   ipaUploadSuccess:
     '已成功上传ipa原生包（id: {{id}}, version: {{version}}, buildTime: {{buildTime}}）',
@@ -129,4 +129,10 @@ export default {
   deletePackageError: '删除原生包 {{packageId}} 失败: {{error}}',
   usageDeletePackage:
     '使用方法: pushy deletePackage [packageId] --appId [appId]',
+  bundleFileNotFound: '未找到 bundle 文件！请使用默认的 bundle 文件名和路径。',
+  diffPackageGenerated: '{{- output}} 已生成。',
+  nodeBsdiffRequired:
+    '此功能需要 "node-bsdiff"。请运行 "{{scriptName}} install node-bsdiff" 来安装',
+  nodeHdiffpatchRequired:
+    '此功能需要 "node-hdiffpatch"。请运行 "{{scriptName}} install node-hdiffpatch" 来安装',
 };

src/modules/bundle-module.ts

@@ -53,7 +53,7 @@ export const bundleModule: CLIModule = {
               taro = false,
               expo = false,
               rncli = false,
-              disableHermes = false,
+              hermes = false,
               output,
             } = context.options;
 
@@ -73,7 +73,7 @@ export const bundleModule: CLIModule = {
                 taro,
                 expo,
                 rncli,
-                disableHermes,
+                hermes,
                 intermediaDir: '${tempDir}/intermedia/${platform}',
                 output: '${tempDir}/output/${platform}.${time}.ppk',
               };
@@ -170,10 +170,10 @@ export const bundleModule: CLIModule = {
           default: false,
           description: 'Use React Native CLI',
         },
-        disableHermes: {
+        hermes: {
           hasValue: false,
           default: false,
-          description: 'Disable Hermes',
+          description: 'Force enable Hermes',
         },
         name: {
           hasValue: true,

src/provider.ts

@@ -42,7 +42,7 @@ export class CLIProviderImpl implements CLIProvider {
           taro: options.taro || false,
           expo: options.expo || false,
           rncli: options.rncli || false,
-          disableHermes: options.disableHermes || false,
+          hermes: options.hermes || false,
         },
       };
 

src/types.ts

@@ -65,7 +65,7 @@ export interface BundleOptions {
   taro?: boolean;
   expo?: boolean;
   rncli?: boolean;
-  disableHermes?: boolean;
+  hermes?: boolean;
 }
 
 export interface PublishOptions {

src/utils/constants.ts

@@ -1,8 +1,12 @@
 import path from 'path';
 
-const scriptName = path.basename(process.argv[1]) as 'cresc' | 'pushy';
+export const scriptName = path.basename(process.argv[1]) as 'cresc' | 'pushy';
 export const IS_CRESC = scriptName === 'cresc';
 
+export const ppkBundleFileNames = ['index.bundlejs', 'bundle.harmony.js'];
+export const isPPKBundleFileName = (fileName: string) =>
+  ppkBundleFileNames.includes(fileName);
+
 export const credentialFile = IS_CRESC ? '.cresc.token' : '.update';
 export const updateJson = IS_CRESC ? 'cresc.config.json' : 'update.json';
 export const tempDir = IS_CRESC ? '.cresc.temp' : '.pushy';