Release v3.1.3: clarify error message (fixes #14)

vphantom · Aug 10, 2019 · 27683f9 · 27683f9
1 parent 3f61a12
commit 27683f9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# jrpc v3.1.2
+# jrpc v3.1.3
 
-[![Build Status](https://travis-ci.org/vphantom/js-jrpc.svg?branch=v3.1.2)](https://travis-ci.org/vphantom/js-jrpc) [![Coverage Status](https://coveralls.io/repos/github/vphantom/js-jrpc/badge.svg?branch=v3.1.2)](https://coveralls.io/github/vphantom/js-jrpc?branch=v3.1.2)
+[![Build Status](https://travis-ci.org/vphantom/js-jrpc.svg?branch=v3.1.3)](https://travis-ci.org/vphantom/js-jrpc) [![Coverage Status](https://coveralls.io/repos/github/vphantom/js-jrpc/badge.svg?branch=v3.1.3)](https://coveralls.io/github/vphantom/js-jrpc?branch=v3.1.3)
 
 Streaming bidirectional backwards-compatible extended JSON-RPC 2.0 in JavaScript
 

diff --git a/jrpc.js b/jrpc.js
@@ -352,17 +352,31 @@ function call(methodName, params, next) {
     return this;
   }
   if (this.remoteTimeout > 0) {
-    this.outTimers[this.serial] = setTimeout(
-      deliverResponse.bind(this, {
-        jsonrpc: '2.0',
-        id: this.serial,
-        error: {
-          code: -1000,
-          message: 'Timed out waiting for response'
-        }
-      }),
-      this.remoteTimeout
-    );
+    if (typeof this.transmitter === 'function') {
+      this.outTimers[this.serial] = setTimeout(
+        deliverResponse.bind(this, {
+          jsonrpc: '2.0',
+          id: this.serial,
+          error: {
+            code: -1000,
+            message: 'Timed out waiting for response'
+          }
+        }),
+        this.remoteTimeout
+      );
+    } else {
+      this.outTimers[this.serial] = setTimeout(
+        deliverResponse.bind(this, {
+          jsonrpc: '2.0',
+          id: this.serial,
+          error: {
+            code: -1100,
+            message: 'Timed out before transmitter was set'
+          }
+        }),
+        this.remoteTimeout
+      );
+    }
   } else {
     this.outTimers[this.serial] = true; // Placeholder
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jrpc",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Streaming bidirectional backwards-compatible extended JSON-RPC 2.0 in JavaScript",
   "main": "jrpc.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "coveralls": "^2.11.9",
     "faucet": "0.0.1",
     "istanbul": "^0.4.3",
-    "tape": "^4.5.1"
+    "tape": "^4.5.1",
+    "phantomjs": "^2.1.7"
   }
 }