sqlite-executor 4.0.2 → 4.0.4

package/dist/esm/index.mjs

@@ -135,7 +135,7 @@ function normalizeSQL(sql) {
     if (void 0 !== cached) return cached;
     var len = sql.length;
     var needed = len + 1;
-    if (_normBuf.length < needed) _normBuf = new Uint16Array(2 * needed);
+    if (_normBuf.length < needed) _normBuf = new Uint16Array(needed);
     var outCodes = _normBuf;
     var writePos = 0;
     var pendingSpace = false;
@@ -241,6 +241,7 @@ function createJsonValueParser(onValue) {
         nesting: 0,
         inString: false,
         escaped: false,
+        _consumed: 0,
         feed: function(chunk) {
             this.buffer += chunk;
             var consumeUntil = 0;
@@ -272,6 +273,11 @@ function createJsonValueParser(onValue) {
                 if (code === CHAR_CLOSE_BRACKET || code === CHAR_CLOSE_BRACE) {
                     this.nesting--;
                     if (0 === this.nesting) {
+                        if (index === this.start + 1) {
+                            this.start = -1;
+                            consumeUntil = index + 1;
+                            continue;
+                        }
                         var raw = this.buffer.slice(this.start, index + 1);
                         this.start = -1;
                         onValue(raw);
@@ -280,12 +286,18 @@ function createJsonValueParser(onValue) {
                 }
             }
             if (consumeUntil > 0) {
-                this.buffer = this.buffer.slice(consumeUntil);
-                this.readPos = 0;
+                this._consumed = consumeUntil;
+                this.readPos = this._consumed;
+                if (this._consumed > 65536) {
+                    this.buffer = this.buffer.slice(this._consumed);
+                    this.readPos = 0;
+                    this._consumed = 0;
+                }
             } else this.readPos = this.buffer.length;
         },
         reset: function() {
             this.buffer = "";
+            this._consumed = 0;
             this.start = -1;
             this.readPos = 0;
             this.nesting = 0;
@@ -305,6 +317,7 @@ function createRowStreamParser(onRow) {
         elementEnd: -1,
         nesting: 0,
         readPos: 0,
+        _consumed: 0,
         feed: function(chunk) {
             if (this.finished) return chunk;
             this.buffer += chunk;
@@ -371,24 +384,38 @@ function createRowStreamParser(onRow) {
                         var delimiter = this.buffer.charCodeAt(lookAhead);
                         if (delimiter === CHAR_COMMA || delimiter === CHAR_CLOSE_BRACKET) {
                             onRow(this.buffer.slice(this.elementStart, this.elementEnd));
-                            this.buffer = this.buffer.slice(lookAhead + 1);
+                            this._consumed = lookAhead + 1;
                             this.elementStart = -1;
                             this.elementEnd = -1;
                             this.nesting = 0;
                             if (delimiter === CHAR_CLOSE_BRACKET) {
                                 this.finished = true;
-                                var tail = this.buffer;
+                                var tail = this.buffer.slice(this._consumed);
                                 this.buffer = "";
+                                this._consumed = 0;
                                 this.readPos = 0;
                                 return tail;
                             }
-                            index = 0;
+                            index = this._consumed;
+                            if (this._consumed > 65536) {
+                                this.buffer = this.buffer.slice(this._consumed);
+                                index = 0;
+                                this._consumed = 0;
+                            }
                             continue;
                         }
                     }
                 }
                 index++;
             }
+            if (this._consumed > 0) {
+                if (-1 !== this.elementStart) {
+                    this.elementStart -= this._consumed;
+                    if (-1 !== this.elementEnd) this.elementEnd -= this._consumed;
+                }
+                this.buffer = this.buffer.slice(this._consumed);
+                this._consumed = 0;
+            }
             if (this.elementStart > 0) {
                 this.buffer = this.buffer.slice(this.elementStart);
                 if (-1 !== this.elementEnd) this.elementEnd -= this.elementStart;
@@ -399,6 +426,7 @@ function createRowStreamParser(onRow) {
         },
         reset: function() {
             this.buffer = "";
+            this._consumed = 0;
             this.started = false;
             this.finished = false;
             this.inString = false;
@@ -427,6 +455,22 @@ function stream_class_apply_descriptor_set(receiver, descriptor, value) {
         descriptor.value = value;
     }
 }
+function _class_apply_descriptor_update(receiver, descriptor) {
+    if (descriptor.set) {
+        if (!descriptor.get) throw new TypeError("attempted to read set only private field");
+        if (!("__destrWrapper" in descriptor)) descriptor.__destrWrapper = {
+            set value (v){
+                descriptor.set.call(receiver, v);
+            },
+            get value () {
+                return descriptor.get.call(receiver);
+            }
+        };
+        return descriptor.__destrWrapper;
+    }
+    if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
+    return descriptor;
+}
 function stream_class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
 }
@@ -447,6 +491,10 @@ function stream_class_private_field_set(receiver, privateMap, value) {
     stream_class_apply_descriptor_set(receiver, descriptor, value);
     return value;
 }
+function _class_private_field_update(receiver, privateMap) {
+    var descriptor = stream_class_extract_field_descriptor(receiver, privateMap, "update");
+    return _class_apply_descriptor_update(receiver, descriptor);
+}
 function stream_defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
@@ -483,7 +531,7 @@ function setupStreamParser(task) {
     return parser;
 }
 _computedKey = Symbol.asyncIterator;
-var _buffer = /*#__PURE__*/ new WeakMap(), _done = /*#__PURE__*/ new WeakMap(), _error = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap();
+var _buffer = /*#__PURE__*/ new WeakMap(), _index = /*#__PURE__*/ new WeakMap(), _done = /*#__PURE__*/ new WeakMap(), _error = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap();
 var _computedKey1 = _computedKey;
 var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
     "use strict";
@@ -493,6 +541,10 @@ var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
             writable: true,
             value: []
         });
+        stream_class_private_field_init(this, _index, {
+            writable: true,
+            value: 0
+        });
         stream_class_private_field_init(this, _done, {
             writable: true,
             value: false
@@ -510,6 +562,7 @@ var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
         {
             key: "push",
             value: function(row) {
+                if (stream_class_private_field_get(this, _done) || stream_class_private_field_get(this, _error)) return;
                 if (stream_class_private_field_get(this, _pending)) {
                     var resolve = stream_class_private_field_get(this, _pending).resolve;
                     stream_class_private_field_set(this, _pending, null);
@@ -549,8 +602,8 @@ var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
             key: "next",
             value: function() {
                 var _this = this;
-                if (stream_class_private_field_get(this, _buffer).length > 0) return Promise.resolve({
-                    value: stream_class_private_field_get(this, _buffer).shift(),
+                if (stream_class_private_field_get(this, _index) < stream_class_private_field_get(this, _buffer).length) return Promise.resolve({
+                    value: stream_class_private_field_get(this, _buffer)[_class_private_field_update(this, _index).value++],
                     done: false
                 });
                 if (stream_class_private_field_get(this, _done)) return Promise.resolve({
@@ -570,6 +623,8 @@ var stream_AsyncRowBuffer = /*#__PURE__*/ function() {
             key: "return",
             value: function() {
                 stream_class_private_field_set(this, _done, true);
+                stream_class_private_field_set(this, _buffer, []);
+                stream_class_private_field_set(this, _index, 0);
                 if (stream_class_private_field_get(this, _pending)) {
                     var resolve = stream_class_private_field_get(this, _pending).resolve;
                     stream_class_private_field_set(this, _pending, null);
@@ -920,11 +975,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 +1001,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 +1069,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 +1093,7 @@ var process_ProcessManager = /*#__PURE__*/ function() {
                                     2
                                 ];
                                 timer = setTimeout(function() {
-                                    _this.kill();
+                                    proc.kill();
                                 }, GRACEFUL_SHUTDOWN_TIMEOUT);
                                 _state.label = 1;
                             case 1:
@@ -1083,13 +1157,14 @@ var _counter = 0;
 var _PREFIX = "__executor_end__";
 var _PID36 = process.pid.toString(36);
 function generateToken() {
-    return "".concat(_PREFIX).concat((_counter++).toString(36), "_").concat(_PID36);
+    _counter = _counter + 1 >>> 0;
+    return "".concat(_PREFIX).concat(_counter.toString(36), "_").concat(_PID36);
 }
 function escape_type_of(obj) {
     return obj && "undefined" != typeof Symbol && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 function escapeValue(value) {
-    if ("string" == typeof value) return "'".concat(value.replace(/'/g, "''"), "'");
+    if ("string" == typeof value) return value.includes("'") ? "'".concat(value.replace(/'/g, "''"), "'") : "'".concat(value, "'");
     if (null == value) return "NULL";
     if ("number" == typeof value || (void 0 === value ? "undefined" : escape_type_of(value)) === "bigint") return String(value);
     if ("boolean" == typeof value) return value ? "TRUE" : "FALSE";
@@ -1263,7 +1338,7 @@ function queue_class_apply_descriptor_set(receiver, descriptor, value) {
         descriptor.value = value;
     }
 }
-function _class_apply_descriptor_update(receiver, descriptor) {
+function queue_class_apply_descriptor_update(receiver, descriptor) {
     if (descriptor.set) {
         if (!descriptor.get) throw new TypeError("attempted to read set only private field");
         if (!("__destrWrapper" in descriptor)) descriptor.__destrWrapper = {
@@ -1299,9 +1374,9 @@ function queue_class_private_field_set(receiver, privateMap, value) {
     queue_class_apply_descriptor_set(receiver, descriptor, value);
     return value;
 }
-function _class_private_field_update(receiver, privateMap) {
+function queue_class_private_field_update(receiver, privateMap) {
     var descriptor = queue_class_extract_field_descriptor(receiver, privateMap, "update");
-    return _class_apply_descriptor_update(receiver, descriptor);
+    return queue_class_apply_descriptor_update(receiver, descriptor);
 }
 function _class_private_method_get(receiver, privateSet, fn) {
     if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
@@ -1456,7 +1531,7 @@ var queue_Queue = /*#__PURE__*/ function() {
                 if (queue_class_private_field_get(this, _size) === queue_class_private_field_get(this, _items).length) _class_private_method_get(this, _grow, grow).call(this);
                 queue_class_private_field_get(this, _items)[queue_class_private_field_get(this, _tail)] = value;
                 queue_class_private_field_set(this, _tail, queue_class_private_field_get(this, _tail) + 1 & queue_class_private_field_get(this, _mask));
-                _class_private_field_update(this, _size).value++;
+                queue_class_private_field_update(this, _size).value++;
             }
         },
         {
@@ -1466,7 +1541,7 @@ var queue_Queue = /*#__PURE__*/ function() {
                 var value = queue_class_private_field_get(this, _items)[queue_class_private_field_get(this, _head)];
                 queue_class_private_field_get(this, _items)[queue_class_private_field_get(this, _head)] = void 0;
                 queue_class_private_field_set(this, _head, queue_class_private_field_get(this, _head) + 1 & queue_class_private_field_get(this, _mask));
-                _class_private_field_update(this, _size).value--;
+                queue_class_private_field_update(this, _size).value--;
                 return value;
             }
         },
@@ -1493,7 +1568,7 @@ var queue_Queue = /*#__PURE__*/ function() {
                         }
                         queue_class_private_field_set(this, _tail, queue_class_private_field_get(this, _tail) - 1 & queue_class_private_field_get(this, _mask));
                         queue_class_private_field_get(this, _items)[queue_class_private_field_get(this, _tail)] = void 0;
-                        _class_private_field_update(this, _size).value--;
+                        queue_class_private_field_update(this, _size).value--;
                         return true;
                     }
                 }
@@ -1712,6 +1787,9 @@ function buildBatchPayload(batch) {
     }
     return parts1.join("");
 }
+function isSentinelRaw(raw, token) {
+    return raw === '[{"'.concat(TOKEN_COLUMN, '":"').concat(token, '"}]');
+}
 function isSentinelRow(value, token) {
     var _value_;
     return Array.isArray(value) && 1 === value.length && (null == (_value_ = value[0]) ? void 0 : _value_[TOKEN_COLUMN]) === token;
@@ -1774,6 +1852,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;
@@ -1788,6 +1868,46 @@ function settleTask(task, error, value, metrics) {
     null == metrics || metrics.incrementTasksSuccess(duration);
     task.resolve(value);
 }
+function finalizePendingTasks(tasks, settle, pumpQueue) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+    try {
+        for(var _iterator = tasks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var task = _step.value;
+            if (task.stderrText) {
+                settle(task, new Error(task.stderrText.trim()), void 0);
+                continue;
+            }
+            if (task.consumerError) {
+                settle(task, task.consumerError, void 0);
+                continue;
+            }
+            if ("query" === task.kind) {
+                settle(task, null, task.rows);
+                continue;
+            }
+            settle(task, null, void 0);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && null != _iterator["return"]) _iterator["return"]();
+        } finally{
+            if (_didIteratorError) throw _iteratorError;
+        }
+    }
+    tasks.clear();
+    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);
+}
 function taskWorker_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];
@@ -1941,7 +2061,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, taskWorker_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,13 +2106,20 @@ 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
                 };
                 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);
-                taskWorker_class_private_method_get(this, _pumpQueue, pumpQueue).call(this);
+                taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
+            }
+        },
+        {
+            key: "_process",
+            get: function() {
+                return taskWorker_class_private_field_get(this, _processManager).process;
             }
         },
         {
@@ -2023,9 +2153,10 @@ function startProcess() {
         taskWorker_class_private_method_get(_this, _rejectAll, taskWorker_rejectAll).call(_this, err);
     });
 }
-function pumpQueue() {
+function taskWorker_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)){
@@ -2064,6 +2195,26 @@ function pumpQueue() {
 function handleParsedValue(raw) {
     var task = taskWorker_class_private_field_get(this, _inflightTasks)[0];
     if (!task) return;
+    if (isSentinelRaw(raw, 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, taskWorker_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, taskWorker_pumpQueue).call(this);
+            return;
+        }
+        if (task.consumerError) {
+            taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, task, task.consumerError, void 0);
+            taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
+            return;
+        }
+        taskWorker_class_private_field_get(this, _pendingFinalizeTasks).add(task);
+        taskWorker_class_private_method_get(this, _scheduleFinalizeCheck, scheduleFinalizeCheck).call(this);
+        taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
+        return;
+    }
+    if ("[]" === raw) return;
     var parsed;
     try {
         parsed = JSON.parse(raw);
@@ -2074,19 +2225,20 @@ 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, taskWorker_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);
+            taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
             return;
         }
         if (task.consumerError) {
             taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, task, task.consumerError, void 0);
-            taskWorker_class_private_method_get(this, _pumpQueue, pumpQueue).call(this);
+            taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
             return;
         }
         taskWorker_class_private_field_get(this, _pendingFinalizeTasks).add(task);
         taskWorker_class_private_method_get(this, _scheduleFinalizeCheck, scheduleFinalizeCheck).call(this);
-        taskWorker_class_private_method_get(this, _pumpQueue, pumpQueue).call(this);
+        taskWorker_class_private_method_get(this, _pumpQueue, taskWorker_pumpQueue).call(this);
         return;
     }
     if ("query" === task.kind) return void collectQueryRows(task, parsed);
@@ -2098,36 +2250,11 @@ function scheduleFinalizeCheck() {
     taskWorker_class_private_field_set(this, _scheduledFinalize, true);
     setImmediate(function() {
         taskWorker_class_private_field_set(_this, _scheduledFinalize, false);
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-        try {
-            for(var _iterator = taskWorker_class_private_field_get(_this, _pendingFinalizeTasks)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var task = _step.value;
-                if (task.stderrText) {
-                    taskWorker_class_private_method_get(_this, _settleTask, settleTask1).call(_this, task, new Error(task.stderrText.trim()), void 0);
-                    continue;
-                }
-                if (task.consumerError) {
-                    taskWorker_class_private_method_get(_this, _settleTask, settleTask1).call(_this, task, task.consumerError, void 0);
-                    continue;
-                }
-                if ("query" === task.kind) {
-                    taskWorker_class_private_method_get(_this, _settleTask, settleTask1).call(_this, task, null, task.rows);
-                    continue;
-                }
-                taskWorker_class_private_method_get(_this, _settleTask, settleTask1).call(_this, task, null, void 0);
-            }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && null != _iterator["return"]) _iterator["return"]();
-            } finally{
-                if (_didIteratorError) throw _iteratorError;
-            }
-        }
-        taskWorker_class_private_field_get(_this, _pendingFinalizeTasks).clear();
-        taskWorker_class_private_method_get(_this, _pumpQueue, pumpQueue).call(_this);
+        finalizePendingTasks(taskWorker_class_private_field_get(_this, _pendingFinalizeTasks), function(t, e, v1) {
+            return taskWorker_class_private_method_get(_this, _settleTask, settleTask1).call(_this, t, e, v1);
+        }, function() {
+            return taskWorker_class_private_method_get(_this, _pumpQueue, taskWorker_pumpQueue).call(_this);
+        });
     });
 }
 function taskWorker_handleStderrChunk(chunk) {
@@ -2141,10 +2268,8 @@ function taskWorker_handleStderrChunk(chunk) {
     task.stderrText += String(chunk);
 }
 function handleTaskTimeout(task) {
-    var _$_class_private_field_get;
-    if (taskWorker_class_private_field_get(this, _inflightTasks)[0] !== task) return;
-    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));
+    var error = prepareTaskTimeout(task, taskWorker_class_private_field_get(this, _metrics));
+    if (error) taskWorker_class_private_method_get(this, _settleTask, settleTask1).call(this, task, error, void 0);
 }
 function settleTask1(task, error, value) {
     settleTask(task, error, value, taskWorker_class_private_field_get(this, _metrics));
@@ -2198,21 +2323,12 @@ function readerPool_class_apply_descriptor_get(receiver, descriptor) {
     if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
-function readerPool_class_apply_descriptor_update(receiver, descriptor) {
-    if (descriptor.set) {
-        if (!descriptor.get) throw new TypeError("attempted to read set only private field");
-        if (!("__destrWrapper" in descriptor)) descriptor.__destrWrapper = {
-            set value (v){
-                descriptor.set.call(receiver, v);
-            },
-            get value () {
-                return descriptor.get.call(receiver);
-            }
-        };
-        return descriptor.__destrWrapper;
+function readerPool_class_apply_descriptor_set(receiver, descriptor, value) {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
+        if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
+        descriptor.value = value;
     }
-    if (!descriptor.writable) throw new TypeError("attempted to set read only private field");
-    return descriptor;
 }
 function readerPool_class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) throw new TypeError("Cannot call a class as a function");
@@ -2229,9 +2345,10 @@ function readerPool_class_private_field_init(obj, privateMap, value) {
     readerPool_check_private_redeclaration(obj, privateMap);
     privateMap.set(obj, value);
 }
-function readerPool_class_private_field_update(receiver, privateMap) {
-    var descriptor = readerPool_class_extract_field_descriptor(receiver, privateMap, "update");
-    return readerPool_class_apply_descriptor_update(receiver, descriptor);
+function readerPool_class_private_field_set(receiver, privateMap, value) {
+    var descriptor = readerPool_class_extract_field_descriptor(receiver, privateMap, "set");
+    readerPool_class_apply_descriptor_set(receiver, descriptor, value);
+    return value;
 }
 function readerPool_defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
@@ -2261,6 +2378,7 @@ var readerPool_ReaderPool = /*#__PURE__*/ function() {
             writable: true,
             value: 0
         });
+        if (poolSize < 1) throw new RangeError("poolSize must be >= 1");
         for(var i = 0; i < poolSize; i++){
             var worker = new taskWorker_TaskWorker({
                 binary: binary,
@@ -2293,10 +2411,16 @@ var readerPool_ReaderPool = /*#__PURE__*/ function() {
             key: "enqueue",
             value: function(task) {
                 var worker = readerPool_class_private_field_get(this, _workers)[readerPool_class_private_field_get(this, _rrIndex) % readerPool_class_private_field_get(this, _workers).length];
-                readerPool_class_private_field_update(this, _rrIndex).value++;
+                readerPool_class_private_field_set(this, _rrIndex, readerPool_class_private_field_get(this, _rrIndex) + 1 >>> 0);
                 worker.enqueue(task);
             }
         },
+        {
+            key: "_workers",
+            get: function() {
+                return readerPool_class_private_field_get(this, _workers);
+            }
+        },
         {
             key: "kill",
             value: function() {
@@ -2909,7 +3033,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 +3043,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 +3107,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 +3242,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 +3260,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();
@@ -3152,6 +3280,21 @@ function pipelineEngine_pumpQueue() {
 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) {
+            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);
+            return;
+        }
+        pipelineEngine_class_private_field_get(this, pipelineEngine_pendingFinalizeTasks).add(task);
+        pipelineEngine_class_private_method_get(this, core_pipelineEngine_scheduleFinalizeCheck, pipelineEngine_scheduleFinalizeCheck).call(this);
+        pipelineEngine_class_private_method_get(this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(this);
+        return;
+    }
+    if ("[]" === raw) return;
     var parsed;
     try {
         parsed = JSON.parse(raw);
@@ -3162,6 +3305,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 +3316,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);
 }
@@ -3181,37 +3326,21 @@ function pipelineEngine_scheduleFinalizeCheck() {
     pipelineEngine_class_private_field_set(this, pipelineEngine_scheduledFinalize, true);
     setImmediate(function() {
         pipelineEngine_class_private_field_set(_this, pipelineEngine_scheduledFinalize, false);
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-        try {
-            for(var _iterator = pipelineEngine_class_private_field_get(_this, pipelineEngine_pendingFinalizeTasks)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var task = _step.value;
-                if (task.stderrText) {
-                    pipelineEngine_class_private_method_get(_this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(_this, task, new Error(task.stderrText.trim()), void 0);
-                    continue;
-                }
-                if (task.consumerError) {
-                    pipelineEngine_class_private_method_get(_this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(_this, task, task.consumerError, void 0);
-                    continue;
-                }
-                if ("query" === task.kind) {
-                    pipelineEngine_class_private_method_get(_this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(_this, task, null, task.rows);
-                    continue;
-                }
-                pipelineEngine_class_private_method_get(_this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(_this, task, null, void 0);
-            }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && null != _iterator["return"]) _iterator["return"]();
-            } finally{
-                if (_didIteratorError) throw _iteratorError;
-            }
-        }
-        pipelineEngine_class_private_field_get(_this, pipelineEngine_pendingFinalizeTasks).clear();
+        finalizePendingTasks(pipelineEngine_class_private_field_get(_this, pipelineEngine_pendingFinalizeTasks), function(t, e, v1) {
+            return pipelineEngine_class_private_method_get(_this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(_this, t, e, v1);
+        }, function() {
+            return pipelineEngine_class_private_method_get(_this, core_pipelineEngine_pumpQueue, pipelineEngine_pumpQueue).call(_this);
+        });
     });
 }
+function pipelineEngine_handleTaskTimeout(task) {
+    var _this, _this1;
+    var error = prepareTaskTimeout(task, pipelineEngine_class_private_field_get(this, pipelineEngine_metrics));
+    if (error) {
+        pipelineEngine_class_private_method_get(this, pipelineEngine_settleTask, pipelineEngine_settleTask1).call(this, task, error, 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
@@ -3439,7 +3568,6 @@ var _computedKey2 = executor_computedKey;
 var executor_SQLiteExecutor = /*#__PURE__*/ function() {
     "use strict";
     function SQLiteExecutor() {
-        var _this = this;
         var _ref = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, _ref_binary = _ref.binary, binary = void 0 === _ref_binary ? "sqlite3" : _ref_binary, _ref_database = _ref.database, database = void 0 === _ref_database ? ":memory:" : _ref_database, logger = _ref.logger, _ref_statementTimeout = _ref.statementTimeout, statementTimeout = void 0 === _ref_statementTimeout ? DEFAULT_STATEMENT_TIMEOUT : _ref_statementTimeout, _ref_autoRestart = _ref.autoRestart, autoRestart = void 0 === _ref_autoRestart ? true : _ref_autoRestart, _ref_poolSize = _ref.poolSize, poolSize = void 0 === _ref_poolSize ? 0 : _ref_poolSize, metrics = _ref.metrics;
         executor_class_call_check(this, SQLiteExecutor);
         executor_class_private_method_init(this, _normalizeTimeout);
@@ -3519,10 +3647,7 @@ var executor_SQLiteExecutor = /*#__PURE__*/ function() {
             metrics: executor_class_private_field_get(this, executor_metrics),
             statementTimeout: executor_class_private_field_get(this, executor_statementTimeout),
             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));
-            }
+            onTaskTimeout: function() {}
         }));
         executor_class_private_method_get(this, executor_startProcess, core_executor_startProcess).call(this);
         if (poolSize > 0 && ":memory:" !== database) executor_class_private_field_set(this, _readerPool, new readerPool_ReaderPool({
@@ -3549,6 +3674,12 @@ var executor_SQLiteExecutor = /*#__PURE__*/ function() {
                 return executor_class_private_field_get(this, _readerPool);
             }
         },
+        {
+            key: "_process",
+            get: function() {
+                return executor_class_private_field_get(this, executor_proc);
+            }
+        },
         {
             key: "metrics",
             get: function() {
@@ -3838,6 +3969,7 @@ function enqueueWriter(kind, sql, timeout, token, onRow, scopeId) {
             reject: reject,
             consumerError: null,
             stderrText: "",
+            settled: false,
             timer: null,
             startTime: 0,
             rowParser: null