fix format

* init

* add deps

* sort key

.github/workflows/lint.yml

@@ -0,0 +1,47 @@
+name: lint
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+# Cancel a currently running workflow from the same PR/branch/tag
+# when a new workflow is triggered
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20.x]
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: Install Dependency
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_OPTIONS: '--max_old_space_size=4096'
+        run: bun install --frozen-lockfile 
+      
+      - name: Run lint
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_OPTIONS: '--max_old_space_size=4096'
+        run: bun lint

.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+name: Publish Package to npmjs
+on:
+  release:
+    types: [published]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+      # Setup .npmrc file to publish to npm
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+      - run: bun install --frozen-lockfile
+      - run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.npmrc

@@ -0,0 +1 @@
+registry = "https://registry.npmjs.org"

.swcrc

@@ -0,0 +1,15 @@
+{
+  "jsc": {
+    "loose": true,
+    "target": "es2018",
+    "parser": {
+      "syntax": "typescript",
+      "tsx": false,
+      "decorators": false,
+      "dynamicImport": false
+    }
+  },
+  "module": {
+    "type": "commonjs"
+  }
+}

biome.json

@@ -0,0 +1,39 @@
+{
+  "files": {
+    "ignore": ["lib"]
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "suspicious": {
+        "noExplicitAny": "off",
+        "noAssignInExpressions": "off",
+        "noDoubleEquals": "off"
+      },
+      "style": {
+        "noNonNullAssertion": "off"
+      },
+      "a11y": {
+        "useValidAnchor": "off"
+      },
+      "performance": {
+        "noDelete": "off"
+      }
+    }
+  },
+  "formatter": {
+    "enabled": true,
+    "formatWithErrors": false,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineEnding": "lf",
+    "lineWidth": 80,
+    "attributePosition": "auto"
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "single"
+    }
+  }
+}

cli.json

@@ -3,11 +3,9 @@
   "defaultCommand": "help",
   "commands": {
     "help": {},
-
     "login": {},
     "logout": {},
     "me": {},
-
     "createApp": {
       "options": {
         "name": {
@@ -33,9 +31,10 @@
         }
       }
     },
-
     "uploadIpa": {},
     "uploadApk": {},
+    "uploadApp": {},
+    "parseApp": {},
     "parseIpa": {},
     "parseApk": {},
     "packages": {
@@ -45,7 +44,6 @@
         }
       }
     },
-
     "publish": {
       "options": {
         "platform": {
@@ -69,7 +67,6 @@
         }
       }
     },
-
     "update": {
       "options": {
         "platform": {
@@ -81,7 +78,6 @@
         "packageId": {
           "hasValue": true
         },
-
         "packageVersion": {
           "hasValue": true
         },
@@ -90,10 +86,12 @@
         },
         "maxPackageVersion": {
           "hasValue": true
+        },
+        "rollout": {
+          "hasValue": true
         }
       }
     },
-
     "updateVersionInfo": {
       "options": {
         "platform": {
@@ -116,7 +114,6 @@
         }
       }
     },
-
     "build": {
       "description": "Bundle javascript and copy assets."
     },
@@ -148,6 +145,18 @@
         },
         "sourcemap": {
           "default": false
+        },
+        "taro": {
+          "default": false
+        },
+        "expo": {
+          "default": false
+        },
+        "rncli": {
+          "default": false
+        },
+        "disableHermes": {
+          "default": false
         }
       }
     },
@@ -199,6 +208,24 @@
         }
       }
     },
+    "hdiffFromPPK": {
+      "description": "Create hdiff patch from a Prepare package(.ppk)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.ppk-patch",
+          "hasValue": true
+        }
+      }
+    },
+    "hdiffFromApp": {
+      "description": "Create hdiff patch from a Harmony package(.app)",
+      "options": {
+        "output": {
+          "default": ".pushy/output/hdiff-${time}.app-patch",
+          "hasValue": true
+        }
+      }
+    },
     "hdiffFromIpa": {
       "description": "Create hdiff patch from a iOS package(.ipa)",
       "options": {

index.js

@@ -1,4 +1 @@
-/**
- * Created by tdzl2003 on 2/22/16.
- */
 module.exports = require('./lib');

package.json

@@ -1,10 +1,11 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.29.0",
+  "version": "1.42.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",
@@ -12,7 +13,9 @@
     "cli.json"
   ],
   "scripts": {
-    "prepublish": "babel src --out-dir lib && chmod +x lib/index.js"
+    "build": "swc src -d lib --strip-leading-paths",
+    "prepare": "npm run build && chmod +x lib/index.js",
+    "lint": "tsc --noEmit & biome check --write ."
   },
   "repository": {
     "type": "git",
@@ -22,6 +25,7 @@
     "react-native",
     "ios",
     "android",
+    "harmony",
     "update"
   ],
   "author": "reactnativecn",
@@ -31,36 +35,50 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
   "dependencies": {
-    "bplist-parser": "^0.2.0",
+    "@badisi/latest-version": "^7.0.12",
+    "bplist-parser": "^0.3.2",
     "bytebuffer": "^5.0.1",
     "cgbi-to-png": "^1.0.7",
+    "chalk": "4",
     "cli-arguments": "^0.2.1",
-    "commander": "^7.2.0",
+    "commander": "^13.1.0",
     "compare-versions": "^6.1.1",
-    "filesize-parser": "^1.5.0",
+    "filesize-parser": "^1.5.1",
+    "form-data": "^4.0.2",
     "fs-extra": "8",
     "gradle-to-js": "^2.0.1",
+    "i18next": "^24.2.3",
+    "isomorphic-git": "^1.29.0",
     "isomorphic-unzip": "^1.1.5",
     "node-fetch": "^2.6.1",
-    "plist": "^3.0.1",
+    "plist": "^3.1.0",
     "progress": "^2.0.3",
     "properties": "^1.2.1",
-    "read": "^1.0.7",
+    "read": "^4.1.0",
-    "request": "^2.88.2",
+    "semver": "^7.7.1",
     "tcp-ping": "^0.1.1",
     "tty-table": "4.2",
     "update-notifier": "^5.1.0",
-    "yauzl": "^2.10.0",
+    "yauzl": "^3.2.0",
-    "yazl": "2.5.1"
+    "yazl": "3.3.1"
-  },
-  "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-plugin-syntax-object-rest-spread": "^6.13.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
-    "babel-plugin-transform-es2015-spread": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0"
   },
   "engines": {
     "node": ">= 10"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^1.9.4",
+    "@swc/cli": "^0.6.0",
+    "@swc/core": "^1.11.9",
+    "@types/filesize-parser": "^1.5.3",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.13.10",
+    "@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",
+    "@types/yauzl": "^2.10.3",
+    "@types/yazl": "^2.4.6",
+    "typescript": "^5.8.2"
   }
 }

src/api.js

@@ -1,177 +0,0 @@
-import fetch from 'node-fetch';
-const defaultEndpoint = 'https://update.reactnative.cn/api';
-let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
-import fs from 'fs';
-import request from 'request';
-import ProgressBar from 'progress';
-import packageJson from '../package.json';
-import tcpp from 'tcp-ping';
-import util from 'util';
-import path from 'path';
-import filesizeParser from 'filesize-parser';
-import { pricingPageUrl } from './utils';
-
-const tcpPing = util.promisify(tcpp.ping);
-
-let session = undefined;
-let savedSession = undefined;
-
-const userAgent = `react-native-update-cli/${packageJson.version}`;
-
-export const getSession = function () {
-  return session;
-};
-
-export const replaceSession = function (newSession) {
-  session = newSession;
-};
-
-export const loadSession = async function () {
-  if (fs.existsSync('.update')) {
-    try {
-      replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
-      savedSession = session;
-    } catch (e) {
-      console.error(
-        'Failed to parse file `.update`. Try to remove it manually.',
-      );
-      throw e;
-    }
-  }
-};
-
-export const saveSession = function () {
-  // Only save on change.
-  if (session !== savedSession) {
-    const current = session;
-    const data = JSON.stringify(current, null, 4);
-    fs.writeFileSync('.update', data, 'utf8');
-    savedSession = current;
-  }
-};
-
-export const closeSession = function () {
-  if (fs.existsSync('.update')) {
-    fs.unlinkSync('.update');
-    savedSession = undefined;
-  }
-  session = undefined;
-  host = process.env.PUSHY_REGISTRY || defaultEndpoint;
-};
-
-async function query(url, options) {
-  const resp = await fetch(url, options);
-  const text = await resp.text();
-  let json;
-  try {
-    json = JSON.parse(text);
-  } catch (e) {
-    throw new Error(`Server error: ${text}`);
-  }
-
-  if (resp.status !== 200) {
-    throw Object.assign(new Error(json.message || json.error), {
-      status: resp.status,
-    });
-  }
-  return json;
-}
-
-function queryWithoutBody(method) {
-  return function (api) {
-    return query(host + api, {
-      method,
-      headers: {
-        'User-Agent': userAgent,
-        'X-AccessToken': session ? session.token : '',
-      },
-    });
-  };
-}
-
-function queryWithBody(method) {
-  return function (api, body) {
-    return query(host + api, {
-      method,
-      headers: {
-        'User-Agent': userAgent,
-        'Content-Type': 'application/json',
-        'X-AccessToken': session ? session.token : '',
-      },
-      body: JSON.stringify(body),
-    });
-  };
-}
-
-export const get = queryWithoutBody('GET');
-export const post = queryWithBody('POST');
-export const put = queryWithBody('PUT');
-export const doDelete = queryWithBody('DELETE');
-
-export async function uploadFile(fn, key) {
-  const { url, backupUrl, formData, maxSize } = await post('/upload', {
-    ext: path.extname(fn),
-  });
-  let realUrl = url;
-
-  if (backupUrl) {
-    if (global.USE_ACC_OSS) {
-      realUrl = backupUrl;
-    } else {
-      const pingResult = await tcpPing({
-        address: url.replace('https://', ''),
-        attempts: 4,
-        timeout: 1000,
-      });
-      // console.log({pingResult});
-      if (isNaN(pingResult.avg) || pingResult.avg > 150) {
-        realUrl = backupUrl;
-      }
-    }
-    // console.log({realUrl});
-  }
-
-  const fileSize = fs.statSync(fn).size;
-  if (maxSize && fileSize > filesizeParser(maxSize)) {
-    throw new Error(
-      `此文件大小${(fileSize / 1048576).toFixed(
-        1,
-      )}m, 超出当前额度${maxSize}。您可以考虑升级付费业务以提升此额度。详情请访问: ${pricingPageUrl}`,
-    );
-  }
-
-  const bar = new ProgressBar('  上传中 [:bar] :percent :etas', {
-    complete: '=',
-    incomplete: ' ',
-    total: fileSize,
-  });
-
-  const info = await new Promise((resolve, reject) => {
-    if (key) {
-      formData.key = key;
-    }
-    formData.file = fs.createReadStream(fn);
-
-    formData.file.on('data', function (data) {
-      bar.tick(data.length);
-    });
-    request.post(
-      realUrl,
-      {
-        formData,
-      },
-      (err, resp, body) => {
-        if (err) {
-          return reject(err);
-        }
-        if (resp.statusCode > 299) {
-          return reject(
-            Object.assign(new Error(body), { status: resp.statusCode }),
-          );
-        }
-        resolve({ hash: formData.key });
-      },
-    );
-  });
-  return info;
-}

src/api.ts

@@ -0,0 +1,175 @@
+import fetch from 'node-fetch';
+import fs from 'node:fs';
+import util from 'node:util';
+import path from 'node:path';
+import ProgressBar from 'progress';
+import packageJson from '../package.json';
+import tcpp from 'tcp-ping';
+import filesizeParser from 'filesize-parser';
+import { pricingPageUrl, credentialFile, IS_CRESC } from './utils/constants';
+import type { Session } from 'types';
+import FormData from 'form-data';
+
+const tcpPing = util.promisify(tcpp.ping);
+
+let session: Session | undefined;
+let savedSession: Session | undefined;
+
+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}`;
+
+export const getSession = () => session;
+
+export const replaceSession = (newSession: { token: string }) => {
+  session = newSession;
+};
+
+export const loadSession = async () => {
+  if (fs.existsSync(credentialFile)) {
+    try {
+      replaceSession(JSON.parse(fs.readFileSync(credentialFile, 'utf8')));
+      savedSession = session;
+    } catch (e) {
+      console.error(
+        `Failed to parse file ${credentialFile}. Try to remove it manually.`,
+      );
+      throw e;
+    }
+  }
+};
+
+export const saveSession = () => {
+  // Only save on change.
+  if (session !== savedSession) {
+    const current = session;
+    const data = JSON.stringify(current, null, 4);
+    fs.writeFileSync(credentialFile, data, 'utf8');
+    savedSession = current;
+  }
+};
+
+export const closeSession = () => {
+  if (fs.existsSync(credentialFile)) {
+    fs.unlinkSync(credentialFile);
+    savedSession = undefined;
+  }
+  session = undefined;
+};
+
+async function query(url: string, options: fetch.RequestInit) {
+  const resp = await fetch(url, options);
+  const text = await resp.text();
+  let json: any;
+  try {
+    json = JSON.parse(text);
+  } catch (e) {}
+
+  if (resp.status !== 200) {
+    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 (api: string) =>
+    query(host + api, {
+      method,
+      headers: {
+        'User-Agent': userAgent,
+        'X-AccessToken': session ? session.token : '',
+      },
+    });
+}
+
+function queryWithBody(method: string) {
+  return (api: string, body?: Record<string, any>) =>
+    query(host + api, {
+      method,
+      headers: {
+        'User-Agent': userAgent,
+        'Content-Type': 'application/json',
+        'X-AccessToken': session ? session.token : '',
+      },
+      body: JSON.stringify(body),
+    });
+}
+
+export const get = queryWithoutBody('GET');
+export const post = queryWithBody('POST');
+export const put = queryWithBody('PUT');
+export const doDelete = queryWithBody('DELETE');
+
+export async function uploadFile(fn: string, key?: string) {
+  const { url, backupUrl, formData, maxSize } = await post('/upload', {
+    ext: path.extname(fn),
+  });
+  let realUrl = url;
+  if (backupUrl) {
+    if (global.USE_ACC_OSS) {
+      realUrl = backupUrl;
+    } else {
+      const pingResult = await tcpPing({
+        address: url.replace('https://', ''),
+        attempts: 4,
+        timeout: 1000,
+      });
+      // console.log({pingResult});
+      if (Number.isNaN(pingResult.avg) || pingResult.avg > 150) {
+        realUrl = backupUrl;
+      }
+    }
+    // console.log({realUrl});
+  }
+
+  const fileSize = fs.statSync(fn).size;
+  if (maxSize && fileSize > filesizeParser(maxSize)) {
+    throw new Error(
+      `此文件大小 ${(fileSize / 1048576).toFixed(
+        1,
+      )}m , 超出当前额度 ${maxSize} 。您可以考虑升级付费业务以提升此额度。详情请访问: ${pricingPageUrl}`,
+    );
+  }
+
+  const bar = new ProgressBar('  Uploading [:bar] :percent :etas', {
+    complete: '=',
+    incomplete: ' ',
+    total: fileSize,
+  });
+
+  const form = new FormData();
+
+  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);
+  });
+
+  if (key) {
+    form.append('key', key);
+  }
+  form.append('file', fileStream);
+
+  const res = await fetch(realUrl, {
+    method: 'POST',
+    body: form,
+  });
+
+  if (res.status > 299) {
+    throw new Error(`${res.status}: ${res.statusText}`);
+  }
+
+  // const body = await response.json();
+  return { hash: key || formData.key };
+}

src/app.ts

@@ -1,22 +1,24 @@
 import { question } from './utils';
-import fs from 'fs';
+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,
   android: 1,
+  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')) {
@@ -33,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;
 
@@ -57,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;
     }
@@ -70,20 +72,24 @@ export async function chooseApp(platform) {
 }
 
 export const commands = {
-  createApp: async function ({ options }) {
+  createApp: async function ({
+    options,
+  }: {
+    options: { name: string; downloadUrl: string; platform: Platform };
+  }) {
     const name = options.name || (await question('应用名称:'));
     const { downloadUrl } = options;
     const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android):')),
+      options.platform || (await question('平台(ios/android/harmony):')),
     );
-    const { id } = await post('/app/create', { name, platform });
+    const { id } = await post('/app/create', { name, platform, downloadUrl });
     console.log(`已成功创建应用（id: ${id}）`);
     await this.selectApp({
       args: [id],
-      options: { platform, downloadUrl },
+      options: { platform },
     });
   },
-  deleteApp: async function ({ args, options }) {
+  deleteApp: async ({ args, options }: { args: string[]; options: { platform: Platform } }) => {
     const { platform } = options;
     const id = args[0] || chooseApp(platform);
     if (!id) {
@@ -92,17 +98,19 @@ export const commands = {
     await doDelete(`/app/${id}`);
     console.log('操作成功');
   },
-  apps: async function ({ options }) {
+  apps: async ({ options }: { options: { platform: Platform } }) => {
     const { platform } = options;
     listApp(platform);
   },
-  selectApp: async function ({ args, options }) {
+  selectApp: async ({ args, options }: { args: string[]; options: { platform: Platform } }) => {
     const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android):')),
+      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 = {};
+    let updateInfo: Partial<Record<Platform, { appId: number; appKey: string }>> = {};
     if (fs.existsSync('update.json')) {
       try {
         updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));

src/bundle.js

@@ -1,700 +0,0 @@
-import path from 'path';
-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 { checkPlatform } from './app';
-import { spawn, spawnSync } from 'child_process';
-const g2js = require('gradle-to-js/lib/parser');
-import os from 'os';
-const properties = require('properties');
-
-let bsdiff, hdiff, diff;
-try {
-  bsdiff = require('node-bsdiff').diff;
-} catch (e) {}
-
-try {
-  hdiff = require('node-hdiffpatch').diff;
-} catch (e) {}
-
-async function runReactNativeBundleCommand(
-  bundleName,
-  development,
-  entryFile,
-  outputFolder,
-  platform,
-  sourcemapOutput,
-  config,
-) {
-  let gradleConfig = {};
-  if (platform === 'android') {
-    gradleConfig = await checkGradleConfig();
-    if (gradleConfig.crunchPngs !== false) {
-      console.warn(
-        'android的crunchPngs选项似乎尚未禁用（如已禁用则请忽略此提示），这可能导致热更包体积异常增大，具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n',
-      );
-    }
-  }
-
-  let reactNativeBundleArgs = [];
-
-  let envArgs = process.env.PUSHY_ENV_ARGS;
-
-  if (envArgs) {
-    Array.prototype.push.apply(
-      reactNativeBundleArgs,
-      envArgs.trim().split(/\s+/),
-    );
-  }
-
-  fs.emptyDirSync(outputFolder);
-
-  let cliPath = require.resolve('react-native/local-cli/cli.js', {
-    paths: [process.cwd()],
-  });
-  let usingExpo = false;
-  try {
-    require.resolve('expo-router', {
-      paths: [process.cwd()],
-    });
-
-    console.log(`expo-router detected, will use @expo/cli to bundle.\n`);
-    // if using expo-router, use expo-cli
-    cliPath = require.resolve('@expo/cli', {
-      paths: [process.cwd()],
-    });
-    usingExpo = true;
-  } catch (e) {}
-  const bundleCommand = usingExpo ? 'export:embed' : 'bundle';
-
-  Array.prototype.push.apply(reactNativeBundleArgs, [
-    cliPath,
-    bundleCommand,
-    '--assets-dest',
-    outputFolder,
-    '--bundle-output',
-    path.join(outputFolder, bundleName),
-    '--dev',
-    development,
-    '--entry-file',
-    entryFile,
-    '--platform',
-    platform,
-    '--reset-cache',
-  ]);
-
-  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(' ')}`,
-  );
-
-  return new Promise((resolve, reject) => {
-    reactNativeBundleProcess.stdout.on('data', (data) => {
-      console.log(data.toString().trim());
-    });
-
-    reactNativeBundleProcess.stderr.on('data', (data) => {
-      console.error(data.toString().trim());
-    });
-
-    reactNativeBundleProcess.on('close', async (exitCode) => {
-      if (exitCode) {
-        reject(
-          new Error(
-            `"react-native bundle" command exited with code ${exitCode}.`,
-          ),
-        );
-      } else {
-        let hermesEnabled = false;
-
-        if (platform === 'android') {
-          const gradlePropeties = await new Promise((resolve) => {
-            properties.parse(
-              './android/gradle.properties',
-              { path: true },
-              function (error, props) {
-                if (error) {
-                  console.error(error);
-                  resolve(null);
-                }
-
-                resolve(props);
-              },
-            );
-          });
-          hermesEnabled = gradlePropeties.hermesEnabled;
-
-          if (typeof hermesEnabled !== 'boolean')
-            hermesEnabled = gradleConfig.enableHermes;
-        } else if (
-          platform === 'ios' &&
-          fs.existsSync('ios/Pods/hermes-engine')
-        ) {
-          hermesEnabled = true;
-        }
-        if (hermesEnabled) {
-          await compileHermesByteCode(
-            bundleName,
-            outputFolder,
-            sourcemapOutput,
-          );
-        }
-        resolve(null);
-      }
-    });
-  });
-}
-
-function getHermesOSBin() {
-  if (os.platform() === 'win32') return 'win64-bin';
-  if (os.platform() === 'darwin') return 'osx-bin';
-  if (os.platform() === 'linux') return 'linux64-bin';
-}
-
-async function checkGradleConfig() {
-  let enableHermes = false;
-  let crunchPngs;
-  try {
-    const gradleConfig = await g2js.parseFile('android/app/build.gradle');
-    const projectConfig = gradleConfig['project.ext.react'];
-    for (const packagerConfig of projectConfig) {
-      if (
-        packagerConfig.includes('enableHermes') &&
-        packagerConfig.includes('true')
-      ) {
-        enableHermes = true;
-        break;
-      }
-    }
-    crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
-  } catch (e) {}
-  return {
-    enableHermes,
-    crunchPngs,
-  };
-}
-
-async function compileHermesByteCode(
-  bundleName,
-  outputFolder,
-  sourcemapOutput,
-) {
-  console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
-  // >= rn 0.69
-  const rnDir = path.dirname(
-    require.resolve('react-native', {
-      paths: [process.cwd()],
-    }),
-  );
-  let hermesPath = path.join(rnDir, `/sdks/hermesc/${getHermesOSBin()}`);
-
-  // < rn 0.69
-  if (!fs.existsSync(hermesPath)) {
-    hermesPath = `node_modules/hermes-engine/${getHermesOSBin()}`;
-  }
-
-  const hermesCommand = `${hermesPath}/hermesc`;
-
-  const args = [
-    '-emit-binary',
-    '-out',
-    path.join(outputFolder, bundleName),
-    path.join(outputFolder, bundleName),
-    '-O',
-  ];
-  if (sourcemapOutput) {
-    args.push('-output-source-map');
-  }
-  console.log(
-    'Running hermesc: ' + hermesCommand + ' ' + args.join(' ') + '\n',
-  );
-  spawnSync(hermesCommand, args, {
-    stdio: 'ignore',
-  });
-}
-
-async function pack(dir, output) {
-  console.log('Packing');
-  fs.ensureDirSync(path.dirname(output));
-  await new Promise((resolve, reject) => {
-    const zipfile = new ZipFile();
-
-    function addDirectory(root, rel) {
-      if (rel) {
-        zipfile.addEmptyDirectory(rel);
-      }
-      const childs = fs.readdirSync(root);
-      for (const name of childs) {
-        if (name === '.' || name === '..' || name === 'index.bundlejs.map') {
-          continue;
-        }
-        const fullPath = path.join(root, name);
-        const stat = fs.statSync(fullPath);
-        if (stat.isFile()) {
-          //console.log('adding: ' + rel+name);
-          zipfile.addFile(fullPath, rel + name);
-        } else if (stat.isDirectory()) {
-          //console.log('adding: ' + rel+name+'/');
-          addDirectory(fullPath, rel + name + '/');
-        }
-      }
-    }
-
-    addDirectory(dir, '');
-
-    zipfile.outputStream.on('error', (err) => reject(err));
-    zipfile.outputStream
-      .pipe(fs.createWriteStream(output))
-      .on('close', function () {
-        resolve();
-      });
-    zipfile.end();
-  });
-  console.log('ppk热更包已生成并保存到: ' + output);
-}
-
-function readEntire(entry, zipFile) {
-  const buffers = [];
-  return new Promise((resolve, reject) => {
-    zipFile.openReadStream(entry, (err, stream) => {
-      stream.pipe({
-        write(chunk) {
-          buffers.push(chunk);
-        },
-        end() {
-          resolve(Buffer.concat(buffers));
-        },
-        prependListener() {},
-        on() {},
-        once() {},
-        emit() {},
-      });
-    });
-  });
-}
-
-function basename(fn) {
-  const m = /^(.+\/)[^\/]+\/?$/.exec(fn);
-  return m && m[1];
-}
-
-async function diffFromPPK(origin, next, output) {
-  fs.ensureDirSync(path.dirname(output));
-
-  const originEntries = {};
-  const originMap = {};
-
-  let originSource;
-
-  await enumZipEntries(origin, (entry, zipFile) => {
-    originEntries[entry.fileName] = entry;
-    if (!/\/$/.test(entry.fileName)) {
-      // isFile
-      originMap[entry.crc32] = entry.fileName;
-
-      if (entry.fileName === 'index.bundlejs') {
-        // This is source.
-        return readEntire(entry, zipFile).then((v) => (originSource = v));
-      }
-    }
-  });
-
-  if (!originSource) {
-    throw new Error(
-      `Bundle file not found! Please use default bundle file name and path.`,
-    );
-  }
-
-  const copies = {};
-
-  const zipfile = new ZipFile();
-
-  const writePromise = new Promise((resolve, reject) => {
-    zipfile.outputStream.on('error', (err) => {
-      throw err;
-    });
-    zipfile.outputStream
-      .pipe(fs.createWriteStream(output))
-      .on('close', function () {
-        resolve();
-      });
-  });
-
-  const addedEntry = {};
-
-  function addEntry(fn) {
-    //console.log(fn);
-    if (!fn || addedEntry[fn]) {
-      return;
-    }
-    const base = basename(fn);
-    if (base) {
-      addEntry(base);
-    }
-    zipfile.addEmptyDirectory(fn);
-  }
-
-  const newEntries = {};
-
-  await enumZipEntries(next, (entry, nextZipfile) => {
-    newEntries[entry.fileName] = entry;
-
-    if (/\/$/.test(entry.fileName)) {
-      // Directory
-      if (!originEntries[entry.fileName]) {
-        addEntry(entry.fileName);
-      }
-    } else if (entry.fileName === 'index.bundlejs') {
-      //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then((newSource) => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(
-          diff(originSource, newSource),
-          'index.bundlejs.patch',
-        );
-        //console.log('End diff');
-      });
-    } else {
-      // If same file.
-      const originEntry = originEntries[entry.fileName];
-      if (originEntry && originEntry.crc32 === entry.crc32) {
-        // ignore
-        return;
-      }
-
-      // If moved from other place
-      if (originMap[entry.crc32]) {
-        const base = basename(entry.fileName);
-        if (!originEntries[base]) {
-          addEntry(base);
-        }
-        copies[entry.fileName] = originMap[entry.crc32];
-        return;
-      }
-
-      // New file.
-      addEntry(basename(entry.fileName));
-
-      return new Promise((resolve, reject) => {
-        nextZipfile.openReadStream(entry, function (err, readStream) {
-          if (err) {
-            return reject(err);
-          }
-          zipfile.addReadStream(readStream, entry.fileName);
-          readStream.on('end', () => {
-            //console.log('add finished');
-            resolve();
-          });
-        });
-      });
-    }
-  });
-
-  const deletes = {};
-
-  for (let k in originEntries) {
-    if (!newEntries[k]) {
-      console.log('Delete ' + k);
-      deletes[k] = 1;
-    }
-  }
-
-  //console.log({copies, deletes});
-  zipfile.addBuffer(
-    Buffer.from(JSON.stringify({ copies, deletes })),
-    '__diff.json',
-  );
-  zipfile.end();
-  await writePromise;
-}
-
-async function diffFromPackage(
-  origin,
-  next,
-  output,
-  originBundleName,
-  transformPackagePath = (v) => v,
-) {
-  fs.ensureDirSync(path.dirname(output));
-
-  const originEntries = {};
-  const originMap = {};
-
-  let originSource;
-
-  await enumZipEntries(origin, (entry, zipFile) => {
-    if (!/\/$/.test(entry.fileName)) {
-      const fn = transformPackagePath(entry.fileName);
-      if (!fn) {
-        return;
-      }
-
-      //console.log(fn);
-      // isFile
-      originEntries[fn] = entry.crc32;
-      originMap[entry.crc32] = fn;
-
-      if (fn === originBundleName) {
-        // This is source.
-        return readEntire(entry, zipFile).then((v) => (originSource = v));
-      }
-    }
-  });
-
-  if (!originSource) {
-    throw new Error(
-      `Bundle file not found! Please use default bundle file name and path.`,
-    );
-  }
-
-  const copies = {};
-
-  const zipfile = new ZipFile();
-
-  const writePromise = new Promise((resolve, reject) => {
-    zipfile.outputStream.on('error', (err) => {
-      throw err;
-    });
-    zipfile.outputStream
-      .pipe(fs.createWriteStream(output))
-      .on('close', function () {
-        resolve();
-      });
-  });
-
-  await enumZipEntries(next, (entry, nextZipfile) => {
-    if (/\/$/.test(entry.fileName)) {
-      // Directory
-      zipfile.addEmptyDirectory(entry.fileName);
-    } else if (entry.fileName === 'index.bundlejs') {
-      //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then((newSource) => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(
-          diff(originSource, newSource),
-          'index.bundlejs.patch',
-        );
-        //console.log('End diff');
-      });
-    } else {
-      // If same file.
-      if (originEntries[entry.fileName] === entry.crc32) {
-        copies[entry.fileName] = '';
-        return;
-      }
-      // If moved from other place
-      if (originMap[entry.crc32]) {
-        copies[entry.fileName] = originMap[entry.crc32];
-        return;
-      }
-
-      return new Promise((resolve, reject) => {
-        nextZipfile.openReadStream(entry, function (err, readStream) {
-          if (err) {
-            return reject(err);
-          }
-          zipfile.addReadStream(readStream, entry.fileName);
-          readStream.on('end', () => {
-            //console.log('add finished');
-            resolve();
-          });
-        });
-      });
-    }
-  });
-
-  zipfile.addBuffer(Buffer.from(JSON.stringify({ copies })), '__diff.json');
-  zipfile.end();
-  await writePromise;
-}
-
-function enumZipEntries(zipFn, callback) {
-  return new Promise((resolve, reject) => {
-    openZipFile(zipFn, { lazyEntries: true }, (err, zipfile) => {
-      if (err) {
-        return reject(err);
-      }
-      zipfile.on('end', resolve);
-      zipfile.on('error', reject);
-      zipfile.on('entry', (entry) => {
-        const result = callback(entry, zipfile);
-        if (result && typeof result.then === 'function') {
-          result.then(() => zipfile.readEntry());
-        } else {
-          zipfile.readEntry();
-        }
-      });
-      zipfile.readEntry();
-    });
-  });
-}
-
-function diffArgsCheck(args, options, diffFn) {
-  const [origin, next] = args;
-
-  if (!origin || !next) {
-    console.error(`Usage: pushy ${diffFn} <origin> <next>`);
-    process.exit(1);
-  }
-
-  if (diffFn.startsWith('hdiff')) {
-    if (!hdiff) {
-      console.error(
-        `This function needs "node-hdiffpatch". 
-        Please run "npm i node-hdiffpatch" to install`,
-      );
-      process.exit(1);
-    }
-    diff = hdiff;
-  } else {
-    if (!bsdiff) {
-      console.error(
-        `This function needs "node-bsdiff". 
-        Please run "npm i node-bsdiff" to install`,
-      );
-      process.exit(1);
-    }
-    diff = bsdiff;
-  }
-  const { output } = options;
-
-  return {
-    origin,
-    next,
-    realOutput: output.replace(/\$\{time\}/g, '' + Date.now()),
-  };
-}
-
-export const commands = {
-  bundle: async function ({ options }) {
-    const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android):')),
-    );
-
-    let { bundleName, entryFile, intermediaDir, output, dev, sourcemap } =
-      translateOptions({
-        ...options,
-        platform,
-      });
-
-    const sourcemapOutput = path.join(intermediaDir, bundleName + '.map');
-
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
-
-    if (!platform) {
-      throw new Error('Platform must be specified.');
-    }
-
-    const { version, major, minor } = getRNVersion();
-
-    console.log('Bundling with react-native: ', version);
-    printVersionCommand();
-
-    await runReactNativeBundleCommand(
-      bundleName,
-      dev,
-      entryFile,
-      intermediaDir,
-      platform,
-      sourcemap ? sourcemapOutput : '',
-    );
-
-    await pack(path.resolve(intermediaDir), realOutput);
-
-    const v = await question('是否现在上传此热更包?(Y/N)');
-    if (v.toLowerCase() === 'y') {
-      await this.publish({
-        args: [realOutput],
-        options: {
-          platform,
-        },
-      });
-    }
-  },
-
-  async diff({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(args, options, 'diff');
-
-    await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
-    console.log(`${realOutput} generated.`);
-  },
-
-  async hdiff({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(args, options, 'hdiff');
-
-    await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
-    console.log(`${realOutput} generated.`);
-  },
-
-  async diffFromApk({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'diffFromApk',
-    );
-
-    await diffFromPackage(
-      origin,
-      next,
-      realOutput,
-      'assets/index.android.bundle',
-    );
-    console.log(`${realOutput} generated.`);
-  },
-
-  async hdiffFromApk({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'hdiffFromApk',
-    );
-
-    await diffFromPackage(
-      origin,
-      next,
-      realOutput,
-      'assets/index.android.bundle',
-    );
-    console.log(`${realOutput} generated.`);
-  },
-
-  async diffFromIpa({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'diffFromIpa',
-    );
-
-    await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
-      const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
-      return m && m[1];
-    });
-
-    console.log(`${realOutput} generated.`);
-  },
-
-  async hdiffFromIpa({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'hdiffFromIpa',
-    );
-
-    await diffFromPackage(origin, next, realOutput, 'main.jsbundle', (v) => {
-      const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
-      return m && m[1];
-    });
-
-    console.log(`${realOutput} generated.`);
-  },
-};

src/index.ts

@@ -2,18 +2,22 @@
 
 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 { t } from './utils/i18n';
 
-updateNotifier({ pkg }).notify({ isGlobal: true });
+updateNotifier({ pkg }).notify({
+  isGlobal: true,
+  message: t('updateNotifier'),
+});
 
-function printUsage({ args }) {
+function printUsage() {
   // const commandName = args[0];
   // TODO: print usage of commandName, or print global usage.
 
   console.log('Usage is under development now.');
   console.log(
-    'Visit `https://github.com/reactnativecn/react-native-pushy` for early document.',
+    'Visit `https://github.com/reactnativecn/react-native-update` for document.',
   );
   process.exit(1);
 }
@@ -27,21 +31,21 @@ const commands = {
   help: printUsage,
 };
 
-function run() {
+async function run() {
-  printVersionCommand();
+  await printVersionCommand();
   if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') {
     process.exit();
   }
 
   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))
     .catch((err) => {
       if (err.status === 401) {
-        console.log('尚未登录。\n请在项目目录中运行`pushy login`命令来登录');
+        console.log(t('loginFirst'));
         return;
       }
       console.error(err.stack);

src/locales/en.ts

@@ -0,0 +1,17 @@
+export default {
+  updateNotifier:
+    'Run `{updateCommand}` to update the CLI to get continuous improvements in features, performance, and security.',
+  loginFirst:
+    'Not logged in.\nPlease run `cresc login` in the project directory to login.',
+  lockNotFound:
+    'No lock file detected, which may cause inconsistent dependencies and hot-updating issues.',
+  multipleLocksFound:
+    'Multiple lock files detected ({lockFiles}), which may cause inconsistent dependencies and hot-updating issues.',
+  lockBestPractice: `
+Best practices for lock files:
+1. All members of the development team should use the same package manager to maintain a single lock file.
+2. Add the lock file to version control (but do not commit multiple lock files of different formats).
+3. Pay attention to changes in the lock file during code review.
+This can reduce the risk of inconsistent dependencies and supply chain attacks.
+`,
+};

src/locales/zh.ts

@@ -0,0 +1,16 @@
+export default {
+  updateNotifier:
+    '建议运行 `{updateCommand}` 来更新命令行工具以获得功能、性能和安全性的持续改进',
+  loginFirst: '尚未登录。\n请在项目目录中运行`pushy login`命令来登录',
+  lockNotFound:
+    '没有检测到任何 lock 文件，这可能导致依赖关系不一致而使热更异常。',
+  lockBestPractice: `
+关于 lock 文件的最佳实践：
+1. 开发团队中的所有成员应该使用相同的包管理器，维护同一份 lock 文件。
+2. 将 lock 文件添加到版本控制中（但不要同时提交多种不同格式的 lock 文件）。
+3. 代码审核时应关注 lock 文件的变化。
+这样可以最大限度避免因依赖关系不一致而导致的热更异常，也降低供应链攻击等安全隐患。
+`,
+  multipleLocksFound:
+    '检测到多种不同格式的锁文件({lockFiles})，这可能导致依赖关系不一致而使热更异常。',
+};

src/package.ts

@@ -3,10 +3,13 @@ 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';
+import { depVersions } from './utils/dep-versions';
+import { getCommitInfo } from './utils/git';
+import type { Platform } from 'types';
 
-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 +38,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 +51,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后缀文件');
@@ -79,13 +82,15 @@ export const commands = {
       name: versionName,
       hash,
       buildTime,
+      deps: depVersions,
+      commit: await getCommitInfo(),
     });
     saveToLocal(fn, `${appId}/package/${id}.ipa`);
     console.log(
       `已成功上传ipa原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
     );
   },
-  uploadApk: async function ({ args }) {
+  uploadApk: async ({ args }: { args: string[] }) => {
     const fn = args[0];
     if (!fn || !fn.endsWith('.apk')) {
       throw new Error('使用方法: pushy uploadApk apk后缀文件');
@@ -116,29 +121,77 @@ export const commands = {
       name: versionName,
       hash,
       buildTime,
+      deps: depVersions,
+      commit: await getCommitInfo(),
     });
     saveToLocal(fn, `${appId}/package/${id}.apk`);
     console.log(
       `已成功上传apk原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
     );
   },
-  parseIpa: async function ({ args }) {
+  uploadApp: async ({ args }: { args: string[] }) => {
+    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,
+      deps: depVersions,
+      commit: await getCommitInfo(),
+    });
+    saveToLocal(fn, `${appId}/package/${id}.app`);
+    console.log(
+      `已成功上传app原生包（id: ${id}, version: ${versionName}, buildTime: ${buildTime}）`,
+    );
+  },
+  parseApp: async ({ args }: { args: string[] }) => {
+    const fn = args[0];
+    if (!fn || !fn.endsWith('.app')) {
+      throw new Error('使用方法: pushy parseApp app后缀文件');
+    }
+    console.log(await getAppInfo(fn));
+  },
+  parseIpa: async ({ args }: { args: string[] }) => {
     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 }: { args: string[] }) => {
     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 }: { options: { platform: Platform } }) => {
     const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android):')),
+      options.platform || (await question('平台(ios/android/harmony):')),
     );
     const { appId } = await getSelectedApp(platform);
     await listPackage(appId);

src/types.ts

@@ -0,0 +1,10 @@
+declare global {
+  var NO_INTERACTIVE: boolean;
+  var USE_ACC_OSS: boolean;
+}
+
+export interface Session {
+  token: string;
+}
+
+export type Platform = 'ios' | 'android' | 'harmony';

src/user.ts

@@ -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) {
+function md5(str: string) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
 export const commands = {
-  login: async function ({ args }) {
+  login: async ({ args }: { args: string[] }) => {
     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') {

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

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

@@ -1,35 +1,43 @@
-const ApkParser = require('./apk')
+const ApkParser = require('./apk');
-const IpaParser = require('./ipa')
+const IpaParser = require('./ipa');
-const supportFileTypes = ['ipa', 'apk']
+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 splits = (file.name || file).split('.');
-    const fileType = splits[splits.length - 1].toLowerCase()
+    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)
+        this.parser = new IpaParser(this.file);
-        break
+        break;
       case 'apk':
-        this.parser = new ApkParser(this.file)
+        this.parser = new ApkParser(this.file);
-        break
+        break;
+      case 'app':
+        this.parser = new AppParser(this.file);
+        break;
     }
   }
-  parse () {
+  parse() {
-    return this.parser.parse()
+    return this.parser.parse();
   }
 }
 
-module.exports = AppInfoParser
+module.exports = AppInfoParser;

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

@@ -30,7 +30,7 @@ function mapInfoResource (apkInfo, resourceMap) {
   iteratorObj(apkInfo)
   return apkInfo
   function iteratorObj (obj) {
-    for (var i in obj) {
+    for (const i in obj) {
       if (isArray(obj[i])) {
         iteratorArray(obj[i])
       } else if (isObject(obj[i])) {

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

@@ -1,20 +1,23 @@
-const Unzip = require('isomorphic-unzip')
+const Unzip = require('isomorphic-unzip');
-const { isBrowser, decodeNullUnicode } = require('./utils')
+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') {
+  getEntries(regexps, type = 'buffer') {
-    regexps = regexps.map(regex => decodeNullUnicode(regex))
+    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') {
+  getEntry(regex, type = 'buffer') {
-    regex = decodeNullUnicode(regex)
+    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;

src/utils/check-plugin.ts

@@ -0,0 +1,28 @@
+import { plugins } from './plugin-config';
+
+interface BundleParams {
+  sentry: boolean;
+  sourcemap: boolean;
+  [key: string]: any;
+}
+
+export async function checkPlugins(): Promise<BundleParams> {
+  const params: BundleParams = {
+    sentry: false,
+    sourcemap: false,
+  };
+
+  for (const plugin of plugins) {
+    try {
+      const isEnabled = await plugin.detect();
+      if (isEnabled && plugin.bundleParams) {
+        Object.assign(params, plugin.bundleParams);
+        console.log(`检测到 ${plugin.name} 插件,应用相应打包配置`);
+      }
+    } catch (err) {
+      console.warn(`检测 ${plugin.name} 插件时出错:`, err);
+    }
+  }
+
+  return params;
+}

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';

src/utils/dep-versions.ts

@@ -0,0 +1,26 @@
+const currentPackage = require(`${process.cwd()}/package.json`);
+
+const depKeys = Object.keys(currentPackage.dependencies);
+const devDepKeys = Object.keys(currentPackage.devDependencies);
+const dedupedDeps = [...new Set([...depKeys, ...devDepKeys])];
+
+const _depVersions: Record<string, string> = {};
+
+for (const dep of dedupedDeps) {
+  try {
+    const packageJsonPath = require.resolve(`${dep}/package.json`, {
+      paths: [process.cwd()],
+    });
+    const version = require(packageJsonPath).version;
+    _depVersions[dep] = version;
+  } catch (e) {}
+}
+
+export const depVersions = Object.keys(_depVersions)
+  .sort() // Sort the keys alphabetically
+  .reduce((obj, key) => {
+    obj[key] = _depVersions[key]; // Rebuild the object with sorted keys
+    return obj;
+  }, {} as Record<string, string>);
+
+// console.log({ depVersions });

src/utils/git.ts

@@ -0,0 +1,50 @@
+import git from 'isomorphic-git';
+import fs from 'node:fs';
+import path from 'node:path';
+
+export interface CommitInfo {
+  hash: string;
+  message: string;
+  author: string;
+  timestamp: string;
+  origin: string;
+}
+
+function findGitRoot(dir = process.cwd()) {
+  const gitRoot = fs.readdirSync(dir).find((dir) => dir === '.git');
+  if (gitRoot) {
+    // console.log({ gitRoot });
+    return path.join(dir, gitRoot);
+  }
+  const parentDir = path.dirname(dir);
+  if (parentDir === dir) {
+    return null;
+  }
+  return findGitRoot(parentDir);
+}
+
+const gitRoot = findGitRoot();
+
+export async function getCommitInfo(): Promise<CommitInfo | undefined> {
+  if (!gitRoot) {
+    return;
+  }
+  try {
+    const remotes = await git.listRemotes({ fs, gitdir: gitRoot });
+    const origin =
+      remotes.find((remote) => remote.remote === 'origin') || remotes[0];
+    const { commit, oid } = (
+      await git.log({ fs, gitdir: gitRoot, depth: 1 })
+    )[0];
+    return {
+      hash: oid,
+      message: commit.message,
+      author: commit.author.name || commit.committer.name,
+      timestamp: String(commit.committer.timestamp),
+      origin: origin.url,
+    };
+  } catch (error) {
+    console.error(error);
+    return;
+  }
+}

src/utils/i18n.ts

@@ -0,0 +1,28 @@
+import i18next from 'i18next';
+import en from '../locales/en';
+import zh from '../locales/zh';
+import { IS_CRESC } from './constants';
+i18next.init({
+  lng: IS_CRESC ? 'en' : 'zh',
+  // debug: process.env.NODE_ENV !== 'production',
+  resources: {
+    en,
+    zh,
+  },
+});
+
+declare module 'i18next' {
+  // Extend CustomTypeOptions
+  interface CustomTypeOptions {
+    // custom namespace type, if you changed it
+    defaultNS: 'en';
+    // custom resources type
+    resources: {
+      en: typeof en;
+      zh: typeof zh;
+    };
+    // other
+  }
+}
+
+export const t = i18next.t;

src/utils/index.js

@@ -1,168 +0,0 @@
-import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
-import pkg from '../../package.json';
-import AppInfoParser from './app-info-parser';
-import semverLt from 'semver/functions/lt';
-
-import read from 'read';
-
-export function question(query, password) {
-  if (NO_INTERACTIVE) {
-    return Promise.resolve('');
-  }
-  return new Promise((resolve, reject) =>
-    read(
-      {
-        prompt: query,
-        silent: password,
-        replace: password ? '*' : undefined,
-      },
-      (err, result) => (err ? reject(err) : resolve(result)),
-    ),
-  );
-}
-
-export function translateOptions(options) {
-  const ret = {};
-  for (let key in options) {
-    const v = options[key];
-    if (typeof v === 'string') {
-      ret[key] = v.replace(/\$\{(\w+)\}/g, function (v, n) {
-        return options[n] || process.env[n] || v;
-      });
-    } else {
-      ret[key] = v;
-    }
-  }
-  return ret;
-}
-
-export function getRNVersion() {
-  const version = JSON.parse(
-    fs.readFileSync(
-      require.resolve('react-native/package.json', {
-        paths: [process.cwd()],
-      }),
-    ),
-  ).version;
-
-  // We only care about major and minor version.
-  const match = /^(\d+)\.(\d+)\./.exec(version);
-  return {
-    version,
-    major: match[1] | 0,
-    minor: match[2] | 0,
-  };
-}
-
-export async function getApkInfo(fn) {
-  const appInfoParser = new AppInfoParser(fn);
-  const bundleFile = await appInfoParser.parser.getEntry(
-    /assets\/index.android.bundle/,
-  );
-  if (!bundleFile) {
-    throw new Error(
-      '找不到bundle文件。请确保此apk为release版本，且bundle文件名为默认的index.android.bundle',
-    );
-  }
-  const updateJsonFile = await appInfoParser.parser.getEntry(
-    /res\/raw\/update.json/,
-  );
-  let appCredential = {};
-  if (updateJsonFile) {
-    appCredential = JSON.parse(updateJsonFile.toString()).android;
-  }
-  const { versionName, application } = await appInfoParser.parse();
-  let buildTime = 0;
-  if (Array.isArray(application.metaData)) {
-    for (const meta of application.metaData) {
-      if (meta.name === 'pushy_build_time') {
-        buildTime = meta.value[0];
-      }
-    }
-  }
-  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(
-    /payload\/.+?\.app\/main.jsbundle/,
-  );
-  if (!bundleFile) {
-    throw new Error(
-      '找不到bundle文件。请确保此ipa为release版本，且bundle文件名为默认的main.jsbundle',
-    );
-  }
-  const updateJsonFile = await appInfoParser.parser.getEntry(
-    /payload\/.+?\.app\/assets\/update.json/,
-  );
-  let appCredential = {};
-  if (updateJsonFile) {
-    appCredential = JSON.parse(updateJsonFile.toString()).ios;
-  }
-  const { CFBundleShortVersionString: versionName } =
-    await appInfoParser.parse();
-  let buildTimeTxtBuffer = await appInfoParser.parser.getEntry(
-    /payload\/.+?\.app\/pushy_build_time.txt/,
-  );
-  if (!buildTimeTxtBuffer) {
-    // Not in root bundle when use `use_frameworks`
-    buildTimeTxtBuffer = await appInfoParser.parser.getEntry(
-      /payload\/.+?\.app\/frameworks\/react_native_update.framework\/pushy_build_time.txt/,
-    );
-  }
-  if (!buildTimeTxtBuffer) {
-    throw new Error(
-      '无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。',
-    );
-  }
-  const buildTime = buildTimeTxtBuffer.toString().replace('\n', '');
-  return { versionName, buildTime, ...appCredential };
-}
-
-const localDir = path.resolve(os.homedir(), '.pushy');
-fs.ensureDirSync(localDir);
-export function saveToLocal(originPath, destName) {
-  // TODO
-  // const destPath = path.join(localDir, destName);
-  // fs.ensureDirSync(path.dirname(destPath));
-  // fs.copyFileSync(originPath, destPath);
-}
-
-export function printVersionCommand() {
-  console.log('react-native-update-cli: ' + pkg.version);
-  let pushyVersion = '';
-  try {
-    const PACKAGE_JSON_PATH = require.resolve(
-      'react-native-update/package.json',
-      {
-        paths: [process.cwd()],
-      },
-    );
-    pushyVersion = require(PACKAGE_JSON_PATH).version;
-    console.log('react-native-update: ' + pushyVersion);
-  } catch (e) {
-    console.log('react-native-update: 无法获取版本号，请在项目目录中运行命令');
-  }
-  if (pushyVersion) {
-    if (semverLt(pushyVersion, '8.5.1')) {
-      console.warn(
-        '当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8',
-      );
-    }
-    if (semverLt(pushyVersion, '9.2.1')) {
-      console.warn(
-        '当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@9',
-      );
-    }
-  }
-}
-
-export const pricingPageUrl = 'https://pushy.reactnative.cn/pricing.html';

src/utils/index.ts

@@ -0,0 +1,208 @@
+import fs from 'fs-extra';
+import os from 'node:os';
+import path from 'node:path';
+import pkg from '../../package.json';
+import AppInfoParser from './app-info-parser';
+import semverSatisfies from 'semver/functions/satisfies';
+import chalk from 'chalk';
+import latestVersion from '@badisi/latest-version';
+import { checkPlugins } from './check-plugin';
+
+import { read } from 'read';
+import { tempDir } from './constants';
+import { depVersions } from './dep-versions';
+
+export async function question(query: string, password?: boolean) {
+  if (NO_INTERACTIVE) {
+    return '';
+  }
+  return read({
+    prompt: query,
+    silent: password,
+    replace: password ? '*' : undefined,
+  });
+}
+
+export function translateOptions(options: Record<string, string>) {
+  const ret: Record<string, string> = {};
+  for (const key in options) {
+    const v = options[key];
+    if (typeof v === 'string') {
+      ret[key] = v.replace(
+        /\$\{(\w+)\}/g,
+        (v, n) => options[n] || process.env[n] || v,
+      );
+    } else {
+      ret[key] = v;
+    }
+  }
+  return ret;
+}
+
+export async function getApkInfo(fn: string) {
+  const appInfoParser = new AppInfoParser(fn);
+  const bundleFile = await appInfoParser.parser.getEntry(
+    /assets\/index.android.bundle/,
+  );
+  if (!bundleFile) {
+    throw new Error(
+      '找不到bundle文件。请确保此apk为release版本，且bundle文件名为默认的index.android.bundle',
+    );
+  }
+  const updateJsonFile = await appInfoParser.parser.getEntry(
+    /res\/raw\/update.json/,
+  );
+  let appCredential = {};
+  if (updateJsonFile) {
+    appCredential = JSON.parse(updateJsonFile.toString()).android;
+  }
+  const { versionName, application } = await appInfoParser.parse();
+  let buildTime = 0;
+  if (Array.isArray(application.metaData)) {
+    for (const meta of application.metaData) {
+      if (meta.name === 'pushy_build_time') {
+        buildTime = meta.value[0];
+      }
+    }
+  }
+  if (buildTime == 0) {
+    throw new Error(
+      '无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。',
+    );
+  }
+  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: string) {
+  const appInfoParser = new AppInfoParser(fn);
+  const bundleFile = await appInfoParser.parser.getEntry(
+    /payload\/.+?\.app\/main.jsbundle/,
+  );
+  if (!bundleFile) {
+    throw new Error(
+      '找不到bundle文件。请确保此ipa为release版本，且bundle文件名为默认的main.jsbundle',
+    );
+  }
+  const updateJsonFile = await appInfoParser.parser.getEntry(
+    /payload\/.+?\.app\/assets\/update.json/,
+  );
+  let appCredential = {};
+  if (updateJsonFile) {
+    appCredential = JSON.parse(updateJsonFile.toString()).ios;
+  }
+  const { CFBundleShortVersionString: versionName } =
+    await appInfoParser.parse();
+  let buildTimeTxtBuffer = await appInfoParser.parser.getEntry(
+    /payload\/.+?\.app\/pushy_build_time.txt/,
+  );
+  if (!buildTimeTxtBuffer) {
+    // Not in root bundle when use `use_frameworks`
+    buildTimeTxtBuffer = await appInfoParser.parser.getEntry(
+      /payload\/.+?\.app\/frameworks\/react_native_update.framework\/pushy_build_time.txt/,
+    );
+  }
+  if (!buildTimeTxtBuffer) {
+    throw new Error(
+      '无法获取此包的编译时间戳。请更新 react-native-update 到最新版本后重新打包上传。',
+    );
+  }
+  const buildTime = buildTimeTxtBuffer.toString().replace('\n', '');
+  return { versionName, buildTime, ...appCredential };
+}
+
+const localDir = path.resolve(os.homedir(), tempDir);
+fs.ensureDirSync(localDir);
+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(pkgNames: string[]) {
+  return latestVersion(pkgNames, {
+    useCache: true,
+    requestOptions: {
+      timeout: 2000,
+    },
+  })
+    .then((pkgs) => pkgs.map((pkg) => pkg.latest))
+    .catch(() => []);
+}
+
+export async function printVersionCommand() {
+  let [latestPushyCliVersion, latestPushyVersion] = await getLatestVersion([
+    'react-native-update-cli',
+    'react-native-update',
+  ]);
+  latestPushyCliVersion = latestPushyCliVersion
+    ? ` （最新：${chalk.green(latestPushyCliVersion)}）`
+    : '';
+  console.log(
+    `react-native-update-cli: ${pkg.version}${latestPushyCliVersion}`,
+  );
+  let pushyVersion = '';
+  pushyVersion = depVersions['react-native-update'];
+  latestPushyVersion = latestPushyVersion
+    ? ` （最新：${chalk.green(latestPushyVersion)}）`
+    : '';
+  console.log(`react-native-update: ${pushyVersion}${latestPushyVersion}`);
+  if (pushyVersion) {
+    if (semverSatisfies(pushyVersion, '<8.5.2')) {
+      console.warn(
+        `当前版本已不再支持，请至少升级到 v8 的最新小版本后重新打包（代码无需改动）: npm i react-native-update@8 .
+        如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`,
+      );
+    } else if (semverSatisfies(pushyVersion, '9.0.0 - 9.2.1')) {
+      console.warn(
+        `当前版本已不再支持，请至少升级到 v9 的最新小版本后重新打包（代码无需改动，可直接热更）: npm i react-native-update@9 .
+        如有使用安装 apk 的功能，请注意添加所需权限 https://pushy.reactnative.cn/docs/api#async-function-downloadandinstallapkurl`,
+      );
+    } else if (semverSatisfies(pushyVersion, '10.0.0 - 10.17.0')) {
+      console.warn(
+        '当前版本已不再支持，请升级到 v10 的最新小版本（代码无需改动，可直接热更）: npm i react-native-update@10',
+      );
+    }
+  } else {
+    console.log('react-native-update: 无法获取版本号，请在项目目录中运行命令');
+  }
+}
+
+export { checkPlugins };

src/utils/lock-checker.ts

@@ -0,0 +1,7 @@
+const lockFiles = [
+  'package-lock.json',
+  'yarn.lock',
+  'pnpm-lock.yaml',
+  'bun.lockb',
+  'bun.lock',
+];

src/utils/plugin-config.ts

@@ -0,0 +1,32 @@
+import fs from 'fs-extra';
+
+interface PluginConfig {
+  name: string;
+  bundleParams?: {
+    [key: string]: any;
+  };
+  detect: () => Promise<boolean>;
+}
+
+export const plugins: PluginConfig[] = [
+  {
+    name: 'sentry',
+    bundleParams: {
+      sentry: true,
+      sourcemap: true,
+    },
+    detect: async () => {
+      try {
+        await fs.access('ios/sentry.properties');
+        return true;
+      } catch {
+        try {
+          await fs.access('android/sentry.properties');
+          return true;
+        } catch {
+          return false;
+        }
+      }
+    }
+  }
+];

src/versions.ts

@@ -4,8 +4,10 @@ import { question, saveToLocal } from './utils';
 import { checkPlatform, getSelectedApp } from './app';
 import { choosePackage } from './package';
 import { compare } from 'compare-versions';
+import { depVersions } from './utils/dep-versions';
+import { getCommitInfo } from './utils/git';
 
-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) {
@@ -13,12 +15,12 @@ async function showVersion(appId, offset) {
       .slice(0, 3)
       .map((v) => v.name)
       .join(', ');
-    const count = version.packages.length;
+    const pkgCount = version.packages.length;
-    if (count > 3) {
+    if (pkgCount > 3) {
-      packageInfo += `...and ${count - 3} more`;
+      packageInfo += `...and ${pkgCount - 3} more`;
     }
-    if (count === 0) {
+    if (pkgCount === 0) {
-      packageInfo = `(no package)`;
+      packageInfo = 'no package';
     } else {
       packageInfo = `[${packageInfo}]`;
     }
@@ -31,7 +33,7 @@ async function showVersion(appId, offset) {
   return data;
 }
 
-async function listVersions(appId) {
+async function listVersions(appId: string) {
   let offset = 0;
   while (true) {
     await showVersion(appId, offset);
@@ -52,7 +54,7 @@ async function listVersions(appId) {
   }
 }
 
-async function chooseVersion(appId) {
+async function chooseVersion(appId: string) {
   let offset = 0;
   while (true) {
     const data = await showVersion(appId, offset);
@@ -86,22 +88,26 @@ export const commands = {
 
     if (!fn || !fn.endsWith('.ppk')) {
       throw new Error(
-        '使用方法: pushy publish ppk后缀文件 --platform ios|android',
+        '使用方法: pushy publish ppk后缀文件 --platform ios|android|harmony',
       );
     }
 
     const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android):')),
+      options.platform || (await question('平台(ios/android/harmony):')),
     );
     const { appId } = await getSelectedApp(platform);
 
     const { hash } = await uploadFile(fn);
 
+    const versionName =
+      name || (await question('输入版本名称: ')) || '(未命名)';
     const { id } = await post(`/app/${appId}/version/create`, {
-      name: name || (await question('输入版本名称: ')) || '(未命名)',
+      name: versionName,
       hash,
       description: description || (await question('输入版本描述:')),
       metaInfo: metaInfo || (await question('输入自定义的 meta info:')),
+      deps: depVersions,
+      commit: await getCommitInfo(),
     });
     // TODO local diff
     saveToLocal(fn, `${appId}/ppk/${id}.ppk`);
@@ -111,33 +117,40 @@ export const commands = {
     if (v.toLowerCase() === 'y') {
       await this.update({ args: [], options: { versionId: id, platform } });
     }
+    return versionName;
   },
-  versions: async function ({ options }) {
+  versions: async ({ options }) => {
     const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android):')),
+      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):')),
+      options.platform || (await question('平台(ios/android/harmony):')),
     );
     const { appId } = await getSelectedApp(platform);
-    const versionId = options.versionId || (await chooseVersion(appId)).id;
+    let versionId = options.versionId || (await chooseVersion(appId)).id;
+    if (versionId === 'null') {
+      versionId = null;
+    }
 
     let pkgId;
     let pkgVersion = options.packageVersion;
     let minPkgVersion = options.minPackageVersion;
     let maxPkgVersion = options.maxPackageVersion;
-    if (pkgVersion) {
+    let rollout = options.rollout;
-      pkgVersion = pkgVersion.trim();
+    if (rollout === undefined) {
-      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      rollout = null;
-      const pkg = data.find((d) => d.name === pkgVersion);
+    } else {
-      if (pkg) {
+      try {
-        pkgId = pkg.id;
+        rollout = Number.parseInt(rollout);
-      } else {
+      } catch (e) {
-        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
+        throw new Error('rollout 必须是 1-100 的整数');
+      }
+      if (rollout < 1 || rollout > 100) {
+        throw new Error('rollout 必须是 1-100 的整数');
       }
     }
     if (minPkgVersion) {
@@ -145,15 +158,31 @@ export const commands = {
       const { data } = await get(`/app/${appId}/package/list?limit=1000`);
       const pkgs = data.filter((d) => compare(d.name, minPkgVersion, '>='));
       if (pkgs.length === 0) {
-        throw new Error(
+        throw new Error(`未查询到 >= ${minPkgVersion} 的原生版本`);
-          `未查询到 >= ${minPkgVersion} 的原生版本`,
+      }
+      if (rollout) {
+        const rolloutConfig = {};
+        for (const pkg of pkgs) {
+          rolloutConfig[pkg.name] = rollout;
+        }
+        await put(`/app/${appId}/version/${versionId}`, {
+          config: {
+            rollout: rolloutConfig,
+          },
+        });
+        console.log(
+          `已在原生版本 ${pkgs
+            .map((p) => p.name)
+            .join(', ')} 上设置灰度发布 ${rollout}% 热更版本 ${versionId}`,
         );
       }
       for (const pkg of pkgs) {
         await put(`/app/${appId}/package/${pkg.id}`, {
           versionId,
         });
-        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+        console.log(
+          `已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`,
+        );
       }
       console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
       return;
@@ -163,19 +192,46 @@ export const commands = {
       const { data } = await get(`/app/${appId}/package/list?limit=1000`);
       const pkgs = data.filter((d) => compare(d.name, maxPkgVersion, '<='));
       if (pkgs.length === 0) {
-        throw new Error(
+        throw new Error(`未查询到 <= ${maxPkgVersion} 的原生版本`);
-          `未查询到 <= ${maxPkgVersion} 的原生版本`,
+      }
+      if (rollout) {
+        const rolloutConfig = {};
+        for (const pkg of pkgs) {
+          rolloutConfig[pkg.name] = rollout;
+        }
+        await put(`/app/${appId}/version/${versionId}`, {
+          config: {
+            rollout: rolloutConfig,
+          },
+        });
+        console.log(
+          `已在原生版本 ${pkgs
+            .map((p) => p.name)
+            .join(', ')} 上设置灰度发布 ${rollout}% 热更版本 ${versionId}`,
         );
       }
       for (const pkg of pkgs) {
         await put(`/app/${appId}/package/${pkg.id}`, {
           versionId,
         });
-        console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
+        console.log(
+          `已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`,
+        );
       }
       console.log(`操作完成，共已绑定 ${pkgs.length} 个原生版本`);
       return;
     }
+
+    const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+    if (pkgVersion) {
+      pkgVersion = pkgVersion.trim();
+      const pkg = data.find((d) => d.name === pkgVersion);
+      if (pkg) {
+        pkgId = pkg.id;
+      } else {
+        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
+      }
+    }
     if (!pkgId) {
       pkgId = options.packageId || (await choosePackage(appId)).id;
     }
@@ -183,14 +239,36 @@ 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: {
+          rollout: {
+            [pkgVersion]: rollout,
+          },
+        },
+      });
+      console.log(
+        `已将在原生版本 ${pkgVersion} (id: ${pkgId}) 上设置灰度发布 ${rollout}% 热更版本 ${versionId} `,
+      );
+    }
     await put(`/app/${appId}/package/${pkgId}`, {
       versionId,
     });
-    console.log('操作成功');
+    console.log(
+      `已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`,
+    );
   },
-  updateVersionInfo: async function ({ args, options }) {
+  updateVersionInfo: async ({ args, options }) => {
     const platform = checkPlatform(
-      options.platform || (await question('平台(ios/android):')),
+      options.platform || (await question('平台(ios/android/harmony):')),
     );
     const { appId } = await getSelectedApp(platform);
     const versionId = options.versionId || (await chooseVersion(appId)).id;

tsconfig.json

@@ -0,0 +1,75 @@
+{
+  "compilerOptions": {
+    /* Basic Options */
+    "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
+    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+    "lib": [
+      "ESNext"
+    ] /* Specify library files to be included in the compilation. */,
+    "allowJs": true /* Allow javascript files to be compiled. */,
+    // "checkJs": true /* Report errors in .js files. */,
+    "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "lib" /* Redirect output structure to the directory. */,
+    // "rootDir": "src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    // "composite": true,                     /* Enable project compilation */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    "noEmit": true /* Do not emit outputs. */,
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    "isolatedModules": true /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */,
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
+    "strictNullChecks": true /* Enable strict null checks. */,
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */,
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true /* Report errors on unused locals. */,
+    // "noUnusedParameters": true /* Report errors on unused parameters. */,
+    "noImplicitReturns": false /* Report error when not all code paths in function return a value. */,
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "baseUrl": "./src" /* Base directory to resolve non-absolute module names. */,
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [
+    //   "src",
+    //   "db",
+    //   "config",
+    //   "models"
+    // ] /* List of root folders whose combined content represents the structure of the project at runtime. */,
+    "typeRoots": [
+      "src/types"
+    ] /* List of folders to include type definitions from. */,
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
+    "paths": {
+      "@/*": ["src/*"]
+    },
+    "resolveJsonModule": true,
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    "skipLibCheck": true,
+    "incremental": true
+  },
+  "exclude": ["node_modules", "lib"]
+}