sqlite-executor 4.0.2 → 4.0.3

package/dist/esm/core/pipelineEngine.d.mts

@@ -12,6 +12,8 @@ export interface PipelineEngineOptions {
 	logger?: { error?: (...args: any[]) => void };
 	/** 管线化批量大小，控制一次 stdin.write 合并几条语句，默认 10 */
 	batchSize?: number;
+	/** 最大 inflight 任务数，默认 50 */
+	maxInflight?: number;
 	/** 任务超时时的回调 */
 	onTaskTimeout?: (task: any) => void;
 }

package/dist/esm/core/process.d.mts

@@ -11,8 +11,14 @@ export declare class ProcessManager {
 	 * @param options.initMode 初始化模式
 	 *   - `"wal"` （默认）：启动时通过 `-cmd` 设置 WAL 模式 + busy_timeout
 	 *   - `"none"`：不添加任何初始化参数（适用于 reader，直接继承数据库已有 WAL 模式）
+	 * @param options.onDrain  drain 回调，当 stdin pipe 重新可写时调用
 	 */
-	constructor(options?: { binary?: string; database?: string; initMode?: "wal" | "none" });
+	constructor(options?: {
+		binary?: string;
+		database?: string;
+		initMode?: "wal" | "none";
+		onDrain?: () => void;
+	});
 
 	/** 当前使用的 sqlite3 可执行文件路径 */
 	get binary(): string;
@@ -20,6 +26,12 @@ export declare class ProcessManager {
 	/** 底层子进程实例，未启动时为 null */
 	get process(): ChildProcess | null;
 
+	/**
+	 * drain 状态，true 表示 OS pipe 已满，应暂停写入 stdin。
+	 * 当 pipe 重新可写时 drain 事件触发，draining 恢复为 false。
+	 */
+	get draining(): boolean;
+
 	/**
 	 * 启动子进程（json 模式），返回 ChildProcess 实例。
 	 * @throws {Error} 如果 binary 路径为空或文件不存在
@@ -29,6 +41,9 @@ export declare class ProcessManager {
 	/** 向子进程的 stdin 写入数据 */
 	write(data: string): void;
 
+	/** 注册 drain 回调，当 pipe 重新可写时被调用。 */
+	setOnDrainCallback(fn: () => void): void;
+
 	/**
 	 * 终止子进程。
 	 * 先尝试 SIGTERM，3 秒后未退出则 SIGKILL。

package/dist/esm/core/taskWorker.d.mts

@@ -1,3 +1,5 @@
+import { Metrics } from "./metrics.mts";
+
 /**
  * 单个 sqlite3 进程 Worker，支持管线化（pipelining）。
  *
@@ -18,6 +20,8 @@ export class TaskWorker {
 	 * @param options.name              Worker 名称，用于日志和调试
 	 * @param options.initMode          子进程初始化模式（参考 ProcessManager）
 	 * @param options.batchSize         管线化批量大小，默认 10
+	 * @param options.maxInflight       最大 inflight 任务数，默认 50
+	 * @param options.metrics           指标收集器
 	 */
 	constructor(options: {
 		binary: string;
@@ -27,6 +31,8 @@ export class TaskWorker {
 		name?: string;
 		initMode?: "wal" | "none";
 		batchSize?: number;
+		maxInflight?: number;
+		metrics?: Metrics;
 	});
 
 	/** Worker 名称 */

package/dist/esm/index.mjs

@@ -920,11 +920,11 @@ function _ts_generator(thisArg, body) {
     }
 }
 var GRACEFUL_SHUTDOWN_TIMEOUT = 5000;
-var _binary = /*#__PURE__*/ new WeakMap(), _database = /*#__PURE__*/ new WeakMap(), _proc = /*#__PURE__*/ new WeakMap(), _initMode = /*#__PURE__*/ new WeakMap(), _draining = /*#__PURE__*/ new WeakMap();
+var _binary = /*#__PURE__*/ new WeakMap(), _database = /*#__PURE__*/ new WeakMap(), _proc = /*#__PURE__*/ new WeakMap(), _initMode = /*#__PURE__*/ new WeakMap(), _draining = /*#__PURE__*/ new WeakMap(), _onDrain = /*#__PURE__*/ new WeakMap();
 var process_ProcessManager = /*#__PURE__*/ function() {
     "use strict";
     function ProcessManager() {
-        var _ref = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, binary = _ref.binary, database = _ref.database, _ref_initMode = _ref.initMode, initMode = void 0 === _ref_initMode ? "wal" : _ref_initMode;
+        var _ref = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, binary = _ref.binary, database = _ref.database, _ref_initMode = _ref.initMode, initMode = void 0 === _ref_initMode ? "wal" : _ref_initMode, onDrain = _ref.onDrain;
         process_class_call_check(this, ProcessManager);
         process_class_private_field_init(this, _binary, {
             writable: true,
@@ -946,12 +946,29 @@ var process_ProcessManager = /*#__PURE__*/ function() {
             writable: true,
             value: false
         });
+        process_class_private_field_init(this, _onDrain, {
+            writable: true,
+            value: void 0
+        });
         var _which;
         process_class_private_field_set(this, _binary, null != (_which = which(binary)) ? _which : binary);
         process_class_private_field_set(this, _database, database);
         process_class_private_field_set(this, _initMode, initMode);
+        process_class_private_field_set(this, _onDrain, null != onDrain ? onDrain : function() {});
     }
     process_create_class(ProcessManager, [
+        {
+            key: "draining",
+            get: function() {
+                return process_class_private_field_get(this, _draining);
+            }
+        },
+        {
+            key: "setOnDrainCallback",
+            value: function(fn) {
+                process_class_private_field_set(this, _onDrain, fn);
+            }
+        },
         {
             key: "binary",
             get: function() {
@@ -997,10 +1014,12 @@ var process_ProcessManager = /*#__PURE__*/ function() {
                 var _$_class_private_field_get;
                 var stream = null == (_$_class_private_field_get = process_class_private_field_get(this, _proc)) ? void 0 : _$_class_private_field_get.stdin;
                 if (!stream) return;
-                if (!stream.write(data) && !process_class_private_field_get(this, _draining)) {
+                if (process_class_private_field_get(this, _draining)) return;
+                if (!stream.write(data)) {
                     process_class_private_field_set(this, _draining, true);
                     stream.once("drain", function() {
                         process_class_private_field_set(_this, _draining, false);
+                        process_class_private_field_get(_this, _onDrain).call(_this);
                     });
                 }
             }
@@ -1019,7 +1038,7 @@ var process_ProcessManager = /*#__PURE__*/ function() {
                                     2
                                 ];
                                 timer = setTimeout(function() {
-                                    _this.kill();
+                                    proc.kill();
                                 }, GRACEFUL_SHUTDOWN_TIMEOUT);
                                 _state.label = 1;
                             case 1:
@@ -1774,6 +1793,8 @@ function processStreamRows(task, parsed) {
 }
 function settleTask(task, error, value, metrics) {
     var _ref = arguments.length > 4 && void 0 !== arguments[4] ? arguments[4] : {}, _ref_resetRowParser = _ref.resetRowParser, resetRowParser = void 0 === _ref_resetRowParser ? false : _ref_resetRowParser;
+    if (task.settled) return;
+    task.settled = true;
     clearTimeout(task.timer);
     if (resetRowParser) {
         var _task_rowParser_reset, _task_rowParser;
@@ -1941,7 +1962,10 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
         taskWorker_class_private_field_set(this, _processManager, new process_ProcessManager({
             binary: binary,
             database: database,
-            initMode: initMode
+            initMode: initMode,
+            onDrain: function() {
+                return taskWorker_class_private_method_get(_this, _pumpQueue, pumpQueue).call(_this);
+            }
         }));
         taskWorker_class_private_field_set(this, _valueParser, createJsonValueParser(function(raw) {
             return taskWorker_class_private_method_get(_this, _handleParsedValue, handleParsedValue).call(_this, raw);
@@ -1983,6 +2007,7 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
                     onRow: null != (_config_onRow = config.onRow) ? _config_onRow : null,
                     consumerError: null,
                     stderrText: "",
+                    settled: false,
                     errorScheduled: false,
                     timer: null,
                     startTime: 0
@@ -2026,6 +2051,7 @@ function startProcess() {
 function pumpQueue() {
     var _this = this;
     var _$_class_private_field_get;
+    if (taskWorker_class_private_field_get(this, _processManager).draining) return;
     if (taskWorker_class_private_field_get(this, _inflightTasks).length >= taskWorker_class_private_field_get(this, _maxInflight)) return;
     var batch = [];
     while(batch.length < taskWorker_class_private_field_get(this, _batchSize) && !taskWorker_class_private_field_get(this, _pendingQueue).isEmpty() && taskWorker_class_private_field_get(this, _inflightTasks).length + batch.length < taskWorker_class_private_field_get(this, _maxInflight)){
@@ -2074,6 +2100,7 @@ function handleParsedValue(raw) {
     if (isSentinelRow(parsed, task.token)) {
         clearTimeout(task.timer);
         taskWorker_class_private_field_get(this, _inflightTasks).shift();
+        if (task.timedout) return void taskWorker_class_private_method_get(this, _pumpQueue, pumpQueue).call(this);
         if (task.stderrText) {
             taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, task, new Error(task.stderrText.trim()), void 0);
             taskWorker_class_private_method_get(this, _pumpQueue, pumpQueue).call(this);
@@ -2142,9 +2169,12 @@ function taskWorker_handleStderrChunk(chunk) {
 }
 function handleTaskTimeout(task) {
     var _$_class_private_field_get;
-    if (taskWorker_class_private_field_get(this, _inflightTasks)[0] !== task) return;
+    if (task.settled) return;
+    task.timedout = true;
+    clearTimeout(task.timer);
+    task.timer = null;
     null == (_$_class_private_field_get = taskWorker_class_private_field_get(this, _metrics)) || _$_class_private_field_get.incrementTasksTimeout();
-    taskWorker_class_private_method_get(this, _rejectAll, taskWorker_rejectAll).call(this, createTimeoutError(task.timeout, task.sql));
+    taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, task, createTimeoutError(task.timeout, task.sql), void 0);
 }
 function settleTask1(task, error, value) {
     settleTask(task, error, value, taskWorker_class_private_field_get(this, _metrics));
@@ -2909,7 +2939,7 @@ function pipelineEngine_unsupported_iterable_to_array(o, minLen) {
     if ("Map" === n || "Set" === n) return Array.from(n);
     if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return pipelineEngine_array_like_to_array(o, minLen);
 }
-var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduledFinalize = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), pipelineEngine_maxInflight = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), pipelineEngine_handleParsedValue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
+var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduledFinalize = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), pipelineEngine_maxInflight = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), pipelineEngine_handleParsedValue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_handleTaskTimeout = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
 var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
     "use strict";
     function PipelineEngine(processManager, param) {
@@ -2919,6 +2949,7 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         pipelineEngine_class_private_method_init(this, core_pipelineEngine_pumpQueue);
         pipelineEngine_class_private_method_init(this, pipelineEngine_handleParsedValue);
         pipelineEngine_class_private_method_init(this, core_pipelineEngine_scheduleFinalizeCheck);
+        pipelineEngine_class_private_method_init(this, core_pipelineEngine_handleTaskTimeout);
         pipelineEngine_class_private_method_init(this, pipelineEngine_settleTask);
         pipelineEngine_class_private_field_init(this, _queue, {
             writable: true,
@@ -2982,6 +3013,9 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         pipelineEngine_class_private_field_set(this, _sharedValueParser, createJsonValueParser(function(raw) {
             return pipelineEngine_class_private_method_get(_this, pipelineEngine_handleParsedValue, core_pipelineEngine_handleParsedValue).call(_this, raw);
         }));
+        pipelineEngine_class_private_field_get(this, pipelineEngine_processManager).setOnDrainCallback(function() {
+            return pipelineEngine_class_private_method_get(_this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(_this);
+        });
     }
     pipelineEngine_create_class(PipelineEngine, [
         {
@@ -3114,6 +3148,7 @@ function pipelineEngine_pumpQueue() {
     var _this = this;
     var _$_class_private_field_get;
     if (!pipelineEngine_class_private_field_get(this, _active)) return;
+    if (pipelineEngine_class_private_field_get(this, pipelineEngine_processManager).draining) return;
     if (pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length >= pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)) return;
     var batch = [];
     while(batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_batchSize) && !pipelineEngine_class_private_field_get(this, _queue).isEmpty() && pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length + batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)){
@@ -3131,8 +3166,7 @@ function pipelineEngine_pumpQueue() {
             var task = _step.value;
             task.startTime = now;
             task.timer = setTimeout(function() {
-                if (pipelineEngine_class_private_field_get(_this, pipelineEngine_inflightTasks)[0] !== task) return;
-                pipelineEngine_class_private_field_get(_this, _onTaskTimeout).call(_this, task);
+                return pipelineEngine_class_private_method_get(_this, core_pipelineEngine_handleTaskTimeout, pipelineEngine_handleTaskTimeout).call(_this, task);
             }, task.timeout);
         };
         for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
@@ -3162,6 +3196,7 @@ function core_pipelineEngine_handleParsedValue(raw) {
     if (isSentinelRow(parsed, task.token)) {
         clearTimeout(task.timer);
         pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).shift();
+        if (task.timedout) return void pipelineEngine_class_private_method_get(this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(this);
         if (task.consumerError) {
             pipelineEngine_class_private_method_get(this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(this, task, task.consumerError, void 0);
             pipelineEngine_class_private_method_get(this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(this);
@@ -3172,6 +3207,7 @@ function core_pipelineEngine_handleParsedValue(raw) {
         pipelineEngine_class_private_method_get(this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(this);
         return;
     }
+    if (task.timedout) return;
     if ("query" === task.kind) return void collectQueryRows(task, parsed);
     if ("stream" === task.kind) processStreamRows(task, parsed);
 }
@@ -3212,6 +3248,14 @@ function pipelineEngine_scheduleFinalizeCheck() {
         pipelineEngine_class_private_field_get(_this, pipelineEngine_pendingFinalizeTasks).clear();
     });
 }
+function pipelineEngine_handleTaskTimeout(task) {
+    var _this, _this1;
+    if (task.settled) return;
+    task.timedout = true;
+    clearTimeout(task.timer);
+    pipelineEngine_class_private_method_get(this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(this, task, createTimeoutError(task.timeout, task.sql), void 0);
+    null == (_this = pipelineEngine_class_private_field_get(_this1 = this, _onTaskTimeout)) || _this.call(_this1, task);
+}
 function pipelineEngine_settleTask1(task, error, value) {
     settleTask(task, error, value, pipelineEngine_class_private_field_get(this, pipelineEngine_metrics), {
         resetRowParser: true
@@ -3521,7 +3565,6 @@ var executor_SQLiteExecutor = /*#__PURE__*/ function() {
             logger: executor_class_private_field_get(this, executor_logger),
             onTaskTimeout: function(task) {
                 executor_class_private_field_get(_this, executor_metrics).incrementTasksTimeout();
-                executor_class_private_method_get(_this, _handleProcessFailure, handleProcessFailure).call(_this, createTimeoutError(task.timeout, task.sql));
             }
         }));
         executor_class_private_method_get(this, executor_startProcess, core_executor_startProcess).call(this);
@@ -3838,6 +3881,7 @@ function enqueueWriter(kind, sql, timeout, token, onRow, scopeId) {
             reject: reject,
             consumerError: null,
             stderrText: "",
+            settled: false,
             timer: null,
             startTime: 0,
             rowParser: null