Use shared instance of Serial in menu handler

sebromero · sebromero · commit 041468f79616 · 2024-12-13T23:10:54.000+01:00
diff --git a/backend/ipc.js b/backend/ipc.js
@@ -1,7 +1,6 @@
 const fs = require('fs')
-const Serial = require('./serial.js')
-let serial
 const registerMenu = require('./menu.js')
+const serial = require('./serial.js').sharedInstance
 
 const {
   openFolderDialog,
@@ -11,7 +10,7 @@ const {
 } = require('./helpers.js')
 
 module.exports = function registerIPCHandlers(win, ipcMain, app, dialog) {
-  serial = new Serial(win)
+  serial.win = win // Required to send callback messages to renderer
   
   ipcMain.handle('open-folder', async (event) => {
     console.log('ipcMain', 'open-folder')
diff --git a/backend/menu.js b/backend/menu.js
@@ -1,6 +1,6 @@
 const { app, Menu } = require('electron')
 const path = require('path')
-const Serial = require('./serial.js')
+const serial = require('./serial.js').sharedInstance
 const openAboutWindow = require('about-window').default
 const shortcuts  = require('./shortcuts.js')
 const { type } = require('os')
@@ -128,7 +128,7 @@ module.exports = function registerMenu(win, state = {}) {
           accelerator: '',
           click: async () => {
             try {
-              await Serial.disconnect()
+              await serial.disconnect()
               win.reload()
             } catch(e) {
               console.error('Reload from menu failed:', e)
diff --git a/backend/serial.js b/backend/serial.js
@@ -1,7 +1,7 @@
 const MicroPython = require('micropython.js')
 
 class Serial {
-    constructor(win) {
+    constructor(win = null) {
         this.win = win
         this.board = new MicroPython()
         this.board.chunk_size = 192
@@ -110,4 +110,6 @@ except OSError:
     }
 }
 
-module.exports = Serial
+const sharedInstance = new Serial()
+
+module.exports = {sharedInstance, Serial}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`const MicroPython = require('micropython.js')`
`2`	`2`
`3`	`3`	`class Serial {`
`4`		`- constructor(win) {`
	`4`	`+ constructor(win = null) {`
`5`	`5`	`this.win = win`
`6`	`6`	`this.board = new MicroPython()`
`7`	`7`	`this.board.chunk_size = 192`
`@@ -110,4 +110,6 @@ except OSError:`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`-module.exports = Serial`
	`113`	`+const sharedInstance = new Serial()`
	`114`	`+`
	`115`	`+module.exports = {sharedInstance, Serial}`