Merge pull request #182 from yuja201/fix/181-worker-node-path

[fix] disable RunAsNode fuse and use utilityProcess for worker execution

Author: minju-22

package-lock.json

@@ -20,7 +20,8 @@
     "build:unpack": "npm run build && electron-builder --dir",
     "build:win": "npm run build && electron-builder --win",
     "build:mac": "electron-vite build && electron-builder --mac",
-    "build:linux": "electron-vite build && electron-builder --linux"
+    "build:linux": "electron-vite build && electron-builder --linux",
+    "postpack": "node scripts/fuse.mjs"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.68.0",
@@ -51,6 +52,7 @@
     "@electron-toolkit/eslint-config-prettier": "^3.0.0",
     "@electron-toolkit/eslint-config-ts": "^3.1.0",
     "@electron-toolkit/tsconfig": "^2.0.0",
+    "@electron/fuses": "^2.1.0",
     "@electron/rebuild": "^4.0.1",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^22.19.0",
@@ -83,10 +85,6 @@
         "filter": [
           "*.sql"
         ]
-      },
-      {
-        "from": "build/node/node.exe",
-        "to": "bin/node.exe"
       }
     ],
     "directories": {

package.json

@@ -0,0 +1,9 @@
+import { flipFuses, FuseVersion, FuseV1Options } from '@electron/fuses'
+import { createRequire } from 'node:module'
+
+const require = createRequire(import.meta.url)
+
+await flipFuses(require.resolve('electron'), {
+  version: FuseVersion.V1,
+  [FuseV1Options.RunAsNode]: false
+})

scripts/fuse.mjs

@@ -1,7 +1,6 @@
 import path from 'node:path'
 import os from 'node:os'
-import { spawn } from 'node:child_process'
-import { app, BrowserWindow } from 'electron'
+import { app, BrowserWindow, utilityProcess } from 'electron'
 import type { WorkerTask, WorkerResult, GenerateRequest, GenerationResult } from '@shared/types'
 import { getDatabaseByProjectId } from '../../database/databases'
 import { getDBMSById } from '../../database/dbms'
@@ -83,108 +82,90 @@ export async function runDataGenerator(
       : undefined
 
   const queue = [...tables]
-  const running = new Set<ReturnType<typeof spawn>>()
+  const running = new Set<ReturnType<typeof utilityProcess.fork>>()
   const results: WorkerResult[] = []
   const cacheRoot = getFileCacheRoot()
 
   const startNext = async (): Promise<void> => {
-    if (queue.length === 0) return
-    const table = queue.shift()!
-
-    const task: WorkerTask = {
-      projectId,
-      dbType: dbTypeKey,
-      table,
-      schema,
-      database: databaseInfo,
-      rules,
-      mode,
-      connection: connectionInfo,
-      skipInvalidRows: payload.skipInvalidRows ?? true
-    }
-    const isPackaged = app.isPackaged
-    const baseDir = isPackaged
-      ? fs.existsSync(path.join(process.resourcesPath, 'app.asar.unpacked'))
-        ? path.join(process.resourcesPath, 'app.asar.unpacked')
-        : path.join(process.resourcesPath, 'app')
-      : app.getAppPath()
-
-    const workerPath = path.join(baseDir, 'out', 'main', 'worker-runner.js')
-
-    const nodeBinary = path.join(process.resourcesPath, 'bin', 'node.exe')
-
-    const child = spawn(nodeBinary, [workerPath], {
-      stdio: ['pipe', 'pipe', 'pipe'],
-      env: {
-        ...process.env,
-        TASK: JSON.stringify(task),
-        HERESDUMMY_CACHE_DIR: cacheRoot
+    try {
+      if (queue.length === 0) return
+      const table = queue.shift()!
+
+      const task: WorkerTask = {
+        projectId,
+        dbType: dbTypeKey,
+        table,
+        schema,
+        database: databaseInfo,
+        rules,
+        mode,
+        connection: connectionInfo,
+        skipInvalidRows: payload.skipInvalidRows ?? true
       }
-    })
-    running.add(child)
-
-    let stdout = ''
-    let stdoutBuffer = ''
-    let stderr = ''
-
-    child.stdout.on('data', (data) => {
-      const chunk = data.toString()
-      process.stdout.write(chunk)
-      stdout += chunk
-
-      stdoutBuffer += chunk
-      let newlineIndex: number
-      while ((newlineIndex = stdoutBuffer.indexOf('\n')) !== -1) {
-        const line = stdoutBuffer.slice(0, newlineIndex).trim()
-        stdoutBuffer = stdoutBuffer.slice(newlineIndex + 1)
-        if (!line) continue
-
-        if (line.startsWith('{') && line.endsWith('}')) {
-          try {
-            const msg = JSON.parse(line)
-            if (msg.type) {
-              mainWindow.webContents.send('data-generator:progress', msg)
-            }
-          } catch (err) {
-            void err
+      const isPackaged = app.isPackaged
+      const baseDir = isPackaged
+        ? fs.existsSync(path.join(process.resourcesPath, 'app.asar.unpacked'))
+          ? path.join(process.resourcesPath, 'app.asar.unpacked')
+          : path.join(process.resourcesPath, 'app')
+        : app.getAppPath()
+
+      const workerPath = path.join(baseDir, 'out', 'main', 'worker-runner.js')
+
+      const child = utilityProcess.fork(workerPath, [], {
+        stdio: 'pipe',
+        env: {
+          ...process.env,
+          HERESDUMMY_CACHE_DIR: cacheRoot
+        },
+        serviceName: 'Data Generator Worker'
+      })
+      running.add(child)
+
+      child.postMessage({
+        type: 'start',
+        task
+      })
+
+      let stderr = ''
+
+      // 완료 행 수 받아서 진행 상황 프론트로 보내기
+      child.on('message', (data) => {
+        if (data.type) {
+          if (data.type === 'worker-result') {
+            results.push(data.result)
+          } else {
+            mainWindow.webContents.send('data-generator:progress', data)
           }
         }
-      }
-    })
-
-    child.stderr.on('data', (data) => {
-      stderr += data.toString()
-      console.error('[worker] stderr:', data.toString())
-    })
-
-    child.on('close', (code) => {
-      running.delete(child)
-      if (code === 0) {
-        // stdout 안에서 success 포함 JSON 객체 전부 추출
-        const matches = stdout.match(/\{[^}]*"success"[^}]*\}/g)
-
-        if (matches && matches.length > 0) {
-          // 가장 마지막 JSON이 최종 결과 JSON
-          const finalJson = matches[matches.length - 1]
-          results.push(JSON.parse(finalJson))
-        } else {
+      })
+
+      child.stderr?.on('data', (data) => {
+        stderr += data.toString()
+        console.error('[worker] stderr:', data.toString())
+      })
+
+      child.on('exit', (code) => {
+        running.delete(child)
+        if (code !== 0) {
           results.push({
             success: false,
             tableName: table.tableName,
             sqlPath: '',
-            error: 'Worker finished without a valid result JSON.'
+            error: stderr || `Worker exited with code ${code}`
           })
         }
-      } else {
-        results.push({
-          success: false,
-          tableName: table.tableName,
-          sqlPath: '',
-          error: stderr || `Worker exited with code ${code}`
-        })
-      }
+        startNext()
+      })
+    } catch (err) {
+      logger.error('startNext 실패', err)
+      results.push({
+        success: false,
+        tableName: 'unknown',
+        sqlPath: '',
+        error: (err as Error).message
+      })
       startNext()
-    })
+    }
   }
 
   for (let i = 0; i < Math.min(MAX_PARALLEL, queue.length); i++) {