Skip to content

feat(extension): Restore error logs in message handlers #146

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

Merged
grypez merged 1 commit into from
Oct 10, 2024
Merged

feat(extension): Restore error logs in message handlers #146

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
22 changes: 17 additions & 5 deletions packages/extension/src/offscreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { makePromiseKit } from '@endo/promise-kit';
import { isKernelCommand, KernelCommandMethod } from '@ocap/kernel';
import {
isKernelCommand,
isKernelCommandReply,
KernelCommandMethod,
} from '@ocap/kernel';
import type { KernelCommandReply, KernelCommand } from '@ocap/kernel';
import {
ChromeRuntimeTarget,
Expand All @@ -14,7 +18,7 @@ import { ExtensionVatWorkerServer } from './VatWorkerServer.js';

const logger = makeLogger('[ocap glue]');

main().catch(console.error);
main().catch(logger.error);

/**
* The main function for the offscreen script.
Expand Down Expand Up @@ -45,9 +49,12 @@ async function main(): Promise<void> {
kernelWorker.receiveMessages(),
kernelInitKit.promise.then(async () => {
for await (const message of backgroundStream) {
isKernelCommand(message)
? await kernelWorker.sendMessage(message)
: logger.info('Received unexpected message', message);
if (!isKernelCommand(message)) {
logger.error('Offscreen received unexpected message', message);
continue;
}

await kernelWorker.sendMessage(message);
}
return undefined;
}),
Expand Down Expand Up @@ -96,6 +103,11 @@ async function main(): Promise<void> {
// change once this offscreen script is providing services to the kernel worker that don't
// involve the user.
for await (const message of workerStream) {
if (!isKernelCommandReply(message)) {
logger.error('Kernel received unexpected message', message);
continue;
}

if (message.method === KernelCommandMethod.InitKernel) {
logger.info('Kernel initialized.');
kernelInitKit.resolve();
Expand Down