react-native-update-cli 1.38.1 → 1.39.0

package/lib/versions.js

@@ -86,8 +86,9 @@ const commands = {
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { appId } = await (0, _app.getSelectedApp)(platform);
         const { hash } = await (0, _api.uploadFile)(fn);
+        const versionName = name || await (0, _utils.question)('输入版本名称: ') || '(未命名)';
         const { id } = await (0, _api.post)(`/app/${appId}/version/create`, {
-            name: name || await (0, _utils.question)('输入版本名称: ') || '(未命名)',
+            name: versionName,
             hash,
             description: description || await (0, _utils.question)('输入版本描述:'),
             metaInfo: metaInfo || await (0, _utils.question)('输入自定义的 meta info:')
@@ -105,6 +106,7 @@ const commands = {
                 }
             });
         }
+        return versionName;
     },
     versions: async ({ options })=>{
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));

package/package.json

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

package/src/{app.js → app.ts}

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import Table from 'tty-table';
 
 import { post, get, doDelete } from './api';
+import type { Platform } from './types';
 
 const validPlatforms = {
   ios: 1,
@@ -10,14 +11,14 @@ const validPlatforms = {
   harmony: 1,
 };
 
-export function checkPlatform(platform) {
+export function checkPlatform(platform: Platform) {
   if (!validPlatforms[platform]) {
     throw new Error(`无法识别的平台 '${platform}'`);
   }
   return platform;
 }
 
-export function getSelectedApp(platform) {
+export function getSelectedApp(platform: Platform) {
   checkPlatform(platform);
 
   if (!fs.existsSync('update.json')) {
@@ -34,7 +35,7 @@ export function getSelectedApp(platform) {
   return updateInfo[platform];
 }
 
-export async function listApp(platform) {
+export async function listApp(platform: Platform) {
   const { data } = await get('/app/list');
   const list = platform ? data.filter((v) => v.platform === platform) : data;
 
@@ -58,12 +59,12 @@ export async function listApp(platform) {
   return list;
 }
 
-export async function chooseApp(platform) {
+export async function chooseApp(platform: Platform) {
   const list = await listApp(platform);
 
   while (true) {
     const id = await question('输入应用 id:');
-    const app = list.find((v) => v.id === (id | 0));
+    const app = list.find((v) => v.id === Number(id));
     if (app) {
       return app;
     }

package/src/bundle.js

@@ -3,15 +3,17 @@ import { getRNVersion, translateOptions } from './utils';
 import * as fs from 'fs-extra';
 import { ZipFile } from 'yazl';
 import { open as openZipFile } from 'yauzl';
-import { question, printVersionCommand } from './utils';
+import { question, checkPlugins } from './utils';
 import { checkPlatform } from './app';
 import { spawn, spawnSync } from 'node:child_process';
+import semverSatisfies from 'semver/functions/satisfies';
 const g2js = require('gradle-to-js/lib/parser');
-import os from 'os';
+import os from 'node:os';
 const properties = require('properties');
-const path = require('path');
 
-let bsdiff, hdiff, diff;
+let bsdiff;
+let hdiff;
+let diff;
 try {
   bsdiff = require('node-bsdiff').diff;
 } catch (e) {}
@@ -39,9 +41,9 @@ async function runReactNativeBundleCommand(
     }
   }
 
-  let reactNativeBundleArgs = [];
+  const reactNativeBundleArgs = [];
 
-  let envArgs = process.env.PUSHY_ENV_ARGS;
+  const envArgs = process.env.PUSHY_ENV_ARGS;
 
   if (envArgs) {
     Array.prototype.push.apply(
@@ -59,8 +61,19 @@ async function runReactNativeBundleCommand(
     cliPath = require.resolve('@expo/cli', {
       paths: [process.cwd()],
     });
-    usingExpo = true;
-  } catch (e) {
+    const expoCliVersion = JSON.parse(
+      fs.readFileSync(
+        require.resolve('@expo/cli/package.json', {
+          paths: [process.cwd()],
+        }),
+      ),
+    ).version;
+    // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
+    if (semverSatisfies(expoCliVersion, '>= 0.10.17')) {
+      usingExpo = true;
+    }
+  } catch (e) {}
+  if (!usingExpo) {
     try {
       // rn >= 0.75
       cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
@@ -73,8 +86,15 @@ async function runReactNativeBundleCommand(
       });
     }
   }
-  const bundleCommand = usingExpo ? 'export:embed' : platform === 'harmony' ? 'bundle-harmony' : 'bundle';
-  if (platform == 'harmony') {
+  const bundleParams = await checkPlugins();
+  const minifyOption = bundleParams.minify;
+  const isSentry = bundleParams.sentry;
+  const bundleCommand = usingExpo
+    ? 'export:embed'
+    : platform === 'harmony'
+    ? 'bundle-harmony'
+    : 'bundle';
+  if (platform === 'harmony') {
     Array.prototype.push.apply(reactNativeBundleArgs, [
       cliPath,
       bundleCommand,
@@ -91,8 +111,7 @@ async function runReactNativeBundleCommand(
     if (config) {
       reactNativeBundleArgs.push('--config', config);
     }
-  }
-  else{
+  } else {
     Array.prototype.push.apply(reactNativeBundleArgs, [
       cliPath,
       bundleCommand,
@@ -107,17 +126,19 @@ async function runReactNativeBundleCommand(
       '--platform',
       platform,
       '--reset-cache',
+      '--minify',
+      minifyOption,
     ]);
-  
+
     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(' ')}`,
@@ -147,7 +168,7 @@ async function runReactNativeBundleCommand(
             properties.parse(
               './android/gradle.properties',
               { path: true },
-              function (error, props) {
+              (error, props) => {
                 if (error) {
                   console.error(error);
                   resolve(null);
@@ -166,7 +187,7 @@ async function runReactNativeBundleCommand(
           fs.existsSync('ios/Pods/hermes-engine')
         ) {
           hermesEnabled = true;
-        }else if (platform === 'harmony') {
+        } else if (platform === 'harmony') {
           await copyHarmonyBundle(outputFolder);
         }
         if (hermesEnabled) {
@@ -174,6 +195,7 @@ async function runReactNativeBundleCommand(
             bundleName,
             outputFolder,
             sourcemapOutput,
+            !isSentry,
           );
         }
         resolve(null);
@@ -193,7 +215,7 @@ async function copyHarmonyBundle(outputFolder) {
     }
     await fs.remove(path.join(harmonyRawPath, 'update.json'));
     await fs.copy('update.json', path.join(harmonyRawPath, 'update.json'));
-  
+
     await fs.ensureDir(outputFolder);
     await fs.copy(harmonyRawPath, outputFolder);
   } catch (error) {
@@ -237,8 +259,9 @@ async function compileHermesByteCode(
   bundleName,
   outputFolder,
   sourcemapOutput,
+  shouldCleanSourcemap,
 ) {
-  console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
+  console.log('Hermes enabled, now compiling to hermes bytecode:\n');
   // >= rn 0.69
   const rnDir = path.dirname(
     require.resolve('react-native', {
@@ -264,13 +287,11 @@ async function compileHermesByteCode(
   if (sourcemapOutput) {
     fs.copyFileSync(
       sourcemapOutput,
-      path.join(outputFolder, bundleName + '.txt.map'),
+      path.join(outputFolder, `${bundleName}.txt.map`),
     );
     args.push('-output-source-map');
   }
-  console.log(
-    'Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n',
-  );
+  console.log(`Running hermesc: ${hermesCommand} ${args.join(' ')}`);
   spawnSync(hermesCommand, args, {
     stdio: 'ignore',
   });
@@ -280,13 +301,13 @@ async function compileHermesByteCode(
     if (!fs.existsSync(composerPath)) {
       return;
     }
-    console.log(`Composing source map`);
+    console.log('Composing source map');
     spawnSync(
       'node',
       [
         composerPath,
-        path.join(outputFolder, bundleName + '.txt.map'),
-        path.join(outputFolder, bundleName + '.map'),
+        path.join(outputFolder, `${bundleName}.txt.map`),
+        path.join(outputFolder, `${bundleName}.map`),
         '-o',
         sourcemapOutput,
       ],
@@ -295,7 +316,96 @@ async function compileHermesByteCode(
       },
     );
   }
-  fs.removeSync(path.join(outputFolder, bundleName + '.txt.map'));
+  if (shouldCleanSourcemap) {
+    fs.removeSync(path.join(outputFolder, `${bundleName}.txt.map`));
+  }
+}
+
+async function copyDebugidForSentry(bundleName, outputFolder, sourcemapOutput) {
+  if (sourcemapOutput) {
+    let copyDebugidPath;
+    try {
+      copyDebugidPath = require.resolve(
+        '@sentry/react-native/scripts/copy-debugid.js',
+        {
+          paths: [process.cwd()],
+        },
+      );
+    } catch (error) {
+      console.error(
+        '无法找到 Sentry copy-debugid.js 脚本文件，请确保已正确安装 @sentry/react-native',
+      );
+      return;
+    }
+
+    if (!fs.existsSync(copyDebugidPath)) {
+      return;
+    }
+    console.log('Copying debugid');
+    spawnSync(
+      'node',
+      [
+        copyDebugidPath,
+        path.join(outputFolder, `${bundleName}.txt.map`),
+        path.join(outputFolder, `${bundleName}.map`),
+      ],
+      {
+        stdio: 'ignore',
+      },
+    );
+  }
+  fs.removeSync(path.join(outputFolder, `${bundleName}.txt.map`));
+}
+
+async function uploadSourcemapForSentry(
+  bundleName,
+  outputFolder,
+  sourcemapOutput,
+  version,
+) {
+  if (sourcemapOutput) {
+    let sentryCliPath;
+    try {
+      sentryCliPath = require.resolve('@sentry/cli/bin/sentry-cli', {
+        paths: [process.cwd()],
+      });
+    } catch (error) {
+      console.error('无法找到 Sentry CLI 工具，请确保已正确安装 @sentry/cli');
+      return;
+    }
+
+    if (!fs.existsSync(sentryCliPath)) {
+      return;
+    }
+
+    spawnSync(
+      'node',
+      [sentryCliPath, 'releases', 'set-commits', version, '--auto'],
+      {
+        stdio: 'inherit',
+      },
+    );
+    console.log(`Sentry release created for version: ${version}`);
+
+    console.log('Uploading sourcemap');
+    spawnSync(
+      'node',
+      [
+        sentryCliPath,
+        'releases',
+        'files',
+        version,
+        'upload-sourcemaps',
+        '--strip-prefix',
+        path.join(process.cwd(), outputFolder),
+        path.join(outputFolder, bundleName),
+        path.join(outputFolder, `${bundleName}.map`),
+      ],
+      {
+        stdio: 'inherit',
+      },
+    );
+  }
 }
 
 async function pack(dir, output) {
@@ -320,7 +430,7 @@ async function pack(dir, output) {
           zipfile.addFile(fullPath, rel + name);
         } else if (stat.isDirectory()) {
           //console.log('adding: ' + rel+name+'/');
-          addDirectory(fullPath, rel + name + '/');
+          addDirectory(fullPath, `${rel}${name}/`);
         }
       }
     }
@@ -328,14 +438,12 @@ async function pack(dir, output) {
     addDirectory(dir, '');
 
     zipfile.outputStream.on('error', (err) => reject(err));
-    zipfile.outputStream
-      .pipe(fs.createWriteStream(output))
-      .on('close', function () {
-        resolve();
-      });
+    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', () => {
+      resolve();
+    });
     zipfile.end();
   });
-  console.log('ppk热更包已生成并保存到: ' + output);
+  console.log(`ppk热更包已生成并保存到: ${output}`);
 }
 
 export function readEntire(entry, zipFile) {
@@ -360,7 +468,7 @@ export function readEntire(entry, zipFile) {
 
 function basename(fn) {
   const m = /^(.+\/)[^\/]+\/?$/.exec(fn);
-  return m && m[1];
+  return m?.[1];
 }
 
 async function diffFromPPK(origin, next, output) {
@@ -377,7 +485,10 @@ async function diffFromPPK(origin, next, output) {
       // isFile
       originMap[entry.crc32] = entry.fileName;
 
-      if (entry.fileName === 'index.bundlejs' || entry.fileName === 'bundle.harmony.js') {
+      if (
+        entry.fileName === 'index.bundlejs' ||
+        entry.fileName === 'bundle.harmony.js'
+      ) {
         // This is source.
         return readEntire(entry, zipFile).then((v) => (originSource = v));
       }
@@ -386,7 +497,7 @@ async function diffFromPPK(origin, next, output) {
 
   if (!originSource) {
     throw new Error(
-      `Bundle file not found! Please use default bundle file name and path.`,
+      'Bundle file not found! Please use default bundle file name and path.',
     );
   }
 
@@ -398,11 +509,9 @@ async function diffFromPPK(origin, next, output) {
     zipfile.outputStream.on('error', (err) => {
       throw err;
     });
-    zipfile.outputStream
-      .pipe(fs.createWriteStream(output))
-      .on('close', function () {
-        resolve();
-      });
+    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', () => {
+      resolve();
+    });
   });
 
   const addedEntry = {};
@@ -439,7 +548,7 @@ async function diffFromPPK(origin, next, output) {
         );
         //console.log('End diff');
       });
-    }else if (entry.fileName === 'bundle.harmony.js') {
+    } else if (entry.fileName === 'bundle.harmony.js') {
       //console.log('Found bundle');
       return readEntire(entry, nextZipfile).then((newSource) => {
         //console.log('Begin diff');
@@ -471,7 +580,7 @@ async function diffFromPPK(origin, next, output) {
       addEntry(basename(entry.fileName));
 
       return new Promise((resolve, reject) => {
-        nextZipfile.openReadStream(entry, function (err, readStream) {
+        nextZipfile.openReadStream(entry, (err, readStream) => {
           if (err) {
             return reject(err);
           }
@@ -487,9 +596,9 @@ async function diffFromPPK(origin, next, output) {
 
   const deletes = {};
 
-  for (let k in originEntries) {
+  for (const k in originEntries) {
     if (!newEntries[k]) {
-      console.log('Delete ' + k);
+      console.log(`Delete ${k}`);
       deletes[k] = 1;
     }
   }
@@ -538,7 +647,7 @@ async function diffFromPackage(
 
   if (!originSource) {
     throw new Error(
-      `Bundle file not found! Please use default bundle file name and path.`,
+      'Bundle file not found! Please use default bundle file name and path.',
     );
   }
 
@@ -550,11 +659,9 @@ async function diffFromPackage(
     zipfile.outputStream.on('error', (err) => {
       throw err;
     });
-    zipfile.outputStream
-      .pipe(fs.createWriteStream(output))
-      .on('close', function () {
-        resolve();
-      });
+    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', () => {
+      resolve();
+    });
   });
 
   await enumZipEntries(next, (entry, nextZipfile) => {
@@ -581,7 +688,7 @@ async function diffFromPackage(
         );
         //console.log('End diff');
       });
-    }else {
+    } else {
       // If same file.
       if (originEntries[entry.fileName] === entry.crc32) {
         copies[entry.fileName] = '';
@@ -594,7 +701,7 @@ async function diffFromPackage(
       }
 
       return new Promise((resolve, reject) => {
-        nextZipfile.openReadStream(entry, function (err, readStream) {
+        nextZipfile.openReadStream(entry, (err, readStream) => {
           if (err) {
             return reject(err);
           }
@@ -630,7 +737,7 @@ export async function enumZipEntries(zipFn, callback, nestedPath = '') {
             !entry.fileName.endsWith('/') &&
             entry.fileName.toLowerCase().endsWith('.hap')
           ) {
-            const tempDir = path.join(os.tmpdir(), 'nested_zip_' + Date.now());
+            const tempDir = path.join(os.tmpdir(), `nested_zip_${Date.now()}`);
             await fs.ensureDir(tempDir);
             const tempZipPath = path.join(tempDir, 'temp.zip');
 
@@ -644,7 +751,7 @@ export async function enumZipEntries(zipFn, callback, nestedPath = '') {
               });
             });
 
-            await enumZipEntries(tempZipPath, callback, fullPath + '/');
+            await enumZipEntries(tempZipPath, callback, `${fullPath}/`);
 
             await fs.remove(tempDir);
           }
@@ -697,7 +804,7 @@ function diffArgsCheck(args, options, diffFn) {
   return {
     origin,
     next,
-    realOutput: output.replace(/\$\{time\}/g, '' + Date.now()),
+    realOutput: output.replace(/\$\{time\}/g, `${Date.now()}`),
   };
 }
 
@@ -707,15 +814,19 @@ export const commands = {
       options.platform || (await question('平台(ios/android/harmony):')),
     );
 
-    let { bundleName, entryFile, intermediaDir, output, dev, sourcemap } =
+    const { bundleName, entryFile, intermediaDir, output, dev } =
       translateOptions({
         ...options,
         platform,
       });
 
-    const sourcemapOutput = path.join(intermediaDir, bundleName + '.map');
+    const bundleParams = await checkPlugins();
+    const sourcemap = bundleParams.sourcemap;
+    const isSentry = bundleParams.sentry;
+
+    const sourcemapOutput = path.join(intermediaDir, `${bundleName}.map`);
 
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
+    const realOutput = output.replace(/\$\{time\}/g, `${Date.now()}`);
 
     if (!platform) {
       throw new Error('Platform must be specified.');
@@ -723,7 +834,7 @@ export const commands = {
 
     const { version, major, minor } = getRNVersion();
 
-    console.log('Bundling with react-native: ', version);
+    console.log(`Bundling with react-native: ${version}`);
 
     await runReactNativeBundleCommand(
       bundleName,
@@ -738,12 +849,21 @@ export const commands = {
 
     const v = await question('是否现在上传此热更包?(Y/N)');
     if (v.toLowerCase() === 'y') {
-      await this.publish({
+    const versionName = await this.publish({
         args: [realOutput],
         options: {
           platform,
         },
       });
+      if (isSentry) {
+        await copyDebugidForSentry(bundleName, intermediaDir, sourcemapOutput);
+        await uploadSourcemapForSentry(
+          bundleName,
+          intermediaDir,
+          sourcemapOutput,
+          versionName,
+        );
+      }
     }
   },
 
@@ -817,7 +937,7 @@ export const commands = {
 
     await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
       const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
-      return m && m[1];
+      return m?.[1];
     });
 
     console.log(`${realOutput} generated.`);
@@ -832,7 +952,7 @@ export const commands = {
 
     await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
       const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
-      return m && m[1];
+      return m?.[1];
     });
 
     console.log(`${realOutput} generated.`);

package/src/{package.js → package.ts}

@@ -6,7 +6,7 @@ import { checkPlatform, getSelectedApp } from './app';
 import { getApkInfo, getIpaInfo, getAppInfo } from './utils';
 import Table from 'tty-table';
 
-export async function listPackage(appId) {
+export async function listPackage(appId: string) {
   const { data } = await get(`/app/${appId}/package/list?limit=1000`);
 
   const header = [{ value: '原生包 Id' }, { value: '原生版本' }];
@@ -35,12 +35,12 @@ export async function listPackage(appId) {
   return data;
 }
 
-export async function choosePackage(appId) {
+export async function choosePackage(appId: string) {
   const list = await listPackage(appId);
 
   while (true) {
     const id = await question('输入原生包 id:');
-    const app = list.find((v) => v.id === (id | 0));
+    const app = list.find((v) => v.id === Number(id));
     if (app) {
       return app;
     }
@@ -48,7 +48,7 @@ export async function choosePackage(appId) {
 }
 
 export const commands = {
-  uploadIpa: async function ({ args }) {
+  uploadIpa: async ({ args }: { args: string[] }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {
       throw new Error('使用方法: pushy uploadIpa ipa后缀文件');
@@ -85,7 +85,7 @@ export const commands = {
       `已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
     );
   },
-  uploadApk: async function ({ args }) {
+  uploadApk: async ({ args }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
       throw new Error('使用方法: pushy uploadApk apk后缀文件');
@@ -122,7 +122,7 @@ export const commands = {
       `已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
     );
   },
-  uploadApp: async function ({ args }) {
+  uploadApp: async ({ args }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.app')) {
       throw new Error('使用方法: pushy uploadApp app后缀文件');
@@ -134,7 +134,6 @@ export const commands = {
       appKey: appKeyInPkg,
     } = await getAppInfo(fn);
     const { appId, appKey } = await getSelectedApp('harmony');
-    
 
     if (appIdInPkg && appIdInPkg != appId) {
       throw new Error(
@@ -160,28 +159,28 @@ export const commands = {
       `已成功上传app原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
     );
   },
-  parseApp: async function ({ args }) {
+  parseApp: async ({ args }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.app')) {
       throw new Error('使用方法: pushy parseApp app后缀文件');
     }
     console.log(await getAppInfo(fn));
   },
-  parseIpa: async function ({ args }) {
+  parseIpa: async ({ args }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {
       throw new Error('使用方法: pushy parseIpa ipa后缀文件');
     }
     console.log(await getIpaInfo(fn));
   },
-  parseApk: async function ({ args }) {
+  parseApk: async ({ args }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
       throw new Error('使用方法: pushy parseApk apk后缀文件');
     }
     console.log(await getApkInfo(fn));
   },
-  packages: async function ({ options }) {
+  packages: async ({ options }) => {
     const platform = checkPlatform(
       options.platform || (await question('平台(ios/android/harmony):')),
     );

package/src/types.ts

@@ -6,3 +6,5 @@ declare global {
 export interface Session {
   token: string;
 }
+
+export type Platform = 'ios' | 'android' | 'harmony';