From 59d8a2cd315f13327d6372b4268faa2aafa4f0ef Mon Sep 17 00:00:00 2001 From: isaacgr Date: Sun, 8 Oct 2023 06:51:44 -0400 Subject: [PATCH] Fix lint errors --- src/client/protocol/base.js | 4 +- tests/client/http-client.test.js | 4 +- tests/client/https-client.test.js | 4 +- ...reconnect-after-serverDisconnected.test.js | 82 +++++++++---------- tests/server/http-server-protocol.test.js | 2 +- 5 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/client/protocol/base.js b/src/client/protocol/base.js index 717a5a6..95c02ee 100644 --- a/src/client/protocol/base.js +++ b/src/client/protocol/base.js @@ -96,9 +96,7 @@ class JsonRpcClientProtocol { this.listen(); resolve(this.server); }); - this.connector.on("error", (error) => - this._onConnectionFailed(error, resolve, reject) - ); + this.connector.on("error", error => this._onConnectionFailed(error, resolve, reject)); this.connector.on("close", (hadError) => { if (!hadError) { this.factory.emit("serverDisconnected"); diff --git a/tests/client/http-client.test.js b/tests/client/http-client.test.js index 7f2810d..d80e25c 100644 --- a/tests/client/http-client.test.js +++ b/tests/client/http-client.test.js @@ -20,7 +20,7 @@ describe("HTTP Client", () => { .then(() => { done(); }) - .catch((e) => console.log(e)); + .catch(e => console.log(e)); }); after((done) => { serverHttp @@ -28,7 +28,7 @@ describe("HTTP Client", () => { .then(() => { done(); }) - .catch((e) => console.log(e)); + .catch(e => console.log(e)); }); describe("connection", () => { // it("should receive error trying to write while disconnected", (done) => { diff --git a/tests/client/https-client.test.js b/tests/client/https-client.test.js index 5ae5c28..84504b7 100644 --- a/tests/client/https-client.test.js +++ b/tests/client/https-client.test.js @@ -18,7 +18,7 @@ describe("HTTPS Client", () => { .then(() => { done(); }) - .catch((e) => console.log(e)); + .catch(e => console.log(e)); }); after((done) => { serverHttps @@ -26,7 +26,7 @@ describe("HTTPS Client", () => { .then(() => { done(); }) - .catch((e) => console.log(e)); + .catch(e => console.log(e)); }); describe("connection", () => { // it("should receive error trying to write while disconnected", (done) => { diff --git a/tests/issues/#123-reconnect-after-serverDisconnected.test.js b/tests/issues/#123-reconnect-after-serverDisconnected.test.js index 6bcfc82..1dce3ee 100644 --- a/tests/issues/#123-reconnect-after-serverDisconnected.test.js +++ b/tests/issues/#123-reconnect-after-serverDisconnected.test.js @@ -1,41 +1,41 @@ -const { expect } = require("chai"); -const Jaysonic = require("../../src"); -const { server } = require("../test-server"); -const intercept = require("intercept-stdout"); - -const tcpclient = new Jaysonic.client.tcp({ - retries: 10 -}); - -describe("#123 Reconnect after serverDisconnected", () => { - beforeEach(async () => { - await server.listen(); - }); - afterEach(async () => { - await tcpclient.end(); - }); - it("should attempt to reconnect at the default rate after receiving a serverDisconnected", async () => { - let reconnectAttempts = 0; - let capturedText = ""; - const unhook = intercept((text) => { - capturedText += text; - }); - tcpclient.serverDisconnected(async () => { - reconnectAttempts += 1; - tcpclient.pcolInstance = null; - await tcpclient.connect(); - }); - await tcpclient.connect(); - await server.close(); - await new Promise((r) => setTimeout(r, 10000)); - unhook(); - // first re-connect attempt is done without error - // second is done with error and does not trigger the serverDisconnected call - // after which the test should timeout - // 2 attempts, 5s apart 10s total - expect(capturedText).to.equal( - `Failed to connect. Address [127.0.0.1:8100]. Retrying. 9 attempts left.\nFailed to connect. Address [127.0.0.1:8100]. Retrying. 8 attempts left.\n` - ); - expect(reconnectAttempts).to.equal(1); - }).timeout(30000); -}); +const { expect } = require("chai"); +const intercept = require("intercept-stdout"); +const Jaysonic = require("../../src"); +const { server } = require("../test-server"); + +const tcpclient = new Jaysonic.client.tcp({ + retries: 10 +}); + +describe("#123 Reconnect after serverDisconnected", () => { + beforeEach(async () => { + await server.listen(); + }); + afterEach(async () => { + await tcpclient.end(); + }); + it("should attempt to reconnect at the default rate after receiving a serverDisconnected", async () => { + let reconnectAttempts = 0; + let capturedText = ""; + const unhook = intercept((text) => { + capturedText += text; + }); + tcpclient.serverDisconnected(async () => { + reconnectAttempts += 1; + tcpclient.pcolInstance = null; + await tcpclient.connect(); + }); + await tcpclient.connect(); + await server.close(); + await new Promise(r => setTimeout(r, 10000)); + unhook(); + // first re-connect attempt is done without error + // second is done with error and does not trigger the serverDisconnected call + // after which the test should timeout + // 2 attempts, 5s apart 10s total + expect(capturedText).to.equal( + "Failed to connect. Address [127.0.0.1:8100]. Retrying. 9 attempts left.\nFailed to connect. Address [127.0.0.1:8100]. Retrying. 8 attempts left.\n" + ); + expect(reconnectAttempts).to.equal(1); + }).timeout(30000); +}); diff --git a/tests/server/http-server-protocol.test.js b/tests/server/http-server-protocol.test.js index c63aeb8..aa497b6 100644 --- a/tests/server/http-server-protocol.test.js +++ b/tests/server/http-server-protocol.test.js @@ -51,7 +51,7 @@ describe("HTTP Server Protocol Status Override", () => { this.setResponseStatus({ errorCode: 400, status: 301 }); this.gotError( new Error( - '{"jsonrpc": "2.0", "error": {"code": -32600, "message": "Invalid Request"}, "id": 2}' + "{\"jsonrpc\": \"2.0\", \"error\": {\"code\": -32600, \"message\": \"Invalid Request\"}, \"id\": 2}" ) ); }