Added the correct exception handling of the Android package manager, made the deletion of the installation file mandatory, despite the installation result, by placing it in the finally block. (#403)

Signed-off-by: Кинчаров Данил <[email protected]>

Signed-off-by: Кинчаров Данил <[email protected]>

Author: DonVietnam

src/adb/DeviceClient.ts

@@ -331,7 +331,7 @@ export default class DeviceClient {
 
      * @param port The port number to connect to.
      * @param host Optional. The host to connect to. Allegedly this is supposed to establish a connection to the given host from the device, but we have not been able to get it to work at all. Skip the host and everything works great.
-     * 
+     *
      * @returns The TCP connection (i.e. [`net.Socket`][node-net]). Read and write as you please. Call `conn.end()` to end the connection.
      */
   public openTcp(port: number, host?: string): Bluebird<Duplex> {
@@ -453,8 +453,9 @@ export default class DeviceClient {
     return this.transport().then((transport) => {
       return new InstallCommand(transport)
         .execute(apk)
-        .then(() => this.shell(['rm', '-f', apk]))
-        .then((stream) => new Parser(stream).readAll())
+        .finally(() => {
+          return this.shell(['rm', '-f', apk]).then((stream) => new Parser(stream).readAll());
+        })
         .then(() => true);
     });
   }
@@ -525,7 +526,7 @@ export default class DeviceClient {
      * Retrieves information about the given path.
      *
      * @param path The path.
-     * 
+     *
      * @returns An [`fs.Stats`][node-fs-stats] instance. While the `stats.is*` methods are available, only the following properties are supported:
         -   **mode** The raw mode.
         -   **size** The file size.

src/adb/command/host-transport/install.ts

@@ -2,28 +2,38 @@ import Protocol from '../../protocol';
 import Command from '../../command';
 import Bluebird from 'bluebird';
 
+const OKAY_OUTPUT_REGEXP = /^(Success|Failure \[(.*?)\]|Exception)(.*)$/;
+const INSTALL_EXCEPTION_CODE = 'INSTALL_EXCEPTION';
+
+class InstallError extends Error {
+  code: string;
+  constructor(message: string, code: string) {
+    super(message);
+    this.code = code;
+  }
+}
+
 export default class InstallCommand extends Command<boolean> {
   execute(apk: string): Bluebird<boolean> {
     this._send(`shell:pm install -r ${this._escapeCompat(apk)}`);
     return this.parser.readAscii(4).then((reply) => {
       switch (reply) {
         case Protocol.OKAY:
           return this.parser
-            .searchLine(/^(Success|Failure \[(.*?)\])$/)
-            .then(function (match) {
-              let code, err;
+            .searchLine(OKAY_OUTPUT_REGEXP)
+            .then((match) => {
               if (match[1] === 'Success') {
                 return true;
+              } else if (match[1] === 'Exception') {
+                return this.parser.readLine().then((buffer: Buffer) => {
+                  throw new InstallError(buffer.toString(), INSTALL_EXCEPTION_CODE);
+                });
               } else {
-                code = match[2];
-                err = new Error(`${apk} could not be installed [${code}]`);
-                err.code = code;
-                throw err;
+                const code = match[2];
+                throw new InstallError(`${apk} could not be installed [${code}]`, code);
               }
             })
             .finally(() => {
-              // Consume all remaining content to "naturally" close the
-              // connection.
               return this.parser.readAll();
             });
         case Protocol.FAIL: