Skip to content

Commit 287ce37

Browse files
committed
Revert "fix: avoid double logging of connection error (#391)"
This reverts commit cb7f51b.
1 parent a4603d5 commit 287ce37

File tree

2 files changed

+12
-29
lines changed

2 files changed

+12
-29
lines changed

index.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ class SmeeClient {
2929

3030
<<<<<<< HEAD
3131
#onerror: (err: ErrorEvent) => void = (err) => {
32-
if (this.#events?.readyState === EventSource.CLOSED) {
33-
this.#logger.error("Connection closed");
34-
} else {
35-
this.#logger.error("Error in connection", err);
36-
}
32+
this.#logger.error("Error in connection", err);
3733
};
3834
=======
3935
constructor({
@@ -133,12 +129,21 @@ class SmeeClient {
133129

134130
<<<<<<< HEAD
135131
const connected = new Promise<void>((resolve, reject) => {
132+
const onError = (err: ErrorEvent) => {
133+
if (events.readyState === EventSource.CLOSED) {
134+
this.#logger.error("Connection closed");
135+
} else {
136+
this.#logger.error("Error in connection", err);
137+
}
138+
reject(err);
139+
};
140+
136141
events.addEventListener("open", () => {
137142
this.#logger.info(`Connected to ${this.#source}`);
138-
events.removeEventListener("error", reject);
143+
events.removeEventListener("error", onError);
139144
resolve();
140145
});
141-
events.addEventListener("error", reject);
146+
events.addEventListener("error", onError);
142147
});
143148

144149
this.#events = events;

test/connection-error.test.ts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { VoidLogger } from "./helpers/void-logger.ts";
55
import { WebhookServer } from "./helpers/webhook-server.ts";
66

77
import SmeeClient from "../index.ts";
8-
import { randomInt } from "node:crypto";
98

109
describe("connection", () => {
1110
test("should emit an error if the server closes connection unexpectedly", async () => {
@@ -53,25 +52,4 @@ describe("connection", () => {
5352
await smeeClient.stop();
5453
await webhookServer.stop();
5554
});
56-
57-
test("logs an error when the server is not found", async () => {
58-
const domain = "bad.n" + randomInt(1e10).toString(36) + ".proxy";
59-
const url = `http://${domain}/events`;
60-
61-
const logger = new VoidLogger();
62-
63-
try {
64-
const smeeClient = new SmeeClient({
65-
source: url,
66-
target: "http://localhost:3000",
67-
logger,
68-
});
69-
await smeeClient.start();
70-
throw new Error("Expected an error to be thrown");
71-
} catch (error: any) {
72-
expect(logger.errorCalls.length).toBe(1);
73-
expect(logger.errorCalls[0].length).toBe(2);
74-
expect(logger.errorCalls[0][0]).toBe("Error in connection");
75-
}
76-
});
7755
});

0 commit comments

Comments
 (0)