mirror/react-native-pushy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

remove node-bsdiff. prompt to install when needed.

Browse Source
This commit is contained in:
sunnylqm 2016-08-25 14:08:47 +08:00
parent 7bf0fb12de
commit 19b2b5918e
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
local-cli/src/bundle.js
View File

@ -12,11 +12,21 @@ import {
import * as fs from 'fs'; import * as fs from 'fs';
import {ZipFile} from 'yazl'; import {ZipFile} from 'yazl';
import {open as openZipFile} from 'yauzl'; import {open as openZipFile} from 'yauzl';
import {diff} from 'node-bsdiff'; // import {diff} from 'node-bsdiff';
import { question } from './utils'; import { question } from './utils';
import {checkPlatform} from './app'; import {checkPlatform} from './app';
import crypto from 'crypto'; import crypto from 'crypto';
var diff;
try {
diff = require('node-bsdiff');
} catch(e) {
diff = function() {
console.warn('This function needs "node-bsdiff". Please run "npm i node-bsdiff -S" from your project directory first!');
throw new Error('This function needs module "node-bsdiff". Please install it first.')
}
}
function mkdir(dir){ function mkdir(dir){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
mkdirRecurisve(dir, err => { mkdirRecurisve(dir, err => {
@ -106,7 +116,7 @@ function basename(fn) {
return m && m[1]; return m && m[1];
} }
async function diffWithPPK(origin, next, output) { async function diffFromPPK(origin, next, output) {
await mkdir(path.dirname(output)); await mkdir(path.dirname(output));
const originEntries = {}; const originEntries = {};
@ -223,7 +233,7 @@ async function diffWithPPK(origin, next, output) {
await writePromise; await writePromise;
} }
async function diffWithPackage(origin, next, output, originBundleName, transformPackagePath = v=>v) { async function diffFromPackage(origin, next, output, originBundleName, transformPackagePath = v=>v) {
await mkdir(path.dirname(output)); await mkdir(path.dirname(output));
const originEntries = {}; const originEntries = {};
@ -419,11 +429,11 @@ export const commands = {
const realOutput = output.replace(/\$\{time\}/g, '' + Date.now()); const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
if (!origin || !next) { if (!origin || !next) {
console.error('pushy diffWithApk <origin> <next>'); console.error('pushy diff <origin> <next>');
process.exit(1); process.exit(1);
} }
await diffWithPPK(origin, next, realOutput, 'index.bundlejs'); await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
console.log(`${realOutput} generated.`); console.log(`${realOutput} generated.`);
}, },
@ -434,11 +444,11 @@ export const commands = {
const realOutput = output.replace(/\$\{time\}/g, '' + Date.now()); const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
if (!origin || !next) { if (!origin || !next) {
console.error('pushy diffWithApk <origin> <next>'); console.error('pushy diffFromApk <origin> <next>');
process.exit(1); process.exit(1);
} }
await diffWithPackage(origin, next, realOutput, 'assets/index.android.bundle'); await diffFromPackage(origin, next, realOutput, 'assets/index.android.bundle');
console.log(`${realOutput} generated.`); console.log(`${realOutput} generated.`);
}, },
@ -449,11 +459,11 @@ export const commands = {
const realOutput = output.replace(/\$\{time\}/g, '' + Date.now()); const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
if (!origin || !next) { if (!origin || !next) {
console.error('pushy diffWithIpa <origin> <next>'); console.error('pushy diffFromIpa <origin> <next>');
process.exit(1); process.exit(1);
} }
await diffWithPackage(origin, next, realOutput, 'main.jsbundle', v=>{ await diffFromPackage(origin, next, realOutput, 'main.jsbundle', v=>{
const m = /^Payload\/[^/]+\/(.+)$/.exec(v); const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
return m && m[1]; return m && m[1];
}); });

1
package.json
View File

@ -33,7 +33,6 @@
"isomorphic-fetch": "^2.2.1", "isomorphic-fetch": "^2.2.1",
"mkdir-recursive": "^0.2.1", "mkdir-recursive": "^0.2.1",
"node-apk-parser": "^0.2.3", "node-apk-parser": "^0.2.3",
"node-bsdiff": "^0.1.4",
"progress": "^1.1.8", "progress": "^1.1.8",
"read": "^1.0.7", "read": "^1.0.7",
"request": "^2.69.0", "request": "^2.69.0",