@muyichengshayu/promptx 0.2.2 → 0.2.4

package/apps/server/src/gitDiffClient.js

@@ -3,17 +3,19 @@ import process from 'node:process'
 import { spawn } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 
-const DEFAULT_TIMEOUT_MS = 20_000
+const DEFAULT_TIMEOUT_MS = Math.max(1_000, Number(process.env.PROMPTX_GIT_DIFF_TIMEOUT_MS) || 60_000)
+const DEFAULT_MAX_WORKERS = Math.max(1, Number(process.env.PROMPTX_GIT_DIFF_WORKER_POOL_SIZE) || 2)
 const MAX_STDERR_LENGTH = 4000
 
 const currentDir = path.dirname(fileURLToPath(import.meta.url))
 const workerEntryPath = path.join(currentDir, 'gitDiffWorker.js')
 
-let workerProcess = null
-let workerStdoutBuffer = ''
-let workerStderrBuffer = ''
 let nextRequestId = 1
-const pendingRequests = new Map()
+let nextWorkerId = 1
+const workerPool = []
+const requestQueue = []
+const requestMap = new Map()
+const activeRequests = new Map()
 const workerMetrics = {
   startedAt: new Date().toISOString(),
   spawnCount: 0,
@@ -44,11 +46,6 @@ function createWorkerError(message = '') {
   return error
 }
 
-function resetWorkerBuffers() {
-  workerStdoutBuffer = ''
-  workerStderrBuffer = ''
-}
-
 function createLastRequestSnapshot(request = {}, patch = {}) {
   return {
     requestId: String(request.requestId || patch.requestId || '').trim(),
@@ -68,91 +65,266 @@ function markLastRequest(request = {}, patch = {}) {
   workerMetrics.lastRequest = createLastRequestSnapshot(request, patch)
 }
 
-function appendWorkerStderr(chunk) {
-  workerStderrBuffer = `${workerStderrBuffer}${Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk || '')}`
-  if (workerStderrBuffer.length > MAX_STDERR_LENGTH) {
-    workerStderrBuffer = workerStderrBuffer.slice(-MAX_STDERR_LENGTH)
+function getNowIso() {
+  return new Date().toISOString()
+}
+
+function getRequestDurationMs(request = {}) {
+  const startedAt = Date.parse(String(request.requestMeta?.startedAt || ''))
+  return Number.isFinite(startedAt) ? Math.max(0, Date.now() - startedAt) : 0
+}
+
+function getWorkerIndex(workerId = '') {
+  return workerPool.findIndex((worker) => worker.id === workerId)
+}
+
+function getWorkerById(workerId = '') {
+  const index = getWorkerIndex(workerId)
+  return index >= 0 ? workerPool[index] : null
+}
+
+function removeWorker(worker) {
+  const index = getWorkerIndex(worker?.id)
+  if (index >= 0) {
+    workerPool.splice(index, 1)
+  }
+}
+
+function clearRequestTimer(request) {
+  if (request?.timer) {
+    clearTimeout(request.timer)
+    request.timer = null
   }
 }
 
-function settlePendingRequest(requestId, handler) {
-  const pending = pendingRequests.get(requestId)
-  if (!pending) {
+function removeQueuedRequest(requestId = '') {
+  const index = requestQueue.findIndex((request) => request.requestId === requestId)
+  if (index >= 0) {
+    requestQueue.splice(index, 1)
+  }
+}
+
+function updateWorkerExitMetrics({ code = null, signal = '', reason = '' } = {}) {
+  workerMetrics.lastWorkerExitAt = getNowIso()
+  workerMetrics.lastWorkerExitCode = typeof code === 'number' ? code : null
+  workerMetrics.lastWorkerExitSignal = String(signal || '').trim()
+  workerMetrics.lastWorkerExitReason = String(reason || '').trim()
+}
+
+function finalizeRequest(request, handler) {
+  if (!request || request.settled) {
     return
   }
 
-  pendingRequests.delete(requestId)
-  clearTimeout(pending.timer)
-  handler(pending)
+  request.settled = true
+  clearRequestTimer(request)
+  removeQueuedRequest(request.requestId)
+  requestMap.delete(request.requestId)
+  activeRequests.delete(request.requestId)
+  handler(request)
 }
 
-function rejectAllPendingRequests(error) {
-  for (const [requestId, pending] of pendingRequests.entries()) {
-    pendingRequests.delete(requestId)
-    clearTimeout(pending.timer)
+function rejectRequestWithError(request, error) {
+  finalizeRequest(request, (pending) => {
+    workerMetrics.failedRequests += 1
+    markLastRequest(pending.requestMeta, {
+      finishedAt: getNowIso(),
+      durationMs: getRequestDurationMs(pending),
+      status: error?.code === 'GIT_DIFF_TIMEOUT' ? 'timeout' : 'failed',
+      timeout: error?.code === 'GIT_DIFF_TIMEOUT',
+      errorMessage: String(error?.message || error || 'git diff request failed'),
+    })
     pending.reject(error)
+  })
+}
+
+function resolveRequest(request, value) {
+  finalizeRequest(request, (pending) => {
+    workerMetrics.completedRequests += 1
+    markLastRequest(pending.requestMeta, {
+      finishedAt: getNowIso(),
+      durationMs: getRequestDurationMs(pending),
+      status: 'completed',
+    })
+    pending.resolve(value)
+  })
+}
+
+function createWorkerState(child) {
+  return {
+    id: `git-diff-worker-${nextWorkerId++}`,
+    child,
+    stdoutBuffer: '',
+    stderrBuffer: '',
+    activeRequestId: '',
+    startedAt: getNowIso(),
+    stopping: false,
+  }
+}
+
+function appendWorkerStderr(worker, chunk) {
+  worker.stderrBuffer = `${worker.stderrBuffer}${Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk || '')}`
+  if (worker.stderrBuffer.length > MAX_STDERR_LENGTH) {
+    worker.stderrBuffer = worker.stderrBuffer.slice(-MAX_STDERR_LENGTH)
+  }
+}
+
+function stopWorker(worker, reason = '') {
+  if (!worker || worker.stopping) {
+    return
+  }
+
+  worker.stopping = true
+  removeWorker(worker)
+  updateWorkerExitMetrics({
+    signal: 'manual_stop',
+    reason,
+  })
+
+  if (worker.child?.exitCode === null && !worker.child?.killed) {
+    worker.child.kill()
+  }
+}
+
+function dispatchQueuedRequests() {
+  while (requestQueue.length) {
+    let worker = workerPool.find((item) => !item.activeRequestId && !item.stopping) || null
+    if (!worker && workerPool.length < DEFAULT_MAX_WORKERS) {
+      worker = ensureGitDiffWorker()
+    }
+    if (!worker) {
+      return
+    }
+
+    const request = requestQueue.shift()
+    if (!request || request.settled) {
+      continue
+    }
+
+    request.workerId = worker.id
+    worker.activeRequestId = request.requestId
+    activeRequests.set(request.requestId, request)
+
+    try {
+      worker.child.stdin?.write(`${JSON.stringify({
+        requestId: request.requestId,
+        action: 'getTaskGitDiffReview',
+        taskSlug: request.taskSlug,
+        options: request.options,
+      })}\n`)
+    } catch (error) {
+      worker.activeRequestId = ''
+      activeRequests.delete(request.requestId)
+      request.workerId = ''
+      rejectRequestWithError(request, createWorkerError(String(error?.message || error)))
+      stopWorker(worker, String(error?.message || error || 'worker write failed'))
+    }
   }
 }
 
-function detachWorkerListeners(child) {
-  child.stdout?.removeAllListeners()
-  child.stderr?.removeAllListeners()
-  child.removeAllListeners()
+function settleWorkerRequest(worker, requestId, handler) {
+  const request = activeRequests.get(requestId)
+  if (!request) {
+    return
+  }
+
+  if (worker.activeRequestId === requestId) {
+    worker.activeRequestId = ''
+  }
+  request.workerId = ''
+  handler(request)
+  dispatchQueuedRequests()
 }
 
-function handleWorkerLine(line) {
+function handleWorkerLine(worker, line) {
   let payload
   try {
     payload = JSON.parse(line)
   } catch {
-    rejectAllPendingRequests(
-      createWorkerError(`git diff worker returned invalid JSON: ${line.slice(0, 200)}`)
-    )
-    stopGitDiffWorker()
+    const error = createWorkerError(`git diff worker returned invalid JSON: ${line.slice(0, 200)}`)
+    if (worker.activeRequestId) {
+      settleWorkerRequest(worker, worker.activeRequestId, (request) => {
+        rejectRequestWithError(request, error)
+      })
+    }
+    stopWorker(worker, error.message)
     return
   }
 
   const requestId = String(payload?.requestId || '').trim()
   if (!requestId) {
-    rejectAllPendingRequests(
-      createWorkerError(String(payload?.error?.message || '').trim() || 'git diff worker returned a response without requestId.')
+    const error = createWorkerError(
+      String(payload?.error?.message || '').trim() || 'git diff worker returned a response without requestId.'
     )
-    stopGitDiffWorker()
+    if (worker.activeRequestId) {
+      settleWorkerRequest(worker, worker.activeRequestId, (request) => {
+        rejectRequestWithError(request, error)
+      })
+    }
+    stopWorker(worker, error.message)
     return
   }
 
-  settlePendingRequest(requestId, ({ resolve, reject }) => {
+  settleWorkerRequest(worker, requestId, (request) => {
     if (!payload?.ok) {
-      reject(createWorkerError(String(payload?.error?.message || '').trim() || workerStderrBuffer.trim()))
+      const error = createWorkerError(String(payload?.error?.message || '').trim() || worker.stderrBuffer.trim())
+      rejectRequestWithError(request, error)
       return
     }
-    resolve(payload.result)
+    resolveRequest(request, payload.result)
   })
 }
 
-function handleWorkerStdout(chunk) {
-  workerStdoutBuffer = `${workerStdoutBuffer}${Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk || '')}`
+function handleWorkerStdout(worker, chunk) {
+  worker.stdoutBuffer = `${worker.stdoutBuffer}${Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk || '')}`
 
-  let newlineIndex = workerStdoutBuffer.indexOf('\n')
+  let newlineIndex = worker.stdoutBuffer.indexOf('\n')
   while (newlineIndex !== -1) {
-    const line = workerStdoutBuffer.slice(0, newlineIndex).trim()
-    workerStdoutBuffer = workerStdoutBuffer.slice(newlineIndex + 1)
+    const line = worker.stdoutBuffer.slice(0, newlineIndex).trim()
+    worker.stdoutBuffer = worker.stdoutBuffer.slice(newlineIndex + 1)
     if (line) {
-      handleWorkerLine(line)
+      handleWorkerLine(worker, line)
     }
-    newlineIndex = workerStdoutBuffer.indexOf('\n')
+    newlineIndex = worker.stdoutBuffer.indexOf('\n')
   }
 }
 
-function ensureGitDiffWorker() {
-  if (workerProcess && !workerProcess.killed && workerProcess.exitCode === null) {
-    return workerProcess
+function handleWorkerFailure(worker, error) {
+  removeWorker(worker)
+  updateWorkerExitMetrics({
+    reason: String(error?.message || error || 'worker error'),
+  })
+
+  if (worker.activeRequestId) {
+    settleWorkerRequest(worker, worker.activeRequestId, (request) => {
+      rejectRequestWithError(request, createWorkerError(String(error?.message || error)))
+    })
   }
 
-  resetWorkerBuffers()
-  if (workerMetrics.spawnCount > 0) {
-    workerMetrics.restartCount += 1
+  dispatchQueuedRequests()
+}
+
+function handleWorkerClose(worker, code, signal) {
+  removeWorker(worker)
+  updateWorkerExitMetrics({
+    code,
+    signal,
+    reason: worker.stderrBuffer.trim() || (signal ? `signal:${signal}` : `code:${code}`),
+  })
+
+  if (worker.activeRequestId) {
+    const error = worker.stderrBuffer.trim()
+      ? createWorkerError(`git diff worker exited unexpectedly: ${worker.stderrBuffer.trim()}`)
+      : createWorkerError('git diff worker exited unexpectedly.')
+    settleWorkerRequest(worker, worker.activeRequestId, (request) => {
+      rejectRequestWithError(request, error)
+    })
   }
+
+  dispatchQueuedRequests()
+}
+
+function ensureGitDiffWorker() {
   const child = spawn(process.execPath, [workerEntryPath], {
     cwd: currentDir,
     env: {
@@ -161,58 +333,46 @@ function ensureGitDiffWorker() {
     stdio: ['pipe', 'pipe', 'pipe'],
     windowsHide: true,
   })
+
+  if (workerMetrics.spawnCount > 0) {
+    workerMetrics.restartCount += 1
+  }
+
+  const worker = createWorkerState(child)
+  workerPool.push(worker)
   workerMetrics.spawnCount += 1
-  workerMetrics.lastWorkerSpawnedAt = new Date().toISOString()
+  workerMetrics.lastWorkerSpawnedAt = worker.startedAt
 
-  child.stdout?.on('data', handleWorkerStdout)
-  child.stderr?.on('data', appendWorkerStderr)
+  child.stdout?.on('data', (chunk) => {
+    handleWorkerStdout(worker, chunk)
+  })
+  child.stderr?.on('data', (chunk) => {
+    appendWorkerStderr(worker, chunk)
+  })
   child.on('error', (error) => {
-    workerMetrics.lastWorkerExitAt = new Date().toISOString()
-    workerMetrics.lastWorkerExitCode = null
-    workerMetrics.lastWorkerExitSignal = ''
-    workerMetrics.lastWorkerExitReason = String(error?.message || error || 'worker error')
-    rejectAllPendingRequests(createWorkerError(String(error?.message || error)))
-    if (workerProcess === child) {
-      workerProcess = null
-    }
-    detachWorkerListeners(child)
+    handleWorkerFailure(worker, error)
   })
   child.on('close', (code, signal) => {
-    const tail = workerStderrBuffer.trim()
-    workerMetrics.lastWorkerExitAt = new Date().toISOString()
-    workerMetrics.lastWorkerExitCode = typeof code === 'number' ? code : null
-    workerMetrics.lastWorkerExitSignal = String(signal || '').trim()
-    workerMetrics.lastWorkerExitReason = tail || (signal ? `signal:${signal}` : `code:${code}`)
-    rejectAllPendingRequests(
-      tail
-        ? createWorkerError(`git diff worker exited unexpectedly: ${tail}`)
-        : createWorkerError('git diff worker exited unexpectedly.')
-    )
-    if (workerProcess === child) {
-      workerProcess = null
-    }
-    detachWorkerListeners(child)
-    resetWorkerBuffers()
+    handleWorkerClose(worker, code, signal)
   })
 
-  workerProcess = child
-  return child
+  return worker
 }
 
 export function stopGitDiffWorker() {
-  if (!workerProcess) {
-    return
-  }
+  const stopError = createWorkerError('git diff worker stopped.')
 
-  const child = workerProcess
-  workerProcess = null
-  rejectAllPendingRequests(createWorkerError('git diff worker stopped.'))
-  detachWorkerListeners(child)
-  resetWorkerBuffers()
+  requestQueue.splice(0, requestQueue.length).forEach((request) => {
+    rejectRequestWithError(request, stopError)
+  })
 
-  if (child.exitCode === null && !child.killed) {
-    child.kill()
+  for (const request of [...activeRequests.values()]) {
+    rejectRequestWithError(request, stopError)
   }
+
+  ;[...workerPool].forEach((worker) => {
+    stopWorker(worker, 'stopped')
+  })
 }
 
 export function getTaskGitDiffReviewInSubprocess(taskSlug = '', options = {}) {
@@ -223,81 +383,83 @@ export function getTaskGitDiffReviewInSubprocess(taskSlug = '', options = {}) {
     taskSlug: String(taskSlug || '').trim(),
     scope: String(options.scope || '').trim(),
     filePath: String(options.filePath || '').trim(),
-    startedAt: new Date().toISOString(),
+    startedAt: getNowIso(),
   }
-  const child = ensureGitDiffWorker()
+
   workerMetrics.totalRequests += 1
 
   return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      pendingRequests.delete(requestId)
-      workerMetrics.timeoutRequests += 1
-      workerMetrics.failedRequests += 1
-      markLastRequest(requestMeta, {
-        finishedAt: new Date().toISOString(),
-        durationMs: Date.now() - Date.parse(requestMeta.startedAt),
-        status: 'timeout',
-        timeout: true,
-        errorMessage: `git diff request timed out after ${timeoutMs}ms`,
-      })
-      stopGitDiffWorker()
-      reject(createTimeoutError(timeoutMs))
-    }, timeoutMs)
-
-    pendingRequests.set(requestId, {
-      resolve: (value) => {
-        workerMetrics.completedRequests += 1
-        markLastRequest(requestMeta, {
-          finishedAt: new Date().toISOString(),
-          durationMs: Date.now() - Date.parse(requestMeta.startedAt),
-          status: 'completed',
-        })
-        resolve(value)
-      },
-      reject: (error) => {
-        workerMetrics.failedRequests += 1
-        markLastRequest(requestMeta, {
-          finishedAt: new Date().toISOString(),
-          durationMs: Date.now() - Date.parse(requestMeta.startedAt),
-          status: error?.code === 'GIT_DIFF_TIMEOUT' ? 'timeout' : 'failed',
-          timeout: error?.code === 'GIT_DIFF_TIMEOUT',
-          errorMessage: String(error?.message || error || 'git diff request failed'),
-        })
-        reject(error)
-      },
-      timer,
-    })
-
-    try {
-      child.stdin?.write(`${JSON.stringify({
-        requestId,
-        action: 'getTaskGitDiffReview',
-        taskSlug: String(taskSlug || '').trim(),
-        options,
-      })}\n`)
-    } catch (error) {
-      settlePendingRequest(requestId, ({ reject: rejectPending }) => {
-        rejectPending(createWorkerError(String(error?.message || error)))
-      })
-      stopGitDiffWorker()
+    const request = {
+      requestId,
+      taskSlug: String(taskSlug || '').trim(),
+      options,
+      resolve,
+      reject,
+      requestMeta,
+      settled: false,
+      workerId: '',
+      timer: setTimeout(() => {
+        const currentRequest = requestMap.get(requestId)
+        if (!currentRequest || currentRequest.settled) {
+          return
+        }
+
+        workerMetrics.timeoutRequests += 1
+        const timeoutError = createTimeoutError(timeoutMs)
+        if (currentRequest.workerId) {
+          const worker = getWorkerById(currentRequest.workerId)
+          if (worker && worker.activeRequestId === requestId) {
+            worker.activeRequestId = ''
+          }
+          rejectRequestWithError(currentRequest, timeoutError)
+          if (worker) {
+            stopWorker(worker, `request_timeout:${requestId}`)
+          }
+          dispatchQueuedRequests()
+          return
+        }
+
+        rejectRequestWithError(currentRequest, timeoutError)
+      }, timeoutMs),
     }
+
+    request.timer.unref?.()
+    requestMap.set(requestId, request)
+    requestQueue.push(request)
+    dispatchQueuedRequests()
   })
 }
 
 export function __getGitDiffWorkerPidForTest() {
-  return Number(workerProcess?.pid || 0)
+  return Number(workerPool[0]?.child?.pid || 0)
+}
+
+export function __getGitDiffWorkerPidsForTest() {
+  return workerPool.map((worker) => Number(worker.child?.pid || 0)).filter((pid) => pid > 0)
 }
 
 export function getGitDiffWorkerDiagnostics() {
   return {
     worker: {
-      pid: Number(workerProcess?.pid || 0),
-      running: Boolean(workerProcess && !workerProcess.killed && workerProcess.exitCode === null),
-      pendingRequests: pendingRequests.size,
-      stderrTail: workerStderrBuffer.trim(),
+      pid: Number(workerPool[0]?.child?.pid || 0),
+      running: workerPool.some((worker) => !worker.stopping && worker.child?.exitCode === null && !worker.child?.killed),
+      pendingRequests: requestQueue.length + activeRequests.size,
+      stderrTail: String(workerPool[0]?.stderrBuffer || '').trim(),
     },
+    workers: workerPool.map((worker) => ({
+      id: worker.id,
+      pid: Number(worker.child?.pid || 0),
+      running: !worker.stopping && worker.child?.exitCode === null && !worker.child?.killed,
+      activeRequestId: String(worker.activeRequestId || '').trim(),
+      stderrTail: String(worker.stderrBuffer || '').trim(),
+      startedAt: worker.startedAt,
+    })),
     metrics: {
       ...workerMetrics,
+      maxWorkers: DEFAULT_MAX_WORKERS,
+      queueDepth: requestQueue.length,
+      activeRequestCount: activeRequests.size,
+      workerCount: workerPool.length,
       lastWorkerExitSignal: String(workerMetrics.lastWorkerExitSignal || ''),
       lastWorkerExitReason: String(workerMetrics.lastWorkerExitReason || ''),
       lastRequest: workerMetrics.lastRequest ? { ...workerMetrics.lastRequest } : null,

package/apps/server/src/runDispatchService.js

@@ -136,7 +136,7 @@ export function createRunDispatchService(options = {}) {
       throw createApiError('errors.shellEmptyCommand', '请输入要执行的命令，例如 !git status', 400)
     }
     if (commandMode === 'shell' && !allowShellCommand) {
-      throw createApiError('errors.shellLocalOnly', '命令模式默认仅允许在本机本地界面中使用；如需对远程访问开放，请先到设置里显式开启。', 403)
+      throw createApiError('errors.shellLocalOnly', '当前入口未被允许执行命令。请在设置 -> 通用 -> 远程命令安全中启用对应模式，或改为本机本地访问。', 403)
     }
 
     const task = getTaskBySlug(normalizedTaskSlug)

package/apps/server/src/systemConfig.js

@@ -7,6 +7,7 @@ const SYSTEM_CONFIG_FILE = 'system-config.json'
 const DEFAULT_RUNNER_MAX_CONCURRENT_RUNS = 3
 const MIN_RUNNER_MAX_CONCURRENT_RUNS = 1
 const MAX_RUNNER_MAX_CONCURRENT_RUNS = 16
+const REMOTE_COMMAND_SECURITY_MODES = new Set(['disabled', 'relay', 'trusted-proxy'])
 
 function getSystemConfigPath() {
   const { dataDir } = ensurePromptxStorageReady()
@@ -40,9 +41,30 @@ function normalizeRunnerConfig(input = {}, fallback = {}) {
   }
 }
 
+function normalizeRemoteCommandSecurityConfig(input = {}, fallback = {}) {
+  const inputMode = String(input?.mode || '').trim()
+  const fallbackMode = String(fallback?.mode || '').trim()
+  const mode = REMOTE_COMMAND_SECURITY_MODES.has(inputMode)
+    ? inputMode
+    : REMOTE_COMMAND_SECURITY_MODES.has(fallbackMode)
+      ? fallbackMode
+      : 'disabled'
+
+  return {
+    mode,
+    trustedProxyToken: mode === 'trusted-proxy'
+      ? String(input?.trustedProxyToken || fallback?.trustedProxyToken || '').trim()
+      : '',
+  }
+}
+
 function normalizeSystemConfig(input = {}, fallback = {}) {
   return {
     runner: normalizeRunnerConfig(input?.runner || {}, fallback?.runner || {}),
+    remoteCommandSecurity: normalizeRemoteCommandSecurityConfig(
+      input?.remoteCommandSecurity || {},
+      fallback?.remoteCommandSecurity || {}
+    ),
   }
 }
 
@@ -73,7 +95,7 @@ function getSystemConfigManagedByEnv() {
   }
 }
 
-function getSystemConfigForClient() {
+function getSystemConfigForRuntime() {
   const stored = readStoredSystemConfig()
   const managedByEnv = getSystemConfigManagedByEnv()
 
@@ -86,8 +108,21 @@ function getSystemConfigForClient() {
   }, stored)
 }
 
+function getSystemConfigForClient() {
+  const effective = getSystemConfigForRuntime()
+
+  return {
+    runner: effective.runner,
+    remoteCommandSecurity: {
+      mode: String(effective.remoteCommandSecurity?.mode || 'disabled').trim() || 'disabled',
+      trustedProxyTokenConfigured: Boolean(String(effective.remoteCommandSecurity?.trustedProxyToken || '').trim()),
+    },
+  }
+}
+
 export {
   getSystemConfigForClient,
+  getSystemConfigForRuntime,
   getSystemConfigManagedByEnv,
   getSystemConfigPath,
   normalizeSystemConfig,