1
0
mirror of https://gitcode.com/github-mirrors/react-native-update-cli.git synced 2025-09-18 10:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity GitHub Gitee

Compare commits

..

1 Commits

Author SHA1 Message Date
sunnylqm
387a879d4b v1.30.3 2024-10-09 20:31:29 +08:00
16 changed files with 3756 additions and 583 deletions

View File

@@ -1,47 +0,0 @@
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

View File

@@ -1,22 +0,0 @@
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 }}

1
.npmrc
View File

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

15
.swcrc
View File

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

BIN
bun.lockb

Binary file not shown.

View File

@@ -3,9 +3,11 @@
"defaultCommand": "help", "defaultCommand": "help",
"commands": { "commands": {
"help": {}, "help": {},
"login": {}, "login": {},
"logout": {}, "logout": {},
"me": {}, "me": {},
"createApp": { "createApp": {
"options": { "options": {
"name": { "name": {
@@ -31,6 +33,7 @@
} }
} }
}, },
"uploadIpa": {}, "uploadIpa": {},
"uploadApk": {}, "uploadApk": {},
"parseIpa": {}, "parseIpa": {},
@@ -42,6 +45,7 @@
} }
} }
}, },
"publish": { "publish": {
"options": { "options": {
"platform": { "platform": {
@@ -65,6 +69,7 @@
} }
} }
}, },
"update": { "update": {
"options": { "options": {
"platform": { "platform": {
@@ -76,6 +81,7 @@
"packageId": { "packageId": {
"hasValue": true "hasValue": true
}, },
"packageVersion": { "packageVersion": {
"hasValue": true "hasValue": true
}, },
@@ -84,12 +90,10 @@
}, },
"maxPackageVersion": { "maxPackageVersion": {
"hasValue": true "hasValue": true
},
"rollout": {
"hasValue": true
} }
} }
}, },
"updateVersionInfo": { "updateVersionInfo": {
"options": { "options": {
"platform": { "platform": {
@@ -112,6 +116,7 @@
} }
} }
}, },
"build": { "build": {
"description": "Bundle javascript and copy assets." "description": "Bundle javascript and copy assets."
}, },
@@ -194,24 +199,6 @@
} }
} }
}, },
"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": { "hdiffFromIpa": {
"description": "Create hdiff patch from a iOS package(.ipa)", "description": "Create hdiff patch from a iOS package(.ipa)",
"options": { "options": {
@@ -227,4 +214,4 @@
"default": false "default": false
} }
} }
} }

View File

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

View File

@@ -1,6 +1,6 @@
{ {
"name": "react-native-update-cli", "name": "react-native-update-cli",
"version": "1.36.0", "version": "1.30.3",
"description": "Command tools for javaScript updater with `pushy` service for react native apps.", "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
"main": "index.js", "main": "index.js",
"bin": { "bin": {
@@ -12,8 +12,7 @@
"cli.json" "cli.json"
], ],
"scripts": { "scripts": {
"build": "swc src -d lib --strip-leading-paths", "prepublish": "babel src --out-dir lib && chmod +x lib/index.js"
"prepare": "npm run build && chmod +x lib/index.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@@ -32,40 +31,36 @@
}, },
"homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli", "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
"dependencies": { "dependencies": {
"@badisi/latest-version": "^7.0.10", "bplist-parser": "^0.2.0",
"bplist-parser": "^0.3.2",
"bytebuffer": "^5.0.1", "bytebuffer": "^5.0.1",
"cgbi-to-png": "^1.0.7", "cgbi-to-png": "^1.0.7",
"chalk": "4",
"cli-arguments": "^0.2.1", "cli-arguments": "^0.2.1",
"commander": "^12.1.0", "commander": "^7.2.0",
"compare-versions": "^6.1.1", "compare-versions": "^6.1.1",
"filesize-parser": "^1.5.1", "filesize-parser": "^1.5.0",
"form-data": "^4.0.1",
"fs-extra": "8", "fs-extra": "8",
"gradle-to-js": "^2.0.1", "gradle-to-js": "^2.0.1",
"isomorphic-unzip": "^1.1.5", "isomorphic-unzip": "^1.1.5",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"plist": "^3.1.0", "plist": "^3.0.1",
"progress": "^2.0.3", "progress": "^2.0.3",
"properties": "^1.2.1", "properties": "^1.2.1",
"read": "^4.0.0", "read": "^1.0.7",
"semver": "^7.6.3", "request": "^2.88.2",
"tcp-ping": "^0.1.1", "tcp-ping": "^0.1.1",
"tty-table": "4.2", "tty-table": "4.2",
"update-notifier": "^5.1.0", "update-notifier": "^5.1.0",
"yauzl": "^3.2.0", "yauzl": "^2.10.0",
"yazl": "3.3.1" "yazl": "2.5.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": { "engines": {
"node": ">= 10" "node": ">= 10"
}, }
"devDependencies": {
"@swc/cli": "^0.5.1",
"@swc/core": "^1.9.3",
"@types/node": "^22.9.3",
"oxlint": "^0.13.1",
"typescript": "^5.7.2"
},
"packageManager": "yarn@1.22.22"
} }

3570
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,22 +1,20 @@
import fetch from 'node-fetch'; import fetch from 'node-fetch';
import fs from 'node:fs'; const defaultEndpoint = 'https://update.reactnative.cn/api';
import util from 'node:util'; let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
import path from 'node:path'; import fs from 'fs';
import request from 'request';
import ProgressBar from 'progress'; import ProgressBar from 'progress';
import packageJson from '../package.json'; import packageJson from '../package.json';
import tcpp from 'tcp-ping'; import tcpp from 'tcp-ping';
import util from 'util';
import path from 'path';
import filesizeParser from 'filesize-parser'; import filesizeParser from 'filesize-parser';
import { pricingPageUrl } from './utils'; import { pricingPageUrl } from './utils';
import { Session } from 'types';
import FormData from 'form-data';
const tcpPing = util.promisify(tcpp.ping); const tcpPing = util.promisify(tcpp.ping);
let session: Session | undefined; let session = undefined;
let savedSession: Session | undefined; let savedSession = undefined;
const defaultEndpoint = 'https://update.reactnative.cn/api';
let host = process.env.PUSHY_REGISTRY || defaultEndpoint;
const userAgent = `react-native-update-cli/${packageJson.version}`; const userAgent = `react-native-update-cli/${packageJson.version}`;
@@ -24,7 +22,7 @@ export const getSession = function () {
return session; return session;
}; };
export const replaceSession = function (newSession: { token: string }) { export const replaceSession = function (newSession) {
session = newSession; session = newSession;
}; };
@@ -61,28 +59,26 @@ export const closeSession = function () {
host = process.env.PUSHY_REGISTRY || defaultEndpoint; host = process.env.PUSHY_REGISTRY || defaultEndpoint;
}; };
async function query(url: string, options: fetch.RequestInit) { async function query(url, options) {
const resp = await fetch(url, options); const resp = await fetch(url, options);
const text = await resp.text(); const text = await resp.text();
let json; let json;
try { try {
json = JSON.parse(text); json = JSON.parse(text);
} catch (e) { } catch (e) {
if (resp.statusText.includes('Unauthorized')) { throw new Error(`Server error: ${text}`);
throw new Error('登录信息已过期,请使用 pushy login 命令重新登录');
} else {
throw new Error(`Server error: ${resp.statusText}`);
}
} }
if (resp.status !== 200) { if (resp.status !== 200) {
throw new Error(`${resp.status}: ${resp.statusText}`); throw Object.assign(new Error(json.message || json.error), {
status: resp.status,
});
} }
return json; return json;
} }
function queryWithoutBody(method: string) { function queryWithoutBody(method) {
return function (api: string) { return function (api) {
return query(host + api, { return query(host + api, {
method, method,
headers: { headers: {
@@ -93,8 +89,8 @@ function queryWithoutBody(method: string) {
}; };
} }
function queryWithBody(method: string) { function queryWithBody(method) {
return function (api: string, body: Record<string, any>) { return function (api, body) {
return query(host + api, { return query(host + api, {
method, method,
headers: { headers: {
@@ -112,11 +108,12 @@ export const post = queryWithBody('POST');
export const put = queryWithBody('PUT'); export const put = queryWithBody('PUT');
export const doDelete = queryWithBody('DELETE'); export const doDelete = queryWithBody('DELETE');
export async function uploadFile(fn: string, key?: string) { export async function uploadFile(fn, key) {
const { url, backupUrl, formData, maxSize } = await post('/upload', { const { url, backupUrl, formData, maxSize } = await post('/upload', {
ext: path.extname(fn), ext: path.extname(fn),
}); });
let realUrl = url; let realUrl = url;
if (backupUrl) { if (backupUrl) {
if (global.USE_ACC_OSS) { if (global.USE_ACC_OSS) {
realUrl = backupUrl; realUrl = backupUrl;
@@ -137,9 +134,9 @@ export async function uploadFile(fn: string, key?: string) {
const fileSize = fs.statSync(fn).size; const fileSize = fs.statSync(fn).size;
if (maxSize && fileSize > filesizeParser(maxSize)) { if (maxSize && fileSize > filesizeParser(maxSize)) {
throw new Error( throw new Error(
`此文件大小 ${(fileSize / 1048576).toFixed( `此文件大小${(fileSize / 1048576).toFixed(
1, 1,
)}m , 超出当前额度 ${maxSize} 您可以考虑升级付费业务以提升此额度详情请访问: ${pricingPageUrl}`, )}m, 超出当前额度${maxSize}您可以考虑升级付费业务以提升此额度详情请访问: ${pricingPageUrl}`,
); );
} }
@@ -149,30 +146,34 @@ export async function uploadFile(fn: string, key?: string) {
total: fileSize, total: fileSize,
}); });
const form = new FormData(); const info = await new Promise((resolve, reject) => {
if (key) {
formData.key = key;
}
formData.file = fs.createReadStream(fn);
Object.entries(formData).forEach(([k, v]) => { formData.file.on('data', function (data) {
form.append(k, v); 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(JSON.stringify(body)), {
status: resp.statusCode,
}),
);
}
resolve({ hash: formData.key });
},
);
}); });
const fileStream = fs.createReadStream(fn); return info;
fileStream.on('data', function (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 };
} }

View File

@@ -1,15 +1,14 @@
import path from 'node:path'; import path from 'path';
import { getRNVersion, translateOptions } from './utils'; import { getRNVersion, translateOptions } from './utils';
import * as fs from 'fs-extra'; import * as fs from 'fs-extra';
import { ZipFile } from 'yazl'; import { ZipFile } from 'yazl';
import { open as openZipFile } from 'yauzl'; import { open as openZipFile } from 'yauzl';
import { question, printVersionCommand } from './utils'; import { question, printVersionCommand } from './utils';
import { checkPlatform } from './app'; import { checkPlatform } from './app';
import { spawn, spawnSync } from 'node:child_process'; import { spawn, spawnSync } from 'child_process';
const g2js = require('gradle-to-js/lib/parser'); const g2js = require('gradle-to-js/lib/parser');
import os from 'os'; import os from 'os';
const properties = require('properties'); const properties = require('properties');
const path = require('path');
let bsdiff, hdiff, diff; let bsdiff, hdiff, diff;
try { try {
@@ -34,7 +33,7 @@ async function runReactNativeBundleCommand(
gradleConfig = await checkGradleConfig(); gradleConfig = await checkGradleConfig();
if (gradleConfig.crunchPngs !== false) { if (gradleConfig.crunchPngs !== false) {
console.warn( console.warn(
'androidcrunchPngs 选项似乎尚未禁用(如已禁用则请忽略此提示),这可能导致热更包体积异常增大,具体请参考 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', 'androidcrunchPngs选项似乎尚未禁用如已禁用则请忽略此提示这可能导致热更包体积异常增大具体请参考 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',
); );
} }
} }
@@ -54,70 +53,57 @@ async function runReactNativeBundleCommand(
let cliPath; let cliPath;
try {
// rn >= 0.75
cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
paths: [process.cwd()],
});
} catch (e) {
// rn < 0.75
cliPath = require.resolve('react-native/local-cli/cli.js', {
paths: [process.cwd()],
});
}
let usingExpo = false; let usingExpo = false;
try { 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', { cliPath = require.resolve('@expo/cli', {
paths: [process.cwd()], paths: [process.cwd()],
}); });
usingExpo = true; usingExpo = true;
} catch (e) { } catch (e) {}
try { const bundleCommand = usingExpo ? 'export:embed' : 'bundle';
// rn >= 0.75
cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
paths: [process.cwd()],
});
} catch (e) {
// rn < 0.75
cliPath = require.resolve('react-native/local-cli/cli.js', {
paths: [process.cwd()],
});
}
}
const bundleCommand = usingExpo ? 'export:embed' : platform === 'harmony' ? 'bundle-harmony' : 'bundle';
if (platform == 'harmony') {
Array.prototype.push.apply(reactNativeBundleArgs, [
cliPath,
bundleCommand,
'--dev',
development,
'--entry-file',
entryFile,
]);
if (sourcemapOutput) { Array.prototype.push.apply(reactNativeBundleArgs, [
reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput); cliPath,
} bundleCommand,
'--assets-dest',
outputFolder,
'--bundle-output',
path.join(outputFolder, bundleName),
'--dev',
development,
'--entry-file',
entryFile,
'--platform',
platform,
'--reset-cache',
]);
if (config) { if (sourcemapOutput) {
reactNativeBundleArgs.push('--config', config); reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
}
} }
else{
Array.prototype.push.apply(reactNativeBundleArgs, [ if (config) {
cliPath, reactNativeBundleArgs.push('--config', config);
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); const reactNativeBundleProcess = spawn('node', reactNativeBundleArgs);
console.log( console.log(
`Running bundle command: node ${reactNativeBundleArgs.join(' ')}`, `Running bundle command: node ${reactNativeBundleArgs.join(' ')}`,
@@ -166,8 +152,6 @@ async function runReactNativeBundleCommand(
fs.existsSync('ios/Pods/hermes-engine') fs.existsSync('ios/Pods/hermes-engine')
) { ) {
hermesEnabled = true; hermesEnabled = true;
}else if (platform === 'harmony') {
await copyHarmonyBundle(outputFolder);
} }
if (hermesEnabled) { if (hermesEnabled) {
await compileHermesByteCode( await compileHermesByteCode(
@@ -182,21 +166,6 @@ async function runReactNativeBundleCommand(
}); });
} }
async function copyHarmonyBundle(outputFolder) {
const harmonyRawPath = 'harmony/entry/src/main/resources/rawfile';
try {
await fs.ensureDir(outputFolder);
await fs.copy(harmonyRawPath, outputFolder);
console.log(
`Successfully copied from ${harmonyRawPath} to ${outputFolder}`,
);
} catch (error) {
console.error('Error in copyHarmonyBundle:', error);
}
}
function getHermesOSBin() { function getHermesOSBin() {
if (os.platform() === 'win32') return 'win64-bin'; if (os.platform() === 'win32') return 'win64-bin';
if (os.platform() === 'darwin') return 'osx-bin'; if (os.platform() === 'darwin') return 'osx-bin';
@@ -208,19 +177,17 @@ async function checkGradleConfig() {
let crunchPngs; let crunchPngs;
try { try {
const gradleConfig = await g2js.parseFile('android/app/build.gradle'); const gradleConfig = await g2js.parseFile('android/app/build.gradle');
crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
const projectConfig = gradleConfig['project.ext.react']; const projectConfig = gradleConfig['project.ext.react'];
if (projectConfig) { for (const packagerConfig of projectConfig) {
for (const packagerConfig of projectConfig) { if (
if ( packagerConfig.includes('enableHermes') &&
packagerConfig.includes('enableHermes') && packagerConfig.includes('true')
packagerConfig.includes('true') ) {
) { enableHermes = true;
enableHermes = true; break;
break;
}
} }
} }
crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
} catch (e) {} } catch (e) {}
return { return {
enableHermes, enableHermes,
@@ -257,10 +224,6 @@ async function compileHermesByteCode(
'-O', '-O',
]; ];
if (sourcemapOutput) { if (sourcemapOutput) {
fs.copyFileSync(
sourcemapOutput,
path.join(outputFolder, bundleName + '.txt.map'),
);
args.push('-output-source-map'); args.push('-output-source-map');
} }
console.log( console.log(
@@ -269,28 +232,6 @@ async function compileHermesByteCode(
spawnSync(hermesCommand, args, { spawnSync(hermesCommand, args, {
stdio: 'ignore', stdio: 'ignore',
}); });
if (sourcemapOutput) {
const composerPath =
'node_modules/react-native/scripts/compose-source-maps.js';
if (!fs.existsSync(composerPath)) {
return;
}
console.log(`Composing source map`);
spawnSync(
'node',
[
composerPath,
path.join(outputFolder, bundleName + '.txt.map'),
path.join(outputFolder, bundleName + '.map'),
'-o',
sourcemapOutput,
],
{
stdio: 'ignore',
},
);
}
fs.removeSync(path.join(outputFolder, bundleName + '.txt.map'));
} }
async function pack(dir, output) { async function pack(dir, output) {
@@ -372,7 +313,7 @@ async function diffFromPPK(origin, next, output) {
// isFile // isFile
originMap[entry.crc32] = entry.fileName; originMap[entry.crc32] = entry.fileName;
if (entry.fileName === 'index.bundlejs' || entry.fileName === 'bundle.harmony.js') { if (entry.fileName === 'index.bundlejs') {
// This is source. // This is source.
return readEntire(entry, zipFile).then((v) => (originSource = v)); return readEntire(entry, zipFile).then((v) => (originSource = v));
} }
@@ -434,16 +375,6 @@ async function diffFromPPK(origin, next, output) {
); );
//console.log('End diff'); //console.log('End diff');
}); });
}else if (entry.fileName === 'bundle.harmony.js') {
//console.log('Found bundle');
return readEntire(entry, nextZipfile).then((newSource) => {
//console.log('Begin diff');
zipfile.addBuffer(
diff(originSource, newSource),
'bundle.harmony.js.patch',
);
//console.log('End diff');
});
} else { } else {
// If same file. // If same file.
const originEntry = originEntries[entry.fileName]; const originEntry = originEntries[entry.fileName];
@@ -566,17 +497,7 @@ async function diffFromPackage(
); );
//console.log('End diff'); //console.log('End diff');
}); });
} else if (entry.fileName === 'bundle.harmony.js') { } else {
//console.log('Found bundle');
return readEntire(entry, nextZipfile).then((newSource) => {
//console.log('Begin diff');
zipfile.addBuffer(
diff(originSource, newSource),
'bundle.harmony.js.patch',
);
//console.log('End diff');
});
}else {
// If same file. // If same file.
if (originEntries[entry.fileName] === entry.crc32) { if (originEntries[entry.fileName] === entry.crc32) {
copies[entry.fileName] = ''; copies[entry.fileName] = '';
@@ -608,53 +529,22 @@ async function diffFromPackage(
await writePromise; await writePromise;
} }
async function enumZipEntries(zipFn, callback, nestedPath = '') { function enumZipEntries(zipFn, callback) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
openZipFile(zipFn, { lazyEntries: true }, async (err, zipfile) => { openZipFile(zipFn, { lazyEntries: true }, (err, zipfile) => {
if (err) { if (err) {
return reject(err); return reject(err);
} }
zipfile.on('end', resolve); zipfile.on('end', resolve);
zipfile.on('error', reject); zipfile.on('error', reject);
zipfile.on('entry', async (entry) => { zipfile.on('entry', (entry) => {
const fullPath = nestedPath + entry.fileName; const result = callback(entry, zipfile);
if (result && typeof result.then === 'function') {
try { result.then(() => zipfile.readEntry());
if ( } else {
!entry.fileName.endsWith('/') && zipfile.readEntry();
entry.fileName.toLowerCase().endsWith('.hap')
) {
const tempDir = path.join(os.tmpdir(), 'nested_zip_' + Date.now());
await fs.ensureDir(tempDir);
const tempZipPath = path.join(tempDir, 'temp.zip');
await new Promise((res, rej) => {
zipfile.openReadStream(entry, async (err, readStream) => {
if (err) return rej(err);
const writeStream = fs.createWriteStream(tempZipPath);
readStream.pipe(writeStream);
writeStream.on('finish', res);
writeStream.on('error', rej);
});
});
await enumZipEntries(tempZipPath, callback, fullPath + '/');
await fs.remove(tempDir);
}
const result = callback(entry, zipfile, fullPath);
if (result && typeof result.then === 'function') {
await result;
}
} catch (error) {
console.error('处理文件时出错:', error);
} }
zipfile.readEntry();
}); });
zipfile.readEntry(); zipfile.readEntry();
}); });
}); });
@@ -719,6 +609,7 @@ export const commands = {
const { version, major, minor } = getRNVersion(); const { version, major, minor } = getRNVersion();
console.log('Bundling with react-native: ', version); console.log('Bundling with react-native: ', version);
printVersionCommand();
await runReactNativeBundleCommand( await runReactNativeBundleCommand(
bundleName, bundleName,
@@ -788,21 +679,6 @@ export const commands = {
console.log(`${realOutput} generated.`); console.log(`${realOutput} generated.`);
}, },
async hdiffFromApp({ args, options }) {
const { origin, next, realOutput } = diffArgsCheck(
args,
options,
'hdiffFromApp',
);
await diffFromPackage(
origin,
next,
realOutput,
'resources/rawfile/bundle.harmony.js',
);
console.log(`${realOutput} generated.`);
},
async diffFromIpa({ args, options }) { async diffFromIpa({ args, options }) {
const { origin, next, realOutput } = diffArgsCheck( const { origin, next, realOutput } = diffArgsCheck(
args, args,

View File

@@ -5,13 +5,9 @@ import updateNotifier from 'update-notifier';
import { printVersionCommand } from './utils/index.js'; import { printVersionCommand } from './utils/index.js';
import pkg from '../package.json'; import pkg from '../package.json';
updateNotifier({ pkg }).notify({ updateNotifier({ pkg }).notify({ isGlobal: true });
isGlobal: true,
message:
'建议运行 `{updateCommand}` 来更新命令行工具以获得功能、性能和安全性的持续改进',
});
function printUsage() { function printUsage({ args }) {
// const commandName = args[0]; // const commandName = args[0];
// TODO: print usage of commandName, or print global usage. // TODO: print usage of commandName, or print global usage.
@@ -31,8 +27,8 @@ const commands = {
help: printUsage, help: printUsage,
}; };
async function run() { function run() {
await printVersionCommand(); printVersionCommand();
if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') { if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') {
process.exit(); process.exit();
} }

View File

@@ -1,8 +0,0 @@
declare global {
var NO_INTERACTIVE: boolean;
var USE_ACC_OSS: boolean;
}
export interface Session {
token: string;
}

View File

@@ -1,23 +1,26 @@
import fs from 'fs-extra'; import fs from 'fs-extra';
import os from 'node:os'; import os from 'os';
import path from 'node:path'; import path from 'path';
import pkg from '../../package.json'; import pkg from '../../package.json';
import AppInfoParser from './app-info-parser'; import AppInfoParser from './app-info-parser';
import semverSatisfies from 'semver/functions/satisfies'; import semverSatisfies from 'semver/functions/satisfies';
import chalk from 'chalk';
import latestVersion from '@badisi/latest-version';
import { read } from 'read'; import read from 'read';
export async function question(query, password) { export function question(query, password) {
if (NO_INTERACTIVE) { if (NO_INTERACTIVE) {
return ''; return Promise.resolve('');
} }
return read({ return new Promise((resolve, reject) =>
prompt: query, read(
silent: password, {
replace: password ? '*' : undefined, prompt: query,
}); silent: password,
replace: password ? '*' : undefined,
},
(err, result) => (err ? reject(err) : resolve(result)),
),
);
} }
export function translateOptions(options) { export function translateOptions(options) {
@@ -133,23 +136,8 @@ export function saveToLocal(originPath, destName) {
// fs.copyFileSync(originPath, destPath); // fs.copyFileSync(originPath, destPath);
} }
async function getLatestVersion(pkgName) { export function printVersionCommand() {
return Promise.race([ console.log('react-native-update-cli: ' + pkg.version);
latestVersion(pkgName)
.then((p) => p.latest)
.catch(() => ''),
new Promise((resolve) => setTimeout(() => resolve(''), 2000)),
]);
}
export async function printVersionCommand() {
let latestPushyCliVersion = await getLatestVersion('react-native-update-cli');
latestPushyCliVersion = latestPushyCliVersion
? ` (最新:${chalk.green(latestPushyCliVersion)}`
: '';
console.log(
`react-native-update-cli: ${pkg.version}${latestPushyCliVersion}`,
);
let pushyVersion = ''; let pushyVersion = '';
try { try {
const PACKAGE_JSON_PATH = require.resolve( const PACKAGE_JSON_PATH = require.resolve(
@@ -159,28 +147,18 @@ export async function printVersionCommand() {
}, },
); );
pushyVersion = require(PACKAGE_JSON_PATH).version; pushyVersion = require(PACKAGE_JSON_PATH).version;
let latestPushyVersion = await getLatestVersion('react-native-update'); console.log('react-native-update: ' + pushyVersion);
latestPushyVersion = latestPushyVersion
? ` (最新:${chalk.green(latestPushyVersion)}`
: '';
console.log(`react-native-update: ${pushyVersion}${latestPushyVersion}`);
} catch (e) { } catch (e) {
console.log('react-native-update: 无法获取版本号,请在项目目录中运行命令'); console.log('react-native-update: 无法获取版本号,请在项目目录中运行命令');
} }
if (pushyVersion) { if (pushyVersion) {
if (semverSatisfies(pushyVersion, '<8.5.2')) { if (semverSatisfies(pushyVersion, '<8.5.1')) {
console.warn( console.warn(
`当前版本已不再支持,请至少升级到 v8 的最新小版本后重新打包(代码无需改动): npm i react-native-update@8 . '当前版本已不再支持,请至少升级到 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')) { } else if (semverSatisfies(pushyVersion, '9.0.0 - 9.2.0')) {
console.warn( console.warn(
`当前版本已不再支持,请至少升级到 v9 的最新小版本后重新打包(代码无需改动,可直接热更: npm i react-native-update@9 . '当前版本已不再支持,请至少升级到 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`,
); );
} }
} }

View File

@@ -124,26 +124,20 @@ export const commands = {
options.platform || (await question('平台(ios/android):')), options.platform || (await question('平台(ios/android):')),
); );
const { appId } = await getSelectedApp(platform); const { appId } = await getSelectedApp(platform);
let versionId = options.versionId || (await chooseVersion(appId)).id; const versionId = options.versionId || (await chooseVersion(appId)).id;
if (versionId === 'null') {
versionId = null;
}
let pkgId; let pkgId;
let pkgVersion = options.packageVersion; let pkgVersion = options.packageVersion;
let minPkgVersion = options.minPackageVersion; let minPkgVersion = options.minPackageVersion;
let maxPkgVersion = options.maxPackageVersion; let maxPkgVersion = options.maxPackageVersion;
let rollout = options.rollout; if (pkgVersion) {
if (rollout === undefined) { pkgVersion = pkgVersion.trim();
rollout = null; const { data } = await get(`/app/${appId}/package/list?limit=1000`);
} else { const pkg = data.find((d) => d.name === pkgVersion);
try { if (pkg) {
rollout = parseInt(rollout); pkgId = pkg.id;
} catch (e) { } else {
throw new Error('rollout 必须是 1-100 的整数'); throw new Error(`未查询到匹配原生版本:${pkgVersion}`);
}
if (rollout < 1 || rollout > 100) {
throw new Error('rollout 必须是 1-100 的整数');
} }
} }
if (minPkgVersion) { if (minPkgVersion) {
@@ -151,29 +145,15 @@ export const commands = {
const { data } = await get(`/app/${appId}/package/list?limit=1000`); const { data } = await get(`/app/${appId}/package/list?limit=1000`);
const pkgs = data.filter((d) => compare(d.name, minPkgVersion, '>=')); const pkgs = data.filter((d) => compare(d.name, minPkgVersion, '>='));
if (pkgs.length === 0) { if (pkgs.length === 0) {
throw new Error(`未查询到 >= ${minPkgVersion} 的原生版本`); throw new Error(
} `未查询到 >= ${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) { for (const pkg of pkgs) {
await put(`/app/${appId}/package/${pkg.id}`, { await put(`/app/${appId}/package/${pkg.id}`, {
versionId, versionId,
}); });
console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`); console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
} }
console.log(`操作完成,共已绑定 ${pkgs.length} 个原生版本`); console.log(`操作完成,共已绑定 ${pkgs.length} 个原生版本`);
return; return;
@@ -183,44 +163,19 @@ export const commands = {
const { data } = await get(`/app/${appId}/package/list?limit=1000`); const { data } = await get(`/app/${appId}/package/list?limit=1000`);
const pkgs = data.filter((d) => compare(d.name, maxPkgVersion, '<=')); const pkgs = data.filter((d) => compare(d.name, maxPkgVersion, '<='));
if (pkgs.length === 0) { if (pkgs.length === 0) {
throw new Error(`未查询到 <= ${maxPkgVersion} 的原生版本`); throw new Error(
} `未查询到 <= ${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) { for (const pkg of pkgs) {
await put(`/app/${appId}/package/${pkg.id}`, { await put(`/app/${appId}/package/${pkg.id}`, {
versionId, versionId,
}); });
console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkg.name} (id: ${pkg.id})`); console.log(`已将版本 ${versionId} 绑定到原生版本 ${pkg.name}`);
} }
console.log(`操作完成,共已绑定 ${pkgs.length} 个原生版本`); console.log(`操作完成,共已绑定 ${pkgs.length} 个原生版本`);
return; 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) { if (!pkgId) {
pkgId = options.packageId || (await choosePackage(appId)).id; pkgId = options.packageId || (await choosePackage(appId)).id;
} }
@@ -228,30 +183,10 @@ export const commands = {
if (!pkgId) { if (!pkgId) {
throw new Error('请提供 packageId 或 packageVersion 参数'); 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}`, { await put(`/app/${appId}/package/${pkgId}`, {
versionId, versionId,
}); });
console.log(`已将热更版本 ${versionId} 绑定到原生版本 ${pkgVersion} (id: ${pkgId})`); console.log('操作成功');
}, },
updateVersionInfo: async function ({ args, options }) { updateVersionInfo: async function ({ args, options }) {
const platform = checkPlatform( const platform = checkPlatform(

View File

@@ -1,75 +0,0 @@
{
"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"]
}