@devicefarmer/adbkit 2.11.3 → 3.2.2

package/dist/src/cli.js

@@ -0,0 +1,86 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 (k !== "default" && Object.prototype.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 });
+const fs_1 = __importDefault(require("fs"));
+const commander_1 = require("commander");
+const node_forge_1 = __importDefault(require("node-forge"));
+const pkg = __importStar(require("../package.json"));
+const adb_1 = __importDefault(require("./adb"));
+const auth_1 = __importDefault(require("./adb/auth"));
+const packetreader_1 = __importDefault(require("./adb/tcpusb/packetreader"));
+const bluebird_1 = __importDefault(require("bluebird"));
+const program = new commander_1.Command();
+program.version(pkg.version);
+program
+    .command('pubkey-convert <file>')
+    .option('-f, --format <format>', 'format (pem or openssh)', String, 'pem')
+    .description('Converts an ADB-generated public key into PEM format.')
+    .action(function (file, options) {
+    return auth_1.default.parsePublicKey(fs_1.default.readFileSync(file).toString('utf8')).then((key) => {
+        switch (options.format.toLowerCase()) {
+            case 'pem':
+                return console.log(node_forge_1.default.pki.publicKeyToPem(key).trim());
+            case 'openssh':
+                return console.log(node_forge_1.default.ssh.publicKeyToOpenSSH(key, 'adbkey').trim());
+            default:
+                console.error("Unsupported format '" + options.format + "'");
+                return process.exit(1);
+        }
+    });
+});
+program
+    .command('pubkey-fingerprint <file>')
+    .description('Outputs the fingerprint of an ADB-generated public key.')
+    .action(function (file) {
+    return auth_1.default.parsePublicKey(fs_1.default.readFileSync(file).toString('utf8')).then((key) => {
+        return console.log('%s %s', key.fingerprint, key.comment);
+    });
+});
+program
+    .command('usb-device-to-tcp <serial>')
+    .option('-p, --port <port>', 'port number', (value) => String(value), '6174')
+    .description('Provides an USB device over TCP using a translating proxy.')
+    .action((serial, options) => {
+    const adb = adb_1.default.createClient();
+    const server = adb
+        .createTcpUsbBridge(serial, {
+        auth: () => bluebird_1.default.resolve(),
+    })
+        .on('listening', () => console.info('Connect with `adb connect localhost:%d`', options.port))
+        .on('error', (err) => console.error('An error occured: ' + err.message));
+    server.listen(options.port);
+});
+program
+    .command('parse-tcp-packets <file>')
+    .description('Parses ADB TCP packets from the given file.')
+    .action((file) => {
+    const reader = new packetreader_1.default(fs_1.default.createReadStream(file));
+    reader.on('packet', (packet) => console.log(packet.toString()));
+});
+program.parse(process.argv);
+//# sourceMappingURL=cli.js.map

package/dist/src/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -0,0 +1,19 @@
+export { default as Adb } from './adb';
+export { Callback } from './Callback';
+export { ClientOptions } from './ClientOptions';
+export { CpuStats, Loads } from './CpuStats';
+export { default as Device } from './Device';
+export { default as DeviceWithPath } from './DeviceWithPath';
+export { default as ExtendedPublicKey } from './ExtendedPublicKey';
+export { Features } from './Features';
+export { default as Forward } from './Forward';
+export { default as FramebufferMeta } from './FramebufferMeta';
+export { default as FramebufferStreamWithMeta } from './FramebufferStreamWithMeta';
+export { Properties } from './Properties';
+export { default as Reverse } from './Reverse';
+export { default as SocketOptions } from './SocketOptions';
+export { default as StartActivityOptions } from './StartActivityOptions';
+export { default as StartServiceOptions, ExtraValue, ExtraObject, Extra } from './StartServiceOptions';
+export { default as TrackerChangeSet } from './TrackerChangeSet';
+export { default as WithToString } from './WithToString';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACvG,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/src/index.js

@@ -0,0 +1,12 @@
+"use strict";
+// export { default } from './adb';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Adb = void 0;
+var adb_1 = require("./adb");
+Object.defineProperty(exports, "Adb", { enumerable: true, get: function () { return __importDefault(adb_1).default; } });
+// export { default as Client } from './adb/client';
+// export { default as ShellCommand } from './adb/command/host-transport/shell';
+//# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,mCAAmC;;;;;;AAEnC,6BAAuC;AAA9B,2GAAA,OAAO,OAAO;AAmBvB,oDAAoD;AACpD,gFAAgF"}

package/package.json

@@ -1,62 +1,82 @@
 {
   "name": "@devicefarmer/adbkit",
-  "version": "2.11.3",
-  "description": "A pure Node.js client for the Android Debug Bridge.",
+  "version": "3.2.2",
+  "description": "A Typescript client for the Android Debug Bridge.",
   "keywords": [
     "adb",
     "adbkit",
     "android",
     "logcat",
+    "typescript",
     "monkey"
   ],
   "bin": {
     "adbkit": "./bin/adbkit"
   },
   "bugs": {
-    "url": "https://github.com/DeviceFarmer/adbkit/issues"
+    "url": "https://github.com/devicefarmer/adbkit/issues"
   },
   "license": "Apache-2.0",
   "author": {
     "name": "Device Farmer",
-    "email": "contact@openstf.io",
-    "url": "https://devicefarmer.github.io/"
+    "email": "contact@devicefarmer.com",
+    "url": "https://devicefarmer.com/"
   },
-  "main": "./index",
+  "contributors": [
+    {
+      "name": "uriel chemouni",
+      "email": "uchemouni@gmail.com",
+      "url": "https://urielch.github.io/urielch/"
+    }
+  ],
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/DeviceFarmer/adbkit.git"
+    "url": "https://github.com/devicefarmer/adbkit.git"
   },
   "scripts": {
-    "postpublish": "grunt clean",
-    "prepublish": "grunt test coffee",
-    "test": "grunt test"
+    "clean": "rimraf dist index.d.ts index.js",
+    "keycode": "node tasks/keycode.js",
+    "prepublish": "npm run clean && npm run compile && npm run test",
+    "compile": "tsc  -p .",
+    "compile2": "tsc -p tsconfig-dist.json",
+    "lint": "eslint   ./ --ext .ts",
+    "format": "eslint ./ --ext .ts --fix",
+    "testJS": "mocha --reporter spec --colors dist/test/**/*.js",
+    "test": "mocha -r ts-node/register --reporter spec --colors test/**/*.ts"
   },
   "dependencies": {
-    "@devicefarmer/adbkit-logcat": "^1.1.0",
-    "@devicefarmer/adbkit-monkey": "~1.0.1",
-    "bluebird": "~2.9.24",
-    "commander": "^2.3.0",
-    "debug": "~2.6.3",
-    "node-forge": "^0.10.0",
-    "split": "~0.3.3"
+    "@devicefarmer/adbkit-logcat": "^2.1.2",
+    "@devicefarmer/adbkit-monkey": "~1.2.0",
+    "bluebird": "~3.7",
+    "commander": "^9.1.0",
+    "debug": "~4.3.1",
+    "node-forge": "^1.3.1",
+    "split": "~1.0.1"
   },
   "devDependencies": {
-    "bench": "~0.3.5",
-    "chai": "~2.2.0",
-    "coffee-script": "~1.9.1",
-    "grunt": "~0.4.5",
-    "grunt-cli": "~0.1.13",
-    "grunt-coffeelint": "0.0.13",
-    "grunt-contrib-clean": "~0.6.0",
-    "grunt-contrib-coffee": "~0.13.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-exec": "~0.4.3",
-    "grunt-jsonlint": "~1.0.4",
-    "grunt-notify": "~0.4.1",
-    "mocha": "~2.2.1",
-    "sinon": "~1.14.1",
-    "sinon-chai": "~2.7.0",
-    "coffeelint": "~1.9.3"
+    "@types/debug": "^4.1.5",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^14.14.10",
+    "@types/sinon-chai": "^3.2.5",
+    "@types/bluebird": "^3.5.33",
+    "@types/node-forge": "^1.0.1",
+    "@typescript-eslint/eslint-plugin": "^4.9.1",
+    "@typescript-eslint/parser": "^4.9.1",
+    "bench": "~0.3.6",
+    "chai": "~4.3.0",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.0.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-progress": "0.0.1",
+    "mocha": "~8.3.1",
+    "prettier": "^2.2.1",
+    "rimraf": "^3.0.2",
+    "sinon": "~13.0.1",
+    "sinon-chai": "~3.7.0",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.1.3"
   },
   "engines": {
     "node": ">= 0.10.4"

package/.semaphore/publish.yml

@@ -1,19 +0,0 @@
-version: v1.0
-name: Publish
-blocks:
-  - name: Publish
-    task:
-      jobs:
-        - name: NPM publish
-          commands:
-            - checkout
-            - sem-version node 12
-            - cache restore
-            - npm install
-            - npm publish --access public
-      secrets:
-        - name: npmjs
-agent:
-  machine:
-    type: e1-standard-2
-    os_image: ubuntu1804

package/.semaphore/semaphore.yml

@@ -1,27 +0,0 @@
-version: v1.0
-name: NPM Test
-agent:
-  machine:
-    type: e1-standard-2
-    os_image: ubuntu1804
-blocks:
-  - name: Test
-    task:
-      jobs:
-        - name: Test
-          commands:
-            - checkout
-            - 'wget https://dl.google.com/android/repository/platform-tools-latest-linux.zip -O ~/platform-tools-latest-linux.zip'
-            - unzip ~/platform-tools-latest-linux.zip -d ~
-            - 'export PATH=$PATH:~/platform-tools'
-            - sem-version node 12
-            - cache restore
-            - npm install
-            - cache store
-            - npm run build --if-present
-            - npm test
-promotions:
-  - name: NPM publish
-    pipeline_file: publish.yml
-    auto_promote:
-      when: (branch = 'master' OR tag =~ '.*') AND result = 'passed'

package/index.js

@@ -1,4 +0,0 @@
-(function() {
-  module.exports = require('./lib/adb');
-
-}).call(this);

package/lib/adb/auth.js

@@ -1,78 +0,0 @@
-var Auth, BigInteger, Promise, forge;
-
-Promise = require('bluebird');
-
-forge = require('node-forge');
-
-BigInteger = forge.jsbn.BigInteger;
-
-
-/*
-The stucture of an ADB RSAPublicKey is as follows:
-
-    #define RSANUMBYTES 256           // 2048 bit key length
-    #define RSANUMWORDS (RSANUMBYTES / sizeof(uint32_t))
-
-    typedef struct RSAPublicKey {
-        int len;                  // Length of n[] in number of uint32_t
-        uint32_t n0inv;           // -1 / n[0] mod 2^32
-        uint32_t n[RSANUMWORDS];  // modulus as little endian array
-        uint32_t rr[RSANUMWORDS]; // R^2 as little endian array
-        int exponent;             // 3 or 65537
-    } RSAPublicKey;
- */
-
-Auth = (function() {
-  var RE, readPublicKeyFromStruct;
-
-  function Auth() {}
-
-  RE = /^((?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?)\0?( .*|)\s*$/;
-
-  readPublicKeyFromStruct = function(struct, comment) {
-    var e, key, len, md, n, offset;
-    if (!struct.length) {
-      throw new Error("Invalid public key");
-    }
-    offset = 0;
-    len = struct.readUInt32LE(offset) * 4;
-    offset += 4;
-    if (struct.length !== 4 + 4 + len + len + 4) {
-      throw new Error("Invalid public key");
-    }
-    offset += 4;
-    n = new Buffer(len);
-    struct.copy(n, 0, offset, offset + len);
-    [].reverse.call(n);
-    offset += len;
-    offset += len;
-    e = struct.readUInt32LE(offset);
-    if (!(e === 3 || e === 65537)) {
-      throw new Error("Invalid exponent " + e + ", only 3 and 65537 are supported");
-    }
-    key = forge.pki.setRsaPublicKey(new BigInteger(n.toString('hex'), 16), new BigInteger(e.toString(), 10));
-    md = forge.md.md5.create();
-    md.update(struct.toString('binary'));
-    key.fingerprint = md.digest().toHex().match(/../g).join(':');
-    key.comment = comment;
-    return key;
-  };
-
-  Auth.parsePublicKey = function(buffer) {
-    return new Promise(function(resolve, reject) {
-      var comment, match, struct;
-      if (match = RE.exec(buffer)) {
-        struct = new Buffer(match[1], 'base64');
-        comment = match[2].trim();
-        return resolve(readPublicKeyFromStruct(struct, comment));
-      } else {
-        return reject(new Error("Unrecognizable public key format"));
-      }
-    });
-  };
-
-  return Auth;
-
-})();
-
-module.exports = Auth;