gh-pages: Add method to share connection status

bundle.js

@@ -1,4 +1,5 @@
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+(function (Buffer){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -141,8 +142,16 @@ var LedgerBridge = function () {
     }, {
         key: 'makeApp',
         value: async function makeApp() {
+            var _this3 = this;
+
             var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
+            // It's possible that a connection to the device could already exist
+            // at the time a user tries to sign; in that case, simply bail!
+            if (this.transport) {
+                return Promise.resolve(true);
+            }
+
             try {
                 if (this.transportType === 'ledgerLive') {
                     var reestablish = false;
@@ -170,6 +179,36 @@ var LedgerBridge = function () {
                     this.transport = await _hwTransportU2f2.default.create();
                     this.app = new _hwAppEth2.default(this.transport);
                 }
+
+                // Ensure the correct (Ethereum) app is open; if not, immediately kill
+                // the connection as the wrong app is open and switching apps will call
+                // a disconnect from within the Ledger API
+                try {
+                    var sampleSendResult = await this.transport.send(0xb0, 0x01, 0x00, 0x00);
+                    var bufferResult = Buffer.from(sampleSendResult).toString();
+                    // Ensures the correct app is open
+                    if (bufferResult.includes('Ethereum')) {
+                        // Ensure the device is unlocked by requesting an account
+                        // An error of `6b0c` will throw if locked
+                        var _ref = await this.app.getAddress('44\'/60\'/0\'/0', false, true),
+                            address = _ref.address;
+
+                        if (address) {
+                            this.sendConnectionMessage(true);
+
+                            this.transport.on('disconnect', function (event) {
+                                _this3.onDisconnect();
+                            });
+                        } else {
+                            this.onDisconnect();
+                        }
+                    }
+                } catch (e) {
+                    console.log('LEDGER:::Transport check error', e);
+                    this.sendConnectionMessage(false);
+                    this.onDisconnect();
+                    throw e;
+                }
             } catch (e) {
                 console.log('LEDGER:::CREATE APP ERROR', e);
                 throw e;
@@ -224,7 +263,7 @@ var LedgerBridge = function () {
                 });
             } finally {
                 if (this.transportType !== 'ledgerLive') {
-                    this.cleanUp();
+                    // await this.cleanUp()
                 }
             }
         }
@@ -250,7 +289,7 @@ var LedgerBridge = function () {
                 });
             } finally {
                 if (this.transportType !== 'ledgerLive') {
-                    this.cleanUp();
+                    await this.cleanUp();
                 }
             }
         }
@@ -277,7 +316,7 @@ var LedgerBridge = function () {
                 });
             } finally {
                 if (this.transportType !== 'ledgerLive') {
-                    this.cleanUp();
+                    await this.cleanUp();
                 }
             }
         }
@@ -303,9 +342,24 @@ var LedgerBridge = function () {
                     messageId: messageId
                 });
             } finally {
-                this.cleanUp();
+                await this.cleanUp();
             }
         }
+    }, {
+        key: 'onDisconnect',
+        value: function onDisconnect() {
+            this.cleanUp();
+            this.sendConnectionMessage(false);
+        }
+    }, {
+        key: 'sendConnectionMessage',
+        value: function sendConnectionMessage(connected) {
+            this.sendMessageToExtension({
+                action: 'ledger-connection-change',
+                success: true,
+                payload: { connected: connected }
+            });
+        }
     }, {
         key: 'ledgerErrToMessage',
         value: function ledgerErrToMessage(err) {
@@ -358,6 +412,7 @@ var LedgerBridge = function () {
 
 exports.default = LedgerBridge;
 
+}).call(this,require("buffer").Buffer)
 },{"@ledgerhq/hw-app-eth":125,"@ledgerhq/hw-transport-http/lib/WebSocketTransport":161,"@ledgerhq/hw-transport-u2f":165,"@ledgerhq/hw-transport-webhid":166,"buffer":226}],2:[function(require,module,exports){
 'use strict';
 
@@ -367,9 +422,7 @@ var _ledgerBridge2 = _interopRequireDefault(_ledgerBridge);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-(async function () {
-    var bridge = new _ledgerBridge2.default();
-})();
+new _ledgerBridge2.default();
 console.log('MetaMask < = > Ledger Bridge initialized from ' + window.location + '!');
 
 },{"./ledger-bridge":1}],3:[function(require,module,exports){

ledger-bridge.js

@@ -80,15 +80,15 @@ export default class LedgerBridge {
 
     async attemptMakeApp (replyAction, messageId) {
         try {
-            await this.makeApp({ openOnly: true });
-            await this.cleanUp();
+            await this.makeApp({ openOnly: true })
+            await this.cleanUp()
             this.sendMessageToExtension({
                 action: replyAction,
                 success: true,
                 messageId,
             })
         } catch (error) {
-            await this.cleanUp();
+            await this.cleanUp()
             this.sendMessageToExtension({
                 action: replyAction,
                 success: false,
@@ -99,15 +99,21 @@ export default class LedgerBridge {
     }
 
     async makeApp (config = {}) {
+        // It's possible that a connection to the device could already exist
+        // at the time a user tries to sign; in that case, simply bail!
+        if(this.transport) {
+            return Promise.resolve(true);
+        }
+
         try {
             if (this.transportType === 'ledgerLive') {
-                let reestablish = false;
+                let reestablish = false
                 try {
                     await WebSocketTransport.check(BRIDGE_URL)
                 } catch (_err) {
                     window.open('ledgerlive://bridge?appName=Ethereum')
                     await this.checkTransportLoop()
-                    reestablish = true;
+                    reestablish = true
                 }
                 if (!this.app || reestablish) {
                     this.transport = await WebSocketTransport.open(BRIDGE_URL)
@@ -118,7 +124,7 @@ export default class LedgerBridge {
                 const nameOfDeviceType = device && device.constructor.name
                 const deviceIsOpen = device && device.opened
                 if (this.app && nameOfDeviceType === 'HIDDevice' && deviceIsOpen) {
-                    return;
+                    return
                 }
                 this.transport = config.openOnly
                 ? await TransportWebHID.openConnected()
@@ -128,6 +134,36 @@ export default class LedgerBridge {
                 this.transport = await TransportU2F.create()
                 this.app = new LedgerEth(this.transport)
             }
+
+            // Ensure the correct (Ethereum) app is open; if not, immediately kill
+            // the connection as the wrong app is open and switching apps will call
+            // a disconnect from within the Ledger API
+            try {
+                const sampleSendResult = await this.transport.send(0xb0, 0x01, 0x00, 0x00)
+                const bufferResult = Buffer.from(sampleSendResult).toString()
+                // Ensures the correct app is open
+                if(bufferResult.includes('Ethereum')) {
+                    // Ensure the device is unlocked by requesting an account
+                    // An error of `6b0c` will throw if locked
+                    const { address } = await this.app.getAddress(`44'/60'/0'/0`, false, true)
+                    if (address) {
+                        this.sendConnectionMessage(true)
+
+                        this.transport.on('disconnect', (event) => {
+                            this.onDisconnect()
+                        })
+                    }
+                    else {
+                        this.onDisconnect()
+                    }
+                }
+            }
+            catch(e) {
+                console.log('LEDGER:::Transport check error', e)
+                this.sendConnectionMessage(false)
+                this.onDisconnect()
+                throw e
+            }
         } catch (e) {
             console.log('LEDGER:::CREATE APP ERROR', e)
             throw e
@@ -179,7 +215,7 @@ export default class LedgerBridge {
             })
         } finally {
             if (this.transportType !== 'ledgerLive') {
-                this.cleanUp()
+                // await this.cleanUp()
             }
         }
     }
@@ -206,7 +242,7 @@ export default class LedgerBridge {
 
         } finally {
             if (this.transportType !== 'ledgerLive') {
-                this.cleanUp()
+                await this.cleanUp()
             }
         }
     }
@@ -233,7 +269,7 @@ export default class LedgerBridge {
 
         } finally {
             if (this.transportType !== 'ledgerLive') {
-                this.cleanUp()
+                await this.cleanUp()
             }
         }
     }
@@ -259,10 +295,23 @@ export default class LedgerBridge {
             })
 
         } finally {
-            this.cleanUp()
+            await this.cleanUp()
         }
     }
 
+    onDisconnect() {
+        this.cleanUp()
+        this.sendConnectionMessage(false)
+    }
+
+    sendConnectionMessage(connected) {
+        this.sendMessageToExtension({
+            action: 'ledger-connection-change',
+            success: true,
+            payload: { connected }
+        })
+    }
+
     ledgerErrToMessage (err) {
         const isU2FError = (err) => !!err && !!(err).metaData
         const isStringError = (err) => typeof err === 'string'

main.js

@@ -1,7 +1,5 @@
 'use strict'
 import LedgerBridge from './ledger-bridge'
 
-(async () => {
-    const bridge = new LedgerBridge()
-})()
+new LedgerBridge()
 console.log(`MetaMask < = > Ledger Bridge initialized from ${window.location}!`)