[bug]fix node send multi fc

Author: frankie-zeng

src/cli/build.ts

@@ -1,14 +1,9 @@
 import dllLib from '../../resources/lib/zlgcan.dll?asset&asarUnpack'
+import esbuild from '../../resources/bin/esbuild?asset&asarUnpack'
 
-let esbuild_executable: any
-
-const loadEsbuild = async () => {
-  if (process.platform === 'win32') {
-    esbuild_executable = await import('../../resources/bin/esbuild.exe?asset&asarUnpack')
-  } else {
-    esbuild_executable = await import('../../resources/bin/esbuild?asset&asarUnpack')
-    //<-- May change fetch from node_modules esbuild_executable = await import('esbuild/bin/esbuild?asset&asarUnpack')
-  }
+let esbuild_executable = esbuild
+if (process.platform === 'win32') {
+  esbuild_executable = `${esbuild}.exe`
 }
 
 import path from 'path'

src/main/docan/cantp.ts

@@ -14,6 +14,8 @@ import {
 } from '../share/can'
 import { queue, QueueObject } from 'async'
 import { CAN_SOCKET, CanBase } from './base'
+import { v4 } from 'uuid'
+import { i } from 'vite/dist/node/types.d-aGj9QkWt'
 export interface CanTp {
   close: () => void
   writeTp(addr: CanAddr, data: Buffer): Promise<number>
@@ -151,6 +153,7 @@ export class CAN_TP_SOCKET {
 }
 
 export class CAN_TP implements CanTp {
+  uuid: string
   base: CanBase
   cnt = 0
   event = new EventEmitter()
@@ -172,8 +175,9 @@ export class CAN_TP implements CanTp {
     }
   > = {}
   lastWriteError?: TpError
-  constructor(base: CanBase) {
+  constructor(base: CanBase, uuid?: string) {
     this.base = base
+    this.uuid = uuid || v4()
     //close peak tp default handle
 
     this.tpStatus = {}
@@ -265,7 +269,14 @@ export class CAN_TP implements CanTp {
         reject(new TpError(TP_ERROR_ID.TP_TIMEOUT_A, addr, data))
       }, addr.nAs)
       this.base
-        .writeBase(addrToId(addr), addr, data)
+        .writeBase(
+          addrToId(addr),
+          {
+            ...addr,
+            uuid: this.uuid
+          },
+          data
+        )
         .then((ts) => {
           clearTimeout(timer)
           resolve({ ts })
@@ -623,7 +634,12 @@ function baseHandle(val: CanMessage) {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   //@ts-ignore
   const _this = this as { addr: CanAddr; id: number; inst: CAN_TP; listenOnly: boolean }
+
+  if (val.msgType.uuid == _this.inst.uuid) {
+    return
+  }
   const tpCmdId = _this.inst.getReadId(_this.addr)
+
   const status = _this.inst.tpStatus[tpCmdId] || 0
   let index = 0
   if (

src/main/ipc/uds.ts

@@ -1,15 +1,10 @@
 import { BrowserWindow, ipcMain, shell } from 'electron'
 import scriptIndex from '../../../resources/docs/.gitkeep?asset&asarUnpack'
+import esbuild from '../../../resources/bin/esbuild?asset&asarUnpack'
 
-let esbuild_executable: any
-
-const loadEsbuild = async () => {
-  if (process.platform === 'win32') {
-    esbuild_executable = await import('../../../resources/bin/esbuild.exe?asset&asarUnpack')
-  } else {
-    esbuild_executable = await import('../../../resources/bin/esbuild?asset&asarUnpack')
-    //<-- May change fetch from node_modules esbuild_executable = await import('esbuild/bin/esbuild?asset&asarUnpack')
-  }
+let esbuild_executable = esbuild
+if (process.platform === 'win32') {
+  esbuild_executable = `${esbuild}.exe`
 }
 
 import path from 'path'

src/main/nodeItem.ts

@@ -179,13 +179,10 @@ export class NodeClass {
             for (const c of nodeItem.channel) {
               const canBaseItem = this.canBaseMap.get(c)
               if (canBaseItem && tester.type == 'can') {
-                const tp = new CAN_TP(canBaseItem)
+                const tp = new CAN_TP(canBaseItem, nodeItem.id)
                 for (const [index, addr] of tester.address.entries()) {
                   if (addr.type == 'can' && addr.canAddr) {
-                    const idT = tp.getReadId(
-                      addr.canAddr,
-                      nodeItem.isTest ? true : tester.simulateBy != nodeItem.id
-                    )
+                    const idT = tp.getReadId(addr.canAddr, tester.simulateBy != nodeItem.id)
                     tp.event.on(idT, (data) => {
                       if (data instanceof CanTpError) {
                         //TODO:
@@ -210,7 +207,7 @@ export class NodeClass {
                     if (index == 0) {
                       const idR = tp.getReadId(
                         swapAddr(addr.canAddr),
-                        nodeItem.isTest ? tester.simulateBy != nodeItem.id : true
+                        tester.simulateBy != nodeItem.id
                       )
                       tp.event.on(idR, (data) => {
                         if (data instanceof CanTpError) {
@@ -293,7 +290,7 @@ export class NodeClass {
               if (ethBaseItem && tester.type == 'eth') {
                 const baseItem = this.doips.find((d) => d.base.id == ethBaseItem.id)
                 if (baseItem) {
-                  if (tester.simulateBy == nodeItem.id && !nodeItem.isTest) {
+                  if (tester.simulateBy == nodeItem.id) {
                     baseItem.registerEntity(true, this.log)
                   }
                   for (const addr of tester.address) {