fix(chromium): detach from shared workers (#18976)

This prevents shared workers from stalling upon restart.

We receive `Inspector.targetCrashed` and
`Inspector.targetReloadedAfterCrash` events that assume
`Runtime.runIfWaitingForDebugger` from any attached client. It is easier
and more stable to just detach from shared workers, because we do not
inspect them.

For service workers, we should actually issue
`Runtime.runIfWaitingForDebugger` in such cases, because we attach to
them.

Fixes #18932.
This commit is contained in:
Dmitry Gozman 2022-11-22 15:20:42 -08:00 committed by GitHub
parent 73e7c0ed3d
commit 190ed9465f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 0 deletions

View File

@ -196,6 +196,18 @@ export class CRBrowser extends Browser {
context.emit(CRBrowserContext.CREvents.ServiceWorker, serviceWorker);
return;
}
// Detach from any targets we are not interested in, to avoid side-effects.
//
// One example of a side effect: upon shared worker restart, we receive
// Inspector.targetReloadedAfterCrash and backend waits for Runtime.runIfWaitingForDebugger
// from any attached client. If we do not resume, shared worker will stall.
//
// Ideally, detaching should resume any target, but there is a bug in the backend,
// so we must Runtime.runIfWaitingForDebugger first.
session._sendMayFail('Runtime.runIfWaitingForDebugger').then(() => {
this._session._sendMayFail('Target.detachFromTarget', { sessionId });
});
}
_onDetachedFromTarget(payload: Protocol.Target.detachFromTargetParameters) {

View File

@ -49,6 +49,10 @@ export class CRServiceWorker extends Worker {
session.send('Runtime.enable', {}).catch(e => { });
session.send('Runtime.runIfWaitingForDebugger').catch(e => { });
session.on('Inspector.targetReloadedAfterCrash', () => {
// Resume service worker after restart.
session._sendMayFail('Runtime.runIfWaitingForDebugger', {});
});
}
async updateOffline(initial: boolean): Promise<void> {

View File

@ -0,0 +1,7 @@
<script>
window.sharedWorkerResponsePromise = new Promise(f => {
window.myWorker = new SharedWorker("shared-worker.js");
window.myWorker.port.postMessage('hello');
window.myWorker.port.onmessage = e => f(e.data);
});
</script>

View File

@ -0,0 +1,4 @@
onconnect = event => {
const port = event.ports[0];
port.onmessage = e => port.postMessage('echo:' + e.data);
};

View File

@ -0,0 +1,29 @@
/**
* Copyright (c) Microsoft Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { contextTest as test, expect } from '../config/browserTest';
test('should survive shared worker restart', async ({ context, server }) => {
const page1 = await context.newPage();
await page1.goto(server.PREFIX + '/shared-worker/shared-worker.html');
expect(await page1.evaluate('window.sharedWorkerResponsePromise')).toBe('echo:hello');
await page1.close();
const page2 = await context.newPage();
await page2.goto(server.PREFIX + '/shared-worker/shared-worker.html');
expect(await page2.evaluate('window.sharedWorkerResponsePromise')).toBe('echo:hello');
await page2.close();
});