react-native-update-cli 1.40.1 → 1.41.0-beta.1

package/lib/api.js

@@ -48,7 +48,7 @@ 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"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -58,20 +58,20 @@ function _interop_require_default(obj) {
 const tcpPing = _nodeutil.default.promisify(_tcpping.default.ping);
 let session;
 let savedSession;
-const defaultEndpoint = 'https://update.reactnative.cn/api';
-let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
+const defaultEndpoint = _constants.IS_CRESC ? 'https://api.cresc.dev' : 'https://update.reactnative.cn/api';
+const host = process.env.PUSHY_REGISTRY || process.env.RNU_API || defaultEndpoint;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
 const getSession = ()=>session;
 const replaceSession = (newSession)=>{
     session = newSession;
 };
 const loadSession = async ()=>{
-    if (_nodefs.default.existsSync('.update')) {
+    if (_nodefs.default.existsSync(_constants.credentialFile)) {
         try {
-            replaceSession(JSON.parse(_nodefs.default.readFileSync('.update', 'utf8')));
+            replaceSession(JSON.parse(_nodefs.default.readFileSync(_constants.credentialFile, 'utf8')));
             savedSession = session;
         } catch (e) {
-            console.error('Failed to parse file `.update`. Try to remove it manually.');
+            console.error(`Failed to parse file ${_constants.credentialFile}. Try to remove it manually.`);
             throw e;
         }
     }
@@ -81,17 +81,16 @@ const saveSession = ()=>{
     if (session !== savedSession) {
         const current = session;
         const data = JSON.stringify(current, null, 4);
-        _nodefs.default.writeFileSync('.update', data, 'utf8');
+        _nodefs.default.writeFileSync(_constants.credentialFile, data, 'utf8');
         savedSession = current;
     }
 };
 const closeSession = ()=>{
-    if (_nodefs.default.existsSync('.update')) {
-        _nodefs.default.unlinkSync('.update');
+    if (_nodefs.default.existsSync(_constants.credentialFile)) {
+        _nodefs.default.unlinkSync(_constants.credentialFile);
         savedSession = undefined;
     }
     session = undefined;
-    host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 };
 async function query(url, options) {
     const resp = await (0, _nodefetch.default)(url, options);
@@ -156,17 +155,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/index.js

@@ -7,19 +7,17 @@ const _api = require("./api");
 const _updatenotifier = /*#__PURE__*/ _interop_require_default(require("update-notifier"));
 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"));
+const _constants = require("./utils/constants");
 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',
+    lng: _constants.IS_CRESC ? 'en' : 'zh',
     // debug: process.env.NODE_ENV !== 'production',
     resources: {
         en: _en.default,
@@ -54,7 +52,7 @@ async function run() {
     }
     const argv = require('cli-arguments').parse(require('../cli.json'));
     global.NO_INTERACTIVE = argv.options['no-interactive'];
-    global.USE_ACC_OSS = argv.options['acc'];
+    global.USE_ACC_OSS = argv.options.acc;
     (0, _api.loadSession)().then(()=>commands[argv.command](argv)).catch((err)=>{
         if (err.status === 401) {
             console.log('尚未登录。\n请在项目目录中运行`pushy login`命令来登录');

package/lib/utils/constants.js

@@ -0,0 +1,39 @@
+"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, {
+    IS_CRESC: function() {
+        return IS_CRESC;
+    },
+    credentialFile: function() {
+        return credentialFile;
+    },
+    pricingPageUrl: function() {
+        return pricingPageUrl;
+    },
+    tempDir: function() {
+        return tempDir;
+    },
+    updateJson: function() {
+        return updateJson;
+    }
+});
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const scriptName = _nodepath.default.basename(process.argv[1]);
+const IS_CRESC = scriptName === 'cresc';
+const credentialFile = IS_CRESC ? '.cresc.token' : '.update';
+const updateJson = IS_CRESC ? 'cresc.config.json' : 'update.json';
+const tempDir = IS_CRESC ? '.cresc.temp' : '.pushy';
+const pricingPageUrl = 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/lib/versions.js

@@ -23,7 +23,7 @@ async function showVersion(appId, offset) {
             packageInfo += `...and ${count - 3} more`;
         }
         if (count === 0) {
-            packageInfo = `(no package)`;
+            packageInfo = 'no package';
         } else {
             packageInfo = `[${packageInfo}]`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.40.1",
+  "version": "1.41.0-beta.1",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -68,7 +68,15 @@
     "@biomejs/biome": "^1.9.4",
     "@swc/cli": "^0.5.1",
     "@swc/core": "^1.9.3",
+    "@types/filesize-parser": "^1.5.3",
+    "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.9.3",
+    "@types/node-fetch": "^2.6.12",
+    "@types/progress": "^2.0.7",
+    "@types/semver": "^7.5.8",
+    "@types/tcp-ping": "^0.1.6",
+    "@types/update-notifier": "^6.0.8",
     "typescript": "^5.7.2"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

package/src/api.ts

@@ -6,7 +6,7 @@ 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, credentialFile, IS_CRESC } from './utils/constants';
 import type { Session } from 'types';
 import FormData from 'form-data';
 
@@ -15,8 +15,12 @@ const tcpPing = util.promisify(tcpp.ping);
 let session: Session | undefined;
 let savedSession: Session | undefined;
 
-const defaultEndpoint = 'https://update.reactnative.cn/api';
-let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
+const defaultEndpoint = IS_CRESC
+  ? 'https://api.cresc.dev'
+  : 'https://update.reactnative.cn/api';
+
+const host =
+  process.env.PUSHY_REGISTRY || process.env.RNU_API || defaultEndpoint;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
@@ -27,13 +31,13 @@ export const replaceSession = (newSession: { token: string }) => {
 };
 
 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,18 +49,17 @@ 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;
-  host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 };
 
 async function query(url: string, options: fetch.RequestInit) {
@@ -137,7 +140,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 +148,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

@@ -297,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;

package/src/index.ts

@@ -4,18 +4,13 @@ import { loadSession } from './api';
 import updateNotifier from 'update-notifier';
 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';
+import { IS_CRESC } from './utils/constants';
 
 i18next.init({
-  lng: global.IS_CRESC ? 'en' : 'zh',
+  lng: IS_CRESC ? 'en' : 'zh',
   // debug: process.env.NODE_ENV !== 'production',
   resources: {
     en,
@@ -57,7 +52,7 @@ async function run() {
 
   const argv = require('cli-arguments').parse(require('../cli.json'));
   global.NO_INTERACTIVE = argv.options['no-interactive'];
-  global.USE_ACC_OSS = argv.options['acc'];
+  global.USE_ACC_OSS = argv.options.acc;
 
   loadSession()
     .then(() => commands[argv.command](argv))

package/src/types.ts

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

package/src/utils/constants.ts

@@ -0,0 +1,13 @@
+import path from 'node:path';
+
+const scriptName: 'cresc' | 'pushy' = path.basename(process.argv[1]) as
+  | 'cresc'
+  | 'pushy';
+export const IS_CRESC = scriptName === 'cresc';
+
+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';
+export const pricingPageUrl = 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];
@@ -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 };

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

@@ -5,7 +5,7 @@ import { checkPlatform, getSelectedApp } from './app';
 import { choosePackage } from './package';
 import { compare } from 'compare-versions';
 
-async function showVersion(appId, offset) {
+async function showVersion(appId: string, offset: number) {
   const { data, count } = await get(`/app/${appId}/version/list`);
   console.log(`Offset ${offset}`);
   for (const version of data) {
@@ -18,7 +18,7 @@ async function showVersion(appId, offset) {
       packageInfo += `...and ${count - 3} more`;
     }
     if (count === 0) {
-      packageInfo = `(no package)`;
+      packageInfo = 'no package';
     } else {
       packageInfo = `[${packageInfo}]`;
     }