fix unhandled exception on json parsing (#51)

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 
 node_js:
-  - '10'
-  - '12'
-  - '13'
+  - "10"
+  - "12"
+  - "14"
+  - "15"

README.md

@@ -31,7 +31,6 @@ aria2.js controls aria2 via its [JSON-RPC interface](https://aria2.github.io/man
 * multiple transports
   * [HTTP](https://aria2.github.io/manual/en/html/aria2c.html#rpc-interface)
   * [WebSocket](https://aria2.github.io/manual/en/html/aria2c.html#json-rpc-over-websocket)
-  * ~~[JSONP](https://aria2.github.io/manual/en/html/aria2c.html#json-rpc-using-http-get)~~ [#25](https://github.com/sonnyp/aria2.js/pull/25)
 * promise API
 
 See [aria2 methods](https://aria2.github.io/manual/en/html/aria2c.html#methods) and [aria2 notifications](https://aria2.github.io/manual/en/html/aria2c.html#notifications).

lib/Aria2.js

@@ -38,7 +38,7 @@ class Aria2 extends JSONRPCClient {
     const multi = [
       calls.map(([method, ...params]) => {
         return { methodName: prefix(method), params: this.addSecret(params) };
-      })
+      }),
     ];
     return super.call("system.multicall", multi);
   }
@@ -47,19 +47,19 @@ class Aria2 extends JSONRPCClient {
     return super.batch(
       calls.map(([method, ...params]) => [
         prefix(method),
-        this.addSecret(params)
+        this.addSecret(params),
       ])
     );
   }
 
   async listNotifications() {
     const events = await this.call("system.listNotifications");
-    return events.map(event => unprefix(event));
+    return events.map((event) => unprefix(event));
   }
 
   async listMethods() {
     const methods = await this.call("system.listMethods");
-    return methods.map(method => unprefix(method));
+    return methods.map((method) => unprefix(method));
   }
 }
 
@@ -70,7 +70,7 @@ Aria2.defaultOptions = Object.assign({}, JSONRPCClient.defaultOptions, {
   host: "localhost",
   port: 6800,
   secret: "",
-  path: "/jsonrpc"
+  path: "/jsonrpc",
 });
 
 module.exports = Aria2;

lib/JSONRPCClient.js

@@ -38,7 +38,7 @@ class JSONRPCClient extends EventEmitter {
 
   websocket(message) {
     return new Promise((resolve, reject) => {
-      const cb = err => {
+      const cb = (err) => {
         if (err) reject(err);
         else resolve();
       };
@@ -48,18 +48,21 @@ class JSONRPCClient extends EventEmitter {
   }
 
   async http(message) {
-    const response = this.fetch(this.url("http"), {
+    const response = await this.fetch(this.url("http"), {
       method: "POST",
       body: JSON.stringify(message),
       headers: {
         Accept: "application/json",
-        "Content-Type": "application/json"
-      }
+        "Content-Type": "application/json",
+      },
     });
 
-    response.then(async res => {
-      this._onmessage(await res.json());
-    });
+    response
+      .json()
+      .then(this._onmessage)
+      .catch((err) => {
+        this.emit("error", err);
+      });
 
     return response;
   }
@@ -72,7 +75,7 @@ class JSONRPCClient extends EventEmitter {
     const message = {
       method,
       "json-rpc": "2.0",
-      id: this.id()
+      id: this.id(),
     };
 
     if (params) Object.assign(message, { params });
@@ -152,12 +155,22 @@ class JSONRPCClient extends EventEmitter {
     socket.onclose = (...args) => {
       this.emit("close", ...args);
     };
-    socket.onmessage = event => {
-      this._onmessage(JSON.parse(event.data));
+    socket.onmessage = (event) => {
+      let message;
+      try {
+        message = JSON.parse(event.data);
+      } catch (err) {
+        this.emit("error", err);
+        return;
+      }
+      this._onmessage(message);
     };
     socket.onopen = (...args) => {
       this.emit("open", ...args);
     };
+    socket.onerror = (...args) => {
+      this.emit("error", ...args);
+    };
 
     return promiseEvent(this, "open");
   }
@@ -176,7 +189,7 @@ JSONRPCClient.defaultOptions = {
   secret: "",
   path: "/jsonrpc",
   fetch,
-  WebSocket
+  WebSocket,
 };
 
 module.exports = JSONRPCClient;

lib/debug.js

@@ -2,7 +2,7 @@
 
 const { inspect } = require("util");
 
-module.exports = aria2 => {
+module.exports = (aria2) => {
   aria2.on("open", () => {
     console.log("aria2", "OPEN");
   });
@@ -11,12 +11,12 @@ module.exports = aria2 => {
     console.log("aria2", "CLOSE");
   });
 
-  aria2.on("input", m => {
+  aria2.on("input", (m) => {
     console.log("aria2", "IN");
     console.log(inspect(m, { depth: null, colors: true }));
   });
 
-  aria2.on("output", m => {
+  aria2.on("output", (m) => {
     console.log("aria2", "OUT");
     console.log(inspect(m, { depth: null, colors: true }));
   });