react-native-update-cli 2.8.0 → 2.8.2

package/src/bundle.ts

@@ -2,48 +2,19 @@ import { spawn, spawnSync } from 'child_process';
 import path from 'path';
 import { satisfies } from 'compare-versions';
 import * as fs from 'fs-extra';
-import {
-  type Entry,
-  type ZipFile as YauzlZipFile,
-  open as openZipFile,
-} from 'yauzl';
 import { ZipFile as YazlZipFile } from 'yazl';
 import { getPlatform } from './app';
 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';
-import { isPPKBundleFileName, scriptName, tempDir } from './utils/constants';
+import { tempDir } from './utils/constants';
 import { depVersions } from './utils/dep-versions';
 import { t } from './utils/i18n';
 import { versionCommands } from './versions';
 
-type Diff = (oldSource?: Buffer, newSource?: Buffer) => Buffer;
-
-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 {}
-
-  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,
   dev,
@@ -537,353 +508,6 @@ async function pack(dir: string, output: string) {
   console.log(t('fileGenerated', { file: output }));
 }
 
-export function readEntry(
-  entry: Entry,
-  zipFile: YauzlZipFile,
-): Promise<Buffer> {
-  const buffers: Buffer[] = [];
-  return new Promise((resolve, reject) => {
-    zipFile.openReadStream(entry, (err, stream) => {
-      stream.on('data', (chunk: Buffer) => {
-        buffers.push(chunk);
-      });
-      stream.on('end', () => {
-        resolve(Buffer.concat(buffers));
-      });
-      stream.on('error', (err) => {
-        reject(err);
-      });
-    });
-  });
-}
-
-function basename(fn: string) {
-  const m = /^(.+\/)[^\/]+\/?$/.exec(fn);
-  return m?.[1];
-}
-
-async function diffFromPPK(origin: string, next: string, output: string) {
-  fs.ensureDirSync(path.dirname(output));
-
-  const originEntries = {};
-  const originMap = {};
-
-  let originSource: Buffer | undefined;
-
-  await enumZipEntries(origin, (entry, zipFile) => {
-    originEntries[entry.fileName] = entry;
-    if (!/\/$/.test(entry.fileName)) {
-      // isFile
-      originMap[entry.crc32] = entry.fileName;
-
-      if (isPPKBundleFileName(entry.fileName)) {
-        // This is source.
-        return readEntry(entry, zipFile).then((v) => (originSource = v));
-      }
-    }
-  });
-
-  if (!originSource) {
-    throw new Error(t('bundleFileNotFound'));
-  }
-
-  const copies = {};
-
-  const zipfile = new YazlZipFile();
-
-  const writePromise = new Promise((resolve, reject) => {
-    zipfile.outputStream.on('error', (err) => {
-      throw err;
-    });
-    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', () => {
-      resolve(void 0);
-    });
-  });
-
-  const addedEntry = {};
-
-  function addEntry(fn: string) {
-    //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 (isPPKBundleFileName(entry.fileName)) {
-      //console.log('Found bundle');
-      return readEntry(entry, nextZipfile).then((newSource) => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(
-          diff(originSource, newSource),
-          `${entry.fileName}.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, (err, readStream) => {
-          if (err) {
-            return reject(err);
-          }
-          zipfile.addReadStream(readStream, entry.fileName);
-          readStream.on('end', () => {
-            //console.log('add finished');
-            resolve(void 0);
-          });
-        });
-      });
-    }
-  });
-
-  const deletes = {};
-
-  for (const k in originEntries) {
-    if (!newEntries[k]) {
-      console.log(t('deleteFile', { file: 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: string,
-  next: string,
-  output: string,
-  originBundleName: string,
-  transformPackagePath = (v: string) => v,
-) {
-  fs.ensureDirSync(path.dirname(output));
-
-  const originEntries = {};
-  const originMap = {};
-
-  let originSource: Buffer | undefined;
-
-  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 readEntry(entry, zipFile).then((v) => (originSource = v));
-      }
-    }
-  });
-
-  if (!originSource) {
-    throw new Error(t('bundleFileNotFound'));
-  }
-
-  const copies = {};
-
-  const zipfile = new YazlZipFile();
-
-  const writePromise = new Promise((resolve, reject) => {
-    zipfile.outputStream.on('error', (err) => {
-      throw err;
-    });
-    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', () => {
-      resolve(void 0);
-    });
-  });
-
-  await enumZipEntries(next, (entry, nextZipfile) => {
-    if (/\/$/.test(entry.fileName)) {
-      // Directory
-      zipfile.addEmptyDirectory(entry.fileName);
-    } else if (isPPKBundleFileName(entry.fileName)) {
-      //console.log('Found bundle');
-      return readEntry(entry, nextZipfile).then((newSource) => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(
-          diff(originSource, newSource),
-          `${entry.fileName}.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, (err, readStream) => {
-          if (err) {
-            return reject(err);
-          }
-          zipfile.addReadStream(readStream, entry.fileName);
-          readStream.on('end', () => {
-            //console.log('add finished');
-            resolve(void 0);
-          });
-        });
-      });
-    }
-  });
-
-  zipfile.addBuffer(Buffer.from(JSON.stringify({ copies })), '__diff.json');
-  zipfile.end();
-  await writePromise;
-}
-
-export async function enumZipEntries(
-  zipFn: string,
-  callback: (
-    entry: Entry,
-    zipFile: YauzlZipFile,
-    nestedPath?: string,
-  ) => Promise<any>,
-  nestedPath = '',
-) {
-  return new Promise((resolve, reject) => {
-    openZipFile(
-      zipFn,
-      { lazyEntries: true },
-      async (err: any, zipfile: YauzlZipFile) => {
-        if (err) {
-          return reject(err);
-        }
-
-        zipfile.on('end', resolve);
-        zipfile.on('error', reject);
-        zipfile.on('entry', async (entry) => {
-          const fullPath = nestedPath + entry.fileName;
-
-          try {
-            if (
-              !entry.fileName.endsWith('/') &&
-              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(void 0));
-                  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(t('processingError', { error }));
-          }
-
-          zipfile.readEntry();
-        });
-
-        zipfile.readEntry();
-      },
-    );
-  });
-}
-
-function diffArgsCheck(args: string[], options: any, diffFn: string) {
-  const [origin, next] = args;
-
-  if (!origin || !next) {
-    console.error(t('usageDiff', { command: diffFn }));
-    process.exit(1);
-  }
-
-  if (diffFn.startsWith('hdiff')) {
-    if (!hdiff) {
-      console.error(t('nodeHdiffpatchRequired', { scriptName }));
-      process.exit(1);
-    }
-    diff = hdiff;
-  } else {
-    if (!bsdiff) {
-      console.error(t('nodeBsdiffRequired', { scriptName }));
-      process.exit(1);
-    }
-    diff = bsdiff;
-  }
-  const { output } = translateOptions({
-    ...options,
-    tempDir,
-  });
-
-  return {
-    origin,
-    next,
-    realOutput: output.replace(/\$\{time\}/g, `${Date.now()}`),
-  };
-}
-
 export const bundleCommands = {
   bundle: async ({ options }) => {
     const platform = await getPlatform(options.platform);
@@ -1001,110 +625,4 @@ export const bundleCommands = {
       }
     }
   },
-
-  async diff({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(args, options, 'diff');
-
-    await diffFromPPK(origin, next, realOutput);
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
-
-  async hdiff({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(args, options, 'hdiff');
-
-    await diffFromPPK(origin, next, realOutput);
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
-
-  async diffFromApk({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'diffFromApk',
-    );
-
-    await diffFromPackage(
-      origin,
-      next,
-      realOutput,
-      'assets/index.android.bundle',
-    );
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
-
-  async hdiffFromApk({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'hdiffFromApk',
-    );
-
-    await diffFromPackage(
-      origin,
-      next,
-      realOutput,
-      'assets/index.android.bundle',
-    );
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
-
-  async diffFromApp({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'diffFromApp',
-    );
-    await diffFromPackage(
-      origin,
-      next,
-      realOutput,
-      'resources/rawfile/bundle.harmony.js',
-    );
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
-
-  async hdiffFromApp({ args, options }) {
-    const { origin, next, realOutput } = diffArgsCheck(
-      args,
-      options,
-      'hdiffFromApp',
-    );
-    await diffFromPackage(
-      origin,
-      next,
-      realOutput,
-      'resources/rawfile/bundle.harmony.js',
-    );
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
-
-  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?.[1];
-    });
-
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
-
-  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?.[1];
-    });
-
-    console.log(t('diffPackageGenerated', { output: realOutput }));
-  },
 };