opt multi windows log

Author: frankie-zeng

src/main/multiWin.ts

@@ -13,25 +13,25 @@ import {
 import path, { join } from 'path'
 import icon from '../../resources/icon.png?asset'
 
-ipcMain.on('ipc-get-port', (event) => {
-  const win = BrowserWindow.fromWebContents(event.sender)
-  if (win) {
-    const port = logQ.portMap.get(win)
-    if (port) {
-      port.close()
-    }
-    const { port1, port2 } = new MessageChannelMain()
-    logQ.portMap.set(win, port1)
-    event.sender.postMessage('port', null, [port2])
-    // port2.start()
+ipcMain.on('ipc-get-port', (event, id: string) => {
+  console.log('get-port', id)
+
+  const port = logQ.portMap.get(id)
+  if (port) {
+    port.close()
+    logQ.portMap.delete(id)
   }
+  const { port1, port2 } = new MessageChannelMain()
+  logQ.portMap.set(id, port1)
+  event.sender.postMessage('port', null, [port2])
+  // port2.start()
 })
 class LogQueue {
   private static instance: LogQueue | null = null
   list: any[] = []
   timer: any
   mainWin: BrowserWindow | undefined
-  portMap: Map<BrowserWindow, MessagePortMain> = new Map()
+  portMap: Map<string, MessagePortMain> = new Map()
 
   private constructor(
     public win: BrowserWindow[] = [],
@@ -85,6 +85,7 @@ const winMap = new Map<string, BrowserWindow>()
 const winPosMap = new Map<string, { x: number; y: number; width: number; height: number }>()
 
 ipcMain.on('ipc-open-window', (event, arg) => {
+  console.log('open', arg.id)
   if (winMap.has(arg.id)) {
     winMap.get(arg.id)?.show()
   } else {
@@ -152,9 +153,10 @@ export function closeAllWindows() {
       height: pos?.height
     })
     win.close()
-    const port = logQ.portMap.get(win)
+    const port = logQ.portMap.get(key)
     if (port) {
       port.close()
+      logQ.portMap.delete(key)
     }
   })
 }
@@ -171,9 +173,10 @@ export function closeWindow(id: string) {
       height: pos?.height
     })
     win.close()
-    const port = logQ.portMap.get(win)
+    const port = logQ.portMap.get(id)
     if (port) {
       port.close()
+      logQ.portMap.delete(id)
     }
   }
 }

src/preload/api.d.ts

@@ -7,5 +7,5 @@ export type Api = {
   writeFile: (path: string, data: string) => Promise<void>
   readdir: (path: string) => Promise<Dirent[]>
   state: (path: string) => Promise<Stats>
-  getPort: () => void
+  getPort: (id: string) => void
 }

src/preload/index.ts

@@ -21,14 +21,14 @@ path.relative = (from: string, to: string) => {
   return ipcRenderer.sendSync('ipc-path-relative', from, to)
 }
 
-const getPort = (): void => {
+const getPort = (id: string): void => {
   ipcRenderer.once('port', (event, ports) => {
     const portCache = event.ports?.[0]
     if (portCache) {
       window.postMessage('port', '*', [portCache])
     }
   })
-  ipcRenderer.send('ipc-get-port')
+  ipcRenderer.send('ipc-get-port', id)
 }
 
 // Custom APIs for renderer

src/renderer/src/main.ts

@@ -34,7 +34,7 @@ import { useRuntimeStore } from './stores/runtime'
 import { assign, cloneDeep } from 'lodash'
 import wujieVue from 'wujie-vue3'
 
-const channel = new BroadcastChannel('ipc-log')
+// const channel = new BroadcastChannel('ipc-log')
 const dataChannel = new BroadcastChannel('ipc-data')
 const projectChannel = new BroadcastChannel('ipc-project')
 const runtimeChannel = new BroadcastChannel('ipc-runtime')
@@ -45,9 +45,6 @@ window.logBus = mitt()
 window.dataParseWorker = dataParseWorker
 dataParseWorker.onmessage = (event) => {
   //main tab
-  if (window.params.id == undefined && Layout.externWinNum > 0) {
-    channel.postMessage(event.data)
-  }
   for (const key of Object.keys(event.data)) {
     window.logBus.emit(key, { key, values: event.data[key] })
   }
@@ -69,7 +66,7 @@ window.onmessage = (event) => {
     )
   }
 }
-window.api.getPort()
+
 VxeUI.use(VxeUIPluginRenderElement)
 VxeUI.setI18n('en-US', enUS)
 VxeUI.setLanguage('en-US')
@@ -109,15 +106,11 @@ window.params = {}
 urlParams.forEach((value, key) => {
   window.params[key] = value
 })
-
+window.api.getPort(window.params.id || 'main')
 //单向的
 if (window.params.id) {
   router.push(`/${window.params.path}`)
-  channel.onmessage = (event) => {
-    for (const key of Object.keys(event.data)) {
-      window.logBus.emit(key, { key, values: event.data[key] })
-    }
-  }
+
   dataChannel.onmessage = (event) => {
     dataStore.$patch((state) => {
       assign(state, event.data)