feat(overmind-devtools): electron 8 with heartbeat

Author: christianalfoni

package-lock.json

@@ -30,9 +30,9 @@
     "axios": "0.19.0",
     "color": "3.0.0",
     "color-hash": "1.0.3",
-    "electron": "7.1.9",
-    "electron-json-storage": "4.1.0",
-    "electron-prompt": "1.3.1",
+    "electron": "^8.0.0",
+    "electron-json-storage": "^4.1.8",
+    "electron-prompt": "^1.5.1",
     "emotion": "9.2.12",
     "express": "4.16.3",
     "graphql": "14.5.8",

package.json

@@ -62,6 +62,13 @@ class DevtoolBackend {
     const parsedMessage = JSON.parse(message)
 
     switch (parsedMessage.type) {
+      case 'ping':
+        this.devtoolSocket.send(
+          JSON.stringify({
+            type: 'pong'
+          })
+        )
+        break
       case 'storage:get':
         this.evaluateDevtoolMessage(parsedMessage, () =>
           this.options.storage.get(parsedMessage.data.key)

packages/node_modules/overmind-devtools-client/DevtoolBackend.js

@@ -15,7 +15,11 @@ class WebsocketConnector {
   private socket: WebSocket
   private messagesBeforeConnected: Array<[string, any, any]> = []
   private isOpen = false
-
+  private schedulePing () {
+    setTimeout(() => {
+      this.send('ping')
+    }, 1000 * 30)
+  }
   public connect(
     port: string | number // TODO: return Promise so we can wait for it
   ) {
@@ -28,7 +32,11 @@ class WebsocketConnector {
       this.socket.onmessage = (message) => {
         const parsedMessage = JSON.parse(message.data)
 
-        this.emit(parsedMessage.type, parsedMessage.data)
+        if (parsedMessage.type === 'pong') {
+          this.schedulePing()
+        } else {
+          this.emit(parsedMessage.type, parsedMessage.data) 
+        }
       }
       this.socket.onopen = () => {
         resolve()
@@ -37,6 +45,7 @@ class WebsocketConnector {
           this.send(...message)
         })
         this.messagesBeforeConnected.length = 0
+        this.schedulePing()
       }
       this.socket.onclose = (reason) => {
         console.log("Socket closed", reason)
@@ -91,6 +100,7 @@ export class BackendConnector extends WebsocketConnector {
   onMessage = (onMessage: MessageCallback) => {
     this.on('message', (message) => {
       onMessage(message)
+      
     })
   }
   onDisconnect = (onDisconnect: (name: string) => void) => {

packages/node_modules/overmind-devtools-client/src/BackendConnector.ts

@@ -1,21 +1,22 @@
 import {
   Action,
-  pipe,
-  Operator,
   AsyncAction,
-  mutate,
+  Operator,
   debounce,
+  mutate,
+  pipe,
   wait,
 } from 'overmind'
+
+import * as o from './operators'
 import {
-  Message,
-  Tab,
-  ExecutionType,
   ActionsListItemType,
   Component,
+  ExecutionType,
+  Message,
+  Tab,
 } from './types'
-import * as o from './operators'
-import { isValidJson, createApp, getActionId } from './utils'
+import { createApp, getActionId, isValidJson } from './utils'
 
 export const onMessage: Operator<Message> = pipe(
   o.ensureCurrentApp(),

packages/node_modules/overmind-devtools-client/src/overmind/actions.ts

@@ -223,7 +223,7 @@ export enum ExecutionType {
 }
 
 export enum AppMessageType {
-  PORT_EXISTS = 'PORT_EXISTS',
+  PORT_EXISTS = 'PORT_EXISTS'
 }
 
 export type AppMessage<T> = {

packages/node_modules/overmind-devtools-client/src/overmind/types.ts

@@ -20,9 +20,9 @@
 	"dependencies": {
 		"color": "^3.0.0",
 		"color-hash": "^1.0.3",
-		"electron": "^7.1.9",
-		"electron-json-storage": "^4.1.0",
-		"electron-prompt": "^1.3.1",
+		"electron": "^8.0.0",
+		"electron-json-storage": "^4.1.8",
+		"electron-prompt": "^1.5.1",
 		"overmind-devtools-client": "next",
 		"ws": "^7.0.0"
 	},

packages/node_modules/overmind-devtools/package.json

@@ -17,13 +17,6 @@ function createWindow() {
     minWidth: 500,
   })
 
-  electron.protocol.registerFileProtocol('filestub', (request, callback) => {
-    const url = request.url.substr(10)    
-    const file = { path: path.normalize(`${path.join(__dirname, '..')}/${url}`) }
-
-    callback(file)
-  })
-
   const devtoolBackend = DevtoolBackend.create({
     onRelaunch() {
       app.relaunch()
@@ -78,6 +71,7 @@ function createWindow() {
           }
         )
     } else {
+      console.log("y0!")
       mainWindow.loadURL('http://localhost:8080')
       mainWindow.webContents.openDevTools()
     }
@@ -100,10 +94,7 @@ function createWindow() {
                     onPortSubmit,
                     onRestart
                   )
-                ),
-              {
-                baseURLForDataURL: `file://${path.resolve()}/devtoolsDist/`,
-              }
+                )
             )
           })
       })
@@ -168,22 +159,6 @@ function createWindow() {
   )
 
   startDevtoolBackend().then(openDevtools)
-
-  /*
-    BUG FIX: https://github.com/electron/electron/issues/13008#issuecomment-575909942
-  */
- let redirectURL = 'data:application/x-javascript;base64,UHJvZHVjdFJlZ2lzdHJ5SW1wbC5SZWdpc3RyeT1jbGFzc3tjb25zdHJ1Y3Rvcigpe31uYW1lRm9yVXJsKHIpe3JldHVybiBudWxsfWVudHJ5Rm9yVXJsKHIpe3JldHVybiBudWxsfXR5cGVGb3JVcmwocil7cmV0dXJuIG51bGx9fSxQcm9kdWN0UmVnaXN0cnlJbXBsLl9oYXNoRm9yRG9tYWluPWZ1bmN0aW9uKHIpe3JldHVybiIifSxQcm9kdWN0UmVnaXN0cnlJbXBsLnJlZ2lzdGVyPWZ1bmN0aW9uKHIsdCl7UHJvZHVjdFJlZ2lzdHJ5SW1wbC5fcHJvZHVjdHNCeURvbWFpbkhhc2g9bmV3IE1hcH0sUHJvZHVjdFJlZ2lzdHJ5SW1wbC5fcHJvZHVjdHNCeURvbWFpbkhhc2g9bmV3IE1hcCxQcm9kdWN0UmVnaXN0cnlJbXBsLnJlZ2lzdGVyKFtdLFtdKSxQcm9kdWN0UmVnaXN0cnlJbXBsLnNoYTE9ZnVuY3Rpb24ocil7cmV0dXJuIiJ9Ow==';
- electron.session.defaultSession.webRequest.onBeforeRequest((details, callback) => {
-   if ((/^devtools:\/\/devtools\/remote\/serve_file\/@[0-9a-f]{40}\/product_registry_impl\/product_registry_impl_module.js$/ui).test(details.url)) {
-     // eslint-disable-next-line
-     callback({
-       redirectURL
-     });
-     return;
-   }
-   // eslint-disable-next-line
-   callback({});
- });
 }
 
 // This method will be called when Electron has finished