react-native-update-cli 2.7.2 → 2.8.0

package/cli.json

@@ -254,7 +254,6 @@
           "default": false
         },
         "hermes": {
-          "hasValue": true,
           "default": false
         },
         "name": {

package/lib/bundle.js

@@ -28,6 +28,7 @@ const _yazl = require("yazl");
 const _app = require("./app");
 const _utils = require("./utils");
 const _os = /*#__PURE__*/ _interop_require_default(require("os"));
+const _globaldirs = require("global-dirs");
 const _addgitignore = require("./utils/add-gitignore");
 const _checklockfile = require("./utils/check-lockfile");
 const _constants = require("./utils/constants");
@@ -80,17 +81,31 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+var _loadDiffModule;
 const g2js = require('gradle-to-js/lib/parser');
 const properties = require('properties');
-let bsdiff;
+const loadDiffModule = (pkgName)=>{
+    const resolvePaths = [
+        process.cwd(),
+        _globaldirs.npm.packages,
+        _globaldirs.yarn.packages
+    ];
+    try {
+        const resolved = require.resolve(pkgName, {
+            paths: resolvePaths
+        });
+        const mod = require(resolved);
+        if (mod == null ? void 0 : mod.diff) {
+            return mod.diff;
+        }
+    } catch (e) {}
+    return undefined;
+};
 let hdiff;
+hdiff = (_loadDiffModule = loadDiffModule('node-hdiffpatch')) == null ? void 0 : _loadDiffModule.diff;
+let bsdiff;
 let diff;
-try {
-    bsdiff = require('node-bsdiff').diff;
-} catch (e) {}
-try {
-    hdiff = require('node-hdiffpatch').diff;
-} catch (e) {}
+bsdiff = loadDiffModule('node-bsdiff');
 async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, forceHermes, cli }) {
     let gradleConfig = {};
     if (platform === 'android') {

package/package.json

@@ -1,40 +1,34 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.7.2",
+  "version": "2.8.0",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
-  "exports": {
-    ".": {
-      "import": "./lib/esm/index.mjs",
-      "require": "./lib/index.js"
-    },
-    "./cli.json": "./cli.json",
-    "./package.json": "./package.json",
-    "./lib/*": "./lib/*",
-    "./src/*": "./src/*",
-    "./proto/*": "./proto/*",
-    "./*": {
-      "import": "./lib/esm/*.mjs",
-      "require": "./lib/*.js"
-    }
-  },
   "bin": {
     "pushy": "lib/index.js",
     "cresc": "lib/index.js"
   },
-  "files": ["lib", "src", "proto", "cli.json"],
+  "files": [
+    "lib",
+    "src",
+    "proto",
+    "cli.json"
+  ],
   "scripts": {
-    "build:cjs": "swc src -d lib --strip-leading-paths",
-    "build:esm": "swc src -d lib/esm --strip-leading-paths --out-file-extension .mjs -C module.type=es6",
-    "build": "npm run build:cjs && npm run build:esm",
-    "prepublishOnly": "npm run build && chmod +x lib/index.js",
+    "build": "swc src -d lib --strip-leading-paths",
+    "prepublishOnly": "bun scripts/prepublish.js && bun run build && chmod +x lib/index.js",
     "lint": "tsc --noEmit & biome check --write ."
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/reactnativecn/react-native-update-cli.git"
   },
-  "keywords": ["react-native", "ios", "android", "harmony", "update"],
+  "keywords": [
+    "react-native",
+    "ios",
+    "android",
+    "harmony",
+    "update"
+  ],
   "author": "reactnativecn",
   "license": "BSD-3-Clause",
   "bugs": {
@@ -78,6 +72,7 @@
     "@biomejs/biome": "^1.9.4",
     "@swc/cli": "0.7.7",
     "@swc/core": "^1.11.24",
+    "@types/bun": "^1.3.8",
     "@types/filesize-parser": "^1.5.3",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.15.18",
@@ -89,5 +84,12 @@
     "@types/yazl": "^2.4.6",
     "typescript": "^5.8.3"
   },
-  "trustedDependencies": ["@biomejs/biome", "@swc/core"]
-}
+  "optionalDependencies": {
+    "node-hdiffpatch": "^1.2.1"
+  },
+  "trustedDependencies": [
+    "@biomejs/biome",
+    "@swc/core",
+    "node-hdiffpatch"
+  ]
+}

package/src/bundle.ts

@@ -13,6 +13,7 @@ import { translateOptions } from './utils';
 import { checkPlugins, question } from './utils';
 const g2js = require('gradle-to-js/lib/parser');
 import os from 'os';
+import { npm, yarn } from 'global-dirs';
 const properties = require('properties');
 import { addGitIgnore } from './utils/add-gitignore';
 import { checkLockFiles } from './utils/check-lockfile';
@@ -23,16 +24,25 @@ import { versionCommands } from './versions';
 
 type Diff = (oldSource?: Buffer, newSource?: Buffer) => Buffer;
 
-let bsdiff: Diff;
-let hdiff: Diff;
-let diff: Diff;
-try {
-  bsdiff = require('node-bsdiff').diff;
-} catch (e) {}
+const loadDiffModule = (pkgName: string): Diff | undefined => {
+  const resolvePaths = [process.cwd(), npm.packages, yarn.packages];
+
+  try {
+    const resolved = require.resolve(pkgName, { paths: resolvePaths });
+    const mod = require(resolved);
+    if (mod?.diff) {
+      return mod.diff as Diff;
+    }
+  } catch {}
 
-try {
-  hdiff = require('node-hdiffpatch').diff;
-} catch (e) {}
+  return undefined;
+};
+
+let hdiff: Diff | undefined;
+hdiff = (loadDiffModule('node-hdiffpatch') as any)?.diff;
+let bsdiff: Diff | undefined;
+let diff: Diff;
+bsdiff = loadDiffModule('node-bsdiff');
 
 async function runReactNativeBundleCommand({
   bundleName,

package/lib/esm/api..mjs

@@ -1,183 +0,0 @@
-import fs from "fs";
-import path from "path";
-import util from "util";
-import filesizeParser from "filesize-parser";
-import FormData from "form-data";
-import fetch from "node-fetch";
-import ProgressBar from "progress";
-import tcpp from "tcp-ping";
-import { getBaseUrl } from "./utils/http-helper";
-import packageJson from "../package.json";
-import { credentialFile, pricingPageUrl, IS_CRESC } from "./utils/constants";
-import { t } from "./utils/i18n";
-const tcpPing = util.promisify(tcpp.ping);
-let session;
-let savedSession;
-let apiToken;
-const userAgent = `react-native-update-cli/${packageJson.version}`;
-export const getSession = ()=>session;
-export const getApiToken = ()=>apiToken;
-export const setApiToken = (token)=>{
-    apiToken = token;
-};
-const loadApiTokenFromEnv = ()=>{
-    // Use CRESC_API_TOKEN for cresc, PUSHY_API_TOKEN for pushy
-    const envToken = IS_CRESC ? process.env.CRESC_API_TOKEN : process.env.PUSHY_API_TOKEN;
-    if (envToken) {
-        apiToken = envToken;
-    }
-};
-export const replaceSession = (newSession)=>{
-    session = newSession;
-};
-export const loadSession = async ()=>{
-    loadApiTokenFromEnv();
-    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, options) {
-    const baseUrl = await getBaseUrl;
-    const fullUrl = `${baseUrl}${url}`;
-    const resp = await fetch(fullUrl, options);
-    const text = await resp.text();
-    let json;
-    try {
-        json = JSON.parse(text);
-    } catch (e) {}
-    if (resp.status !== 200) {
-        const message = (json == null ? void 0 : json.message) || resp.statusText;
-        if (resp.status === 401) {
-            throw new Error(t('loginExpired'));
-        }
-        throw new Error(message);
-    }
-    return json;
-}
-function queryWithoutBody(method) {
-    return (api)=>{
-        const headers = {
-            'User-Agent': userAgent
-        };
-        if (apiToken) {
-            headers['x-api-token'] = apiToken;
-        } else if (session == null ? void 0 : session.token) {
-            headers['X-AccessToken'] = session.token;
-        }
-        return query(api, {
-            method,
-            headers
-        });
-    };
-}
-function queryWithBody(method) {
-    return (api, body)=>{
-        const headers = {
-            'User-Agent': userAgent,
-            'Content-Type': 'application/json'
-        };
-        if (apiToken) {
-            headers['x-api-token'] = apiToken;
-        } else if (session == null ? void 0 : session.token) {
-            headers['X-AccessToken'] = session.token;
-        }
-        return query(api, {
-            method,
-            headers,
-            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) {
-        // @ts-ignore
-        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)) {
-        const readableFileSize = `${(fileSize / 1048576).toFixed(1)}m`;
-        throw new Error(t('fileSizeExceeded', {
-            fileSize: readableFileSize,
-            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);
-    // form.append('file', fileStream, {
-    //   contentType: 'application/octet-stream',
-    // });
-    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
-    };
-}
-export const getAllPackages = async (appId)=>{
-    const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-    return data;
-};

package/lib/esm/app..mjs

@@ -1,130 +0,0 @@
-import fs from "fs";
-import Table from "tty-table";
-import { question } from "./utils";
-import { doDelete, get, post } from "./api";
-import { t } from "./utils/i18n";
-const validPlatforms = [
-    'ios',
-    'android',
-    'harmony'
-];
-export async function getPlatform(platform) {
-    return assertPlatform(platform || await question(t('platformQuestion')));
-}
-export function assertPlatform(platform) {
-    if (!validPlatforms.includes(platform)) {
-        throw new Error(t('unsupportedPlatform', {
-            platform
-        }));
-    }
-    return platform;
-}
-export function getSelectedApp(platform) {
-    assertPlatform(platform);
-    if (!fs.existsSync('update.json')) {
-        throw new Error(t('appNotSelected', {
-            platform
-        }));
-    }
-    const updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
-    if (!updateInfo[platform]) {
-        throw new Error(t('appNotSelected', {
-            platform
-        }));
-    }
-    return updateInfo[platform];
-}
-export async function listApp(platform = '') {
-    const { data } = await get('/app/list');
-    const list = platform ? data.filter((v)=>v.platform === platform) : data;
-    const header = [
-        {
-            value: t('appId')
-        },
-        {
-            value: t('appName')
-        },
-        {
-            value: t('platform')
-        }
-    ];
-    const rows = [];
-    for (const app of list){
-        rows.push([
-            app.id,
-            app.name,
-            app.platform
-        ]);
-    }
-    console.log(Table(header, rows).render());
-    console.log(`\n${t('totalApps', {
-        count: list.length,
-        platform
-    })}`);
-    return list;
-}
-export async function chooseApp(platform) {
-    const list = await listApp(platform);
-    while(true){
-        const id = await question(t('enterAppIdQuestion'));
-        const app = list.find((v)=>v.id === Number(id));
-        if (app) {
-            return app;
-        }
-    }
-}
-export const appCommands = {
-    createApp: async function({ options }) {
-        const name = options.name || await question(t('appNameQuestion'));
-        const { downloadUrl } = options;
-        const platform = await getPlatform(options.platform);
-        const { id } = await post('/app/create', {
-            name,
-            platform,
-            downloadUrl
-        });
-        console.log(t('createAppSuccess', {
-            id
-        }));
-        await this.selectApp({
-            args: [
-                id
-            ],
-            options: {
-                platform
-            }
-        });
-    },
-    deleteApp: async ({ args, options })=>{
-        const { platform } = options;
-        const id = args[0] || chooseApp(platform);
-        if (!id) {
-            console.log(t('cancelled'));
-        }
-        await doDelete(`/app/${id}`);
-        console.log(t('operationSuccess'));
-    },
-    apps: async ({ options })=>{
-        const { platform } = options;
-        listApp(platform);
-    },
-    selectApp: async ({ args, options })=>{
-        const platform = await getPlatform(options.platform);
-        const id = args[0] ? Number.parseInt(args[0]) : (await chooseApp(platform)).id;
-        let updateInfo = {};
-        if (fs.existsSync('update.json')) {
-            try {
-                updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
-            } catch (e) {
-                console.error(t('failedToParseUpdateJson'));
-                throw e;
-            }
-        }
-        const { appKey } = await get(`/app/${id}`);
-        updateInfo[platform] = {
-            appId: id,
-            appKey
-        };
-        fs.writeFileSync('update.json', JSON.stringify(updateInfo, null, 4), 'utf8');
-    }
-};