react-native-update-cli 1.35.0 → 1.36.0

package/cli.json

@@ -3,11 +3,9 @@
   "defaultCommand": "help",
   "commands": {
     "help": {},
-
     "login": {},
     "logout": {},
     "me": {},
-
     "createApp": {
       "options": {
         "name": {
@@ -33,7 +31,6 @@
         }
       }
     },
-
     "uploadIpa": {},
     "uploadApk": {},
     "parseIpa": {},
@@ -45,7 +42,6 @@
         }
       }
     },
-
     "publish": {
       "options": {
         "platform": {
@@ -69,7 +65,6 @@
         }
       }
     },
-
     "update": {
       "options": {
         "platform": {
@@ -95,7 +90,6 @@
         }
       }
     },
-
     "updateVersionInfo": {
       "options": {
         "platform": {
@@ -118,7 +112,6 @@
         }
       }
     },
-
     "build": {
       "description": "Bundle javascript and copy assets."
     },
@@ -201,6 +194,24 @@
         }
       }
     },
+    "hdiffFromPPK": {
+      "description": "Create hdiff patch from a Prepare package(.ppk)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.ppk-patch",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiffFromApp": {
+      "description": "Create hdiff patch from a Harmony package(.app)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.app-patch",
+          "hasValue": true
+        }
+      }
+    },
     "hdiffFromIpa": {
       "description": "Create hdiff patch from a iOS package(.ipa)",
       "options": {
@@ -216,4 +227,4 @@
       "default": false
     }
   }
-}
+}

package/lib/bundle.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "commands", {
         return commands;
     }
 });
-const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 const _utils = require("./utils");
 const _fsextra = /*#__PURE__*/ _interop_require_wildcard(require("fs-extra"));
 const _yazl = require("yazl");
@@ -64,6 +63,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 const g2js = require('gradle-to-js/lib/parser');
 const properties = require('properties');
+const path = require('path');
 let bsdiff, hdiff, diff;
 try {
     bsdiff = require('node-bsdiff').diff;
@@ -111,27 +111,44 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
             });
         }
     }
-    const bundleCommand = usingExpo ? 'export:embed' : 'bundle';
-    Array.prototype.push.apply(reactNativeBundleArgs, [
-        cliPath,
-        bundleCommand,
-        '--assets-dest',
-        outputFolder,
-        '--bundle-output',
-        _nodepath.default.join(outputFolder, bundleName),
-        '--dev',
-        development,
-        '--entry-file',
-        entryFile,
-        '--platform',
-        platform,
-        '--reset-cache'
-    ]);
-    if (sourcemapOutput) {
-        reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
-    }
-    if (config) {
-        reactNativeBundleArgs.push('--config', config);
+    const bundleCommand = usingExpo ? 'export:embed' : platform === 'harmony' ? 'bundle-harmony' : 'bundle';
+    if (platform == 'harmony') {
+        Array.prototype.push.apply(reactNativeBundleArgs, [
+            cliPath,
+            bundleCommand,
+            '--dev',
+            development,
+            '--entry-file',
+            entryFile
+        ]);
+        if (sourcemapOutput) {
+            reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
+        }
+        if (config) {
+            reactNativeBundleArgs.push('--config', config);
+        }
+    } else {
+        Array.prototype.push.apply(reactNativeBundleArgs, [
+            cliPath,
+            bundleCommand,
+            '--assets-dest',
+            outputFolder,
+            '--bundle-output',
+            path.join(outputFolder, bundleName),
+            '--dev',
+            development,
+            '--entry-file',
+            entryFile,
+            '--platform',
+            platform,
+            '--reset-cache'
+        ]);
+        if (sourcemapOutput) {
+            reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
+        }
+        if (config) {
+            reactNativeBundleArgs.push('--config', config);
+        }
     }
     const reactNativeBundleProcess = (0, _nodechild_process.spawn)('node', reactNativeBundleArgs);
     console.log(`Running bundle command: node ${reactNativeBundleArgs.join(' ')}`);
@@ -163,6 +180,8 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
                     if (typeof hermesEnabled !== 'boolean') hermesEnabled = gradleConfig.enableHermes;
                 } else if (platform === 'ios' && _fsextra.existsSync('ios/Pods/hermes-engine')) {
                     hermesEnabled = true;
+                } else if (platform === 'harmony') {
+                    await copyHarmonyBundle(outputFolder);
                 }
                 if (hermesEnabled) {
                     await compileHermesByteCode(bundleName, outputFolder, sourcemapOutput);
@@ -172,6 +191,16 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
         });
     });
 }
+async function copyHarmonyBundle(outputFolder) {
+    const harmonyRawPath = 'harmony/entry/src/main/resources/rawfile';
+    try {
+        await _fsextra.ensureDir(outputFolder);
+        await _fsextra.copy(harmonyRawPath, outputFolder);
+        console.log(`Successfully copied from ${harmonyRawPath} to ${outputFolder}`);
+    } catch (error) {
+        console.error('Error in copyHarmonyBundle:', error);
+    }
+}
 function getHermesOSBin() {
     if (_os.default.platform() === 'win32') return 'win64-bin';
     if (_os.default.platform() === 'darwin') return 'osx-bin';
@@ -201,12 +230,12 @@ async function checkGradleConfig() {
 async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput) {
     console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
     // >= rn 0.69
-    const rnDir = _nodepath.default.dirname(require.resolve('react-native', {
+    const rnDir = path.dirname(require.resolve('react-native', {
         paths: [
             process.cwd()
         ]
     }));
-    let hermesPath = _nodepath.default.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
+    let hermesPath = path.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
     // < rn 0.69
     if (!_fsextra.existsSync(hermesPath)) {
         hermesPath = `node_modules/hermes-engine/${getHermesOSBin()}`;
@@ -215,12 +244,12 @@ async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput)
     const args = [
         '-emit-binary',
         '-out',
-        _nodepath.default.join(outputFolder, bundleName),
-        _nodepath.default.join(outputFolder, bundleName),
+        path.join(outputFolder, bundleName),
+        path.join(outputFolder, bundleName),
         '-O'
     ];
     if (sourcemapOutput) {
-        _fsextra.copyFileSync(sourcemapOutput, _nodepath.default.join(outputFolder, bundleName + '.txt.map'));
+        _fsextra.copyFileSync(sourcemapOutput, path.join(outputFolder, bundleName + '.txt.map'));
         args.push('-output-source-map');
     }
     console.log('Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n');
@@ -235,19 +264,19 @@ async function compileHermesByteCode(bundleName, outputFolder, sourcemapOutput)
         console.log(`Composing source map`);
         (0, _nodechild_process.spawnSync)('node', [
             composerPath,
-            _nodepath.default.join(outputFolder, bundleName + '.txt.map'),
-            _nodepath.default.join(outputFolder, bundleName + '.map'),
+            path.join(outputFolder, bundleName + '.txt.map'),
+            path.join(outputFolder, bundleName + '.map'),
             '-o',
             sourcemapOutput
         ], {
             stdio: 'ignore'
         });
     }
-    _fsextra.removeSync(_nodepath.default.join(outputFolder, bundleName + '.txt.map'));
+    _fsextra.removeSync(path.join(outputFolder, bundleName + '.txt.map'));
 }
 async function pack(dir, output) {
     console.log('Packing');
-    _fsextra.ensureDirSync(_nodepath.default.dirname(output));
+    _fsextra.ensureDirSync(path.dirname(output));
     await new Promise((resolve, reject)=>{
         const zipfile = new _yazl.ZipFile();
         function addDirectory(root, rel) {
@@ -259,7 +288,7 @@ async function pack(dir, output) {
                 if (name === '.' || name === '..' || name === 'index.bundlejs.map') {
                     continue;
                 }
-                const fullPath = _nodepath.default.join(root, name);
+                const fullPath = path.join(root, name);
                 const stat = _fsextra.statSync(fullPath);
                 if (stat.isFile()) {
                     //console.log('adding: ' + rel+name);
@@ -303,7 +332,7 @@ function basename(fn) {
     return m && m[1];
 }
 async function diffFromPPK(origin, next, output) {
-    _fsextra.ensureDirSync(_nodepath.default.dirname(output));
+    _fsextra.ensureDirSync(path.dirname(output));
     const originEntries = {};
     const originMap = {};
     let originSource;
@@ -312,7 +341,7 @@ async function diffFromPPK(origin, next, output) {
         if (!/\/$/.test(entry.fileName)) {
             // isFile
             originMap[entry.crc32] = entry.fileName;
-            if (entry.fileName === 'index.bundlejs') {
+            if (entry.fileName === 'index.bundlejs' || entry.fileName === 'bundle.harmony.js') {
                 // This is source.
                 return readEntire(entry, zipFile).then((v)=>originSource = v);
             }
@@ -358,6 +387,13 @@ async function diffFromPPK(origin, next, output) {
                 zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch');
             //console.log('End diff');
             });
+        } else if (entry.fileName === 'bundle.harmony.js') {
+            //console.log('Found bundle');
+            return readEntire(entry, nextZipfile).then((newSource)=>{
+                //console.log('Begin diff');
+                zipfile.addBuffer(diff(originSource, newSource), 'bundle.harmony.js.patch');
+            //console.log('End diff');
+            });
         } else {
             // If same file.
             const originEntry = originEntries[entry.fileName];
@@ -406,7 +442,7 @@ async function diffFromPPK(origin, next, output) {
     await writePromise;
 }
 async function diffFromPackage(origin, next, output, originBundleName, transformPackagePath = (v)=>v) {
-    _fsextra.ensureDirSync(_nodepath.default.dirname(output));
+    _fsextra.ensureDirSync(path.dirname(output));
     const originEntries = {};
     const originMap = {};
     let originSource;
@@ -450,6 +486,13 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
                 zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch');
             //console.log('End diff');
             });
+        } else if (entry.fileName === 'bundle.harmony.js') {
+            //console.log('Found bundle');
+            return readEntire(entry, nextZipfile).then((newSource)=>{
+                //console.log('Begin diff');
+                zipfile.addBuffer(diff(originSource, newSource), 'bundle.harmony.js.patch');
+            //console.log('End diff');
+            });
         } else {
             // If same file.
             if (originEntries[entry.fileName] === entry.crc32) {
@@ -481,23 +524,43 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
     zipfile.end();
     await writePromise;
 }
-function enumZipEntries(zipFn, callback) {
+async function enumZipEntries(zipFn, callback, nestedPath = '') {
     return new Promise((resolve, reject)=>{
         (0, _yauzl.open)(zipFn, {
             lazyEntries: true
-        }, (err, zipfile)=>{
+        }, async (err, zipfile)=>{
             if (err) {
                 return reject(err);
             }
             zipfile.on('end', resolve);
             zipfile.on('error', reject);
-            zipfile.on('entry', (entry)=>{
-                const result = callback(entry, zipfile);
-                if (result && typeof result.then === 'function') {
-                    result.then(()=>zipfile.readEntry());
-                } else {
-                    zipfile.readEntry();
+            zipfile.on('entry', async (entry)=>{
+                const fullPath = nestedPath + entry.fileName;
+                try {
+                    if (!entry.fileName.endsWith('/') && entry.fileName.toLowerCase().endsWith('.hap')) {
+                        const tempDir = path.join(_os.default.tmpdir(), 'nested_zip_' + Date.now());
+                        await _fsextra.ensureDir(tempDir);
+                        const tempZipPath = path.join(tempDir, 'temp.zip');
+                        await new Promise((res, rej)=>{
+                            zipfile.openReadStream(entry, async (err, readStream)=>{
+                                if (err) return rej(err);
+                                const writeStream = _fsextra.createWriteStream(tempZipPath);
+                                readStream.pipe(writeStream);
+                                writeStream.on('finish', res);
+                                writeStream.on('error', rej);
+                            });
+                        });
+                        await enumZipEntries(tempZipPath, callback, fullPath + '/');
+                        await _fsextra.remove(tempDir);
+                    }
+                    const result = callback(entry, zipfile, fullPath);
+                    if (result && typeof result.then === 'function') {
+                        await result;
+                    }
+                } catch (error) {
+                    console.error('处理文件时出错:', error);
                 }
+                zipfile.readEntry();
             });
             zipfile.readEntry();
         });
@@ -538,7 +601,7 @@ const commands = {
             ...options,
             platform
         });
-        const sourcemapOutput = _nodepath.default.join(intermediaDir, bundleName + '.map');
+        const sourcemapOutput = path.join(intermediaDir, bundleName + '.map');
         const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
         if (!platform) {
             throw new Error('Platform must be specified.');
@@ -546,7 +609,7 @@ const commands = {
         const { version, major, minor } = (0, _utils.getRNVersion)();
         console.log('Bundling with react-native: ', version);
         await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform, sourcemap ? sourcemapOutput : '');
-        await pack(_nodepath.default.resolve(intermediaDir), realOutput);
+        await pack(path.resolve(intermediaDir), realOutput);
         const v = await (0, _utils.question)('是否现在上传此热更包?(Y/N)');
         if (v.toLowerCase() === 'y') {
             await this.publish({
@@ -579,6 +642,11 @@ const commands = {
         await diffFromPackage(origin, next, realOutput, 'assets/index.android.bundle');
         console.log(`${realOutput} generated.`);
     },
+    async hdiffFromApp ({ args, options }) {
+        const { origin, next, realOutput } = diffArgsCheck(args, options, 'hdiffFromApp');
+        await diffFromPackage(origin, next, realOutput, 'resources/rawfile/bundle.harmony.js');
+        console.log(`${realOutput} generated.`);
+    },
     async diffFromIpa ({ args, options }) {
         const { origin, next, realOutput } = diffArgsCheck(args, options, 'diffFromIpa');
         await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.35.0",
+  "version": "1.36.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

package/src/bundle.js

@@ -9,6 +9,7 @@ import { spawn, spawnSync } from 'node:child_process';
 const g2js = require('gradle-to-js/lib/parser');
 import os from 'os';
 const properties = require('properties');
+const path = require('path');
 
 let bsdiff, hdiff, diff;
 try {
@@ -72,32 +73,51 @@ async function runReactNativeBundleCommand(
       });
     }
   }
-  const bundleCommand = usingExpo ? 'export:embed' : 'bundle';
-
-  Array.prototype.push.apply(reactNativeBundleArgs, [
-    cliPath,
-    bundleCommand,
-    '--assets-dest',
-    outputFolder,
-    '--bundle-output',
-    path.join(outputFolder, bundleName),
-    '--dev',
-    development,
-    '--entry-file',
-    entryFile,
-    '--platform',
-    platform,
-    '--reset-cache',
-  ]);
+  const bundleCommand = usingExpo ? 'export:embed' : platform === 'harmony' ? 'bundle-harmony' : 'bundle';
+  if (platform == 'harmony') {
+    Array.prototype.push.apply(reactNativeBundleArgs, [
+      cliPath,
+      bundleCommand,
+      '--dev',
+      development,
+      '--entry-file',
+      entryFile,
+    ]);
 
-  if (sourcemapOutput) {
-    reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
-  }
+    if (sourcemapOutput) {
+      reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
+    }
 
-  if (config) {
-    reactNativeBundleArgs.push('--config', config);
+    if (config) {
+      reactNativeBundleArgs.push('--config', config);
+    }
   }
-
+  else{
+    Array.prototype.push.apply(reactNativeBundleArgs, [
+      cliPath,
+      bundleCommand,
+      '--assets-dest',
+      outputFolder,
+      '--bundle-output',
+      path.join(outputFolder, bundleName),
+      '--dev',
+      development,
+      '--entry-file',
+      entryFile,
+      '--platform',
+      platform,
+      '--reset-cache',
+    ]);
+  
+    if (sourcemapOutput) {
+      reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
+    }
+  
+    if (config) {
+      reactNativeBundleArgs.push('--config', config);
+    }
+  }
+ 
   const reactNativeBundleProcess = spawn('node', reactNativeBundleArgs);
   console.log(
     `Running bundle command: node ${reactNativeBundleArgs.join(' ')}`,
@@ -146,6 +166,8 @@ async function runReactNativeBundleCommand(
           fs.existsSync('ios/Pods/hermes-engine')
         ) {
           hermesEnabled = true;
+        }else if (platform === 'harmony') {
+          await copyHarmonyBundle(outputFolder);
         }
         if (hermesEnabled) {
           await compileHermesByteCode(
@@ -160,6 +182,21 @@ async function runReactNativeBundleCommand(
   });
 }
 
+async function copyHarmonyBundle(outputFolder) {
+  const harmonyRawPath = 'harmony/entry/src/main/resources/rawfile';
+
+  try {
+    await fs.ensureDir(outputFolder);
+    await fs.copy(harmonyRawPath, outputFolder);
+
+    console.log(
+      `Successfully copied from ${harmonyRawPath} to ${outputFolder}`,
+    );
+  } catch (error) {
+    console.error('Error in copyHarmonyBundle:', error);
+  }
+}
+
 function getHermesOSBin() {
   if (os.platform() === 'win32') return 'win64-bin';
   if (os.platform() === 'darwin') return 'osx-bin';
@@ -335,7 +372,7 @@ async function diffFromPPK(origin, next, output) {
       // isFile
       originMap[entry.crc32] = entry.fileName;
 
-      if (entry.fileName === 'index.bundlejs') {
+      if (entry.fileName === 'index.bundlejs' || entry.fileName === 'bundle.harmony.js') {
         // This is source.
         return readEntire(entry, zipFile).then((v) => (originSource = v));
       }
@@ -397,6 +434,16 @@ async function diffFromPPK(origin, next, output) {
         );
         //console.log('End diff');
       });
+    }else if (entry.fileName === 'bundle.harmony.js') {
+      //console.log('Found bundle');
+      return readEntire(entry, nextZipfile).then((newSource) => {
+        //console.log('Begin diff');
+        zipfile.addBuffer(
+          diff(originSource, newSource),
+          'bundle.harmony.js.patch',
+        );
+        //console.log('End diff');
+      });
     } else {
       // If same file.
       const originEntry = originEntries[entry.fileName];
@@ -519,7 +566,17 @@ async function diffFromPackage(
         );
         //console.log('End diff');
       });
-    } else {
+    } else if (entry.fileName === 'bundle.harmony.js') {
+      //console.log('Found bundle');
+      return readEntire(entry, nextZipfile).then((newSource) => {
+        //console.log('Begin diff');
+        zipfile.addBuffer(
+          diff(originSource, newSource),
+          'bundle.harmony.js.patch',
+        );
+        //console.log('End diff');
+      });
+    }else {
       // If same file.
       if (originEntries[entry.fileName] === entry.crc32) {
         copies[entry.fileName] = '';
@@ -551,22 +608,53 @@ async function diffFromPackage(
   await writePromise;
 }
 
-function enumZipEntries(zipFn, callback) {
+async function enumZipEntries(zipFn, callback, nestedPath = '') {
   return new Promise((resolve, reject) => {
-    openZipFile(zipFn, { lazyEntries: true }, (err, zipfile) => {
+    openZipFile(zipFn, { lazyEntries: true }, async (err, zipfile) => {
       if (err) {
         return reject(err);
       }
+
       zipfile.on('end', resolve);
       zipfile.on('error', reject);
-      zipfile.on('entry', (entry) => {
-        const result = callback(entry, zipfile);
-        if (result && typeof result.then === 'function') {
-          result.then(() => zipfile.readEntry());
-        } else {
-          zipfile.readEntry();
+      zipfile.on('entry', async (entry) => {
+        const fullPath = nestedPath + entry.fileName;
+
+        try {
+          if (
+            !entry.fileName.endsWith('/') &&
+            entry.fileName.toLowerCase().endsWith('.hap')
+          ) {
+            const tempDir = path.join(os.tmpdir(), 'nested_zip_' + Date.now());
+            await fs.ensureDir(tempDir);
+            const tempZipPath = path.join(tempDir, 'temp.zip');
+
+            await new Promise((res, rej) => {
+              zipfile.openReadStream(entry, async (err, readStream) => {
+                if (err) return rej(err);
+                const writeStream = fs.createWriteStream(tempZipPath);
+                readStream.pipe(writeStream);
+                writeStream.on('finish', res);
+                writeStream.on('error', rej);
+              });
+            });
+
+            await enumZipEntries(tempZipPath, callback, fullPath + '/');
+
+            await fs.remove(tempDir);
+          }
+
+          const result = callback(entry, zipfile, fullPath);
+          if (result && typeof result.then === 'function') {
+            await result;
+          }
+        } catch (error) {
+          console.error('处理文件时出错:', error);
         }
+
+        zipfile.readEntry();
       });
+
       zipfile.readEntry();
     });
   });
@@ -700,6 +788,21 @@ export const commands = {
     console.log(`${realOutput} generated.`);
   },
 
+  async hdiffFromApp({ args, options }) {
+    const { origin, next, realOutput } = diffArgsCheck(
+      args,
+      options,
+      'hdiffFromApp',
+    );
+    await diffFromPackage(
+      origin,
+      next,
+      realOutput,
+      'resources/rawfile/bundle.harmony.js',
+    );
+    console.log(`${realOutput} generated.`);
+  },
+
   async diffFromIpa({ args, options }) {
     const { origin, next, realOutput } = diffArgsCheck(
       args,