disconnect native host

Author: samuelmaddock

packages/electron-chrome-extensions/src/browser/api/lib/native-messaging-host.ts

@@ -56,13 +56,14 @@ export class NativeMessagingHost {
   }
 
   destroy() {
+    if (!this.connected) return
     this.connected = false
     if (this.process) {
-      this.process.disconnect()
+      this.process.kill()
       this.process = undefined
     }
     this.sender.ipc.off(`crx-native-msg-${this.connectionId}`, this.receiveExtensionMessage)
-    // TODO: send disconnect
+    this.sender.send(`crx-native-msg-${this.connectionId}-disconnect`)
   }
 
   private async launch(application: string, extensionId: string) {
@@ -83,8 +84,14 @@ export class NativeMessagingHost {
     this.process.stderr!.on('data', (data) => {
       d('stderr: %s', data.toString())
     })
-    this.process.on('error', (err) => d('error: %s', err))
-    this.process.on('exit', (code) => d('exited %d', code))
+    this.process.on('error', (err) => {
+      d('error: %s', err)
+      this.destroy()
+    })
+    this.process.on('exit', (code) => {
+      d('exited %d', code)
+      this.destroy()
+    })
 
     this.connected = true
 

packages/electron-chrome-extensions/src/renderer/index.ts

@@ -56,14 +56,20 @@ export const injectExtensionAPIs = () => {
     extensionId: string,
     application: string,
     receive: (message: any) => void,
+    disconnect: () => void,
     callback: ConnectNativeCallback,
   ) => {
     const connectionId = (contextBridge as any).executeInMainWorld({
       func: () => crypto.randomUUID(),
     })
     invokeExtension(extensionId, 'runtime.connectNative', {}, connectionId, application)
-    ipcRenderer.on(`crx-native-msg-${connectionId}`, (_event, message) => {
+    const onMessage = (_event: Electron.IpcRendererEvent, message: any) => {
       receive(message)
+    }
+    ipcRenderer.on(`crx-native-msg-${connectionId}`, onMessage)
+    ipcRenderer.once(`crx-native-msg-${connectNative}-disconnect`, () => {
+      ipcRenderer.off(`crx-native-msg-${connectionId}`, onMessage)
+      disconnect()
     })
     const send = (message: any) => {
       ipcRenderer.send(`crx-native-msg-${connectionId}`, message)
@@ -182,39 +188,43 @@ export const injectExtensionAPIs = () => {
 
     class NativePort implements chrome.runtime.Port {
       private connectionId: string = ''
+      private connected = false
       private pending: any[] = []
 
-      name: string = 'NativePort'
+      name: string = ''
 
-      _init(connectionId: string, send: (message: any) => void) {
+      _init = (connectionId: string, send: (message: any) => void) => {
+        this.connected = true
         this.connectionId = connectionId
         this._send = send
 
-        this.pending.forEach((msg) => {
-          console.log('sending pending', JSON.stringify(msg))
-          this.postMessage(msg)
-        })
+        this.pending.forEach((msg) => this.postMessage(msg))
         this.pending = []
 
-        console.log('***NativePort._init')
+        Object.defineProperty(this, '_init', { value: undefined })
       }
 
       _send(message: any) {
         this.pending.push(message)
       }
 
       _receive(message: any) {
-        console.log('NativePort received', JSON.stringify(message))
         ;(this.onMessage as any)._emit(message)
       }
 
+      _disconnect() {
+        this.disconnect()
+      }
+
       postMessage(message: any) {
-        console.log('***NativePort.postMessage', JSON.stringify(message))
         this._send(message)
       }
       disconnect() {
-        electron.disconnectNative(extensionId, this.connectionId)
-        ;(this.onDisconnect as any)._emit()
+        if (this.connected) {
+          electron.disconnectNative(extensionId, this.connectionId)
+          ;(this.onDisconnect as any)._emit()
+          this.connected = false
+        }
       }
       onMessage: chrome.runtime.PortMessageEvent = new Event() as any
       onDisconnect: chrome.runtime.PortDisconnectEvent = new Event() as any
@@ -499,10 +509,11 @@ export const injectExtensionAPIs = () => {
             connectNative: (application: string) => {
               const port = new NativePort()
               const receive = port._receive.bind(port)
+              const disconnect = port._disconnect.bind(port)
               const callback: ConnectNativeCallback = (connectionId, send) => {
                 port._init(connectionId, send)
               }
-              electron.connectNative(extensionId, application, receive, callback)
+              electron.connectNative(extensionId, application, receive, disconnect, callback)
               return port
             },
             openOptionsPage: invokeExtension('runtime.openOptionsPage'),