react-native-update-cli 1.37.0 → 1.38.1

package/cli.json

@@ -33,6 +33,8 @@
     },
     "uploadIpa": {},
     "uploadApk": {},
+    "uploadApp": {},
+    "parseApp": {},
     "parseIpa": {},
     "parseApk": {},
     "packages": {

package/lib/api.js

@@ -61,13 +61,11 @@ let savedSession;
 const defaultEndpoint = 'https://update.reactnative.cn/api';
 let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
-const getSession = function() {
-    return session;
-};
-const replaceSession = function(newSession) {
+const getSession = ()=>session;
+const replaceSession = (newSession)=>{
     session = newSession;
 };
-const loadSession = async function() {
+const loadSession = async ()=>{
     if (_nodefs.default.existsSync('.update')) {
         try {
             replaceSession(JSON.parse(_nodefs.default.readFileSync('.update', 'utf8')));
@@ -78,7 +76,7 @@ const loadSession = async function() {
         }
     }
 };
-const saveSession = function() {
+const saveSession = ()=>{
     // Only save on change.
     if (session !== savedSession) {
         const current = session;
@@ -87,7 +85,7 @@ const saveSession = function() {
         savedSession = current;
     }
 };
-const closeSession = function() {
+const closeSession = ()=>{
     if (_nodefs.default.existsSync('.update')) {
         _nodefs.default.unlinkSync('.update');
         savedSession = undefined;
@@ -101,32 +99,27 @@ async function query(url, options) {
     let json;
     try {
         json = JSON.parse(text);
-    } catch (e) {
-        if (resp.statusText.includes('Unauthorized')) {
+    } catch (e) {}
+    if (resp.status !== 200) {
+        const message = (json == null ? void 0 : json.message) || resp.statusText;
+        if (resp.status === 401) {
             throw new Error('登录信息已过期，请使用 pushy login 命令重新登录');
-        } else {
-            throw new Error(`Server error: ${resp.statusText}`);
         }
-    }
-    if (resp.status !== 200) {
-        throw new Error(`${resp.status}: ${resp.statusText}`);
+        throw new Error(message);
     }
     return json;
 }
 function queryWithoutBody(method) {
-    return function(api) {
-        return query(host + api, {
+    return (api)=>query(host + api, {
             method,
             headers: {
                 'User-Agent': userAgent,
                 'X-AccessToken': session ? session.token : ''
             }
         });
-    };
 }
 function queryWithBody(method) {
-    return function(api, body) {
-        return query(host + api, {
+    return (api, body)=>query(host + api, {
             method,
             headers: {
                 'User-Agent': userAgent,
@@ -135,7 +128,6 @@ function queryWithBody(method) {
             },
             body: JSON.stringify(body)
         });
-    };
 }
 const get = queryWithoutBody('GET');
 const post = queryWithBody('POST');
@@ -176,7 +168,7 @@ async function uploadFile(fn, key) {
         form.append(k, v);
     });
     const fileStream = _nodefs.default.createReadStream(fn);
-    fileStream.on('data', function(data) {
+    fileStream.on('data', (data)=>{
         bar.tick(data.length);
     });
     if (key) {

package/lib/app.js

@@ -26,7 +26,7 @@ _export(exports, {
     }
 });
 const _utils = require("./utils");
-const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _nodefs = /*#__PURE__*/ _interop_require_default(require("node:fs"));
 const _ttytable = /*#__PURE__*/ _interop_require_default(require("tty-table"));
 const _api = require("./api");
 function _interop_require_default(obj) {
@@ -47,10 +47,10 @@ function checkPlatform(platform) {
 }
 function getSelectedApp(platform) {
     checkPlatform(platform);
-    if (!_fs.default.existsSync('update.json')) {
+    if (!_nodefs.default.existsSync('update.json')) {
         throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
     }
-    const updateInfo = JSON.parse(_fs.default.readFileSync('update.json', 'utf8'));
+    const updateInfo = JSON.parse(_nodefs.default.readFileSync('update.json', 'utf8'));
     if (!updateInfo[platform]) {
         throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
     }
@@ -116,7 +116,7 @@ const commands = {
             }
         });
     },
-    deleteApp: async function({ args, options }) {
+    deleteApp: async ({ args, options })=>{
         const { platform } = options;
         const id = args[0] || chooseApp(platform);
         if (!id) {
@@ -125,17 +125,17 @@ const commands = {
         await (0, _api.doDelete)(`/app/${id}`);
         console.log('操作成功');
     },
-    apps: async function({ options }) {
+    apps: async ({ options })=>{
         const { platform } = options;
         listApp(platform);
     },
-    selectApp: async function({ args, options }) {
+    selectApp: async ({ args, options })=>{
         const platform = checkPlatform(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
-        const id = args[0] ? parseInt(args[0]) : (await chooseApp(platform)).id;
+        const id = args[0] ? Number.parseInt(args[0]) : (await chooseApp(platform)).id;
         let updateInfo = {};
-        if (_fs.default.existsSync('update.json')) {
+        if (_nodefs.default.existsSync('update.json')) {
             try {
-                updateInfo = JSON.parse(_fs.default.readFileSync('update.json', 'utf8'));
+                updateInfo = JSON.parse(_nodefs.default.readFileSync('update.json', 'utf8'));
             } catch (e) {
                 console.error('Failed to parse file `update.json`. Try to remove it manually.');
                 throw e;
@@ -146,6 +146,6 @@ const commands = {
             appId: id,
             appKey
         };
-        _fs.default.writeFileSync('update.json', JSON.stringify(updateInfo, null, 4), 'utf8');
+        _nodefs.default.writeFileSync('update.json', JSON.stringify(updateInfo, null, 4), 'utf8');
     }
 };

package/lib/bundle.js

@@ -2,10 +2,21 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "commands", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    commands: function() {
         return commands;
+    },
+    enumZipEntries: function() {
+        return enumZipEntries;
+    },
+    readEntire: function() {
+        return readEntire;
     }
 });
 const _utils = require("./utils");
@@ -194,11 +205,19 @@ async function runReactNativeBundleCommand(bundleName, development, entryFile, o
 async function copyHarmonyBundle(outputFolder) {
     const harmonyRawPath = 'harmony/entry/src/main/resources/rawfile';
     try {
+        await _fsextra.ensureDir(harmonyRawPath);
+        try {
+            await _fsextra.access(harmonyRawPath, _fsextra.constants.W_OK);
+        } catch (error) {
+            await _fsextra.chmod(harmonyRawPath, 0o755);
+        }
+        await _fsextra.remove(path.join(harmonyRawPath, 'update.json'));
+        await _fsextra.copy('update.json', path.join(harmonyRawPath, 'update.json'));
         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);
+        console.error('copyHarmonyBundle 错误:', error);
+        throw new Error(`复制文件失败: ${error.message}`);
     }
 }
 function getHermesOSBin() {

package/lib/package.js

@@ -119,6 +119,35 @@ const commands = {
         (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.apk`);
         console.log(`已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
     },
+    uploadApp: async function({ args }) {
+        const fn = args[0];
+        if (!fn || !fn.endsWith('.app')) {
+            throw new Error('使用方法: pushy uploadApp app后缀文件');
+        }
+        const { versionName, buildTime, appId: appIdInPkg, appKey: appKeyInPkg } = await (0, _utils.getAppInfo)(fn);
+        const { appId, appKey } = await (0, _app.getSelectedApp)('harmony');
+        if (appIdInPkg && appIdInPkg != appId) {
+            throw new Error(`appId不匹配！当前app: ${appIdInPkg}, 当前update.json: ${appId}`);
+        }
+        if (appKeyInPkg && appKeyInPkg !== appKey) {
+            throw new Error(`appKey不匹配！当前app: ${appKeyInPkg}, 当前update.json: ${appKey}`);
+        }
+        const { hash } = await (0, _api.uploadFile)(fn);
+        const { id } = await (0, _api.post)(`/app/${appId}/package/create`, {
+            name: versionName,
+            hash,
+            buildTime
+        });
+        (0, _utils.saveToLocal)(fn, `${appId}/package/${id}.app`);
+        console.log(`已成功上传app原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`);
+    },
+    parseApp: async function({ args }) {
+        const fn = args[0];
+        if (!fn || !fn.endsWith('.app')) {
+            throw new Error('使用方法: pushy parseApp app后缀文件');
+        }
+        console.log(await (0, _utils.getAppInfo)(fn));
+    },
     parseIpa: async function({ args }) {
         const fn = args[0];
         if (!fn || !fn.endsWith('.ipa')) {

package/lib/user.js

@@ -10,17 +10,17 @@ Object.defineProperty(exports, "commands", {
 });
 const _utils = require("./utils");
 const _api = require("./api");
-const _crypto = /*#__PURE__*/ _interop_require_default(require("crypto"));
+const _nodecrypto = /*#__PURE__*/ _interop_require_default(require("node:crypto"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 function md5(str) {
-    return _crypto.default.createHash('md5').update(str).digest('hex');
+    return _nodecrypto.default.createHash('md5').update(str).digest('hex');
 }
 const commands = {
-    login: async function({ args }) {
+    login: async ({ args })=>{
         const email = args[0] || await (0, _utils.question)('email:');
         const pwd = args[1] || await (0, _utils.question)('password:', true);
         const { token, info } = await (0, _api.post)('/user/login', {
@@ -33,11 +33,11 @@ const commands = {
         await (0, _api.saveSession)();
         console.log(`欢迎使用 pushy 热更新服务， ${info.name}.`);
     },
-    logout: async function() {
+    logout: async ()=>{
         await (0, _api.closeSession)();
         console.log('已退出登录');
     },
-    me: async function() {
+    me: async ()=>{
         const me = await (0, _api.get)('/user/me');
         for(const k in me){
             if (k !== 'ok') {

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

@@ -0,0 +1,14 @@
+"use strict";
+const Zip = require('./zip');
+class AppParser extends Zip {
+    /**
+   * parser for parsing .apk file
+   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
+   */ constructor(file){
+        super(file);
+        if (!(this instanceof AppParser)) {
+            return new AppParser(file);
+        }
+    }
+}
+module.exports = AppParser;

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

@@ -1,9 +1,11 @@
 "use strict";
 const ApkParser = require('./apk');
 const IpaParser = require('./ipa');
+const AppParser = require('./app');
 const supportFileTypes = [
     'ipa',
-    'apk'
+    'apk',
+    'app'
 ];
 class AppInfoParser {
     parse() {
@@ -14,12 +16,12 @@ class AppInfoParser {
    * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
    */ constructor(file){
         if (!file) {
-            throw new Error('Param miss: file(file\'s path in Node, instance of File or Blob in browser).');
+            throw new Error("Param miss: file(file's path in Node, instance of File or Blob in browser).");
         }
         const splits = (file.name || file).split('.');
         const fileType = splits[splits.length - 1].toLowerCase();
         if (!supportFileTypes.includes(fileType)) {
-            throw new Error('Unsupported file type, only support .ipa or .apk file.');
+            throw new Error('Unsupported file type, only support .ipa or .apk or .app file.');
         }
         this.file = file;
         switch(fileType){
@@ -29,6 +31,9 @@ class AppInfoParser {
             case 'apk':
                 this.parser = new ApkParser(this.file);
                 break;
+            case 'app':
+                this.parser = new AppParser(this.file);
+                break;
         }
     }
 }

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

@@ -1,4 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _bundle = require("../../bundle");
 const Unzip = require('isomorphic-unzip');
 const { isBrowser, decodeNullUnicode } = require('./utils');
 class Zip {
@@ -28,10 +32,24 @@ class Zip {
             ], {
                 type
             }, (err, buffers)=>{
+                console.log(buffers);
                 err ? reject(err) : resolve(buffers[regex]);
             });
         });
     }
+    async getEntryFromHarmonyApp(regex) {
+        try {
+            let originSource;
+            await (0, _bundle.enumZipEntries)(this.file, (entry, zipFile)=>{
+                if (regex.test(entry.fileName)) {
+                    return (0, _bundle.readEntire)(entry, zipFile).then((v)=>originSource = v);
+                }
+            });
+            return originSource;
+        } catch (error) {
+            console.error('Error in getEntryFromHarmonyApp:', error);
+        }
+    }
     constructor(file){
         if (isBrowser()) {
             if (!(file instanceof window.Blob || typeof file.size !== 'undefined')) {

package/lib/utils/index.js

@@ -12,6 +12,9 @@ _export(exports, {
     getApkInfo: function() {
         return getApkInfo;
     },
+    getAppInfo: function() {
+        return getAppInfo;
+    },
     getIpaInfo: function() {
         return getIpaInfo;
     },
@@ -115,6 +118,36 @@ async function getApkInfo(fn) {
         ...appCredential
     };
 }
+async function getAppInfo(fn) {
+    const appInfoParser = new _appinfoparser.default(fn);
+    const bundleFile = await appInfoParser.parser.getEntryFromHarmonyApp(/rawfile\/bundle.harmony.js/);
+    if (!bundleFile) {
+        throw new Error('找不到bundle文件。请确保此app为release版本，且bundle文件名为默认的bundle.harmony.js');
+    }
+    const updateJsonFile = await appInfoParser.parser.getEntryFromHarmonyApp(/rawfile\/update.json/);
+    let appCredential = {};
+    if (updateJsonFile) {
+        appCredential = JSON.parse(updateJsonFile.toString()).harmony;
+    }
+    const metaJsonFile = await appInfoParser.parser.getEntryFromHarmonyApp(/rawfile\/meta.json/);
+    let metaData = {};
+    if (metaJsonFile) {
+        metaData = JSON.parse(metaJsonFile.toString());
+    }
+    const { versionName, pushy_build_time } = metaData;
+    let buildTime = 0;
+    if (pushy_build_time) {
+        buildTime = pushy_build_time;
+    }
+    if (buildTime == 0) {
+        throw new Error('无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。');
+    }
+    return {
+        versionName,
+        buildTime,
+        ...appCredential
+    };
+}
 async function getIpaInfo(fn) {
     const appInfoParser = new _appinfoparser.default(fn);
     const bundleFile = await appInfoParser.parser.getEntry(/payload\/.+?\.app\/main.jsbundle/);

package/lib/versions.js

@@ -106,12 +106,12 @@ const commands = {
             });
         }
     },
-    versions: async function({ options }) {
+    versions: async ({ options })=>{
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { appId } = await (0, _app.getSelectedApp)(platform);
         await listVersions(appId);
     },
-    update: async function({ args, options }) {
+    update: async ({ args, options })=>{
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { appId } = await (0, _app.getSelectedApp)(platform);
         let versionId = options.versionId || (await chooseVersion(appId)).id;
@@ -127,7 +127,7 @@ const commands = {
             rollout = null;
         } else {
             try {
-                rollout = parseInt(rollout);
+                rollout = Number.parseInt(rollout);
             } catch (e) {
                 throw new Error('rollout 必须是 1-100 的整数');
             }
@@ -228,7 +228,7 @@ const commands = {
         });
         console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`);
     },
-    updateVersionInfo: async function({ args, options }) {
+    updateVersionInfo: async ({ args, options })=>{
         const platform = (0, _app.checkPlatform)(options.platform || await (0, _utils.question)('平台(ios/android/harmony):'));
         const { appId } = await (0, _app.getSelectedApp)(platform);
         const versionId = options.versionId || (await chooseVersion(appId)).id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.37.0",
+  "version": "1.38.1",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -13,7 +13,8 @@
   ],
   "scripts": {
     "build": "swc src -d lib --strip-leading-paths",
-    "prepare": "npm run build && chmod +x lib/index.js"
+    "prepare": "npm run build && chmod +x lib/index.js",
+    "lint": "tsc --noEmit & biome check --write ."
   },
   "repository": {
     "type": "git",
@@ -62,11 +63,10 @@
     "node": ">= 10"
   },
   "devDependencies": {
+    "@biomejs/biome": "^1.9.4",
     "@swc/cli": "^0.5.1",
     "@swc/core": "^1.9.3",
     "@types/node": "^22.9.3",
-    "oxlint": "^0.13.1",
     "typescript": "^5.7.2"
-  },
-  "packageManager": "yarn@1.22.22"
+  }
 }

package/src/api.ts

@@ -7,7 +7,7 @@ import packageJson from '../package.json';
 import tcpp from 'tcp-ping';
 import filesizeParser from 'filesize-parser';
 import { pricingPageUrl } from './utils';
-import { Session } from 'types';
+import type { Session } from 'types';
 import FormData from 'form-data';
 
 const tcpPing = util.promisify(tcpp.ping);
@@ -20,15 +20,13 @@ let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
-export const getSession = function () {
-  return session;
-};
+export const getSession = () => session;
 
-export const replaceSession = function (newSession: { token: string }) {
+export const replaceSession = (newSession: { token: string }) => {
   session = newSession;
 };
 
-export const loadSession = async function () {
+export const loadSession = async () => {
   if (fs.existsSync('.update')) {
     try {
       replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
@@ -42,7 +40,7 @@ export const loadSession = async function () {
   }
 };
 
-export const saveSession = function () {
+export const saveSession = () => {
   // Only save on change.
   if (session !== savedSession) {
     const current = session;
@@ -52,7 +50,7 @@ export const saveSession = function () {
   }
 };
 
-export const closeSession = function () {
+export const closeSession = () => {
   if (fs.existsSync('.update')) {
     fs.unlinkSync('.update');
     savedSession = undefined;
@@ -64,38 +62,35 @@ export const closeSession = function () {
 async function query(url: string, options: fetch.RequestInit) {
   const resp = await fetch(url, options);
   const text = await resp.text();
-  let json;
+  let json: any;
   try {
     json = JSON.parse(text);
-  } catch (e) {
-    if (resp.statusText.includes('Unauthorized')) {
-      throw new Error('登录信息已过期，请使用 pushy login 命令重新登录');
-    } else {
-      throw new Error(`Server error: ${resp.statusText}`);
-    }
-  }
+  } catch (e) {}
 
   if (resp.status !== 200) {
-    throw new Error(`${resp.status}: ${resp.statusText}`);
+    const message = json?.message || resp.statusText;
+    if (resp.status === 401) {
+      throw new Error('登录信息已过期，请使用 pushy login 命令重新登录');
+    }
+    throw new Error(message);
   }
   return json;
 }
 
 function queryWithoutBody(method: string) {
-  return function (api: string) {
-    return query(host + api, {
+  return (api: string) =>
+    query(host + api, {
       method,
       headers: {
         'User-Agent': userAgent,
         'X-AccessToken': session ? session.token : '',
       },
     });
-  };
 }
 
 function queryWithBody(method: string) {
-  return function (api: string, body: Record<string, any>) {
-    return query(host + api, {
+  return (api: string, body: Record<string, any>) =>
+    query(host + api, {
       method,
       headers: {
         'User-Agent': userAgent,
@@ -104,7 +99,6 @@ function queryWithBody(method: string) {
       },
       body: JSON.stringify(body),
     });
-  };
 }
 
 export const get = queryWithoutBody('GET');
@@ -155,7 +149,7 @@ export async function uploadFile(fn: string, key?: string) {
     form.append(k, v);
   });
   const fileStream = fs.createReadStream(fn);
-  fileStream.on('data', function (data) {
+  fileStream.on('data', (data) => {
     bar.tick(data.length);
   });
 

package/src/app.js

@@ -1,5 +1,5 @@
 import { question } from './utils';
-import fs from 'fs';
+import fs from 'node:fs';
 import Table from 'tty-table';
 
 import { post, get, doDelete } from './api';
@@ -84,7 +84,7 @@ export const commands = {
       options: { platform, downloadUrl },
     });
   },
-  deleteApp: async function ({ args, options }) {
+  deleteApp: async ({ args, options }) => {
     const { platform } = options;
     const id = args[0] || chooseApp(platform);
     if (!id) {
@@ -93,15 +93,17 @@ export const commands = {
     await doDelete(`/app/${id}`);
     console.log('操作成功');
   },
-  apps: async function ({ options }) {
+  apps: async ({ options }) => {
     const { platform } = options;
     listApp(platform);
   },
-  selectApp: async function ({ args, options }) {
+  selectApp: async ({ args, options }) => {
     const platform = checkPlatform(
       options.platform || (await question('平台(ios/android/harmony):')),
     );
-    const id = args[0] ? parseInt(args[0]) : (await chooseApp(platform)).id;
+    const id = args[0]
+      ? Number.parseInt(args[0])
+      : (await chooseApp(platform)).id;
 
     let updateInfo = {};
     if (fs.existsSync('update.json')) {

package/src/bundle.js

@@ -184,16 +184,21 @@ async function runReactNativeBundleCommand(
 
 async function copyHarmonyBundle(outputFolder) {
   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);
     await fs.copy(harmonyRawPath, outputFolder);
-
-    console.log(
-      `Successfully copied from ${harmonyRawPath} to ${outputFolder}`,
-    );
   } catch (error) {
-    console.error('Error in copyHarmonyBundle:', error);
+    console.error('copyHarmonyBundle 错误:', error);
+    throw new Error(`复制文件失败: ${error.message}`);
   }
 }
 
@@ -333,7 +338,7 @@ async function pack(dir, output) {
   console.log('ppk热更包已生成并保存到: ' + output);
 }
 
-function readEntire(entry, zipFile) {
+export function readEntire(entry, zipFile) {
   const buffers = [];
   return new Promise((resolve, reject) => {
     zipFile.openReadStream(entry, (err, stream) => {
@@ -608,7 +613,7 @@ async function diffFromPackage(
   await writePromise;
 }
 
-async function enumZipEntries(zipFn, callback, nestedPath = '') {
+export async function enumZipEntries(zipFn, callback, nestedPath = '') {
   return new Promise((resolve, reject) => {
     openZipFile(zipFn, { lazyEntries: true }, async (err, zipfile) => {
       if (err) {

package/src/package.js

@@ -3,7 +3,7 @@ import { question, saveToLocal } from './utils';
 
 import { checkPlatform, getSelectedApp } from './app';
 
-import { getApkInfo, getIpaInfo } from './utils';
+import { getApkInfo, getIpaInfo, getAppInfo } from './utils';
 import Table from 'tty-table';
 
 export async function listPackage(appId) {
@@ -122,6 +122,51 @@ export const commands = {
       `已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
     );
   },
+  uploadApp: async function ({ args }) {
+    const fn = args[0];
+    if (!fn || !fn.endsWith('.app')) {
+      throw new Error('使用方法: pushy uploadApp app后缀文件');
+    }
+    const {
+      versionName,
+      buildTime,
+      appId: appIdInPkg,
+      appKey: appKeyInPkg,
+    } = await getAppInfo(fn);
+    const { appId, appKey } = await getSelectedApp('harmony');
+    
+
+    if (appIdInPkg && appIdInPkg != appId) {
+      throw new Error(
+        `appId不匹配！当前app: ${appIdInPkg}, 当前update.json: ${appId}`,
+      );
+    }
+
+    if (appKeyInPkg && appKeyInPkg !== appKey) {
+      throw new Error(
+        `appKey不匹配！当前app: ${appKeyInPkg}, 当前update.json: ${appKey}`,
+      );
+    }
+
+    const { hash } = await uploadFile(fn);
+
+    const { id } = await post(`/app/${appId}/package/create`, {
+      name: versionName,
+      hash,
+      buildTime,
+    });
+    saveToLocal(fn, `${appId}/package/${id}.app`);
+    console.log(
+      `已成功上传app原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
+  },
+  parseApp: async function ({ 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 }) {
     const fn = args[0];
     if (!fn || !fn.endsWith('.ipa')) {

package/src/user.js

@@ -1,13 +1,13 @@
 import { question } from './utils';
 import { post, get, replaceSession, saveSession, closeSession } from './api';
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 
 function md5(str) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
 export const commands = {
-  login: async function ({ args }) {
+  login: async ({ args }) => {
     const email = args[0] || (await question('email:'));
     const pwd = args[1] || (await question('password:', true));
     const { token, info } = await post('/user/login', {
@@ -18,11 +18,11 @@ export const commands = {
     await saveSession();
     console.log(`欢迎使用 pushy 热更新服务， ${info.name}.`);
   },
-  logout: async function () {
+  logout: async () => {
     await closeSession();
     console.log('已退出登录');
   },
-  me: async function () {
+  me: async () => {
     const me = await get('/user/me');
     for (const k in me) {
       if (k !== 'ok') {

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

@@ -0,0 +1,16 @@
+const Zip = require('./zip')
+
+class AppParser extends Zip {
+  /**
+   * parser for parsing .apk file
+   * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
+   */
+  constructor (file) {
+    super(file)
+    if (!(this instanceof AppParser)) {
+      return new AppParser(file)
+    }
+  }
+}
+
+module.exports = AppParser

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

@@ -1,35 +1,43 @@
-const ApkParser = require('./apk')
-const IpaParser = require('./ipa')
-const supportFileTypes = ['ipa', 'apk']
+const ApkParser = require('./apk');
+const IpaParser = require('./ipa');
+const AppParser = require('./app');
+const supportFileTypes = ['ipa', 'apk', 'app'];
 
 class AppInfoParser {
   /**
    * parser for parsing .ipa or .apk file
    * @param {String | File | Blob} file // file's path in Node, instance of File or Blob in Browser
    */
-  constructor (file) {
+  constructor(file) {
     if (!file) {
-      throw new Error('Param miss: file(file\'s path in Node, instance of File or Blob in browser).')
+      throw new Error(
+        "Param miss: file(file's path in Node, instance of File or Blob in browser).",
+      );
     }
-    const splits = (file.name || file).split('.')
-    const fileType = splits[splits.length - 1].toLowerCase()
+    const splits = (file.name || file).split('.');
+    const fileType = splits[splits.length - 1].toLowerCase();
     if (!supportFileTypes.includes(fileType)) {
-      throw new Error('Unsupported file type, only support .ipa or .apk file.')
+      throw new Error(
+        'Unsupported file type, only support .ipa or .apk or .app file.',
+      );
     }
-    this.file = file
+    this.file = file;
 
     switch (fileType) {
       case 'ipa':
-        this.parser = new IpaParser(this.file)
-        break
+        this.parser = new IpaParser(this.file);
+        break;
       case 'apk':
-        this.parser = new ApkParser(this.file)
-        break
+        this.parser = new ApkParser(this.file);
+        break;
+      case 'app':
+        this.parser = new AppParser(this.file);
+        break;
     }
   }
-  parse () {
-    return this.parser.parse()
+  parse() {
+    return this.parser.parse();
   }
 }
 
-module.exports = AppInfoParser
+module.exports = AppInfoParser;

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

@@ -1,20 +1,23 @@
-const Unzip = require('isomorphic-unzip')
-const { isBrowser, decodeNullUnicode } = require('./utils')
+const Unzip = require('isomorphic-unzip');
+const { isBrowser, decodeNullUnicode } = require('./utils');
+import { enumZipEntries, readEntire } from '../../bundle';
 
 class Zip {
-  constructor (file) {
+  constructor(file) {
     if (isBrowser()) {
       if (!(file instanceof window.Blob || typeof file.size !== 'undefined')) {
-        throw new Error('Param error: [file] must be an instance of Blob or File in browser.')
+        throw new Error(
+          'Param error: [file] must be an instance of Blob or File in browser.',
+        );
       }
-      this.file = file
+      this.file = file;
     } else {
       if (typeof file !== 'string') {
-        throw new Error('Param error: [file] must be file path in Node.')
+        throw new Error('Param error: [file] must be file path in Node.');
       }
-      this.file = require('path').resolve(file)
+      this.file = require('path').resolve(file);
     }
-    this.unzip = new Unzip(this.file)
+    this.unzip = new Unzip(this.file);
   }
 
   /**
@@ -22,27 +25,42 @@ class Zip {
    * @param {Array} regexps // regexps for matching files
    * @param {String} type // return type, can be buffer or blob, default buffer
    */
-  getEntries (regexps, type = 'buffer') {
-    regexps = regexps.map(regex => decodeNullUnicode(regex))
+  getEntries(regexps, type = 'buffer') {
+    regexps = regexps.map((regex) => decodeNullUnicode(regex));
     return new Promise((resolve, reject) => {
       this.unzip.getBuffer(regexps, { type }, (err, buffers) => {
-        err ? reject(err) : resolve(buffers)
-      })
-    })
+        err ? reject(err) : resolve(buffers);
+      });
+    });
   }
   /**
    * get entry by regex, return an instance of Buffer or Blob
    * @param {Regex} regex // regex for matching file
    * @param {String} type // return type, can be buffer or blob, default buffer
    */
-  getEntry (regex, type = 'buffer') {
-    regex = decodeNullUnicode(regex)
+  getEntry(regex, type = 'buffer') {
+    regex = decodeNullUnicode(regex);
     return new Promise((resolve, reject) => {
       this.unzip.getBuffer([regex], { type }, (err, buffers) => {
-        err ? reject(err) : resolve(buffers[regex])
-      })
-    })
+        console.log(buffers);
+        err ? reject(err) : resolve(buffers[regex]);
+      });
+    });
+  }
+
+  async getEntryFromHarmonyApp(regex) {
+    try {
+      let originSource;
+      await enumZipEntries(this.file, (entry, zipFile) => {
+        if (regex.test(entry.fileName)) {
+          return readEntire(entry, zipFile).then((v) => (originSource = v));
+        }
+      });
+      return originSource;
+    } catch (error) {
+      console.error('Error in getEntryFromHarmonyApp:', error);
+    }
   }
 }
 
-module.exports = Zip
+module.exports = Zip;

package/src/utils/index.js

@@ -87,6 +87,43 @@ export async function getApkInfo(fn) {
   return { versionName, buildTime, ...appCredential };
 }
 
+export async function getAppInfo(fn) {
+  const appInfoParser = new AppInfoParser(fn);
+  const bundleFile = await appInfoParser.parser.getEntryFromHarmonyApp(
+    /rawfile\/bundle.harmony.js/,
+  );
+  if (!bundleFile) {
+    throw new Error(
+      '找不到bundle文件。请确保此app为release版本，且bundle文件名为默认的bundle.harmony.js',
+    );
+  }
+  const updateJsonFile = await appInfoParser.parser.getEntryFromHarmonyApp(
+    /rawfile\/update.json/,
+  );
+  let appCredential = {};
+  if (updateJsonFile) {
+    appCredential = JSON.parse(updateJsonFile.toString()).harmony;
+  }
+  const metaJsonFile = await appInfoParser.parser.getEntryFromHarmonyApp(
+    /rawfile\/meta.json/,
+  );
+  let metaData = {};
+  if (metaJsonFile) {
+    metaData = JSON.parse(metaJsonFile.toString());
+  }
+  const { versionName, pushy_build_time } = metaData;
+  let buildTime = 0;
+  if (pushy_build_time) {
+    buildTime = pushy_build_time;
+  }
+  if (buildTime == 0) {
+    throw new Error(
+      '无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。',
+    );
+  }
+  return { versionName, buildTime, ...appCredential };
+}
+
 export async function getIpaInfo(fn) {
   const appInfoParser = new AppInfoParser(fn);
   const bundleFile = await appInfoParser.parser.getEntry(

package/src/versions.js

@@ -112,14 +112,14 @@ export const commands = {
       await this.update({ args: [], options: { versionId: id, platform } });
     }
   },
-  versions: async function ({ options }) {
+  versions: async ({ options }) => {
     const platform = checkPlatform(
       options.platform || (await question('平台(ios/android/harmony):')),
     );
     const { appId } = await getSelectedApp(platform);
     await listVersions(appId);
   },
-  update: async function ({ args, options }) {
+  update: async ({ args, options }) => {
     const platform = checkPlatform(
       options.platform || (await question('平台(ios/android/harmony):')),
     );
@@ -138,7 +138,7 @@ export const commands = {
       rollout = null;
     } else {
       try {
-        rollout = parseInt(rollout);
+        rollout = Number.parseInt(rollout);
       } catch (e) {
         throw new Error('rollout 必须是 1-100 的整数');
       }
@@ -173,7 +173,9 @@ export const commands = {
         await put(`/app/${appId}/package/${pkg.id}`, {
           versionId,
         });
-        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`);
+        console.log(
+          `已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`,
+        );
       }
       console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
       return;
@@ -205,7 +207,9 @@ export const commands = {
         await put(`/app/${appId}/package/${pkg.id}`, {
           versionId,
         });
-        console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`);
+        console.log(
+          `已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`,
+        );
       }
       console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
       return;
@@ -228,14 +232,14 @@ export const commands = {
     if (!pkgId) {
       throw new Error('请提供 packageId 或 packageVersion 参数');
     }
-    
+
     if (!pkgVersion) {
       const pkg = data.find((d) => d.id === pkgId);
       if (pkg) {
         pkgVersion = pkg.name;
       }
     }
-    
+
     if (rollout) {
       await put(`/app/${appId}/version/${versionId}`, {
         config: {
@@ -251,9 +255,11 @@ export const commands = {
     await put(`/app/${appId}/package/${pkgId}`, {
       versionId,
     });
-    console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`);
+    console.log(
+      `已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`,
+    );
   },
-  updateVersionInfo: async function ({ args, options }) {
+  updateVersionInfo: async ({ args, options }) => {
     const platform = checkPlatform(
       options.platform || (await question('平台(ios/android/harmony):')),
     );