Port (#250)

* init

* [bug]:fix lin can't send id ==0
[opt]:opt main and ipc

Author: frankie-zeng

src/main/dolin/base.ts

@@ -516,7 +516,7 @@ export default abstract class LinBase {
             }
           }
 
-          if ((frameId || frame?.id) && (frame || eventFrame)) {
+          if ((frameId || frame?.id != undefined) && (frame || eventFrame)) {
             const data = frameData || getFrameData(db, frame)
             const id = frameId || frame.id
             const checksum =

src/main/index.ts

@@ -95,13 +95,13 @@ class ElectronLog extends Transport {
   }
 
   log(info: any, callback: () => void) {
-    if (info.message?.method) {
-      this.q.list.push(info)
-    } else {
-      this.q.win.forEach((win) => {
-        win.webContents.send('ipc-log-main', info)
-      })
+    if (!info.message.method) {
+      info.message = {
+        method: 'ipc-log-main',
+        message: info.message
+      }
     }
+    this.q.list.push(info)
     callback()
   }
 }

src/main/multiWin.ts

@@ -1,13 +1,37 @@
 import { is } from '@electron-toolkit/utils'
-import { app, shell, BrowserWindow, ipcMain, dialog, protocol as eProtocol, net } from 'electron'
+import {
+  app,
+  shell,
+  BrowserWindow,
+  ipcMain,
+  dialog,
+  protocol as eProtocol,
+  net,
+  MessageChannelMain,
+  MessagePortMain
+} from 'electron'
 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()
+  }
+})
 class LogQueue {
   private static instance: LogQueue | null = null
   list: any[] = []
   timer: any
   mainWin: BrowserWindow | undefined
+  portMap: Map<BrowserWindow, MessagePortMain> = new Map()
 
   private constructor(
     public win: BrowserWindow[] = [],
@@ -32,7 +56,9 @@ class LogQueue {
   protected startTimer() {
     this.timer = setInterval(() => {
       if (this.list.length) {
-        this.mainWin!.webContents.send('ipc-log', this.list)
+        this.portMap.forEach((port, win) => {
+          port.postMessage(this.list)
+        })
         this.list = []
       }
     }, this.period)
@@ -117,6 +143,7 @@ ipcMain.on('ipc-close-others-windows', (event, arg) => {
 export function closeAllWindows() {
   winMap.forEach((win, key) => {
     //store pos
+
     const pos = win.getBounds()
     winPosMap.set(key, {
       x: pos?.x,
@@ -125,6 +152,10 @@ export function closeAllWindows() {
       height: pos?.height
     })
     win.close()
+    const port = logQ.portMap.get(win)
+    if (port) {
+      port.close()
+    }
   })
 }
 
@@ -140,6 +171,10 @@ export function closeWindow(id: string) {
       height: pos?.height
     })
     win.close()
+    const port = logQ.portMap.get(win)
+    if (port) {
+      port.close()
+    }
   }
 }
 export function minimizeWindow(id: string) {

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
 }
-

src/preload/index.ts

@@ -21,6 +21,16 @@ path.relative = (from: string, to: string) => {
   return ipcRenderer.sendSync('ipc-path-relative', from, to)
 }
 
+const getPort = (): void => {
+  ipcRenderer.once('port', (event, ports) => {
+    const portCache = event.ports?.[0]
+    if (portCache) {
+      window.postMessage('port', '*', [portCache])
+    }
+  })
+  ipcRenderer.send('ipc-get-port')
+}
+
 // Custom APIs for renderer
 const api: Api = {
   glob: async (pattern: string | string[], options?: GlobOptionsWithFileTypesFalse) => {
@@ -37,7 +47,8 @@ const api: Api = {
   },
   state: async (path: string) => {
     return ipcRenderer.invoke('ipc-fs-stat', path)
-  }
+  },
+  getPort
 }
 
 // Use `contextBridge` APIs to expose Electron APIs to
@@ -51,4 +62,3 @@ if (process.contextIsolated) {
 } else {
   throw new Error('contextBridge is not enabled')
 }
-

src/renderer/src/main.ts

@@ -54,42 +54,22 @@ dataParseWorker.onmessage = (event) => {
 }
 
 window.serviceDetail = window.electron?.ipcRenderer.sendSync('ipc-service-detail')
-window.electron?.ipcRenderer.on('ipc-log', (event, data) => {
-  const groups: { method: string; data: any[] }[] = [] // 存储所有分组，每个元素是 {method, data} 对象
-  let currentGroup: { method: string; data: any[] } | null = null
 
-  data.forEach((item: any) => {
-    const method = item.message.method
-
-    // 如果是新的method或者当前组的method不同，创建新组
-    if (!currentGroup || currentGroup.method !== method) {
-      if (currentGroup) {
-        groups.push(currentGroup)
-      }
-      currentGroup = {
-        method: method,
-        data: []
-      }
-    }
-
-    currentGroup.data.push(item)
-  })
-
-  // 添加最后一组
-  if (currentGroup) {
-    groups.push(currentGroup)
+window.onmessage = (event) => {
+  // event.source === window means the message is coming from the preload
+  // script, as opposed to from an <iframe> or other source.
+  if (event.source === window && event.data === 'port') {
+    const [port] = event.ports
+    dataParseWorker.postMessage(
+      {
+        method: 'onmessage',
+        data: port
+      },
+      [port]
+    )
   }
-
-  // 按顺序发送每个组的数据
-  groups.forEach((group) => {
-    // window.logBus.emit(group.method, undefined, group.data)
-    dataParseWorker.postMessage({
-      method: group.method,
-      data: group.data
-    })
-  })
-})
-
+}
+window.api.getPort()
 VxeUI.use(VxeUIPluginRenderElement)
 VxeUI.setI18n('en-US', enUS)
 VxeUI.setLanguage('en-US')

src/renderer/src/views/uds/log.vue

@@ -215,7 +215,12 @@ function udsLog({ values }: { values: any[] }) {
     writeToTerminal(time, data.label, data.level, data.message.data.msg)
   })
 }
-
+function normalLog({ values }: { values: any[] }) {
+  values.forEach((data) => {
+    const time = new Date().toLocaleTimeString()
+    writeToTerminal(time, data.label, data.level, data.message.message)
+  })
+}
 function testLog({
   values
 }: {
@@ -291,7 +296,6 @@ function testLog({
   }
 }
 
-let mainLog: (() => void) | undefined
 let keydownHandler: ((event: KeyboardEvent) => void) | undefined
 
 onMounted(async () => {
@@ -364,10 +368,7 @@ onMounted(async () => {
   }
 
   if (props.captureSystem) {
-    mainLog = window.electron.ipcRenderer.on('ipc-log-main', (event, data) => {
-      const time = new Date().toLocaleTimeString()
-      writeToTerminal(time, data.label, data.level, data.message)
-    })
+    window.logBus.on('ipc-log-main', normalLog)
   }
   if (props.captureTest) {
     window.logBus.on('testInfo', testLog)
@@ -379,8 +380,8 @@ onMounted(async () => {
 
 onUnmounted(() => {
   // Clean up event listeners first
-  if (props.captureSystem && mainLog) {
-    mainLog()
+  if (props.captureSystem) {
+    window.logBus.off('ipc-log-main', normalLog)
   }
   if (props.captureTest) {
     window.logBus.off('testInfo', testLog)

src/renderer/src/views/uds/uds.vue

@@ -1665,7 +1665,7 @@ watch([contentH, contentW], (val) => {
   opacity: 0.8;
   /* 模糊效果 */
   /* filter: blur(1px); */
-  z-index: v-bind(zIndex - 1);
+  /* z-index: v-bind(zIndex - 1); */
 }
 
 .left2 {
@@ -1680,7 +1680,7 @@ watch([contentH, contentW], (val) => {
   opacity: 0.8;
   /* 模糊效果 */
   /* filter: blur(1px); */
-  z-index: v-bind(zIndex - 1);
+  /* z-index: v-bind(zIndex - 1); */
 }
 
 .left {
@@ -1694,7 +1694,7 @@ watch([contentH, contentW], (val) => {
   opacity: 0.8;
   /* 模糊效果 */
   /* filter: blur(1px); */
-  z-index: v-bind(zIndex - 1);
+  /* z-index: v-bind(zIndex - 1); */
 }
 
 .right1 {
@@ -1709,7 +1709,7 @@ watch([contentH, contentW], (val) => {
   opacity: 0.8;
   /* 模糊效果 */
   /* filter: blur(1px); */
-  z-index: v-bind(zIndex - 1);
+  /* z-index: v-bind(zIndex - 1); */
 }
 
 .right2 {
@@ -1724,7 +1724,7 @@ watch([contentH, contentW], (val) => {
   opacity: 0.8;
   /* 模糊效果 */
   /* filter: blur(1px); */
-  z-index: v-bind(zIndex - 1);
+  /* z-index: v-bind(zIndex - 1); */
 }
 
 .right {
@@ -1738,7 +1738,7 @@ watch([contentH, contentW], (val) => {
   opacity: 0.8;
   /* 模糊效果 */
   /* filter: blur(1px); */
-  z-index: v-bind(zIndex - 1);
+  /* z-index: v-bind(zIndex - 1); */
 }
 
 .el-dropdown-link {