react-native-update-cli 2.4.2 → 2.6.0

package/lib/utils/app-info-parser/zip.js

@@ -1,16 +1,25 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "Zip", {
+    enumerable: true,
+    get: function() {
+        return Zip;
+    }
+});
+const _utils = require("./utils");
 const Unzip = require('isomorphic-unzip');
-const { isBrowser, decodeNullUnicode } = require('./utils');
-const { enumZipEntries, readEntry } = require('../../bundle');
+let bundleZipUtils;
 class Zip {
     /**
    * get entries by regexps, the return format is: { <filename>: <Buffer|Blob> }
    * @param {Array} regexps // regexps for matching files
    * @param {String} type // return type, can be buffer or blob, default buffer
    */ getEntries(regexps, type = 'buffer') {
-        regexps = regexps.map((regex)=>decodeNullUnicode(regex));
+        const decoded = regexps.map((regex)=>(0, _utils.decodeNullUnicode)(regex));
         return new Promise((resolve, reject)=>{
-            this.unzip.getBuffer(regexps, {
+            this.unzip.getBuffer(decoded, {
                 type
             }, (err, buffers)=>{
                 err ? reject(err) : resolve(buffers);
@@ -22,24 +31,26 @@ class Zip {
    * @param {Regex} regex // regex for matching file
    * @param {String} type // return type, can be buffer or blob, default buffer
    */ getEntry(regex, type = 'buffer') {
-        regex = decodeNullUnicode(regex);
+        const decoded = (0, _utils.decodeNullUnicode)(regex);
         return new Promise((resolve, reject)=>{
             this.unzip.getBuffer([
-                regex
+                decoded
             ], {
                 type
             }, (err, buffers)=>{
-                // console.log(buffers);
-                err ? reject(err) : resolve(buffers[regex]);
+                err ? reject(err) : resolve(buffers[decoded]);
             });
         });
     }
     async getEntryFromHarmonyApp(regex) {
         try {
+            const { enumZipEntries, readEntry } = bundleZipUtils != null ? bundleZipUtils : bundleZipUtils = require('../../bundle');
             let originSource;
             await enumZipEntries(this.file, (entry, zipFile)=>{
                 if (regex.test(entry.fileName)) {
-                    return readEntry(entry, zipFile).then((v)=>originSource = v);
+                    return readEntry(entry, zipFile).then((value)=>{
+                        originSource = value;
+                    });
                 }
             });
             return originSource;
@@ -48,7 +59,7 @@ class Zip {
         }
     }
     constructor(file){
-        if (isBrowser()) {
+        if ((0, _utils.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.');
             }
@@ -62,4 +73,3 @@ class Zip {
         this.unzip = new Unzip(this.file);
     }
 }
-module.exports = Zip;

package/lib/utils/http-helper.js

@@ -22,8 +22,8 @@ _export(exports, {
         return testUrls;
     }
 });
-const _constants = require("./constants");
 const _nodefetch = /*#__PURE__*/ _interop_require_default(require("node-fetch"));
+const _constants = require("./constants");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj

package/lib/utils/index.js

@@ -12,6 +12,9 @@ _export(exports, {
     checkPlugins: function() {
         return _checkplugin.checkPlugins;
     },
+    getAabInfo: function() {
+        return getAabInfo;
+    },
     getApkInfo: function() {
         return getApkInfo;
     },
@@ -169,6 +172,140 @@ async function getIpaInfo(fn) {
         ...appCredential
     };
 }
+async function getAabInfo(fn) {
+    const protobuf = require('protobufjs');
+    const root = await protobuf.load(_path.default.join(__dirname, '../../proto/Resources.proto'));
+    const XmlNode = root.lookupType('aapt.pb.XmlNode');
+    const buffer = await readZipEntry(fn, 'base/manifest/AndroidManifest.xml');
+    const message = XmlNode.decode(buffer);
+    const object = XmlNode.toObject(message, {
+        enums: String,
+        longs: String,
+        bytes: String,
+        defaults: true,
+        arrays: true
+    });
+    const manifestElement = object.element;
+    if (manifestElement.name !== 'manifest') {
+        throw new Error('Invalid manifest');
+    }
+    let versionName = '';
+    for (const attr of manifestElement.attribute){
+        if (attr.name === 'versionName') {
+            versionName = attr.value;
+        }
+    }
+    let buildTime = 0;
+    const appCredential = {};
+    // Find application node
+    const applicationNode = manifestElement.child.find((c)=>c.element && c.element.name === 'application');
+    if (applicationNode) {
+        const metaDataNodes = applicationNode.element.child.filter((c)=>c.element && c.element.name === 'meta-data');
+        for (const meta of metaDataNodes){
+            let name = '';
+            let value = '';
+            let resourceId = 0;
+            for (const attr of meta.element.attribute){
+                if (attr.name === 'name') {
+                    name = attr.value;
+                }
+                if (attr.name === 'value') {
+                    var _attr_compiledItem_ref, _attr_compiledItem, _attr_compiledItem_prim, _attr_compiledItem1;
+                    value = attr.value;
+                    if ((_attr_compiledItem = attr.compiledItem) == null ? void 0 : (_attr_compiledItem_ref = _attr_compiledItem.ref) == null ? void 0 : _attr_compiledItem_ref.id) {
+                        resourceId = attr.compiledItem.ref.id;
+                    } else if ((_attr_compiledItem1 = attr.compiledItem) == null ? void 0 : (_attr_compiledItem_prim = _attr_compiledItem1.prim) == null ? void 0 : _attr_compiledItem_prim.intDecimalValue) {
+                        value = attr.compiledItem.prim.intDecimalValue.toString();
+                    }
+                }
+            }
+            if (name === 'pushy_build_time') {
+                if (resourceId > 0) {
+                    const resolvedValue = await resolveResource(fn, resourceId, root);
+                    if (resolvedValue) {
+                        value = resolvedValue;
+                    }
+                }
+                buildTime = Number(value);
+            }
+        }
+    }
+    if (buildTime === 0) {
+        throw new Error((0, _i18n.t)('buildTimeNotFound'));
+    }
+    return {
+        versionName,
+        buildTime,
+        ...appCredential
+    };
+}
+async function readZipEntry(fn, entryName) {
+    const yauzl = require('yauzl');
+    return new Promise((resolve, reject)=>{
+        yauzl.open(fn, {
+            lazyEntries: true
+        }, (err, zipfile)=>{
+            if (err) return reject(err);
+            let found = false;
+            zipfile.readEntry();
+            zipfile.on('entry', (entry)=>{
+                if (entry.fileName === entryName) {
+                    found = true;
+                    zipfile.openReadStream(entry, (err, readStream)=>{
+                        if (err) return reject(err);
+                        const chunks = [];
+                        readStream.on('data', (chunk)=>chunks.push(chunk));
+                        readStream.on('end', ()=>resolve(Buffer.concat(chunks)));
+                        readStream.on('error', reject);
+                    });
+                } else {
+                    zipfile.readEntry();
+                }
+            });
+            zipfile.on('end', ()=>{
+                if (!found) reject(new Error(`${entryName} not found in AAB`));
+            });
+            zipfile.on('error', reject);
+        });
+    });
+}
+async function resolveResource(fn, resourceId, root) {
+    const pkgId = resourceId >> 24 & 0xff;
+    const typeId = resourceId >> 16 & 0xff;
+    const entryId = resourceId & 0xffff;
+    try {
+        const buffer = await readZipEntry(fn, 'base/resources.pb');
+        const ResourceTable = root.lookupType('aapt.pb.ResourceTable');
+        const message = ResourceTable.decode(buffer);
+        const object = ResourceTable.toObject(message, {
+            enums: String,
+            longs: String,
+            bytes: String,
+            defaults: true,
+            arrays: true
+        });
+        // Find package
+        const pkg = object.package.find((p)=>p.packageId === pkgId);
+        if (!pkg) return null;
+        // Find type
+        const type = pkg.type.find((t)=>t.typeId === typeId);
+        if (!type) return null;
+        // Find entry
+        const entry = type.entry.find((e)=>e.entryId === entryId);
+        if (!entry) return null;
+        // Get value from configValue
+        if (entry.configValue && entry.configValue.length > 0) {
+            var _val_item;
+            const val = entry.configValue[0].value;
+            if ((_val_item = val.item) == null ? void 0 : _val_item.str) {
+                return val.item.str.value;
+            }
+        }
+    } catch (e) {
+        console.warn('Failed to resolve resource:', e);
+    }
+    return null;
+}
 const localDir = _path.default.resolve(_os.default.homedir(), _constants.tempDir);
 _fsextra.default.ensureDirSync(localDir);
 function saveToLocal(originPath, destName) {

package/lib/versions.js

@@ -287,5 +287,27 @@ const versionCommands = {
         if (options.metaInfo) updateParams.metaInfo = options.metaInfo;
         await (0, _api.put)(`/app/${appId}/version/${versionId}`, updateParams);
         console.log((0, _i18n.t)('operationSuccess'));
+    },
+    deleteVersion: async ({ options })=>{
+        let appId = options.appId;
+        if (!appId) {
+            const platform = await (0, _app.getPlatform)(options.platform);
+            appId = (await (0, _app.getSelectedApp)(platform)).appId;
+        }
+        let versionId = options.versionId;
+        if (!versionId) {
+            versionId = (await chooseVersion(appId)).id;
+        }
+        try {
+            await (0, _api.doDelete)(`/app/${appId}/version/${versionId}`);
+            console.log((0, _i18n.t)('deleteVersionSuccess', {
+                versionId
+            }));
+        } catch (error) {
+            throw new Error((0, _i18n.t)('deleteVersionError', {
+                versionId,
+                error: error.message
+            }));
+        }
     }
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.4.2",
+  "version": "2.6.0",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {
     "pushy": "lib/index.js",
     "cresc": "lib/index.js"
   },
-  "files": ["lib", "src", "cli.json"],
+  "files": ["lib", "src", "proto", "cli.json"],
   "scripts": {
     "build": "swc src -d lib --strip-leading-paths",
     "prepublishOnly": "npm run build && chmod +x lib/index.js",
@@ -45,6 +45,7 @@
     "plist": "^3.1.0",
     "progress": "^2.0.3",
     "properties": "^1.2.1",
+    "protobufjs": "^7.5.4",
     "read": "^4.1.0",
     "registry-auth-token": "^5.1.0",
     "semver": "^7.7.2",

package/proto/Configuration.proto

@@ -0,0 +1,183 @@
+syntax = "proto3";
+
+package aapt.pb;
+
+option java_package = "com.android.aapt";
+
+message Configuration {
+  enum LayoutDirection {
+    LAYOUT_DIRECTION_UNSET = 0;
+    LAYOUT_DIRECTION_LTR = 1;
+    LAYOUT_DIRECTION_RTL = 2;
+  }
+
+  enum ScreenLayoutSize {
+    SCREEN_LAYOUT_SIZE_UNSET = 0;
+    SCREEN_LAYOUT_SIZE_SMALL = 1;
+    SCREEN_LAYOUT_SIZE_NORMAL = 2;
+    SCREEN_LAYOUT_SIZE_LARGE = 3;
+    SCREEN_LAYOUT_SIZE_XLARGE = 4;
+  }
+
+  enum ScreenLayoutLong {
+    SCREEN_LAYOUT_LONG_UNSET = 0;
+    SCREEN_LAYOUT_LONG_LONG = 1;
+    SCREEN_LAYOUT_LONG_NOTLONG = 2;
+  }
+
+  enum ScreenRound {
+    SCREEN_ROUND_UNSET = 0;
+    SCREEN_ROUND_ROUND = 1;
+    SCREEN_ROUND_NOTROUND = 2;
+  }
+
+  enum WideColorGamut {
+    WIDE_COLOR_GAMUT_UNSET = 0;
+    WIDE_COLOR_GAMUT_WIDECG = 1;
+    WIDE_COLOR_GAMUT_NOWIDECG = 2;
+  }
+
+  enum Hdr {
+    HDR_UNSET = 0;
+    HDR_HIGHDR = 1;
+    HDR_LOWDR = 2;
+  }
+
+  enum Orientation {
+    ORIENTATION_UNSET = 0;
+    ORIENTATION_PORT = 1;
+    ORIENTATION_LAND = 2;
+    ORIENTATION_SQUARE = 3;
+  }
+
+  enum UiModeType {
+    UI_MODE_TYPE_UNSET = 0;
+    UI_MODE_TYPE_NORMAL = 1;
+    UI_MODE_TYPE_DESK = 2;
+    UI_MODE_TYPE_CAR = 3;
+    UI_MODE_TYPE_TELEVISION = 4;
+    UI_MODE_TYPE_APPLIANCE = 5;
+    UI_MODE_TYPE_WATCH = 6;
+    UI_MODE_TYPE_VR_HEADSET = 7;
+  }
+
+  enum UiModeNight {
+    UI_MODE_NIGHT_UNSET = 0;
+    UI_MODE_NIGHT_NIGHT = 1;
+    UI_MODE_NIGHT_NOTNIGHT = 2;
+  }
+
+  enum Touchscreen {
+    TOUCHSCREEN_UNSET = 0;
+    TOUCHSCREEN_NOTOUCH = 1;
+    TOUCHSCREEN_STYLUS = 2;
+    TOUCHSCREEN_FINGER = 3;
+  }
+
+  enum KeysHidden {
+    KEYS_HIDDEN_UNSET = 0;
+    KEYS_HIDDEN_KEYSEXPOSED = 1;
+    KEYS_HIDDEN_KEYSHIDDEN = 2;
+    KEYS_HIDDEN_KEYSSOFT = 3;
+  }
+
+  enum Keyboard {
+    KEYBOARD_UNSET = 0;
+    KEYBOARD_NOKEYS = 1;
+    KEYBOARD_QWERTY = 2;
+    KEYBOARD_12KEY = 3;
+  }
+
+  enum NavHidden {
+    NAV_HIDDEN_UNSET = 0;
+    NAV_HIDDEN_NAVEXPOSED = 1;
+    NAV_HIDDEN_NAVHIDDEN = 2;
+  }
+
+  enum Navigation {
+    NAVIGATION_UNSET = 0;
+    NAVIGATION_NONAV = 1;
+    NAVIGATION_DPAD = 2;
+    NAVIGATION_TRACKBALL = 3;
+    NAVIGATION_WHEEL = 4;
+  }
+
+  enum GrammaticalGender {
+    GRAMMATICAL_GENDER_UNSET = 0;
+    GRAMMATICAL_GENDER_NEUTER = 1;
+    GRAMMATICAL_GENDER_FEMININE = 2;
+    GRAMMATICAL_GENDER_MASCULINE = 3;
+  }
+
+  // Mobile country code.
+  uint32 mcc = 1;
+
+  // Mobile network code.
+  uint32 mnc = 2;
+
+  // Locale.
+  string locale = 3;
+
+  // Layout direction.
+  LayoutDirection layout_direction = 4;
+
+  // Screen width in dp.
+  uint32 screen_width = 5;
+
+  // Screen height in dp.
+  uint32 screen_height = 6;
+
+  // Smallest screen width in dp.
+  uint32 smallest_screen_width = 7;
+
+  // Screen layout size.
+  ScreenLayoutSize screen_layout_size = 8;
+
+  // Screen layout long.
+  ScreenLayoutLong screen_layout_long = 9;
+
+  // Screen round.
+  ScreenRound screen_round = 10;
+
+  // Wide color gamut.
+  WideColorGamut wide_color_gamut = 11;
+
+  // HDR.
+  Hdr hdr = 12;
+
+  // Orientation.
+  Orientation orientation = 13;
+
+  // UI mode type.
+  UiModeType ui_mode_type = 14;
+
+  // UI mode night.
+  UiModeNight ui_mode_night = 15;
+
+  // Density in dpi.
+  uint32 density = 16;
+
+  // Touchscreen.
+  Touchscreen touchscreen = 17;
+
+  // Keys hidden.
+  KeysHidden keys_hidden = 18;
+
+  // Keyboard.
+  Keyboard keyboard = 19;
+
+  // Nav hidden.
+  NavHidden nav_hidden = 20;
+
+  // Navigation.
+  Navigation navigation = 21;
+
+  // SDK version.
+  uint32 sdk_version = 22;
+
+  // Product.
+  string product = 23;
+
+  // Grammatical gender.
+  GrammaticalGender grammatical_gender = 24;
+}