node-turbo 1.2.7 → 1.3.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024-2025 Walter Krivanek
+Copyright (c) 2024-2026 Walter Krivanek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -55,11 +55,11 @@ node-turbo has been tested with 100% code coverage with the following engines/li
 
 | Name | Version(s) |
 | :--- | :--- |
-| [Hotwire Turbo](https://turbo.hotwired.dev/) | 7.3.0 - 8.0.20 |
+| [Hotwire Turbo](https://turbo.hotwired.dev/) | 7.3.0 - 8.0.23 |
 | [Node.js](https://nodejs.org/) | 16.6 - 22.20.0 |
-| [Koa](https://koajs.com/) | 2.14.2 - 3.0.3 |
-| [Express](https://expressjs.com/) | 4.18.2 - 5.1.0 |
-| [ws](https://github.com/websockets/ws) | 8.15.1 -  8.18.3 |
+| [Koa](https://koajs.com/) | 2.14.2 - 3.1.2 |
+| [Express](https://expressjs.com/) | 4.18.2 - 5.2.1 |
+| [ws](https://github.com/websockets/ws) | 8.15.1 -  8.19.0 |
 
 ## API docs
 See [`/docs/API.md`](./docs/API.md) for a documentation of all node-turbo classes and functions.
@@ -216,15 +216,15 @@ Result:
 
 ##### Using the Node.js streams API
 If you want to use the [Node.js streams API](https://nodejs.org/docs/latest/api/stream.html) with Turbo Streams, you can 
-create a Readable stream instance which reads Turbo Stream messages.
+create a `PassThrough` stream instance which reads Turbo Stream messages.
 
 ```javascript
 import { TurboStream } from 'node-turbo';
 
 const ts = new TurboStream();
-const readable = ts.createReadableStream();
+const nStream = ts.createNodeStream();
 
-readable.pipe(process.stdout);
+nStream.pipe(process.stdout);
 
 // These elements get piped immediately:
 ts
@@ -459,9 +459,9 @@ const wss = new WebSocketServer({ port: 8080 });
 
 wss.on('connection', function connection(ws) {
   const ts = new TurboStream();
-  const readable = ts.createReadableStream();
+  const nStream = ts.createNodeStream();
   const wsStream = createWebSocketStream(ws, { encoding: 'utf8' });
-  readable.pipe(wsStream);
+  nStream.pipe(wsStream);
 
   ts
     .append('target-id', '<p>My content</p>')
@@ -508,8 +508,8 @@ const httpServer = http.createServer((req, res) => {
 
     // You can also use the streams API.
     setTimeout(() => {    
-      const stream = ssets.createReadableStream();
-      stream.pipe(res); 
+      const nStream = ssets.createNodeStream();
+      nStream.pipe(res); 
       ssets.prependAll('.stream', '<p>Prepend!</p>');
     }, 2000);
 
@@ -529,7 +529,7 @@ const httpServer = http.createServer((req, res) => {
       padding: 10px;
     }
     </style>
-    <script type="module" src="https://unpkg.com/@hotwired/turbo@8.0.20/dist/turbo.es2017-esm.js"></script>
+    <script type="module" src="https://unpkg.com/@hotwired/turbo@8.0.23/dist/turbo.es2017-esm.js"></script>
     <script>
       var eventSource = new EventSource('/sse');
       eventSource.onmessage = function(event) {
@@ -616,7 +616,7 @@ app.use(async (ctx, next) => {
       padding: 10px;
     }
     </style>
-    <script type="module" src="https://unpkg.com/@hotwired/turbo@8.0.20/dist/turbo.es2017-esm.js"></script>
+    <script type="module" src="https://unpkg.com/@hotwired/turbo@8.0.23/dist/turbo.es2017-esm.js"></script>
     <script>
       var eventSource = new EventSource('/sse');
       eventSource.onmessage = function(event) {
@@ -693,7 +693,7 @@ app.get('/', async (req, res) => {
       padding: 10px;
     }
     </style>
-    <script type="module" src="https://unpkg.com/@hotwired/turbo@8.0.20/dist/turbo.es2017-esm.js"></script>
+    <script type="module" src="https://unpkg.com/@hotwired/turbo@8.0.23/dist/turbo.es2017-esm.js"></script>
     <script>
       var eventSource = new EventSource('/sse');
       eventSource.onmessage = function(event) {
@@ -720,4 +720,4 @@ app.listen(config.port);
 ```
 ## License
  
-node-turbo is © 2024-2025 Walter Krivanek and released under the [MIT license](https://mit-license.org).
+node-turbo is © 2024-2026 Walter Krivanek and released under the [MIT license](https://mit-license.org).

package/docs/API.md

@@ -1,6 +1,6 @@
 # node-turbo API documentation
 
-Version 1.2.7
+Version 1.3.0
 
 ## Table of Contents
 
@@ -26,7 +26,7 @@ Version 1.2.7
       - [turbostream.flush()](#turbostreamflush)
       - [turbostream.custom(action, target, content)](#turbostreamcustomaction-target-content)
       - [turbostream.customAll(action, targets, content)](#turbostreamcustomallaction-targets-content)
-      - [turbostream.createReadableStream(opts, opts.continuous, streamOptions)](#turbostreamcreatereadablestreamopts-optscontinuous-streamoptions)
+      - [turbostream.createNodeStream(opts, streamOptions)](#turbostreamcreatenodestreamopts-streamoptions)
       - [turbostream.append(targetOrAttributes, content)](#turbostreamappendtargetorattributes-content)
       - [turbostream.appendAll(targetsOrAttributes, content)](#turbostreamappendalltargetsorattributes-content)
       - [turbostream.prepend(targetOrAttributes, content)](#turbostreamprependtargetorattributes-content)
@@ -54,7 +54,7 @@ Version 1.2.7
       - [turboelement.renderAttributesAsHtml()](#turboelementrenderattributesashtml)
       - [turboelement.validate()](#turboelementvalidate)
       - [turboelement.render()](#turboelementrender)
-   - [Class: TurboReadable](#class-turboreadable)
+   - [Class: TurboReadable (deprecated)](#class-turboreadable)
       - [new TurboReadable(turboStream[, opts])](#new-turboreadableturbostream-opts)
       - [turboreadable._turboStream](#turboreadable_turbostream)
       - [turboreadable._boundPush](#turboreadable_boundpush)
@@ -92,7 +92,7 @@ Version 1.2.7
       - [sseturbostream.eventName](#sseturbostreameventname)
       - [sseturbostream.render()](#sseturbostreamrender)
       - [sseturbostream.renderSseEvent(raw)](#sseturbostreamrendersseeventraw)
-      - [sseturbostream.createReadableStream()](#sseturbostreamcreatereadablestream)
+      - [sseturbostream.createNodeStream()](#sseturbostreamcreatenodestream)
       - [sseturbostream.event(eventName)](#sseturbostreameventeventname)
 - [node-turbo/errors](#node-turboerrors)
    - [Class: ValidationError](#class-validationerror)
@@ -271,16 +271,16 @@ Adds a Turbo Stream Element with a custom action, targeting multiple DOM element
 
 Returns: {TurboStream} The instance for chaining.
 
-#### turbostream.createReadableStream(opts, opts.continuous, streamOptions)
+#### turbostream.createNodeStream(opts, streamOptions)
 
 - `opts` {Object<String, String>} The options for stream creation.
-- `opts.continuous` {Boolean} If true, a TurboReadable instance is returned. 
- If false, a readable stream created from the buffered items is returned.
+- `opts.continuous` {Boolean} If true, a {node:stream~PassThrough} instance is returned. 
+ If false, a {node:stream~Readable} created from the buffered items is returned.
 - `streamOptions` {Object<String, String>} The options for the readable stream itself.
 
-Creates a readable stream.
+Creates either a {node:stream~Readable} or {node:stream~PassThrough} stream instance.
 
-Returns: {stream.Readable | TurboReadable} Either a readable stream or a TurboReadable instance.
+Returns: {node:stream~Readable | {node:stream~PassThrough}} Either a readable stream or a TurboReadable instance.
 
 #### turbostream.append(targetOrAttributes, content)
 
@@ -510,6 +510,9 @@ Render function to implement.
 
 ### Class: TurboReadable
 
+> [!WARNING]
+> Deprecated since v1.3.0!
+
 ```javascript
 import { TurboReadable } from 'node-turbo';
 ```
@@ -688,7 +691,7 @@ Adds the element to the buffer, if config.buffer === true.
 Fires the event 'element' with the added element.
 > - clear()  
 Clears the buffer.
-> - createReadableStream(opts, opts.continuous, streamOptions)  
+> - createNodeStream(opts, streamOptions)  
 Creates a readable stream.
 > - custom(action, target, content)  
 Adds a Turbo Stream Element with a custom action.
@@ -752,7 +755,7 @@ Adds the element to the buffer, if config.buffer === true.
 Fires the event 'element' with the added element.
 > - clear()  
 Clears the buffer.
-> - createReadableStream(opts, opts.continuous, streamOptions)  
+> - createNodeStream(opts, streamOptions)  
 Creates a readable stream.
 > - custom(action, target, content)  
 Adds a Turbo Stream Element with a custom action.
@@ -851,7 +854,7 @@ Adds the element to the buffer, if config.buffer === true.
 Fires the event 'element' with the added element.
 > - clear()  
 Clears the buffer.
-> - createReadableStream(opts, opts.continuous, streamOptions)  
+> - createNodeStream(opts, streamOptions)  
 Creates a readable stream.
 > - custom(action, target, content)  
 Adds a Turbo Stream Element with a custom action.
@@ -942,15 +945,15 @@ Returns: {String | null} The rendered SSE or null if there were no elements in t
 
 - `raw` {String} The raw HTML string.
 
-Takes a HTML fragment string and converts it to an SSE event message.
+Takes an HTML fragment string and converts it to an SSE event message.
 
 Returns: {String | null} The converted SSE event message or null if no string has been passed.
 
-#### sseturbostream.createReadableStream()
+#### sseturbostream.createNodeStream()
 
-Creates a {TurboReadable} instance, which pipes to a {node:stream~Transform} to add SSE specific syntax.
+Creates a {node:stream~PassThrough} instance, which passes Turbo Stream elements through as SSE messages.
 
-Returns: {node:stream.Transform} The Transform stream instance.
+Returns: {node:stream~PassThrough} The PassThrough stream instance.
 
 #### sseturbostream.event(eventName)
 
@@ -1050,4 +1053,4 @@ Gets thrown when invalid attributes are discovered.
 
 ***
 
-node-turbo is © 2024-2025 by Walter Krivanek and released under the [MIT license](https://mit-license.org).
+node-turbo is © 2024-2026 by Walter Krivanek and released under the [MIT license](https://mit-license.org).

package/docs/config.codekit3

@@ -7,7 +7,7 @@
       "uuidString" : "F605B793-549B-4143-ACBD-2C8AF906877B"
     }
   ],
-  "creatorBuild" : "34680",
+  "creatorBuild" : "34892",
   "files" : {
     "\/API.md" : {
       "cB" : 0,
@@ -1327,8 +1327,6 @@
     "buildFolderActive" : 0,
     "buildFolderName" : "build",
     "cleanBuild" : 1,
-    "cssoForceMediaMerge" : 0,
-    "cssoRestructure" : 1,
     "environmentVariableEntries" : [
       "NODE_ENV:::production"
     ],
@@ -1965,6 +1963,9 @@
         "active" : 0,
         "optionString" : "{'skipBlankLines': false, 'ignoreComments': false}"
       },
+      "no-unassigned-vars" : {
+        "active" : 0
+      },
       "no-undef" : {
         "active" : 1,
         "optionString" : "{'typeof': false}"
@@ -2045,7 +2046,8 @@
         "active" : 0
       },
       "no-useless-escape" : {
-        "active" : 1
+        "active" : 1,
+        "optionString" : "{'allowRegexCharacters': []}"
       },
       "no-useless-rename" : {
         "active" : 0,

package/lib/express/express-turbo-stream.js

@@ -40,7 +40,7 @@ export class ExpressTurboStream extends TurboStream {
 	 */
 	send() {
 		this.res.type(TurboStream.MIME_TYPE);
-		this.res.send(this.render());
+		this.res.send(this.render() ?? '');
 	}
 	
 }

package/lib/express/turbocharge-express.js

@@ -98,8 +98,9 @@ export function turbochargeExpress(expressApp, opts) {
 
 		this.flushHeaders();
 
-		const ssets = new SseTurboStream(); 
-		const stream = ssets.createReadableStream();
+		const ssets = new SseTurboStream();
+		const stream = ssets.createNodeStream();
+		this.req.on('close', () => stream.destroy());
 		stream.pipe(this);
 
 		return ssets;

package/lib/koa/turbocharge-koa.js

@@ -108,9 +108,11 @@ export function turbochargeKoa(koaApp, opts = {}) {
 
 			// this.response.flushHeaders();
 
-			const 
+			const
 				ssets = new SseTurboStream(),
-				readable = ssets.createReadableStream();
+				readable = ssets.createNodeStream();
+
+			this.req.on('close', () => readable.destroy());
 
 			this.status = 200;
 			this.body = readable;

package/lib/sse/sse-turbo-stream.js

@@ -1,6 +1,7 @@
 
-import { TurboStream, TurboReadable } from '#core';
-import { Writable, Transform } from 'node:stream';
+import { TurboStream } from '#core';
+import { PassThrough } from 'node:stream';
+import { deprecate } from 'node:util';
 import db from 'debug';
 const debug = db('node-turbo:sse');
 
@@ -70,7 +71,7 @@ export class SseTurboStream extends TurboStream {
 
 
 	/**
-	 * Takes a HTML fragment string and converts it to an SSE event message.
+	 * Takes an HTML fragment string and converts it to an SSE event message.
 	 * 
 	 * @param {String} raw - The raw HTML string.
 	 * @returns {String|null} The converted SSE event message or null if no string has been passed.
@@ -92,33 +93,51 @@ export class SseTurboStream extends TurboStream {
 
 
 	/**
-	 * Creates a {TurboReadable} instance, which pipes to a {node:stream~Transform} to add 
-	 * SSE specific syntax.
+	 * Creates a {node:stream.PassThrough} to which the the TurboStream elements
+	 * are written as SSE event messages
 	 *
 	 * @returns {node:stream.Transform} The Transform stream instance.
-	 * @since 1.0.0
+	 * @since 1.3.0
 	 */
-	createReadableStream() {
-		const readable = new TurboReadable(this);
-		const eventName = this.eventName;
-
-		const renderSseEvent = this.renderSseEvent.bind(this);
-
-		const sseTransform = new Transform({
-			transform(chunk, encoding, callback) {
-				if (encoding === 'buffer') {
-					chunk = chunk.toString();
-				}
-				const event = renderSseEvent(chunk);
-				this.push(event);
-				if (typeof callback === 'function') {
-					callback();	
-				}
-			}
+	createNodeStream() {
+		const stream = new PassThrough();
+		
+		// Don't buffer Turbo Stream elements.
+		this.updateConfig({ buffer: false });
+		
+		// Instead, immediately write them to the stream.
+		const elementListener = (el) => {
+			stream.write(this.renderSseEvent(el.render()));
+		};
+		
+		this.on('element', elementListener);
+		
+		stream.once('close', () => {
+			this.removeListener('element', elementListener)
 		});
-
-		return readable.pipe(sseTransform);
+		
+		// If we have previously buffered Turbo Stream elements, 
+		// write them immediately.
+		if (this.length > 0) {
+			this.elements.forEach((el) => this.emit('element', el));
+			this.clear();
+		}
+		
+		return stream;
 	}
+	
+	
+	/**
+	 * Creates a {node:stream.PassThrough} to which the the TurboStream elements
+	 * are written as SSE event messages
+	 *
+	 * @returns {node:stream.Transform} The Transform stream instance.
+	 * @since 1.0.0
+	 * @deprecated since 1.3.0
+	 */
+	createReadableStream = deprecate(() => {
+		return this.createNodeStream();
+	}, 'sseTurboStream.createReadableStream() is deprecated. Use sseTurboStream.createNodeStream() instead.');
 
 
 	/**

package/lib/turbo-readable.js

@@ -11,6 +11,7 @@ const debug = db('node-turbo:readable');
  * 
  * @extends {node:stream~Readable}
  * @since 1.0.0
+ * @deprecated since 1.3.8
  */
 export class TurboReadable extends Readable {
 
@@ -101,19 +102,11 @@ export class TurboReadable extends Readable {
 	 * @param {Error} err - The error object, if thrown.
 	 * @since 1.0.0
 	 */
-	_destroy(err) {
+	_destroy(err, callback) {
 		debug('_destroy()', err);
 		this._turboStream.removeListener('element', this._boundPush);
 		this._turboStream.updateConfig({ buffer: true });
-
-		// if (typeof callback === 'function') {
-		// 	if (err) {
-		// 		callback(err);	
-		// 	}
-		// 	else {
-		// 		callback();
-		// 	}
-		// }
+		callback(err);
 	}
 
 

package/lib/turbo-stream.js

@@ -1,7 +1,7 @@
 
 import { EventEmitter } from 'node:events';
-import { TurboStreamElement, TurboReadable } from '#core';
-import { Writable, Readable } from 'node:stream';
+import { TurboStreamElement } from '#core';
+import { Readable, PassThrough } from 'node:stream';
 import { deprecate } from 'node:util';
 import db from 'debug';
 const debug = db('node-turbo:turbostream');
@@ -271,28 +271,67 @@ export class TurboStream extends EventEmitter {
 
 
 	/**
-	 * Creates a readable stream.
-	 * 
+	 * Creates a {node:stream.PassThrough} stream to which the the TurboStream elements
+	 * are written.
+	 *
 	 * @param {Object<String, String>} opts - The options for stream creation.
-	 * @param {Boolean} opts.continuous - If true, a TurboReadable instance is returned. 
-	 *  If false, a readable stream created from the buffered items is returned.
+	 * @param {Boolean} opts.continuous - If true, a {node:stream.PassThrough} is returned that
+	 *  receives elements as they are added. If false, a readable stream created from the buffered
+	 *  items is returned.
 	 * @param {Object<String, String>} streamOptions - The options for the readable stream itself.
-	 * @returns {stream.Readable|TurboReadable} Either a readable stream or a TurboReadable instance.
+	 * @returns {node:stream.PassThrough|stream.Readable} Either a PassThrough stream or a Readable.from() instance.
 	 * @since 1.0.0
 	 */
-	createReadableStream(opts, streamOptions = {}) {
+	createNodeStream(opts, streamOptions = {}) {
 		opts = Object.assign({}, { continuous: true }, opts);
 		debug('createReadableStream()', opts, streamOptions);
 
 		if (opts.continuous === true) {
-			debug(' returns new TurboStreamReadable()');
-			return new TurboReadable(this, streamOptions);
+			debug(' returns PassThrough stream');
+
+			const stream = new PassThrough(streamOptions);
+
+			// Don't buffer Turbo Stream elements.
+			this.updateConfig({ buffer: false });
+
+			// Instead, immediately write them to the stream.
+			const elementListener = (el) => {
+				stream.write(el.render());
+			};
+
+			this.on('element', elementListener);
+
+			stream.once('close', () => {
+				this.removeListener('element', elementListener);
+			});
+
+			// If we have previously buffered Turbo Stream elements,
+			// write them immediately.
+			if (this.length > 0) {
+				this.elements.forEach((el) => this.emit('element', el));
+				this.clear();
+			}
+
+			return stream;
 		}
 		else {
 			debug(' returns Readable.from()');
-			return Readable.from(this.length > 0 ? this.render().split('\n') : [], streamOptions);
+			return Readable.from((this.length > 0) ? this.render().split('\n') : [], streamOptions);
 		}
 	}
+	
+	
+	/**
+	 * Creates a {node:stream.PassThrough} stream to which the the TurboStream elements
+	 * are written.
+	 *
+	 * @returns {node:stream.Transform} The Transform stream instance.
+	 * @since 1.0.0
+	 * @deprecated since 1.3.0
+	 */
+	createReadableStream = deprecate((opts, streamOptions = {}) => {
+		return this.createNodeStream(opts, streamOptions);
+	}, 'turboStream.createReadableStream() is deprecated. Use turboStream.createNodeStream() instead.')
 
 
 	/**

package/lib/ws/ws-turbo-stream.js

@@ -91,6 +91,7 @@ export class WsTurboStream extends TurboStream {
 			if (this.listenerCount('render') > 0) {
 				this.removeListener('render', this.handleRender); 
 			}
+			
 			this.on('element', this.handleElement);
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-turbo",
-	"version": "1.2.7",
+	"version": "1.3.0",
 	"description": "A library for Node.js to assist with the server side of 37signals' Hotwire Turbo framework. It provides classes and functions for Web servers and also convenience functions for the frameworks Koa and Express as well as for WebSocket and SSE.",
 	"keywords": [
 		"node",
@@ -64,23 +64,23 @@
 		"negotiator": "^1.0.0"
 	},
 	"devDependencies": {
-		"@hotwired/turbo": "^8.0.20",
-		"@koa/bodyparser": "^6.0.0",
-		"@playwright/test": "^1.56.1",
-		"c8": "^10.1.3",
-		"chai": "^6.2.0",
+		"@hotwired/turbo": "^8.0.23",
+		"@koa/bodyparser": "^6.1.0",
+		"@playwright/test": "^1.58.2",
+		"c8": "^11.0.0",
+		"chai": "^6.2.2",
 		"chai-spies": "^1.1.0",
 		"colorette": "^2.0.20",
-		"eventsource": "^4.0.0",
-		"express": "^5.1.0",
+		"eventsource": "^4.1.0",
+		"express": "^5.2.1",
 		"git-repo-info": "^2.1.1",
-		"koa": "^3.0.3",
+		"koa": "^3.1.2",
 		"koa-route": "^4.0.1",
 		"koa-static": "^5.0.0",
-		"mocha": "^11.7.4",
+		"mocha": "^11.7.5",
 		"node-mocks-http": "^1.17.2",
 		"nunjucks": "^3.2.4",
-		"supertest": "^7.1.4",
-		"ws": "^8.18.3"
+		"supertest": "^7.2.2",
+		"ws": "^8.19.0"
 	}
 }

package/test/end2end/server-koa.js

@@ -4,13 +4,14 @@ import route from 'koa-route';
 import serve from 'koa-static';
 import bodyParser from '@koa/bodyparser';
 import { turbochargeKoa } from '#koa';
-import { SseTurboStream } from '#sse';
 
 const app = new Koa();
 let ssets;
 
-app.on('error', (err, ctx) => {
-	console.error('Error in Koa:', err);
+app.on('error', (err) => {
+	if (err?.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
+		console.error('Error in Koa:', err);
+	}
 });
 
 // Add node-turbo functions to Koa context.

package/test/integration/sse.test.js

@@ -1,22 +1,28 @@
 
 import { expect } from '../chai.js';
-import request from 'supertest';
 import Koa from 'koa';
 import { EventSource } from 'eventsource';
-import { TurboStream } from '#core';
 import { SseTurboStream } from '#sse';
-import { PassThrough } from 'node:stream';
 
+ 
 const port = 8888;
 
+
 describe('SSE integration', function() {
 
 	before(function() {
+		this.readable = null;
+		this.eventSource = null;
+		this.server = null;
 		this.app = new Koa();
 		this.sseTurboStream = new SseTurboStream();
-
+		
 		this.app.on('error', (err, ctx) => {
-			expect.fail(err);
+			// ERR_STREAM_PREMATURE_CLOSE is expected when the SSE client disconnects.
+			// Also @see: {@link https://github.com/koajs/koa/pull/612|Koa GitHub Issue 612}
+			if (err?.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
+				console.error(err);
+			}
 		});
 
 		this.app.use(async (ctx, next) => {
@@ -29,52 +35,58 @@ describe('SSE integration', function() {
 			ctx.req.socket.setKeepAlive(true);
 
 			ctx.set({
+				'Content-Type': SseTurboStream.MIME_TYPE,
 				'Cache-Control': 'no-cache',
-				'Connection': 'keep-alive',
+				'Connection': 'keep-alive'
 			});
 
-			this.readable = this.sseTurboStream.createReadableStream();
+			this.readable = this.sseTurboStream.createNodeStream();
+			ctx.req.on('close', () => this.readable.destroy());
 
-			ctx.type = SseTurboStream.MIME_TYPE;
 			ctx.status = 200;
 			ctx.body = this.readable;
 		});
-
+		
 		this.server = this.app.listen(port);
 	});
 
 
 	after(function() {
-		this.readable.destroy();
-		this.eventSource.close();
+		this.server.closeAllConnections();
 		this.server.close();
 	});
 
 
-	it('Turbo Stream messages get sent to EventSource as SSE messages', function(done) {
-		const messages = [];
-		
-		this.eventSource = new EventSource(`http://localhost:${port}/sse`);
-		
-		this.eventSource.addEventListener('error', e => {
-			expect.fail('An error occurred while attempting to connect');
-		});
-
-		this.eventSource.addEventListener('message', e => {
+	it('Turbo Stream messages get sent to EventSource as SSE messages', function() {
+		return new Promise((resolve, reject) => {
+			const messages = [];
 			
-			messages.push(e.data);
-
-			if (messages.length === 2) {
-				expect(messages[0]).to.equal('<turbo-stream action="append" target="t1"><template>c1</template></turbo-stream>');
-				expect(messages[1]).to.equal('<turbo-stream action="replace" target="t2"><template>c2</template></turbo-stream>');
-				done();
-			}
+			this.eventSource = new EventSource(`http://localhost:${port}/sse`);
+			
+			this.eventSource.addEventListener('error', (e) => {
+				expect.fail(e.message);
+				reject(e);
+			});
+			
+			this.eventSource.addEventListener('message', (e) => {
+				messages.push(e);
+			
+				if (messages.length === 2) {
+					expect(messages[0].type).to.equal('message');
+					expect(messages[0].data).to.equal('<turbo-stream action="append" target="t1"><template>c1</template></turbo-stream>');
+					expect(messages[1].type).to.equal('message');
+					expect(messages[1].data).to.equal('<turbo-stream action="replace" target="t2"><template>c2</template></turbo-stream>');
+
+					this.eventSource.close();
+					resolve();
+				}
+			});
+			
+			// Send Turbo Stream messages.
+			this.sseTurboStream
+				.append('t1', 'c1')
+				.replace('t2', 'c2');
 		});
-
-		// Send Turbo Stream messages.
-		this.sseTurboStream.append('t1', 'c1');
-		this.sseTurboStream.replace('t2', 'c2');
 	});
 
-
 });

package/test/integration/ws.test.js

@@ -1,6 +1,5 @@
 
 import { expect } from '../chai.js';
-import request from 'supertest';
 import { TurboStream } from '#core';
 import { WsTurboStream } from '#ws';
 import { WebSocketServer, WebSocket, createWebSocketStream } from 'ws';
@@ -113,7 +112,7 @@ describe('WebSocket integration', function() {
 			const messages = [];
 
 			// We're expecting one message with two elements.
-			ws.on('message', (data, isBinary) => {
+			ws.on('message', (data) => {
 				messages.push(data.toString());
 				if (messages.length === 2) {
 					expect(messages[0]).to.equal('<turbo-stream action="append" target="t1"><template>c1</template></turbo-stream>');
@@ -127,7 +126,7 @@ describe('WebSocket integration', function() {
 			ws.once('open', () => {
 				this.wss.clients.forEach(ws => {
 					const ts = new TurboStream();
-					const readable = ts.createReadableStream();
+					const readable = ts.createNodeStream();
 
 					readable.on('error', err => {
 						return reject(err);

package/test/unit/core/turbo-readable.test.js

@@ -1,20 +1,17 @@
 
 import { expect, spy } from '../../chai.js';
-import { TurboStream, TurboElement, TurboStreamElement, TurboReadable } from '#core';
-import { Readable } from 'node:stream';
+import { TurboStream, TurboStreamElement, TurboReadable } from '#core';
 
-const attr = {
-	action: 'a',
-	target: 't'
-};
-
-describe('TurboReadable', function() {
+describe('TurboReadable (deprecated)', function() {
 
 	before(function() { 
 		this.ts = new TurboStream()
 		this.readable = new TurboReadable(this.ts);
 	});
 
+	after(function() { 
+		this.readable.destroy();
+	});
 
 	beforeEach(function() {
 		spy.on(this.readable, 'push');
@@ -68,11 +65,11 @@ describe('TurboReadable', function() {
 	});
 
 
-	it('_destroy() gets called when steam is destroyed', function() {
-		const readable = this.ts.createReadableStream();
+	it('_destroy() gets called when stream is destroyed', function() {
+		const readable = new TurboReadable(new TurboStream());
+			
 		spy.on(readable, '_destroy');
 		readable.destroy();
-
 		expect(readable._destroy).to.have.been.called();
 		spy.restore(readable, '_destroy');
 	});

package/test/unit/core/turbo-stream.test.js

@@ -1,7 +1,7 @@
 
 import { expect } from '../../chai.js';
-import { TurboStream, TurboElement, TurboStreamElement, TurboReadable } from '#core';
-import { Readable } from 'node:stream';
+import { TurboStream, TurboElement, TurboStreamElement } from '#core';
+import { Readable, PassThrough } from 'node:stream';
 
 const attr = {
 	action: 'a',
@@ -379,30 +379,100 @@ describe('TurboStream', function() {
 				expect(ts.elements[0].attributes.action).to.equal('morph');
 			});
 
+			it ('createReadableStream() warns about deprecation.', function() {
+				return new Promise(resolve => {
+					process.once('warning', err => {
+						expect(err).to.be.an('error');
+						expect(err.message).to.include('createReadableStream() is deprecated');
+						resolve();
+					});
+			
+					const ts = new TurboStream();
+					ts.createReadableStream();
+				});
+			});
+			
 		});
 	});
 
 	
-	describe('createReadableStream(opts)', function() {
+	describe('createNodeStream(opts)', function() {
 
-		it('returns new TurboReadable() when opts.continuous = true', function() {
-			const ts = new TurboStream();
-			const readable = ts.createReadableStream();
-			expect(readable).to.be.an.instanceof(TurboReadable);
-		});
-
-		it('returns new Readable() when opts.continuous = false', function() {
-			const ts = new TurboStream().append('t', 'c');
-			const readable = ts.createReadableStream({ continuous: false });
-			expect(readable).not.to.be.an.instanceof(TurboReadable);
-			expect(readable).to.be.an.instanceof(Readable);
+		describe('opts.continuous = true', function() {
+			
+			it('returns PassThrough stream', function() {
+				const ts = new TurboStream();
+				const readable = ts.createNodeStream();
+				expect(readable).to.be.an.instanceof(PassThrough);
+			});
+			
 		});
+		
+		
+		describe('opts.continuous = false', function() {
+			
+			it('returns new Readable()', function() {
+				const ts = new TurboStream();
+				const readable = ts.createNodeStream({ continuous: false });
+				expect(readable).not.to.be.an.instanceof(PassThrough);
+				expect(readable).to.be.an.instanceof(Readable);
+				readable.destroy();
+			});
+			
+			it('emits event \'element\' for existing Turbo Stream elements', function() {
+				return new Promise(resolve => {
+					const ts = new TurboStream().append('t', 'c');
 
-		it('returns new Readable() when opts.continuous = false even if empty', function() {
-			const ts = new TurboStream();
-			const readable = ts.createReadableStream({ continuous: false });
-			expect(readable).not.to.be.an.instanceof(TurboReadable);
-			expect(readable).to.be.an.instanceof(Readable);
+					ts.on('element', (el) => {
+						expect(el).to.be.an.instanceof(TurboStreamElement);
+						
+						resolve();
+					});
+					
+					const readable = ts.createNodeStream();
+					readable.destroy();
+				});
+			});
+			
+			it('Readable stream includes previously added elements (rendered)', function() {
+				const ts = new TurboStream()
+					.append('t', 'c')
+					.append('t2', 'c2');
+					
+				const readable = ts.createNodeStream({ continuous: false });
+				readable.setEncoding('utf8');
+				readable.pause();
+				
+				let 
+					el = '',
+					str = '';
+			
+				while ((el = readable.read()) !== null) {
+					str += el;
+				}
+				
+				readable.destroy();
+				expect(str).to.equal('<turbo-stream action="append" target="t"><template>c</template></turbo-stream><turbo-stream action="append" target="t2"><template>c2</template></turbo-stream>');
+			});
+			
+			it('returns new Readable(), even if empty', function() {
+				const ts = new TurboStream();
+				const readable = ts.createNodeStream({ continuous: false });
+				expect(readable).not.to.be.an.instanceof(PassThrough);
+				expect(readable).to.be.an.instanceof(Readable);
+				readable.destroy();
+			});
+			
+			it('Readable stream is empty, if TurboStream is empty', function() {
+				const ts = new TurboStream();
+					
+				const readable = ts.createNodeStream({ continuous: false });
+				readable.setEncoding('utf8');
+				readable.pause();
+				expect(readable.read()).to.be.null;
+				readable.destroy();
+			});
+			
 		});
 
 	});

package/test/unit/express/turbocharge-express.test.js

@@ -15,7 +15,8 @@ describe('turbochargeExpress()', function() {
 				req: {
 					headers: {
 						'turbo-frame': 'id'
-					}
+					},
+					on: function() {}
 				},
 				send: function(content) {
 					this.output = content;

package/test/unit/koa/turbocharge-koa.test.js

@@ -15,7 +15,8 @@ describe('turbochargeKoa()', function() {
 				req: {
 					headers: {
 						'turbo-frame': 'id'
-					}
+					},
+					on: function() {}
 				}
 			}
 		};

package/test/unit/sse/sse-turbo-stream.test.js

@@ -60,18 +60,26 @@ describe('SseTurboStream', function() {
 	});
 
 
-	it('createReadableStream() returns Transform', function() {
+	it('createNodeStream() returns Transform', function() {
 		const sseSt = new SseTurboStream();
-		const readable = sseSt.createReadableStream();
+		const readable = sseSt.createNodeStream();
 
 		expect(readable).to.be.an.instanceof(Transform);
 	});
+	
+	
+	it('createReadableStream() (deprecated) returns Transform', function() {
+		const sseSt = new SseTurboStream();
+
+		const readable = sseSt.createReadableStream();	
+		expect(readable).to.be.an.instanceof(Transform);
+	});
 
 
 	it('SSE message gets written to stream', function() {
 		return new Promise((resolve, reject) => {
 			const sseSt = new SseTurboStream();
-			const readable = sseSt.createReadableStream();
+			const readable = sseSt.createNodeStream();
 
 			readable.on('data', chunk => {
 				expect(chunk.toString()).to.equal('data: <turbo-stream action="append" target="t"><template>c</template></turbo-stream>\n\n');
@@ -91,7 +99,7 @@ describe('SseTurboStream', function() {
 	it('SSE message with event name gets written to stream', function() {
 		return new Promise((resolve, reject) => {
 			const sseSt = new SseTurboStream('my-event');
-			const readable = sseSt.createReadableStream();
+			const readable = sseSt.createNodeStream();
 
 			readable.on('data', chunk => {
 				expect(chunk.toString()).to.equal('event: my-event\ndata: <turbo-stream action="append" target="t"><template>c</template></turbo-stream>\n\n');