apk-mitm - npm Package Compare versions

Comparing version 0.7.1 to 0.8.0

dist/cli.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.showArmWarning = void 0;
 const path_1 = __importDefault(require("path"));
@@ -69,5 +82,14 @@ const yargs_parser_1 = __importDefault(require("yargs-parser"));
     }).catch((error) => {
-        console.error(chalk_1.default `\n  {red.inverse.bold  Failed! } An error occurred:\n\n`, error.toString());
-        if (error.stderr)
-            console.error('\n', error.stderr);
+        const message = (error.all || (error.toString().replace(/^Error: /, '')))
+            // Replace mentions of the (sometimes very long) temporary directory path
+            .replace(new RegExp(tmpDir, 'g'), chalk_1.default `{bold <tmp_dir>}`)
+            // Highlight (usually relevant) warning lines in Apktool output
+            .replace(/^W: .+$/gm, line => chalk_1.default `{yellow ${line}}`)
+            // De-emphasize Apktool info lines
+            .replace(/^I: .+$/gm, line => chalk_1.default `{dim ${line}}`)
+            // De-emphasize (not very helpful) Apktool "could not exec" error message
+            .replace(/^.+brut\.common\.BrutException: could not exec.+$/gm, line => chalk_1.default `{dim ${line}}`);
+        console.error(chalk_1.default `\n  {red.inverse.bold  Failed! } An error occurred:\n\n${message}`);
+        if (process.arch.startsWith('arm'))
+            showArmWarning();
         process.exit(1);
@@ -98,2 +120,13 @@ });
 }
+function showArmWarning() {
+    console.log(chalk_1.default `{yellow
+  {inverse.bold  NOTE }
+
+  {bold apk-mitm} doesn't officially support ARM-based devices (like Raspberry Pi's)
+  at the moment, so the error above might be a result of that. Please try
+  patching this APK on a device with a more common CPU architecture like x64
+  before reporting an issue.
+  }`);
+}
+exports.showArmWarning = showArmWarning;
 main();

dist/patch-apk.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
@@ -13,2 +25,3 @@ };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.showAppBundleWarning = void 0;
 const path = __importStar(require("path"));
@@ -15,0 +28,0 @@ const fs = __importStar(require("./utils/fs"));

dist/patch-app-bundle.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
@@ -13,2 +25,3 @@ };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchApksBundle = exports.patchXapkBundle = void 0;
 const cross_zip_1 = require("@tybys/cross-zip");
@@ -15,0 +28,0 @@ const rxjs_1 = require("rxjs");

dist/tasks/disable-certificate-pinning.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
@@ -8,0 +20,0 @@ };

dist/tasks/modify-manifest.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
@@ -8,0 +20,0 @@ };

dist/tasks/modify-netsec-config.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
@@ -8,0 +20,0 @@ };

dist/utils/download-tool.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCachedPath = void 0;
 const fs = __importStar(require("fs"));
@@ -11,0 +24,0 @@ const fs_1 = require("fs");

dist/utils/execute-jar.js

@@ -6,6 +6,10 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeJar = void 0;
 const execa_1 = __importDefault(require("execa"));
 function executeJar(path, args) {
-    return execa_1.default('java', ['-jar', path, ...args]);
+    return execa_1.default('java', ['-jar', path, ...args], {
+        // Necessary for showing both stdout and stderr in error output
+        all: true,
+    });
 }
 exports.executeJar = executeJar;

dist/utils/fs.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mkdir = exports.rename = exports.unlink = exports.exists = exports.copyFile = exports.writeFile = exports.readFile = void 0;
 const fs = __importStar(require("fs"));
@@ -11,0 +24,0 @@ const fs_1 = require("fs");

package.json

@@ -13,3 +13,3 @@ {
   ],
-  "version": "0.7.1",
+  "version": "0.8.0",
   "license": "MIT",
@@ -32,9 +32,9 @@ "scripts": {
     "@tybys/cross-zip": "^3.0.4",
-    "chalk": "^4.0.0",
+    "chalk": "^4.1.0",
     "env-paths": "^2.2.0",
-    "execa": "^4.0.0",
-    "follow-redirects": "^1.11.0",
-    "globby": "^11.0.0",
+    "execa": "^4.0.2",
+    "follow-redirects": "^1.12.1",
+    "globby": "^11.0.1",
     "listr": "^0.14.3",
-    "replace-string": "^3.0.0",
+    "replace-string": "^3.1.0",
     "rxjs": "^6.5.5",
@@ -50,4 +50,4 @@ "tempy": "^0.5.0",
     "@types/yargs-parser": "^15.0.0",
-    "typescript": "^3.8.3"
+    "typescript": "^3.9.5"
   }
 }

No alert changes

Improved metrics

Total package byte prevSize

43178

increased by16.43%

Lines of code

831

increased by17.54%

Dependency changes

• Updatedchalk@^4.1.0

• Updatedexeca@^4.0.2

• Updatedfollow-redirects@^1.12.1

• Updatedglobby@^11.0.1

• Updatedreplace-string@^3.1.0