sqlite-executor 4.0.9 → 4.0.11

package/dist/cjs/utils/timeout.d.cts

@@ -5,8 +5,9 @@ export const DEFAULT_STATEMENT_TIMEOUT: 30000;
  * 创建包含 SQL 上下文的超时错误。
  * 注意：sql 应已由调用方完成规范化，本函数不再内部调用 normalizeSQL。
  *
- * @param timeout - 超时时间（毫秒）
- * @param sql     - 超时发生时正在执行的 SQL 语句（已规范化）
- * @returns 包含超时时间和 SQL 信息的 Error 实例
+ * @param timeout   - 超时时间（毫秒）
+ * @param sql       - 超时发生时正在执行的 SQL 语句（已规范化）
+ * @param startTime - 任务开始时的 performance.now() 值（可选）；提供后会生成人类可读的时间信息
+ * @returns 包含超时时间、时间信息和 SQL 的 Error 实例
  */
-export function createTimeoutError(timeout: number, sql: string): Error;
+export function createTimeoutError(timeout: number, sql: string, startTime?: number): Error;

package/dist/esm/index.mjs

@@ -4,7 +4,30 @@ import * as __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__ from "node:fs";
 import * as __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__ from "node:path";
 import * as __WEBPACK_EXTERNAL_MODULE_node_os_74b4b876__ from "node:os";
 var DEFAULT_STATEMENT_TIMEOUT = 30000;
-function createTimeoutError(timeout, sql) {
+function formatDateTime(date) {
+    var y = date.getFullYear();
+    var M = String(date.getMonth() + 1).padStart(2, "0");
+    var d = String(date.getDate()).padStart(2, "0");
+    var h = String(date.getHours()).padStart(2, "0");
+    var m = String(date.getMinutes()).padStart(2, "0");
+    var s = String(date.getSeconds()).padStart(2, "0");
+    var ms = String(date.getMilliseconds()).padStart(3, "0");
+    return "".concat(y, "-").concat(M, "-").concat(d, " ").concat(h, ":").concat(m, ":").concat(s, ".").concat(ms);
+}
+function formatDuration(ms) {
+    if (ms < 1000) return "".concat(ms, "ms");
+    if (ms < 60000) return "".concat((ms / 1000).toFixed(1), "s");
+    var mins = Math.floor(ms / 60000);
+    var secs = (ms % 60000 / 1000).toFixed(1);
+    return "".concat(mins, "m ").concat(secs, "s");
+}
+function createTimeoutError(timeout, sql, startTime) {
+    if (void 0 !== startTime) {
+        var elapsed = Math.max(0, performance.now() - startTime);
+        var startDate = new Date(Date.now() - elapsed);
+        var deadlineDate = new Date(startDate.getTime() + timeout);
+        return new Error("SQLite statement timed out after ".concat(formatDuration(timeout), " ") + "(start: ".concat(formatDateTime(startDate), ", ") + "deadline: ".concat(formatDateTime(deadlineDate), "): ").concat(sql));
+    }
     return new Error("SQLite statement timed out after ".concat(timeout, "ms: ").concat(sql));
 }
 function toError(value) {
@@ -173,6 +196,43 @@ function createRowStreamParser(onRow) {
                     index++;
                     continue;
                 }
+                if (-1 !== elementEnd) {
+                    if (isWhitespaceCode(code)) {
+                        index++;
+                        continue;
+                    }
+                    if (code === CHAR_COMMA || code === CHAR_CLOSE_BRACKET) {
+                        onRow(buffer.slice(elementStart, elementEnd));
+                        consumed = index + 1;
+                        elementStart = -1;
+                        elementEnd = -1;
+                        nesting = 0;
+                        if (code === CHAR_CLOSE_BRACKET) {
+                            this.finished = true;
+                            this.buffer = "";
+                            this.started = false;
+                            this.inString = false;
+                            this.escaped = false;
+                            this.elementStart = -1;
+                            this.elementEnd = -1;
+                            this.nesting = 0;
+                            this._consumed = 0;
+                            this.readPos = 0;
+                            return buffer.slice(consumed);
+                        }
+                        index = consumed;
+                        if (consumed > 65536) {
+                            buffer = buffer.slice(consumed);
+                            this.buffer = buffer;
+                            this._consumed = 0;
+                            index = 0;
+                            consumed = 0;
+                        }
+                        continue;
+                    }
+                    index++;
+                    continue;
+                }
                 if (code === CHAR_QUOTE) {
                     inString = true;
                     index++;
@@ -187,42 +247,6 @@ function createRowStreamParser(onRow) {
                     nesting--;
                     if (0 === nesting) elementEnd = index + 1;
                 }
-                if (-1 !== elementEnd) {
-                    var lookAhead = index + 1;
-                    while(lookAhead < buffer.length && isWhitespaceCode(buffer.charCodeAt(lookAhead)))lookAhead++;
-                    if (lookAhead < buffer.length) {
-                        var delimiter = buffer.charCodeAt(lookAhead);
-                        if (delimiter === CHAR_COMMA || delimiter === CHAR_CLOSE_BRACKET) {
-                            onRow(buffer.slice(elementStart, elementEnd));
-                            consumed = lookAhead + 1;
-                            elementStart = -1;
-                            elementEnd = -1;
-                            nesting = 0;
-                            if (delimiter === CHAR_CLOSE_BRACKET) {
-                                this.finished = true;
-                                this.buffer = "";
-                                this.started = false;
-                                this.inString = false;
-                                this.escaped = false;
-                                this.elementStart = -1;
-                                this.elementEnd = -1;
-                                this.nesting = 0;
-                                this._consumed = 0;
-                                this.readPos = 0;
-                                return buffer.slice(consumed);
-                            }
-                            index = consumed;
-                            if (consumed > 65536) {
-                                buffer = buffer.slice(consumed);
-                                this.buffer = buffer;
-                                this._consumed = 0;
-                                index = 0;
-                                consumed = 0;
-                            }
-                            continue;
-                        }
-                    }
-                }
                 index++;
             }
             this.started = started;
@@ -2209,7 +2233,7 @@ function prepareTaskTimeout(task, metrics) {
     if (task.settled) return null;
     task.timedout = true;
     null == metrics || metrics.incrementTasksTimeout();
-    return createTimeoutError(task.timeout, task.sql);
+    return createTimeoutError(task.timeout, task.sql, task.startTime);
 }
 function createSweeper(param) {
     var inflight = param.inflight, sweepIntervalMs = param.sweepIntervalMs, handleTaskTimeout = param.handleTaskTimeout;
@@ -2242,6 +2266,7 @@ function createFinalizeScheduler(param) {
     var scheduled = false;
     var immediate = null;
     var cancelled = false;
+    var delayedZeroRowQueries = new WeakSet();
     var cancel = function() {
         cancelled = true;
         if (immediate) {
@@ -2257,8 +2282,66 @@ function createFinalizeScheduler(param) {
         immediate = setImmediate(function() {
             immediate = null;
             if (cancelled) return;
+            var delayedTasks = [];
+            var hasQueryRows = Array.from(pendingFinalizeTasks).some(function(task) {
+                return "query" === task.kind && task.rows.length > 0;
+            });
+            if (!(null == pendingStderr ? void 0 : pendingStderr.length) && hasQueryRows) {
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+                try {
+                    for(var _iterator = pendingFinalizeTasks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var task = _step.value;
+                        if ("query" === task.kind && 0 === task.rows.length && !task.stderrText && !task.consumerError && !delayedZeroRowQueries.has(task)) {
+                            delayedZeroRowQueries.add(task);
+                            delayedTasks.push(task);
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && null != _iterator["return"]) _iterator["return"]();
+                    } finally{
+                        if (_didIteratorError) throw _iteratorError;
+                    }
+                }
+                var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+                try {
+                    for(var _iterator1 = delayedTasks[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                        var task1 = _step1.value;
+                        pendingFinalizeTasks["delete"](task1);
+                    }
+                } catch (err) {
+                    _didIteratorError1 = true;
+                    _iteratorError1 = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion1 && null != _iterator1["return"]) _iterator1["return"]();
+                    } finally{
+                        if (_didIteratorError1) throw _iteratorError1;
+                    }
+                }
+            }
             finalizePendingTasks(pendingFinalizeTasks, settle, pumpQueue, pendingStderr, inflight);
+            var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+            try {
+                for(var _iterator2 = delayedTasks[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true){
+                    var task2 = _step2.value;
+                    pendingFinalizeTasks.add(task2);
+                }
+            } catch (err) {
+                _didIteratorError2 = true;
+                _iteratorError2 = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion2 && null != _iterator2["return"]) _iterator2["return"]();
+                } finally{
+                    if (_didIteratorError2) throw _iteratorError2;
+                }
+            }
             scheduled = false;
+            if (delayedTasks.length > 0) check();
         });
     };
     check.cancel = cancel;