brendan/project-inter-server
1
0
Fork 0
mirror of https://github.com/brendan-ch/project-inter-server.git synced 2026-04-19 08:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

add test and code for client closure events

Browse Source
This commit is contained in:
Brendan Chen
2025-04-30 18:17:27 -07:00
parent 31e9c78ebd
commit f74376c8ed
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/notifications/senders/AppleNotificationSender.ts
View File

@@ -18,12 +18,20 @@ export class AppleNotificationSender {
private apnsToken: string | undefined = undefined; private apnsToken: string | undefined = undefined;
private _lastRefreshedTimeMs: number | undefined = undefined; private _lastRefreshedTimeMs: number | undefined = undefined;
private client: ClientHttp2Session | undefined = undefined; constructor(
private shouldActuallySendNotifications = true,
constructor(private shouldActuallySendNotifications = true) { private client: ClientHttp2Session | undefined = undefined,
) {
this.sendNotificationImmediately = this.sendNotificationImmediately.bind(this); this.sendNotificationImmediately = this.sendNotificationImmediately.bind(this);
this.lastReloadedTimeForAPNsIsTooRecent = this.lastReloadedTimeForAPNsIsTooRecent.bind(this); this.lastReloadedTimeForAPNsIsTooRecent = this.lastReloadedTimeForAPNsIsTooRecent.bind(this);
this.reloadAPNsTokenIfTimePassed = this.reloadAPNsTokenIfTimePassed.bind(this); this.reloadAPNsTokenIfTimePassed = this.reloadAPNsTokenIfTimePassed.bind(this);
this.openConnectionIfNoneExists = this.openConnectionIfNoneExists.bind(this);
this.closeConnectionIfExists = this.closeConnectionIfExists.bind(this);
this.registerClosureEventsForClient = this.registerClosureEventsForClient.bind(this);
if (this.client !== undefined) {
this.registerClosureEventsForClient();
}
} }
get lastRefreshedTimeMs(): number | undefined { get lastRefreshedTimeMs(): number | undefined {
@@ -101,8 +109,7 @@ export class AppleNotificationSender {
}; };
try { try {
if (!this.client) { return false } if (!this.client) { return false }
const client = this.client; const req = this.client.request(headers);
const req = client.request(headers);
req.setEncoding('utf8'); req.setEncoding('utf8');
await new Promise<void>((resolve, reject) => { await new Promise<void>((resolve, reject) => {
@@ -142,9 +149,17 @@ export class AppleNotificationSender {
if (!this.client) { if (!this.client) {
this.client = http2.connect(host); this.client = http2.connect(host);
this.registerClosureEventsForClient();
} }
} }
private registerClosureEventsForClient() {
this.client?.on('close', this.closeConnectionIfExists);
this.client?.on('error', this.closeConnectionIfExists);
this.client?.on('goaway', this.closeConnectionIfExists);
this.client?.on('timeout', this.closeConnectionIfExists);
}
private closeConnectionIfExists() { private closeConnectionIfExists() {
this.client?.close(); this.client?.close();
this.client = undefined; this.client = undefined;

4
test/notifications/senders/AppleNotificationSenderTests.test.ts
View File

@@ -168,7 +168,7 @@ describe("AppleNotificationSender", () => {
}); });
it("registers a handler to close the connection if `close` event fired", async () => { it("registers a handler to close the connection if `close` event fired", async () => {
const connectionCloseEvents = ['close', 'goaway', 'error']; const connectionCloseEvents = ['close', 'goaway', 'error', 'timeout'];
await Promise.all(connectionCloseEvents.map(async (event) => { await Promise.all(connectionCloseEvents.map(async (event) => {
const mockClient = new MockClient(200); const mockClient = new MockClient(200);
@@ -179,7 +179,7 @@ describe("AppleNotificationSender", () => {
body: '' body: ''
}; };
const result = await notificationSender.sendNotificationImmediately('1', notificationArguments); await notificationSender.sendNotificationImmediately('1', notificationArguments);
mockClient.emit(event); mockClient.emit(event);