@digipair/skill-sse 0.116.2 → 0.116.4

package/dist/index.esm.js

@@ -1,6 +1,9 @@
-import { ServerResponse } from 'http';
-import { randomUUID, randomBytes } from 'crypto';
-import { EventEmitter } from 'events';
+import { IncomingMessage, ServerResponse } from 'node:http';
+import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+import { setImmediate } from 'node:timers';
+import { Readable } from 'node:stream';
+import { randomUUID, randomBytes } from 'node:crypto';
+import { EventEmitter } from 'node:events';
 
 // src/Session.ts
 function _array_like_to_array$8(arr, len) {
@@ -216,6 +219,21 @@ function _non_iterable_rest$6() {
 function _non_iterable_spread$7() {
     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 _object_spread$3(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property$5(target, key, source[key]);
+        });
+    }
+    return target;
+}
 function _possible_constructor_return$l(self, call) {
     if (call && (_type_of$D(call) === "object" || typeof call === "function")) {
         return call;
@@ -399,76 +417,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-// src/lib/serialize.ts
-var serialize = function(data) {
-    return JSON.stringify(data);
-};
-// src/lib/sanitize.ts
-var newlineVariantsRegex = /(\r\n|\r|\n)/g;
-var newlineTrailingRegex = /\n+$/g;
-var sanitize = function(text) {
-    var sanitized = text;
-    sanitized = sanitized.replace(newlineVariantsRegex, "\n");
-    sanitized = sanitized.replace(newlineTrailingRegex, "");
-    return sanitized;
-};
-var generateId;
-if (randomUUID) {
-    generateId = function() {
-        return randomUUID();
-    };
-} else {
-    generateId = function() {
-        return randomBytes(4).toString("hex");
-    };
-}
-// src/lib/createPushFromStream.ts
-var createPushFromStream = function(push) {
-    return function() {
-        var _ref = _async_to_generator(function(stream) {
-            var options, _options_eventName, eventName;
-            var _arguments = arguments;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        options = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {};
-                        _options_eventName = options.eventName, eventName = _options_eventName === void 0 ? "stream" : _options_eventName;
-                        return [
-                            4,
-                            new Promise(function(resolve, reject) {
-                                stream.on("data", function(chunk) {
-                                    var data;
-                                    if (Buffer.isBuffer(chunk)) {
-                                        data = chunk.toString();
-                                    } else {
-                                        data = chunk;
-                                    }
-                                    push(data, eventName);
-                                });
-                                stream.once("end", function() {
-                                    return resolve(true);
-                                });
-                                stream.once("close", function() {
-                                    return resolve(true);
-                                });
-                                stream.once("error", function(err) {
-                                    return reject(err);
-                                });
-                            })
-                        ];
-                    case 1:
-                        return [
-                            2,
-                            _state.sent()
-                        ];
-                }
-            });
-        });
-        return function(stream) {
-            return _ref.apply(this, arguments);
-        };
-    }();
-};
+var __FetchConnection;
 // src/lib/createPushFromIterable.ts
 var createPushFromIterable = function(push) {
     return function() {
@@ -570,6 +519,167 @@ var createPushFromIterable = function(push) {
         };
     }();
 };
+var createPushFromStream = function(push) {
+    return function() {
+        var _ref = _async_to_generator(function(stream) {
+            var options, _options_eventName, eventName, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, err;
+            var _arguments = arguments;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        options = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {};
+                        _options_eventName = options.eventName, eventName = _options_eventName === void 0 ? "stream" : _options_eventName;
+                        if (!_instanceof$k(stream, Readable)) return [
+                            3,
+                            2
+                        ];
+                        return [
+                            4,
+                            new Promise(function(resolve, reject) {
+                                stream.on("data", function(chunk) {
+                                    var data;
+                                    if (Buffer.isBuffer(chunk)) {
+                                        data = chunk.toString();
+                                    } else {
+                                        data = chunk;
+                                    }
+                                    push(data, eventName);
+                                });
+                                stream.once("end", function() {
+                                    return resolve(true);
+                                });
+                                stream.once("close", function() {
+                                    return resolve(true);
+                                });
+                                stream.once("error", function(err) {
+                                    return reject(err);
+                                });
+                            })
+                        ];
+                    case 1:
+                        return [
+                            2,
+                            _state.sent()
+                        ];
+                    case 2:
+                        _iteratorAbruptCompletion = false, _didIteratorError = false;
+                        _state.label = 3;
+                    case 3:
+                        _state.trys.push([
+                            3,
+                            8,
+                            9,
+                            14
+                        ]);
+                        _iterator = _async_iterator(stream);
+                        _state.label = 4;
+                    case 4:
+                        return [
+                            4,
+                            _iterator.next()
+                        ];
+                    case 5:
+                        if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
+                            3,
+                            7
+                        ];
+                        _value = _step.value;
+                        chunk = _value;
+                        if (Buffer.isBuffer(chunk)) {
+                            push(chunk.toString(), eventName);
+                        } else {
+                            push(chunk, eventName);
+                        }
+                        _state.label = 6;
+                    case 6:
+                        _iteratorAbruptCompletion = false;
+                        return [
+                            3,
+                            4
+                        ];
+                    case 7:
+                        return [
+                            3,
+                            14
+                        ];
+                    case 8:
+                        err = _state.sent();
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                        return [
+                            3,
+                            14
+                        ];
+                    case 9:
+                        _state.trys.push([
+                            9,
+                            ,
+                            12,
+                            13
+                        ]);
+                        if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
+                            3,
+                            11
+                        ];
+                        return [
+                            4,
+                            _iterator.return()
+                        ];
+                    case 10:
+                        _state.sent();
+                        _state.label = 11;
+                    case 11:
+                        return [
+                            3,
+                            13
+                        ];
+                    case 12:
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                        return [
+                            7
+                        ];
+                    case 13:
+                        return [
+                            7
+                        ];
+                    case 14:
+                        return [
+                            2,
+                            true
+                        ];
+                }
+            });
+        });
+        return function(stream) {
+            return _ref.apply(this, arguments);
+        };
+    }();
+};
+var generateId;
+if (randomUUID) {
+    generateId = function() {
+        return randomUUID();
+    };
+} else {
+    generateId = function() {
+        return randomBytes(4).toString("hex");
+    };
+}
+// src/lib/sanitize.ts
+var newlineVariantsRegex = /(\r\n|\r|\n)/g;
+var newlineTrailingRegex = /\n+$/g;
+var sanitize = function(text) {
+    var sanitized = text;
+    sanitized = sanitized.replace(newlineVariantsRegex, "\n");
+    sanitized = sanitized.replace(newlineTrailingRegex, "");
+    return sanitized;
+};
+// src/lib/serialize.ts
+var serialize = function(data) {
+    return JSON.stringify(data);
+};
 // src/EventBuffer.ts
 var EventBuffer = /*#__PURE__*/ function() {
     function EventBuffer() {
@@ -662,7 +772,7 @@ var EventBuffer = /*#__PURE__*/ function() {
    * @param stream - Readable stream to consume data from.
    * @param options - Event name to use for each event created.
    *
-   * @returns A promise that resolves or rejects based on the success of the stream write finishing.
+   * @returns A promise that resolves with `true` or rejects based on the success of the stream write finishing.
    */ _define_property$5(this, "stream", createPushFromStream(this.push));
         /**
    * Iterate over an iterable and write yielded values as events into the buffer.
@@ -706,6 +816,221 @@ var EventBuffer = /*#__PURE__*/ function() {
     ]);
     return EventBuffer;
 }();
+// src/lib/applyHeaders.ts
+var applyHeaders = function(from, to) {
+    var fromMap = _instanceof$k(from, Headers) ? Object.fromEntries(from) : from;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.entries(fromMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _sliced_to_array$6(_step.value, 2), key = _step_value[0], value = _step_value[1];
+            if (Array.isArray(value)) {
+                to.delete(key);
+                var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                try {
+                    for(var _iterator1 = value[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                        var item = _step1.value;
+                        to.append(key, item);
+                    }
+                } catch (err) {
+                    _didIteratorError1 = true;
+                    _iteratorError1 = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                            _iterator1.return();
+                        }
+                    } finally{
+                        if (_didIteratorError1) {
+                            throw _iteratorError1;
+                        }
+                    }
+                }
+            } else if (value === void 0) {
+                to.delete(key);
+            } else {
+                to.set(key, value);
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+};
+// src/lib/constants.ts
+var DEFAULT_REQUEST_HOST = "localhost";
+var DEFAULT_REQUEST_METHOD = "GET";
+var DEFAULT_RESPONSE_CODE = 200;
+var DEFAULT_RESPONSE_HEADERS = {
+    "Content-Type": "text/event-stream",
+    "Cache-Control": "private, no-cache, no-store, no-transform, must-revalidate, max-age=0",
+    Connection: "keep-alive",
+    Pragma: "no-cache",
+    "X-Accel-Buffering": "no"
+};
+// src/adapters/FetchConnection.ts
+var FetchConnection = (__FetchConnection = function _FetchConnection(request, response) {
+    var _this = this;
+    var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+    _class_call_check$B(this, _FetchConnection);
+    _define_property$5(this, "writer", void 0);
+    _define_property$5(this, "url", void 0);
+    _define_property$5(this, "request", void 0);
+    _define_property$5(this, "response", void 0);
+    _define_property$5(this, "sendHead", function() {});
+    _define_property$5(this, "sendChunk", function(chunk) {
+        var encoded = _FetchConnection.encoder.encode(chunk);
+        _this.writer.write(encoded);
+    });
+    _define_property$5(this, "cleanup", function() {
+        _this.writer.close();
+    });
+    this.url = new URL(request.url);
+    this.request = request;
+    var _ref = new TransformStream(), readable = _ref.readable, writable = _ref.writable;
+    this.writer = writable.getWriter();
+    var _options_statusCode, _ref1;
+    this.response = new Response(readable, {
+        status: (_ref1 = (_options_statusCode = options.statusCode) !== null && _options_statusCode !== void 0 ? _options_statusCode : response === null || response === void 0 ? void 0 : response.status) !== null && _ref1 !== void 0 ? _ref1 : DEFAULT_RESPONSE_CODE,
+        headers: DEFAULT_RESPONSE_HEADERS
+    });
+    if (response) {
+        applyHeaders(response.headers, this.response.headers);
+    }
+}, _define_property$5(__FetchConnection, "encoder", new TextEncoder()), __FetchConnection);
+// src/adapters/NodeHttp1Connection.ts
+var NodeHttp1Connection = function NodeHttp1Connection(req, res) {
+    var _this = this;
+    var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+    _class_call_check$B(this, NodeHttp1Connection);
+    _define_property$5(this, "controller", void 0);
+    _define_property$5(this, "url", void 0);
+    _define_property$5(this, "request", void 0);
+    _define_property$5(this, "response", void 0);
+    _define_property$5(this, "onClose", function() {
+        _this.controller.abort();
+    });
+    _define_property$5(this, "sendHead", function() {
+        _this.res.writeHead(_this.response.status, Object.fromEntries(_this.response.headers));
+    });
+    _define_property$5(this, "sendChunk", function(chunk) {
+        _this.res.write(chunk);
+    });
+    _define_property$5(this, "cleanup", function() {
+        _this.req.removeListener("close", _this.onClose);
+        _this.res.removeListener("close", _this.onClose);
+    });
+    this.req = req;
+    this.res = res;
+    var _req_headers_host;
+    this.url = new URL("http://".concat((_req_headers_host = req.headers.host) !== null && _req_headers_host !== void 0 ? _req_headers_host : DEFAULT_REQUEST_HOST).concat(req.url));
+    this.controller = new AbortController();
+    req.once("close", this.onClose);
+    res.once("close", this.onClose);
+    var _req_method;
+    this.request = new Request(this.url, {
+        method: (_req_method = req.method) !== null && _req_method !== void 0 ? _req_method : DEFAULT_REQUEST_METHOD,
+        signal: this.controller.signal
+    });
+    applyHeaders(req.headers, this.request.headers);
+    var _options_statusCode, _ref;
+    this.response = new Response(null, {
+        status: (_ref = (_options_statusCode = options.statusCode) !== null && _options_statusCode !== void 0 ? _options_statusCode : res.statusCode) !== null && _ref !== void 0 ? _ref : DEFAULT_RESPONSE_CODE,
+        headers: DEFAULT_RESPONSE_HEADERS
+    });
+    if (res) {
+        applyHeaders(res.getHeaders(), this.response.headers);
+    }
+};
+// src/adapters/NodeHttp2CompatConnection.ts
+var NodeHttp2CompatConnection = function NodeHttp2CompatConnection(req, res) {
+    var _this = this;
+    var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+    _class_call_check$B(this, NodeHttp2CompatConnection);
+    _define_property$5(this, "controller", void 0);
+    _define_property$5(this, "url", void 0);
+    _define_property$5(this, "request", void 0);
+    _define_property$5(this, "response", void 0);
+    _define_property$5(this, "onClose", function() {
+        _this.controller.abort();
+    });
+    _define_property$5(this, "sendHead", function() {
+        _this.res.writeHead(_this.response.status, Object.fromEntries(_this.response.headers));
+    });
+    _define_property$5(this, "sendChunk", function(chunk) {
+        _this.res.write(chunk);
+    });
+    _define_property$5(this, "cleanup", function() {
+        _this.req.removeListener("close", _this.onClose);
+        _this.res.removeListener("close", _this.onClose);
+    });
+    this.req = req;
+    this.res = res;
+    var _req_headers_host;
+    this.url = new URL("http://".concat((_req_headers_host = req.headers.host) !== null && _req_headers_host !== void 0 ? _req_headers_host : DEFAULT_REQUEST_HOST).concat(req.url));
+    this.controller = new AbortController();
+    req.once("close", this.onClose);
+    res.once("close", this.onClose);
+    var _req_method;
+    this.request = new Request(this.url, {
+        method: (_req_method = req.method) !== null && _req_method !== void 0 ? _req_method : DEFAULT_REQUEST_METHOD,
+        signal: this.controller.signal
+    });
+    var allowedHeaders = _object_spread$3({}, req.headers);
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.keys(allowedHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var header = _step.value;
+            if (header.startsWith(":")) {
+                delete allowedHeaders[header];
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    applyHeaders(allowedHeaders, this.request.headers);
+    var _options_statusCode, _ref;
+    this.response = new Response(null, {
+        status: (_ref = (_options_statusCode = options.statusCode) !== null && _options_statusCode !== void 0 ? _options_statusCode : res.statusCode) !== null && _ref !== void 0 ? _ref : DEFAULT_RESPONSE_CODE,
+        headers: DEFAULT_RESPONSE_HEADERS
+    });
+    if (res) {
+        applyHeaders(res.getHeaders(), this.response.headers);
+    }
+};
+// src/lib/SseError.ts
+var SseError = /*#__PURE__*/ function(Error1) {
+    _inherits$l(SseError, Error1);
+    var _super = _create_super$l(SseError);
+    function SseError(message) {
+        _class_call_check$B(this, SseError);
+        var _this;
+        _this = _super.call(this, message);
+        _this.message = "better-sse: ".concat(message);
+        return _this;
+    }
+    return SseError;
+}(_wrap_native_super$7(Error));
 var TypedEmitter = /*#__PURE__*/ function(EventEmitter) {
     _inherits$l(TypedEmitter, EventEmitter);
     var _super = _create_super$l(TypedEmitter);
@@ -772,25 +1097,11 @@ var TypedEmitter = /*#__PURE__*/ function(EventEmitter) {
     ]);
     return TypedEmitter;
 }(EventEmitter);
-// src/lib/SseError.ts
-var SseError = /*#__PURE__*/ function(Error1) {
-    _inherits$l(SseError, Error1);
-    var _super = _create_super$l(SseError);
-    function SseError(message) {
-        _class_call_check$B(this, SseError);
-        var _this;
-        _this = _super.call(this, message);
-        _this.message = "better-sse: ".concat(message);
-        return _this;
-    }
-    return SseError;
-}(_wrap_native_super$7(Error));
 // src/Session.ts
 var Session = /*#__PURE__*/ function(TypedEmitter) {
     _inherits$l(Session, TypedEmitter);
     var _super = _create_super$l(Session);
-    function Session(req, res) {
-        var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+    function Session(req, res, options) {
         _class_call_check$B(this, Session);
         var _this;
         _this = _super.call(this);
@@ -817,67 +1128,18 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
    * to safely add new properties to the `DefaultSessionState` interface.
    */ _define_property$5(_assert_this_initialized$l(_this), "state", void 0);
         _define_property$5(_assert_this_initialized$l(_this), "buffer", void 0);
-        /**
-   * Raw HTTP request.
-   */ _define_property$5(_assert_this_initialized$l(_this), "req", void 0);
-        /**
-   * Raw HTTP response that is the minimal interface needed and forms the
-   * intersection between the HTTP/1.1 and HTTP/2 server response interfaces.
-   */ _define_property$5(_assert_this_initialized$l(_this), "res", void 0);
-        _define_property$5(_assert_this_initialized$l(_this), "serialize", void 0);
+        _define_property$5(_assert_this_initialized$l(_this), "connection", void 0);
         _define_property$5(_assert_this_initialized$l(_this), "sanitize", void 0);
-        _define_property$5(_assert_this_initialized$l(_this), "trustClientEventId", void 0);
+        _define_property$5(_assert_this_initialized$l(_this), "serialize", void 0);
         _define_property$5(_assert_this_initialized$l(_this), "initialRetry", void 0);
         _define_property$5(_assert_this_initialized$l(_this), "keepAliveInterval", void 0);
         _define_property$5(_assert_this_initialized$l(_this), "keepAliveTimer", void 0);
-        _define_property$5(_assert_this_initialized$l(_this), "statusCode", void 0);
-        _define_property$5(_assert_this_initialized$l(_this), "headers", void 0);
         _define_property$5(_assert_this_initialized$l(_this), "initialize", function() {
-            var url = "http://".concat(_this.req.headers.host).concat(_this.req.url);
-            var params = new URL(url).searchParams;
-            if (_this.trustClientEventId) {
-                var _this_req_headers_lasteventid, _ref, _ref1;
-                var givenLastEventId = (_ref1 = (_ref = (_this_req_headers_lasteventid = _this.req.headers["last-event-id"]) !== null && _this_req_headers_lasteventid !== void 0 ? _this_req_headers_lasteventid : params.get("lastEventId")) !== null && _ref !== void 0 ? _ref : params.get("evs_last_event_id")) !== null && _ref1 !== void 0 ? _ref1 : "";
-                _this.lastId = givenLastEventId;
-            }
-            var headers = {};
-            if (_instanceof$k(_this.res, ServerResponse)) {
-                headers["Content-Type"] = "text/event-stream";
-                headers["Cache-Control"] = "private, no-cache, no-store, no-transform, must-revalidate, max-age=0";
-                headers["Connection"] = "keep-alive";
-                headers["Pragma"] = "no-cache";
-                headers["X-Accel-Buffering"] = "no";
-            } else {
-                headers["content-type"] = "text/event-stream";
-                headers["cache-control"] = "private, no-cache, no-store, no-transform, must-revalidate, max-age=0";
-                headers["pragma"] = "no-cache";
-                headers["x-accel-buffering"] = "no";
-            }
-            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-            try {
-                for(var _iterator = Object.entries(_this.headers)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                    var _step_value = _sliced_to_array$6(_step.value, 2), name = _step_value[0], value = _step_value[1];
-                    headers[name] = value !== null && value !== void 0 ? value : "";
-                }
-            } catch (err) {
-                _didIteratorError = true;
-                _iteratorError = err;
-            } finally{
-                try {
-                    if (!_iteratorNormalCompletion && _iterator.return != null) {
-                        _iterator.return();
-                    }
-                } finally{
-                    if (_didIteratorError) {
-                        throw _iteratorError;
-                    }
-                }
-            }
-            _this.res.writeHead(_this.statusCode, headers);
-            if (params.has("padding")) {
+            _this.connection.sendHead();
+            if (_this.connection.url.searchParams.has("padding")) {
                 _this.buffer.comment(" ".repeat(2049)).dispatch();
             }
-            if (params.has("evs_preamble")) {
+            if (_this.connection.url.searchParams.has("evs_preamble")) {
                 _this.buffer.comment(" ".repeat(2056)).dispatch();
             }
             if (_this.initialRetry !== null) {
@@ -891,58 +1153,47 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
             _this.emit("connected");
         });
         _define_property$5(_assert_this_initialized$l(_this), "onDisconnected", function() {
-            _this.req.removeListener("close", _this.onDisconnected);
-            _this.res.removeListener("close", _this.onDisconnected);
+            _this.connection.request.signal.removeEventListener("abort", _this.onDisconnected);
+            _this.connection.cleanup();
             if (_this.keepAliveTimer) {
                 clearInterval(_this.keepAliveTimer);
             }
             _this.isConnected = false;
             _this.emit("disconnected");
         });
-        _define_property$5(_assert_this_initialized$l(_this), "keepAlive", function() {
+        /**
+   * Write an empty comment and flush it to the client.
+   */ _define_property$5(_assert_this_initialized$l(_this), "keepAlive", function() {
             _this.buffer.comment().dispatch();
             _this.flush();
         });
         /**
-   * @deprecated see https://github.com/MatthewWid/better-sse/issues/52
-   */ _define_property$5(_assert_this_initialized$l(_this), "data", function(data) {
-            _this.buffer.data(data);
-            return _assert_this_initialized$l(_this);
-        });
-        /**
-   * @deprecated see https://github.com/MatthewWid/better-sse/issues/52
-   */ _define_property$5(_assert_this_initialized$l(_this), "id", function() {
-            var id = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "";
-            _this.buffer.id(id);
-            _this.lastId = id;
-            return _assert_this_initialized$l(_this);
-        });
-        /**
-   * @deprecated see https://github.com/MatthewWid/better-sse/issues/52
-   */ _define_property$5(_assert_this_initialized$l(_this), "retry", function(time) {
-            _this.buffer.retry(time);
-            return _assert_this_initialized$l(_this);
-        });
-        /**
-   * @deprecated see https://github.com/MatthewWid/better-sse/issues/52
-   */ _define_property$5(_assert_this_initialized$l(_this), "comment", function(text) {
-            _this.buffer.comment(text);
-            return _assert_this_initialized$l(_this);
+   * Flush the contents of the internal buffer to the client and clear the buffer.
+   */ _define_property$5(_assert_this_initialized$l(_this), "flush", function() {
+            var contents = _this.buffer.read();
+            _this.buffer.clear();
+            _this.connection.sendChunk(contents);
         });
         /**
-   * @deprecated see https://github.com/MatthewWid/better-sse/issues/52
-   */ _define_property$5(_assert_this_initialized$l(_this), "dispatch", function() {
-            _this.buffer.dispatch();
-            return _assert_this_initialized$l(_this);
+   * Get a Request object representing the request of the underlying connection this session manages.
+   *
+   * When using the Fetch API, this will be the original Request object passed to the session constructor.
+   *
+   * When using the Node HTTP APIs, this will be a new Request object with status code and headers copied from the original request.
+   * When the originally given request or response is closed, the abort signal attached to this Request will be triggered.
+   */ _define_property$5(_assert_this_initialized$l(_this), "getRequest", function() {
+            return _this.connection.request;
         });
         /**
-   * Flush the contents of the internal buffer to the client and clear the buffer.
+   * Get a Response object representing the response of the underlying connection this session manages.
    *
-   * @deprecated see https://github.com/MatthewWid/better-sse/issues/52
-   */ _define_property$5(_assert_this_initialized$l(_this), "flush", function() {
-            _this.res.write(_this.buffer.read());
-            _this.buffer.clear();
-            return _assert_this_initialized$l(_this);
+   * When using the Fetch API, this will be a new Response object with status code and headers copied from the original response if given.
+   * Its body will be a ReadableStream that should begin being consumed for the session to consider itself connected.
+   *
+   * When using the Node HTTP APIs, this will be a new Response object with status code and headers copied from the original response.
+   * Its body will be `null`, as data is instead written to the stream of the originally given response object.
+   */ _define_property$5(_assert_this_initialized$l(_this), "getResponse", function() {
+            return _this.connection.response;
         });
         /**
    * Push an event to the client.
@@ -951,6 +1202,8 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
    *
    * If no event ID is given, the event ID (and thus the `lastId` property) is set to a unique string generated using a cryptographic pseudorandom number generator.
    *
+   * If the session has disconnected, an `SseError` will be thrown.
+   *
    * Emits the `push` event with the given data, event name and event ID in that order.
    *
    * @param data - Data to write.
@@ -959,7 +1212,7 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
    */ _define_property$5(_assert_this_initialized$l(_this), "push", function(data) {
             var eventName = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "message", eventId = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : generateId();
             if (!_this.isConnected) {
-                throw new SseError("Cannot push data to a non-active session.");
+                throw new SseError("Cannot push data to a non-active session. Ensure the session is connected before attempting to push events. If using the Fetch API, the response stream must begin being consumed before the session is considered connected.");
             }
             _this.buffer.push(data, eventName, eventId);
             _this.flush();
@@ -977,7 +1230,7 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
    * @param stream - Readable stream to consume data from.
    * @param options - Options to alter how the stream is flushed to the client.
    *
-   * @returns A promise that resolves or rejects based on the success of the stream write finishing.
+   * @returns A promise that resolves with `true` or rejects based on the success of the stream write finishing.
    */ _define_property$5(_assert_this_initialized$l(_this), "stream", createPushFromStream(_this.push));
         /**
    * Iterate over an iterable and send yielded values as events to the client.
@@ -1014,7 +1267,7 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
                                 3,
                                 1
                             ];
-                            _this1.res.write(batcher.read());
+                            _this1.connection.sendChunk(batcher.read());
                             return [
                                 3,
                                 3
@@ -1030,7 +1283,7 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
                             ];
                         case 2:
                             _state.sent();
-                            _this1.res.write(buffer.read());
+                            _this1.connection.sendChunk(buffer.read());
                             _state.label = 3;
                         case 3:
                             return [
@@ -1043,60 +1296,75 @@ var Session = /*#__PURE__*/ function(TypedEmitter) {
                 return _ref.apply(this, arguments);
             };
         }());
-        _this.req = req;
-        _this.res = res;
-        var _options_serializer;
-        var serializer = (_options_serializer = options.serializer) !== null && _options_serializer !== void 0 ? _options_serializer : serialize;
-        var _options_sanitizer;
-        var sanitizer = (_options_sanitizer = options.sanitizer) !== null && _options_sanitizer !== void 0 ? _options_sanitizer : sanitize;
-        _this.serialize = serializer;
-        _this.sanitize = sanitizer;
+        var givenOptions = options !== null && options !== void 0 ? options : {};
+        if (_instanceof$k(req, Request)) {
+            var givenRes = null;
+            if (res) {
+                if (_instanceof$k(res, Response)) {
+                    givenRes = res;
+                } else {
+                    if (options) {
+                        throw new SseError("When providing a Fetch Request object but no Response object, you may pass options as the second OR third argument to the session constructor, but not to both.");
+                    }
+                    givenOptions = res;
+                }
+            }
+            _this.connection = new FetchConnection(req, givenRes, givenOptions);
+        } else if (_instanceof$k(req, IncomingMessage)) {
+            if (_instanceof$k(res, ServerResponse)) {
+                _this.connection = new NodeHttp1Connection(req, res, givenOptions);
+            } else {
+                throw new SseError("When providing a Node IncomingMessage object, a corresponding ServerResponse object must also be provided.");
+            }
+        } else if (_instanceof$k(req, Http2ServerRequest)) {
+            if (_instanceof$k(res, Http2ServerResponse)) {
+                _this.connection = new NodeHttp2CompatConnection(req, res, givenOptions);
+            } else {
+                throw new SseError("When providing a Node HTTP2ServerRequest object, a corresponding HTTP2ServerResponse object must also be provided.");
+            }
+        } else {
+            throw new SseError("Malformed request or response objects given to session constructor. Must be one of IncomingMessage/ServerResponse from the Node HTTP/1 API, HTTP2ServerRequest/HTTP2ServerResponse from the Node HTTP/2 Compatibility API, or Request/Response from the Fetch API.");
+        }
+        if (givenOptions.headers) {
+            applyHeaders(givenOptions.headers, _this.connection.response.headers);
+        }
+        if (givenOptions.trustClientEventId !== false) {
+            var _this_connection_request_headers_get, _ref, _ref1;
+            _this.lastId = (_ref1 = (_ref = (_this_connection_request_headers_get = _this.connection.request.headers.get("last-event-id")) !== null && _this_connection_request_headers_get !== void 0 ? _this_connection_request_headers_get : _this.connection.url.searchParams.get("lastEventId")) !== null && _ref !== void 0 ? _ref : _this.connection.url.searchParams.get("evs_last_event_id")) !== null && _ref1 !== void 0 ? _ref1 : "";
+        }
+        var _givenOptions_state;
+        _this.state = (_givenOptions_state = givenOptions.state) !== null && _givenOptions_state !== void 0 ? _givenOptions_state : {};
+        var _givenOptions_retry;
+        _this.initialRetry = givenOptions.retry === null ? null : (_givenOptions_retry = givenOptions.retry) !== null && _givenOptions_retry !== void 0 ? _givenOptions_retry : 2e3;
+        var _givenOptions_keepAlive;
+        _this.keepAliveInterval = givenOptions.keepAlive === null ? null : (_givenOptions_keepAlive = givenOptions.keepAlive) !== null && _givenOptions_keepAlive !== void 0 ? _givenOptions_keepAlive : 1e4;
+        var _givenOptions_serializer;
+        _this.serialize = (_givenOptions_serializer = givenOptions.serializer) !== null && _givenOptions_serializer !== void 0 ? _givenOptions_serializer : serialize;
+        var _givenOptions_sanitizer;
+        _this.sanitize = (_givenOptions_sanitizer = givenOptions.sanitizer) !== null && _givenOptions_sanitizer !== void 0 ? _givenOptions_sanitizer : sanitize;
         _this.buffer = new EventBuffer({
-            serializer: serializer,
-            sanitizer: sanitizer
+            serializer: _this.serialize,
+            sanitizer: _this.sanitize
         });
-        var _options_trustClientEventId;
-        _this.trustClientEventId = (_options_trustClientEventId = options.trustClientEventId) !== null && _options_trustClientEventId !== void 0 ? _options_trustClientEventId : true;
-        var _options_retry;
-        _this.initialRetry = options.retry === null ? null : (_options_retry = options.retry) !== null && _options_retry !== void 0 ? _options_retry : 2e3;
-        var _options_keepAlive;
-        _this.keepAliveInterval = options.keepAlive === null ? null : (_options_keepAlive = options.keepAlive) !== null && _options_keepAlive !== void 0 ? _options_keepAlive : 1e4;
-        var _options_statusCode;
-        _this.statusCode = (_options_statusCode = options.statusCode) !== null && _options_statusCode !== void 0 ? _options_statusCode : 200;
-        var _options_headers;
-        _this.headers = (_options_headers = options.headers) !== null && _options_headers !== void 0 ? _options_headers : {};
-        var _options_state;
-        _this.state = (_options_state = options.state) !== null && _options_state !== void 0 ? _options_state : {};
-        _this.req.once("close", _this.onDisconnected);
-        _this.res.once("close", _this.onDisconnected);
+        _this.connection.request.signal.addEventListener("abort", _this.onDisconnected);
         setImmediate(_this.initialize);
         return _this;
     }
-    _create_class$w(Session, [
-        {
-            /**
-   * @deprecated see https://github.com/MatthewWid/better-sse/issues/52
-   */ key: "event",
-            value: function event(type) {
-                this.buffer.event(type);
-                return this;
-            }
-        }
-    ]);
     return Session;
 }(TypedEmitter);
 // src/createSession.ts
-var createSession = function() {
-    for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
-        args[_key] = arguments[_key];
-    }
+function createSession(req, res, options) {
     return new Promise(function(resolve) {
-        var session = _construct$7(Session, _to_consumable_array$7(args));
-        session.once("connected", function() {
+        var session = new Session(req, res, options);
+        if (_instanceof$k(req, Request)) {
             resolve(session);
-        });
+        } else {
+            session.once("connected", function() {
+                resolve(session);
+            });
+        }
     });
-};
+}
 // src/Channel.ts
 var Channel = /*#__PURE__*/ function(TypedEmitter) {
     _inherits$l(Channel, TypedEmitter);
@@ -24065,14 +24333,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === ' ') {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$4(tokens1).concat([
             token
@@ -24091,7 +24359,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -24110,9 +24378,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
-        return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
             v: nextMatch1
         };
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-sse",
-  "version": "0.116.2",
+  "version": "0.116.4",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -30,6 +30,6 @@
     "name": "skill-sse"
   },
   "dependencies": {
-    "better-sse": "^0.14.0"
+    "better-sse": "^0.15.1"
   }
 }