@trenskow/rpc 0.1.3 → 0.1.5

package/lib/index.js

@@ -89,15 +89,21 @@ export class Client {
 
 					return new Promise((resolve, reject) => {
 
+						const response = {
+							resolve,
+							reject
+						};
+
+						if (typeof this._options?.timeout === 'number') {
+							response.timeout = setTimeout(() => {
+								this._responses.delete(identifier);
+								reject(new Error('RPC: Timeout waiting for response.'));
+							}, this._options.timeout ?? 5000);
+						}
+
 						this._responses.set(
-							identifier, {
-								resolve,
-								reject,
-								timeout: setTimeout(() => {
-									this._responses.delete(identifier);
-									reject(new Error(`RPC: Timeout waiting for response for identifier ${identifier}.`));
-								}, this._options.timeout ?? 5000)
-							});
+							identifier,
+							response);
 
 						this.sender(
 							`call:${identifier}:${String(prop)}`,
@@ -127,13 +133,14 @@ export class Client {
 
 		const responseHandler = this._responses.get(identifier);
 
-		clearTimeout(responseHandler.timeout);
-
 		if (!responseHandler) {
-			console.warn(`RPC: No response handler found for identifier ${identifier}.`);
 			return;
 		}
 
+		if (responseHandler?.timeout) {
+			clearTimeout(responseHandler.timeout);
+		}
+
 		this._responses.delete(identifier);
 
 		data = inflate(data);
@@ -158,9 +165,11 @@ export default {
 			sender);
 	},
 	connect: function(
-		sender
+		sender,
+		options
 	) {
 		return new Client(
-			sender);
+			sender,
+			options);
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/rpc",
-	"version": "0.1.3",
+	"version": "0.1.5",
 	"description": "A simple RPC server and client for JavaScript.",
 	"keywords": [
 		"rpc",
@@ -25,13 +25,13 @@
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.3",
 		"@eslint/js": "^9.39.2",
-		"chai": "^6.2.1",
+		"chai": "^6.2.2",
 		"chai-as-promised": "^8.0.2",
 		"eslint": "^9.39.2",
 		"globals": "^16.5.0",
 		"mocha": "^11.7.5"
 	},
 	"dependencies": {
-		"@trenskow/json-compressor": "^0.1.2"
+		"@trenskow/json-compressor": "^0.1.3"
 	}
 }

package/test/index.js

@@ -46,6 +46,16 @@ clientTransport.addTransport(serverTransport);
 const server = rpc.serve({
 	async add(a, b) {
 		return a + b;
+	},
+	async throwError() {
+		throw new Error('This is a test error.');
+	},
+	timeout() {
+		return new Promise((resolve) => {
+			setTimeout(() => {
+				resolve('done');
+			}, 300);
+		});
 	}
 }, (command, data) => {
 	serverTransport.send(command, data);
@@ -53,6 +63,8 @@ const server = rpc.serve({
 
 const client = rpc.connect((command, data) => {
 	clientTransport.send(command, data);
+}, {
+	timeout: 200
 });
 
 serverTransport.on('message', ({ command, data }) => {
@@ -71,6 +83,14 @@ describe('RPC', () => {
 			return expect(client.remote.add(2, 3)).to.eventually.equal(5);
 		});
 
+		it ('should handle errors from the server', () => {
+			return expect(client.remote.throwError()).to.be.rejectedWith('This is a test error.');
+		});
+
+		it ('should handle timeouts', () => {
+			return expect(client.remote.timeout()).to.be.rejectedWith('RPC: Timeout waiting for response.');
+		});
+
 	});
 
 });