sqlite-executor 4.0.11 → 4.0.12

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

@@ -7,7 +7,7 @@ export const DEFAULT_STATEMENT_TIMEOUT: 30000;
  *
  * @param timeout   - 超时时间（毫秒）
  * @param sql       - 超时发生时正在执行的 SQL 语句（已规范化）
- * @param startTime - 任务开始时的 performance.now() 值（可选）；提供后会生成人类可读的时间信息
+ * @param startTime - 任务开始时的 Unix 毫秒时间戳或 performance.now() 值（可选）
  * @returns 包含超时时间、时间信息和 SQL 的 Error 实例
  */
 export function createTimeoutError(timeout: number, sql: string, startTime?: number): Error;

package/dist/esm/index.mjs

@@ -1,34 +1,112 @@
 import * as __WEBPACK_EXTERNAL_MODULE_node_child_process_27f17141__ from "node:child_process";
-import * as __WEBPACK_EXTERNAL_MODULE_node_events_0a6aefe7__ from "node:events";
 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 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 _array_like_to_array(arr, len) {
+    if (null == len || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
+    if (null == _i) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && null != _i["return"]) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if ("string" == typeof o) return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if ("Object" === n && o.constructor) n = o.constructor.name;
+    if ("Map" === n || "Set" === n) return Array.from(n);
+    if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
+var DEFAULT_STATEMENT_TIMEOUT = 30000;
 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));
+    var startedAt = resolveStartTimestamp(startTime, timeout);
+    var deadline = startedAt + timeout;
+    var duration = formatDuration(timeout);
+    var rawDuration = duration === "".concat(timeout, "ms") ? "" : " (".concat(timeout, "ms)");
+    return new Error("SQLite statement timed out after ".concat(duration).concat(rawDuration, "; ") + "started at ".concat(formatTimestamp(startedAt), "; ") + "deadline at ".concat(formatTimestamp(deadline), "; SQL: ").concat(sql));
+}
+function resolveStartTimestamp(startTime, timeout) {
+    if (!Number.isFinite(startTime)) return Date.now() - timeout;
+    if (startTime >= 1000000000000) return startTime;
+    return Date.now() - Math.max(0, performance.now() - startTime);
+}
+function formatDuration(milliseconds) {
+    var remaining = milliseconds;
+    var parts = [];
+    var units = [
+        [
+            86400000,
+            "d"
+        ],
+        [
+            3600000,
+            "h"
+        ],
+        [
+            60000,
+            "m"
+        ],
+        [
+            1000,
+            "s"
+        ]
+    ];
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+    try {
+        for(var _iterator = units[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _sliced_to_array(_step.value, 2), unitMilliseconds = _step_value[0], suffix = _step_value[1];
+            var value = Math.floor(remaining / unitMilliseconds);
+            if (value > 0) {
+                parts.push("".concat(value).concat(suffix));
+                remaining -= value * unitMilliseconds;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && null != _iterator["return"]) _iterator["return"]();
+        } finally{
+            if (_didIteratorError) throw _iteratorError;
+        }
     }
-    return new Error("SQLite statement timed out after ".concat(timeout, "ms: ").concat(sql));
+    if (remaining > 0 || 0 === parts.length) parts.push("".concat(remaining, "ms"));
+    return parts.join(" ");
+}
+function formatTimestamp(timestamp) {
+    return new Date(timestamp).toISOString().replace("T", " ").replace("Z", " UTC");
 }
 function toError(value) {
     return value instanceof Error ? value : new Error(String(value));
@@ -963,7 +1041,7 @@ var process_ProcessManager = /*#__PURE__*/ function() {
             value: function() {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var proc, timer, _proc_stdin;
+                    var proc;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -971,6 +1049,9 @@ var process_ProcessManager = /*#__PURE__*/ function() {
                                 if (!proc) return [
                                     2
                                 ];
+                                if (null !== proc.exitCode || null !== proc.signalCode) return [
+                                    2
+                                ];
                                 if (!(process_class_private_field_get(_this, _draining) || process_class_private_field_get(_this, _writeBuffer).length > 0)) return [
                                     3,
                                     2
@@ -989,40 +1070,43 @@ var process_ProcessManager = /*#__PURE__*/ function() {
                                 _state.sent();
                                 _state.label = 2;
                             case 2:
-                                timer = setTimeout(function() {
-                                    proc.kill();
-                                }, GRACEFUL_SHUTDOWN_TIMEOUT).unref();
-                                _state.label = 3;
-                            case 3:
-                                _state.trys.push([
-                                    3,
-                                    5,
-                                    6,
-                                    7
-                                ]);
-                                null == (_proc_stdin = proc.stdin) || _proc_stdin.write(".quit\n");
-                                return [
-                                    4,
-                                    (0, __WEBPACK_EXTERNAL_MODULE_node_events_0a6aefe7__.once)(proc, "close")
+                                if (null !== proc.exitCode || null !== proc.signalCode) return [
+                                    2
                                 ];
-                            case 4:
-                                _state.sent();
                                 return [
-                                    3,
-                                    7
+                                    4,
+                                    new Promise(function(resolve) {
+                                        var settled = false;
+                                        var finish = function() {
+                                            if (settled) return;
+                                            settled = true;
+                                            clearTimeout(timer);
+                                            proc.off("close", finish);
+                                            proc.off("error", finish);
+                                            resolve();
+                                        };
+                                        var forceClose = function() {
+                                            try {
+                                                proc.kill();
+                                            } catch (e) {}
+                                            finish();
+                                        };
+                                        var timer = setTimeout(forceClose, GRACEFUL_SHUTDOWN_TIMEOUT);
+                                        proc.once("close", finish);
+                                        proc.once("error", finish);
+                                        if (null !== proc.exitCode || null !== proc.signalCode) return void finish();
+                                        try {
+                                            if (!proc.stdin) return void forceClose();
+                                            proc.stdin.write(".quit\n", function(error) {
+                                                if (error) forceClose();
+                                            });
+                                        } catch (e) {
+                                            forceClose();
+                                        }
+                                    })
                                 ];
-                            case 5:
+                            case 3:
                                 _state.sent();
-                                return [
-                                    3,
-                                    7
-                                ];
-                            case 6:
-                                clearTimeout(timer);
-                                return [
-                                    7
-                                ];
-                            case 7:
                                 return [
                                     2
                                 ];
@@ -1841,13 +1925,13 @@ function shrinkIfNeeded() {
         queue_class_private_field_set(this, _mask, INITIAL_CAPACITY - 1);
     }
 }
-function _array_like_to_array(arr, len) {
+function inflightTracker_array_like_to_array(arr, len) {
     if (null == len || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
 function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
+    if (Array.isArray(arr)) return inflightTracker_array_like_to_array(arr);
 }
 function inflightTracker_check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
@@ -1924,15 +2008,15 @@ function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+    return _array_without_holes(arr) || _iterable_to_array(arr) || inflightTracker_unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function _unsupported_iterable_to_array(o, minLen) {
+function inflightTracker_unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
-    if ("string" == typeof o) return _array_like_to_array(o, minLen);
+    if ("string" == typeof o) return inflightTracker_array_like_to_array(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if ("Object" === n && o.constructor) n = o.constructor.name;
     if ("Map" === n || "Set" === n) return Array.from(n);
-    if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+    if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return inflightTracker_array_like_to_array(o, minLen);
 }
 var _tasks = /*#__PURE__*/ new WeakMap(), inflightTracker_head = /*#__PURE__*/ new WeakMap();
 var inflightTracker_InflightTracker = /*#__PURE__*/ function() {
@@ -2233,7 +2317,7 @@ function prepareTaskTimeout(task, metrics) {
     if (task.settled) return null;
     task.timedout = true;
     null == metrics || metrics.incrementTasksTimeout();
-    return createTimeoutError(task.timeout, task.sql, task.startTime);
+    return createTimeoutError(task.timeout, task.sql, task.startedAt);
 }
 function createSweeper(param) {
     var inflight = param.inflight, sweepIntervalMs = param.sweepIntervalMs, handleTaskTimeout = param.handleTaskTimeout;
@@ -2243,9 +2327,8 @@ function createSweeper(param) {
         sweepTimer = setTimeout(function() {
             sweepTimer = null;
             var now = performance.now();
-            inflight.forEach(function(task) {
-                if (now - task.startTime > task.timeout) handleTaskTimeout(task);
-            });
+            var task = inflight.first;
+            if (task && now - task.startTime > task.timeout) handleTaskTimeout(task);
             if (inflight.count > 0) schedule();
         }, sweepIntervalMs).unref();
     };
@@ -2351,7 +2434,10 @@ function advanceNextInflightStartTime(inflight) {
     var next = inflight.first;
     if (next && next.startTime > 0) {
         var now = performance.now();
-        if (now > next.startTime) next.startTime = now;
+        if (now > next.startTime) {
+            next.startTime = now;
+            next.startedAt = Date.now();
+        }
     }
 }
 function handleParsedValue(raw, inflight, param) {
@@ -2400,6 +2486,7 @@ function createPumpQueue(param) {
         }
         if (0 === batch.length) return;
         var now = performance.now();
+        var startedAt = Date.now();
         var payload = buildBatchPayload(batch);
         var batchId = nextBatchId++;
         var useWalBatch = payload.startsWith("BEGIN;");
@@ -2408,6 +2495,7 @@ function createPumpQueue(param) {
             for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                 var task1 = _step.value;
                 task1.startTime = now;
+                task1.startedAt = startedAt;
                 task1.batchId = batchId;
                 task1.walBatch = useWalBatch;
             }
@@ -2812,7 +2900,8 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
                     consumerError: null,
                     stderrText: "",
                     settled: false,
-                    startTime: 0
+                    startTime: 0,
+                    startedAt: 0
                 };
                 null == (_$_class_private_field_get = taskWorker_class_private_field_get(this, _metrics)) || _$_class_private_field_get.incrementTasksTotal(config.kind);
                 taskWorker_class_private_field_get(this, _pendingQueue).enqueue(task);
@@ -4474,6 +4563,7 @@ function enqueueWriter(kind, sql, timeout, token, onRow, scopeId) {
             stderrText: "",
             settled: false,
             startTime: 0,
+            startedAt: 0,
             rowParser: null,
             rows: "query" === kind ? [] : null
         };