sqlite-executor 4.0.4 → 4.0.5

package/dist/cjs/core/pipelineEngine.d.cts

@@ -16,6 +16,8 @@ export interface PipelineEngineOptions {
 	maxInflight?: number;
 	/** 任务超时时的回调 */
 	onTaskTimeout?: (task: any) => void;
+	/** 任务超时检查的时间间隔，默认 100ms */
+	sweepInterval?: number;
 }
 
 /**

package/dist/cjs/index.cjs

@@ -340,10 +340,11 @@ function createJsonValueParser(onValue) {
             }
             if (consumeUntil > 0) {
                 this._consumed = consumeUntil;
-                this.readPos = this._consumed;
+                this.readPos = -1 !== this.start ? this.buffer.length : this._consumed;
                 if (this._consumed > 65536) {
+                    if (-1 !== this.start) this.start -= this._consumed;
                     this.buffer = this.buffer.slice(this._consumed);
-                    this.readPos = 0;
+                    this.readPos = this.buffer.length;
                     this._consumed = 0;
                 }
             } else this.readPos = this.buffer.length;
@@ -1353,10 +1354,11 @@ function classifySingle(stmt) {
     return READ_ONLY_KINDS.has(kind) ? "read" : "write";
 }
 function classifySQL(sql) {
-    if ("string" != typeof sql || 0 === sql.trim().length) return "write";
+    if ("string" != typeof sql) return "write";
     var cached = _classifyCache.get(sql);
     if (void 0 !== cached) return cached;
     var trimmed = sql.trim();
+    if (0 === trimmed.length) return "write";
     var result;
     if (trimmed.includes(";")) {
         var stmts = trimmed.split(";");
@@ -1780,7 +1782,7 @@ function buildPayload(sql, token) {
     return "".concat(normalized).concat(suffix, "\nSELECT '").concat(token, "' AS ").concat(TOKEN_COLUMN, ";\n");
 }
 function isTransactionControl(sql) {
-    var s = sql.trim().toUpperCase();
+    var s = sql.toUpperCase();
     return "BEGIN" === s || "BEGIN TRANSACTION" === s || "COMMIT" === s || "COMMIT TRANSACTION" === s || "ROLLBACK" === s || "ROLLBACK TRANSACTION" === s || s.startsWith("BEGIN ") || s.startsWith("COMMIT ") || s.startsWith("ROLLBACK ");
 }
 function buildBatchPayload(batch) {
@@ -1847,8 +1849,9 @@ function buildBatchPayload(batch) {
     }
     return parts1.join("");
 }
+var TC_FIRST_CHAR = TOKEN_COLUMN.charCodeAt(0);
 function isSentinelRaw(raw, token) {
-    return raw === '[{"'.concat(TOKEN_COLUMN, '":"').concat(token, '"}]');
+    return raw.charCodeAt(3) === TC_FIRST_CHAR && raw === '[{"'.concat(TOKEN_COLUMN, '":"').concat(token, '"}]');
 }
 function isSentinelRow(value, token) {
     var _value_;
@@ -1914,7 +1917,6 @@ 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;
         null == (_task_rowParser = task.rowParser) || null == (_task_rowParser_reset = _task_rowParser.reset) || _task_rowParser_reset.call(_task_rowParser);
@@ -1963,8 +1965,6 @@ function finalizePendingTasks(tasks, settle, pumpQueue) {
 function prepareTaskTimeout(task, metrics) {
     if (task.settled) return null;
     task.timedout = true;
-    clearTimeout(task.timer);
-    task.timer = null;
     null == metrics || metrics.incrementTasksTimeout();
     return createTimeoutError(task.timeout, task.sql);
 }
@@ -3093,16 +3093,17 @@ 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(), core_pipelineEngine_handleTaskTimeout = /*#__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(), _sweepTimer = /*#__PURE__*/ new WeakMap(), _sweepIntervalMs = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), pipelineEngine_handleParsedValue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), _scheduleSweep = /*#__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) {
         var _this = this;
-        var metrics = param.metrics, statementTimeout = param.statementTimeout, logger = param.logger, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, onTaskTimeout = param.onTaskTimeout;
+        var metrics = param.metrics, statementTimeout = param.statementTimeout, logger = param.logger, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, onTaskTimeout = param.onTaskTimeout, _param_sweepInterval = param.sweepInterval, sweepInterval = void 0 === _param_sweepInterval ? 100 : _param_sweepInterval;
         pipelineEngine_class_call_check(this, PipelineEngine);
         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, _scheduleSweep);
         pipelineEngine_class_private_method_init(this, core_pipelineEngine_handleTaskTimeout);
         pipelineEngine_class_private_method_init(this, pipelineEngine_settleTask);
         pipelineEngine_class_private_field_init(this, _queue, {
@@ -3157,6 +3158,14 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             writable: true,
             value: false
         });
+        pipelineEngine_class_private_field_init(this, _sweepTimer, {
+            writable: true,
+            value: null
+        });
+        pipelineEngine_class_private_field_init(this, _sweepIntervalMs, {
+            writable: true,
+            value: void 0
+        });
         pipelineEngine_class_private_field_set(this, pipelineEngine_processManager, processManager);
         pipelineEngine_class_private_field_set(this, pipelineEngine_metrics, metrics);
         pipelineEngine_class_private_field_set(this, pipelineEngine_statementTimeout, statementTimeout);
@@ -3170,8 +3179,15 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         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_class_private_field_set(this, _sweepIntervalMs, sweepInterval);
     }
     pipelineEngine_create_class(PipelineEngine, [
+        {
+            key: "_sweepTimer",
+            get: function() {
+                return pipelineEngine_class_private_field_get(this, _sweepTimer);
+            }
+        },
         {
             key: "mainQueue",
             get: function() {
@@ -3222,7 +3238,7 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             value: function(chunk) {
                 var task = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[0];
                 if (!task) return;
-                if ("stream" === task.kind && task.rowParser && !task.rowParser.finished) {
+                if ("stream" === task.kind && task.rowParser && !task.rowParser.finished && !task.timedout) {
                     var leftover = task.rowParser.feed(chunk);
                     if (leftover) pipelineEngine_class_private_field_get(this, _sharedValueParser).feed(leftover);
                     return;
@@ -3246,6 +3262,7 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         {
             key: "rejectAll",
             value: function(error) {
+                pipelineEngine_class_private_field_get(this, _sharedValueParser).reset();
                 var all = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks);
                 pipelineEngine_class_private_field_set(this, pipelineEngine_inflightTasks, []);
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
@@ -3292,6 +3309,8 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             key: "kill",
             value: function() {
                 pipelineEngine_class_private_field_set(this, _active, false);
+                clearTimeout(pipelineEngine_class_private_field_get(this, _sweepTimer));
+                pipelineEngine_class_private_field_set(this, _sweepTimer, null);
                 this.rejectAll(new Error("PipelineEngine is killed"));
             }
         }
@@ -3299,7 +3318,6 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
     return PipelineEngine;
 }();
 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;
@@ -3316,14 +3334,10 @@ function pipelineEngine_pumpQueue() {
     var payload = buildBatchPayload(batch);
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
-        var _loop = function() {
-            var task = _step.value;
-            task.startTime = now;
-            task.timer = setTimeout(function() {
-                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();
+        for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var task1 = _step.value;
+            task1.startTime = now;
+        }
     } catch (err) {
         _didIteratorError = true;
         _iteratorError = err;
@@ -3335,13 +3349,13 @@ function pipelineEngine_pumpQueue() {
         }
     }
     (_$_class_private_field_get = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)).push.apply(_$_class_private_field_get, pipelineEngine_to_consumable_array(batch));
+    pipelineEngine_class_private_method_get(this, _scheduleSweep, scheduleSweep).call(this);
     pipelineEngine_class_private_field_get(this, pipelineEngine_processManager).write(payload);
 }
 function core_pipelineEngine_handleParsedValue(raw) {
     var task = pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks)[0];
     if (!task) return;
     if (isSentinelRaw(raw, 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) {
@@ -3363,7 +3377,6 @@ function core_pipelineEngine_handleParsedValue(raw) {
         return;
     }
     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) {
@@ -3393,6 +3406,20 @@ function pipelineEngine_scheduleFinalizeCheck() {
         });
     });
 }
+function scheduleSweep() {
+    var _this = this;
+    if (pipelineEngine_class_private_field_get(this, _sweepTimer)) return;
+    pipelineEngine_class_private_field_set(this, _sweepTimer, setTimeout(function() {
+        pipelineEngine_class_private_field_set(_this, _sweepTimer, null);
+        var inflight = pipelineEngine_class_private_field_get(_this, pipelineEngine_inflightTasks);
+        var now = performance.now();
+        for(var i = 0; i < inflight.length; i++){
+            var task = inflight[i];
+            if (now - task.startTime > task.timeout) pipelineEngine_class_private_method_get(_this, core_pipelineEngine_handleTaskTimeout, pipelineEngine_handleTaskTimeout).call(_this, task);
+        }
+        if (pipelineEngine_class_private_field_get(_this, pipelineEngine_inflightTasks).length > 0) pipelineEngine_class_private_method_get(_this, _scheduleSweep, scheduleSweep).call(_this);
+    }, pipelineEngine_class_private_field_get(this, _sweepIntervalMs)).unref());
+}
 function pipelineEngine_handleTaskTimeout(task) {
     var _this, _this1;
     var error = prepareTaskTimeout(task, pipelineEngine_class_private_field_get(this, pipelineEngine_metrics));
@@ -4032,9 +4059,9 @@ function enqueueWriter(kind, sql, timeout, token, onRow, scopeId) {
             settled: false,
             timer: null,
             startTime: 0,
-            rowParser: null
+            rowParser: null,
+            rows: "query" === kind ? [] : null
         };
-        if ("query" === kind) task.rows = [];
         if ("stream" === kind) task.rowParser = setupStreamParser(task, executor_class_private_field_get(_this, _pipeline));
         if (executor_class_private_field_get(_this, _txScope).isDeferred(scopeId)) executor_class_private_field_get(_this, _txScope).defer(task);
         else executor_class_private_field_get(_this, _pipeline).enqueue(task);