Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve shared worker restart after reload process #2847

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Improve shared worker restart after reload process #2847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions client/src/app/openslides-main-module/services/shared-worker.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Injectable, NgZone } from '@angular/core';
import {
defer,
filter,
first,
firstValueFrom,
forkJoin,
from,
Expand All @@ -13,7 +14,6 @@ import {
retry,
Subject,
Subscription,
take,
timeout,
timer
} from 'rxjs';
Expand All @@ -27,6 +27,7 @@ import { environment } from 'src/environments/environment';

const SHARED_WORKER_MESSAGE_ACK_TIMEOUT = 4000;
const SHARED_WORKER_READY_TIMEOUT = 10000;
const SHARED_WORKER_READY_TIMEOUT_TERMINATE = 2000;
const SHARED_WORKER_WAIT_AFTER_TERMINATE = 2000;
const SHARED_WORKER_HEALTHCHECK_INTERVAL = 5000;
const SHARED_WORKER_HEALTH_RESPONSE_TIMEOUT = 8000;
Expand Down Expand Up @@ -106,8 +107,8 @@ export class SharedWorkerService {
const worker = new SharedWorker(new URL(`../../worker/default-shared-worker.worker`, import.meta.url), {
name: `openslides-shared-worker`
});
this.conn = worker.port;

this.conn = worker.port;
if (checkReload) {
await this.handleBrowserReload();
}
Expand Down Expand Up @@ -239,19 +240,30 @@ export class SharedWorkerService {
.map(nav => nav.name)
.includes(`reload`))
) {
const waitReady = this.waitForMessage(SHARED_WORKER_READY_TIMEOUT, (data: any) => data === `ready`);
(<MessagePort>this.conn).start();
await waitReady;
let readyFailed = false;
try {
await this.waitForMessage(
SHARED_WORKER_READY_TIMEOUT_TERMINATE,
(data: any) => data === `ready`,
() => (<MessagePort>this.conn).start()
);
} catch (_) {
readyFailed = true;
console.debug(`[shared worker] failed ready wait`);
}

const waitTerminated = this.waitForMessage(
SHARED_WORKER_READY_TIMEOUT,
(data: any) => data?.action === `terminating` || data?.action === `terminate-rejected`
);
this.sendMessageForce(`control`, { action: `terminate` });
const terminateResp = await waitTerminated;
if (terminateResp.data.action === `terminate-rejected`) {
this.ready = true;
return;
try {
const terminateResp = await this.waitForMessage(
readyFailed ? SHARED_WORKER_READY_TIMEOUT_TERMINATE : SHARED_WORKER_READY_TIMEOUT,
(data: any) => data?.action === `terminating` || data?.action === `terminate-rejected`,
() => this.sendMessageForce(`control`, { action: `terminate` })
);
if (terminateResp.data.action === `terminate-rejected`) {
this.ready = true;
return;
}
} catch (_) {
console.debug(`[shared worker] failed term wait`);
}
await new Promise(r => setTimeout(r, SHARED_WORKER_WAIT_AFTER_TERMINATE));

Expand All @@ -267,11 +279,11 @@ export class SharedWorkerService {
isMessage: (data?: any) => boolean,
doBefore?: () => void
): Promise<MessageEvent<WorkerResponse>> {
const eventListener = merge(fromEvent(this.conn, `message`), fromEvent(this.broadcastChannel, `message`));
const promise = firstValueFrom(
fromEvent(this.conn, `message`).pipe(
filter(e => isMessage((<any>e)?.data)),
timeout({ first: timeoutDuration, with: () => of(false) }),
take(1)
eventListener.pipe(
first(e => isMessage((<any>e)?.data)),
timeout({ first: timeoutDuration, with: () => of(false) })
)
);

Expand Down