react-native-update-cli 1.40.0 → 1.41.0-beta.0

package/cli.json

@@ -154,6 +154,9 @@
         },
         "rncli": {
           "default": false
+        },
+        "disableHermes": {
+          "default": false
         }
       }
     },

package/lib/api.js

@@ -48,8 +48,9 @@ const _progress = /*#__PURE__*/ _interop_require_default(require("progress"));
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../package.json"));
 const _tcpping = /*#__PURE__*/ _interop_require_default(require("tcp-ping"));
 const _filesizeparser = /*#__PURE__*/ _interop_require_default(require("filesize-parser"));
-const _utils = require("./utils");
+const _constants = require("./utils/constants");
 const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
+const _constants1 = require("utils/constants");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -58,7 +59,7 @@ function _interop_require_default(obj) {
 const tcpPing = _nodeutil.default.promisify(_tcpping.default.ping);
 let session;
 let savedSession;
-const defaultEndpoint = 'https://update.reactnative.cn/api';
+const defaultEndpoint = global.IS_CRESC ? 'https://api.cresc.dev' : 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
 const getSession = ()=>session;
@@ -66,12 +67,12 @@ const replaceSession = (newSession)=>{
     session = newSession;
 };
 const loadSession = async ()=>{
-    if (_nodefs.default.existsSync('.update')) {
+    if (_nodefs.default.existsSync(_constants1.credentialFile)) {
         try {
-            replaceSession(JSON.parse(_nodefs.default.readFileSync('.update', 'utf8')));
+            replaceSession(JSON.parse(_nodefs.default.readFileSync(_constants1.credentialFile, 'utf8')));
             savedSession = session;
         } catch (e) {
-            console.error('Failed to parse file `.update`. Try to remove it manually.');
+            console.error(`Failed to parse file ${_constants1.credentialFile}. Try to remove it manually.`);
             throw e;
         }
     }
@@ -81,13 +82,13 @@ const saveSession = ()=>{
     if (session !== savedSession) {
         const current = session;
         const data = JSON.stringify(current, null, 4);
-        _nodefs.default.writeFileSync('.update', data, 'utf8');
+        _nodefs.default.writeFileSync(_constants1.credentialFile, data, 'utf8');
         savedSession = current;
     }
 };
 const closeSession = ()=>{
-    if (_nodefs.default.existsSync('.update')) {
-        _nodefs.default.unlinkSync('.update');
+    if (_nodefs.default.existsSync(_constants1.credentialFile)) {
+        _nodefs.default.unlinkSync(_constants1.credentialFile);
         savedSession = undefined;
     }
     session = undefined;
@@ -148,7 +149,7 @@ async function uploadFile(fn, key) {
                 timeout: 1000
             });
             // console.log({pingResult});
-            if (isNaN(pingResult.avg) || pingResult.avg > 150) {
+            if (Number.isNaN(pingResult.avg) || pingResult.avg > 150) {
                 realUrl = backupUrl;
             }
         }
@@ -156,17 +157,17 @@ async function uploadFile(fn, key) {
     }
     const fileSize = _nodefs.default.statSync(fn).size;
     if (maxSize && fileSize > (0, _filesizeparser.default)(maxSize)) {
-        throw new Error(`此文件大小 ${(fileSize / 1048576).toFixed(1)}m , 超出当前额度 ${maxSize} 。您可以考虑升级付费业务以提升此额度。详情请访问: ${_utils.pricingPageUrl}`);
+        throw new Error(`此文件大小 ${(fileSize / 1048576).toFixed(1)}m , 超出当前额度 ${maxSize} 。您可以考虑升级付费业务以提升此额度。详情请访问: ${_constants.pricingPageUrl}`);
     }
-    const bar = new _progress.default('  上传中 [:bar] :percent :etas', {
+    const bar = new _progress.default('  Uploading [:bar] :percent :etas', {
         complete: '=',
         incomplete: ' ',
         total: fileSize
     });
     const form = new _formdata.default();
-    Object.entries(formData).forEach(([k, v])=>{
+    for (const [k, v] of Object.entries(formData)){
         form.append(k, v);
-    });
+    }
     const fileStream = _nodefs.default.createReadStream(fn);
     fileStream.on('data', (data)=>{
         bar.tick(data.length);

package/lib/bundle.js

@@ -85,7 +85,7 @@ try {
 try {
     hdiff = require('node-hdiffpatch').diff;
 } catch (e) {}
-async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, cli }) {
+async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, disableHermes, cli }) {
     let gradleConfig = {};
     if (platform === 'android') {
         gradleConfig = await checkGradleConfig();
@@ -112,7 +112,7 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
                 paths: [
                     process.cwd()
                 ]
-            }))).version;
+            })).toString()).version;
             // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
             if ((0, _satisfies.default)(expoCliVersion, '>= 0.10.17')) {
                 usingExpo = true;
@@ -231,7 +231,10 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
                 reject(new Error(`"react-native bundle" command exited with code ${exitCode}.`));
             } else {
                 let hermesEnabled = false;
-                if (platform === 'android') {
+                if (disableHermes) {
+                    hermesEnabled = false;
+                    console.log('Hermes disabled');
+                } else if (platform === 'android') {
                     const gradlePropeties = await new Promise((resolve)=>{
                         properties.parse('./android/gradle.properties', {
                             path: true
@@ -751,7 +754,7 @@ function diffArgsCheck(args, options, diffFn) {
 const commands = {
     bundle: async function({ options }) {
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
-        const { bundleName, entryFile, intermediaDir, output, dev, sourcemap, taro, expo, rncli } = (0, _utils.translateOptions)({
+        const { bundleName, entryFile, intermediaDir, output, dev, sourcemap, taro, expo, rncli, disableHermes } = (0, _utils.translateOptions)({
             ...options,
             platform
         });
@@ -772,6 +775,7 @@ const commands = {
             outputFolder: intermediaDir,
             platform,
             sourcemapOutput: sourcemap || sourcemapPlugin ? sourcemapOutput : '',
+            disableHermes,
             cli: {
                 taro,
                 expo,

package/lib/index.js

@@ -5,13 +5,27 @@ Object.defineProperty(exports, "__esModule", {
 });
 const _api = require("./api");
 const _updatenotifier = /*#__PURE__*/ _interop_require_default(require("update-notifier"));
-const _index = require("./utils/index.js");
+const _utils = require("./utils");
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../package.json"));
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
+const _i18next = /*#__PURE__*/ _interop_require_default(require("i18next"));
+const _en = /*#__PURE__*/ _interop_require_default(require("./locales/en"));
+const _zh = /*#__PURE__*/ _interop_require_default(require("./locales/zh"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
+const scriptName = _nodepath.default.basename(process.argv[1]);
+global.IS_CRESC = scriptName === 'cresc';
+_i18next.default.init({
+    lng: global.IS_CRESC ? 'en' : 'zh',
+    // debug: process.env.NODE_ENV !== 'production',
+    resources: {
+        en: _en.default,
+        zh: _zh.default
+    }
+});
 (0, _updatenotifier.default)({
     pkg: _packagejson.default
 }).notify({
@@ -34,7 +48,7 @@ const commands = {
     help: printUsage
 };
 async function run() {
-    await (0, _index.printVersionCommand)();
+    await (0, _utils.printVersionCommand)();
     if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') {
         process.exit();
     }

package/lib/locales/en.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _default = {};

package/lib/locales/zh.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _default = {};

package/lib/utils/app-info-parser/zip.js

@@ -32,7 +32,7 @@ class Zip {
             ], {
                 type
             }, (err, buffers)=>{
-                console.log(buffers);
+                // console.log(buffers);
                 err ? reject(err) : resolve(buffers[regex]);
             });
         });

package/lib/utils/constants.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    credentialFile: function() {
+        return credentialFile;
+    },
+    pricingPageUrl: function() {
+        return pricingPageUrl;
+    },
+    tempDir: function() {
+        return tempDir;
+    },
+    updateJson: function() {
+        return updateJson;
+    }
+});
+const credentialFile = global.IS_CRESC ? '.cresc.token' : '.update';
+const updateJson = global.IS_CRESC ? 'cresc.config.json' : 'update.json';
+const tempDir = global.IS_CRESC ? '.cresc.temp' : '.pushy';
+const pricingPageUrl = global.IS_CRESC ? 'https://cresc.dev/pricing' : 'https://pushy.reactnative.cn/pricing.html';

package/lib/utils/index.js

@@ -24,9 +24,6 @@ _export(exports, {
     getRNVersion: function() {
         return getRNVersion;
     },
-    pricingPageUrl: function() {
-        return pricingPageUrl;
-    },
     printVersionCommand: function() {
         return printVersionCommand;
     },
@@ -50,6 +47,7 @@ const _chalk = /*#__PURE__*/ _interop_require_default(require("chalk"));
 const _latestversion = /*#__PURE__*/ _interop_require_default(require("@badisi/latest-version"));
 const _checkplugin = require("./check-plugin");
 const _read = require("read");
+const _constants = require("./constants");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -177,7 +175,7 @@ async function getIpaInfo(fn) {
         ...appCredential
     };
 }
-const localDir = _nodepath.default.resolve(_nodeos.default.homedir(), '.pushy');
+const localDir = _nodepath.default.resolve(_nodeos.default.homedir(), _constants.tempDir);
 _fsextra.default.ensureDirSync(localDir);
 function saveToLocal(originPath, destName) {
 // TODO
@@ -221,4 +219,3 @@ async function printVersionCommand() {
         }
     }
 }
-const pricingPageUrl = 'https://pushy.reactnative.cn/pricing.html';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.40.0",
+  "version": "1.41.0-beta.0",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
-    "pushy": "lib/index.js"
+    "pushy": "lib/index.js",
+    "cresc": "lib/index.js"
   },
   "files": [
     "lib",
@@ -46,6 +47,7 @@
     "form-data": "^4.0.1",
     "fs-extra": "8",
     "gradle-to-js": "^2.0.1",
+    "i18next": "^24.2.2",
     "isomorphic-unzip": "^1.1.5",
     "node-fetch": "^2.6.1",
     "plist": "^3.1.0",
@@ -68,5 +70,6 @@
     "@swc/core": "^1.9.3",
     "@types/node": "^22.9.3",
     "typescript": "^5.7.2"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

package/src/api.ts

@@ -6,16 +6,19 @@ import ProgressBar from 'progress';
 import packageJson from '../package.json';
 import tcpp from 'tcp-ping';
 import filesizeParser from 'filesize-parser';
-import { pricingPageUrl } from './utils';
+import { pricingPageUrl } from './utils/constants';
 import type { Session } from 'types';
 import FormData from 'form-data';
+import { credentialFile } from 'utils/constants';
 
 const tcpPing = util.promisify(tcpp.ping);
 
 let session: Session | undefined;
 let savedSession: Session | undefined;
 
-const defaultEndpoint = 'https://update.reactnative.cn/api';
+const defaultEndpoint = global.IS_CRESC
+  ? 'https://api.cresc.dev'
+  : 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
@@ -26,14 +29,16 @@ export const replaceSession = (newSession: { token: string }) => {
   session = newSession;
 };
 
+
+
 export const loadSession = async () => {
-  if (fs.existsSync('.update')) {
+  if (fs.existsSync(credentialFile)) {
     try {
-      replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
+      replaceSession(JSON.parse(fs.readFileSync(credentialFile, 'utf8')));
       savedSession = session;
     } catch (e) {
       console.error(
-        'Failed to parse file `.update`. Try to remove it manually.',
+        `Failed to parse file ${credentialFile}. Try to remove it manually.`,
       );
       throw e;
     }
@@ -45,14 +50,14 @@ export const saveSession = () => {
   if (session !== savedSession) {
     const current = session;
     const data = JSON.stringify(current, null, 4);
-    fs.writeFileSync('.update', data, 'utf8');
+    fs.writeFileSync(credentialFile, data, 'utf8');
     savedSession = current;
   }
 };
 
 export const closeSession = () => {
-  if (fs.existsSync('.update')) {
-    fs.unlinkSync('.update');
+  if (fs.existsSync(credentialFile)) {
+    fs.unlinkSync(credentialFile);
     savedSession = undefined;
   }
   session = undefined;
@@ -121,7 +126,7 @@ export async function uploadFile(fn: string, key?: string) {
         timeout: 1000,
       });
       // console.log({pingResult});
-      if (isNaN(pingResult.avg) || pingResult.avg > 150) {
+      if (Number.isNaN(pingResult.avg) || pingResult.avg > 150) {
         realUrl = backupUrl;
       }
     }
@@ -137,7 +142,7 @@ export async function uploadFile(fn: string, key?: string) {
     );
   }
 
-  const bar = new ProgressBar('  上传中 [:bar] :percent :etas', {
+  const bar = new ProgressBar('  Uploading [:bar] :percent :etas', {
     complete: '=',
     incomplete: ' ',
     total: fileSize,
@@ -145,9 +150,9 @@ export async function uploadFile(fn: string, key?: string) {
 
   const form = new FormData();
 
-  Object.entries(formData).forEach(([k, v]) => {
+  for (const [k, v] of Object.entries(formData)) {
     form.append(k, v);
-  });
+  }
   const fileStream = fs.createReadStream(fn);
   fileStream.on('data', (data) => {
     bar.tick(data.length);

package/src/bundle.ts

@@ -30,6 +30,7 @@ async function runReactNativeBundleCommand({
   platform,
   sourcemapOutput,
   config,
+  disableHermes,
   cli,
 }: {
   bundleName: string;
@@ -39,6 +40,7 @@ async function runReactNativeBundleCommand({
   platform: string;
   sourcemapOutput: string;
   config?: string;
+  disableHermes?: boolean;
   cli: {
     taro?: boolean;
     expo?: boolean;
@@ -84,7 +86,7 @@ async function runReactNativeBundleCommand({
           require.resolve('@expo/cli/package.json', {
             paths: [process.cwd()],
           }),
-        ),
+        ).toString(),
       ).version;
       // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
       if (semverSatisfies(expoCliVersion, '>= 0.10.17')) {
@@ -221,7 +223,10 @@ async function runReactNativeBundleCommand({
       } else {
         let hermesEnabled: boolean | undefined = false;
 
-        if (platform === 'android') {
+        if (disableHermes) {
+          hermesEnabled = false;
+          console.log('Hermes disabled');
+        } else if (platform === 'android') {
           const gradlePropeties = await new Promise<{
             hermesEnabled?: boolean;
           }>((resolve) => {
@@ -292,7 +297,7 @@ function getHermesOSBin() {
 
 async function checkGradleConfig() {
   let enableHermes = false;
-  let crunchPngs;
+  let crunchPngs: boolean | undefined;
   try {
     const gradleConfig = await g2js.parseFile('android/app/build.gradle');
     crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
@@ -904,6 +909,7 @@ export const commands = {
       taro,
       expo,
       rncli,
+      disableHermes,
     } = translateOptions({
       ...options,
       platform,
@@ -932,6 +938,7 @@ export const commands = {
       outputFolder: intermediaDir,
       platform,
       sourcemapOutput: sourcemap || sourcemapPlugin ? sourcemapOutput : '',
+      disableHermes,
       cli: {
         taro,
         expo,

package/src/index.ts

@@ -2,8 +2,26 @@
 
 import { loadSession } from './api';
 import updateNotifier from 'update-notifier';
-import { printVersionCommand } from './utils/index.js';
+import { printVersionCommand } from './utils';
 import pkg from '../package.json';
+import path from 'node:path';
+import i18next from 'i18next';
+import en from './locales/en';
+import zh from './locales/zh';
+
+const scriptName: 'cresc' | 'pushy' = path.basename(process.argv[1]) as
+  | 'cresc'
+  | 'pushy';
+global.IS_CRESC = scriptName === 'cresc';
+
+i18next.init({
+  lng: global.IS_CRESC ? 'en' : 'zh',
+  // debug: process.env.NODE_ENV !== 'production',
+  resources: {
+    en,
+    zh,
+  },
+});
 
 updateNotifier({ pkg }).notify({
   isGlobal: true,

package/src/locales/en.ts

@@ -0,0 +1 @@
+export default {};

package/src/locales/zh.ts

@@ -0,0 +1 @@
+export default {};

package/src/types.ts

@@ -1,6 +1,7 @@
 declare global {
   var NO_INTERACTIVE: boolean;
   var USE_ACC_OSS: boolean;
+  var IS_CRESC: boolean;
 }
 
 export interface Session {

package/src/utils/app-info-parser/zip.js

@@ -42,7 +42,7 @@ class Zip {
     regex = decodeNullUnicode(regex);
     return new Promise((resolve, reject) => {
       this.unzip.getBuffer([regex], { type }, (err, buffers) => {
-        console.log(buffers);
+        // console.log(buffers);
         err ? reject(err) : resolve(buffers[regex]);
       });
     });

package/src/utils/constants.ts

@@ -0,0 +1,6 @@
+export const credentialFile = global.IS_CRESC ? '.cresc.token' : '.update';
+export const updateJson = global.IS_CRESC ? 'cresc.config.json' : 'update.json';
+export const tempDir = global.IS_CRESC ? '.cresc.temp' : '.pushy';
+export const pricingPageUrl = global.IS_CRESC
+  ? 'https://cresc.dev/pricing'
+  : 'https://pushy.reactnative.cn/pricing.html';

package/src/utils/index.ts

@@ -9,8 +9,9 @@ import latestVersion from '@badisi/latest-version';
 import { checkPlugins } from './check-plugin';
 
 import { read } from 'read';
+import { tempDir } from './constants';
 
-export async function question(query, password) {
+export async function question(query: string, password: boolean) {
   if (NO_INTERACTIVE) {
     return '';
   }
@@ -21,7 +22,7 @@ export async function question(query, password) {
   });
 }
 
-export function translateOptions(options) {
+export function translateOptions(options: Record<string, string>) {
   const ret = {};
   for (const key in options) {
     const v = options[key];
@@ -55,7 +56,7 @@ export function getRNVersion() {
   };
 }
 
-export async function getApkInfo(fn) {
+export async function getApkInfo(fn: string) {
   const appInfoParser = new AppInfoParser(fn);
   const bundleFile = await appInfoParser.parser.getEntry(
     /assets\/index.android.bundle/,
@@ -163,16 +164,16 @@ export async function getIpaInfo(fn: string) {
   return { versionName, buildTime, ...appCredential };
 }
 
-const localDir = path.resolve(os.homedir(), '.pushy');
+const localDir = path.resolve(os.homedir(), tempDir);
 fs.ensureDirSync(localDir);
-export function saveToLocal(originPath, destName) {
+export function saveToLocal(originPath: string, destName: string) {
   // TODO
   // const destPath = path.join(localDir, destName);
   // fs.ensureDirSync(path.dirname(destPath));
   // fs.copyFileSync(originPath, destPath);
 }
 
-async function getLatestVersion(pkgName) {
+async function getLatestVersion(pkgName: string) {
   return Promise.race([
     latestVersion(pkgName)
       .then((p) => p.latest)
@@ -225,6 +226,6 @@ export async function printVersionCommand() {
   }
 }
 
-export const pricingPageUrl = 'https://pushy.reactnative.cn/pricing.html';
+
 
 export { checkPlugins };