feat(extension): use logger

Author: grypez

packages/extension/src/background.ts

@@ -2,11 +2,13 @@ import type { Json } from '@metamask/utils';
 import { KernelCommandMethod, isKernelCommandReply } from '@ocap/kernel';
 import type { KernelCommand } from '@ocap/kernel';
 import { ChromeRuntimeDuplexStream } from '@ocap/streams/browser';
-import { delay } from '@ocap/utils';
+import { delay, makeLogger } from '@ocap/utils';
 
 const OFFSCREEN_DOCUMENT_PATH = '/offscreen.html';
 
-main().catch(console.error);
+const logger = makeLogger('[background]');
+
+main().catch(logger.error);
 
 /**
  * The main function for the background script.
@@ -36,7 +38,7 @@ async function main(): Promise<void> {
     await offscreenStream.write(command);
   };
 
-  // globalThis.kernel will exist due to dev-console.js in background-trusted-prelude.js
+  // globalThis.kernel will exist due to dev-logger.js in background-trusted-prelude.js
   Object.defineProperties(globalThis.kernel, {
     ping: {
       value: async () =>
@@ -56,22 +58,22 @@ async function main(): Promise<void> {
     sendClusterCommand({
       method: KernelCommandMethod.ping,
       params: [],
-    }).catch(console.error);
+    }).catch(logger.error);
   });
 
   // Handle replies from the offscreen document
   for await (const message of offscreenStream) {
     if (!isKernelCommandReply(message)) {
-      console.error('Background received unexpected message', message);
+      logger.error('Background received unexpected message', message);
       continue;
     }
 
     switch (message.method) {
       case KernelCommandMethod.ping:
-        console.log(message.params);
+        logger.log(message.params);
         break;
       default:
-        console.error(
+        logger.error(
           // @ts-expect-error Compile-time exhaustiveness check
           `Background received unexpected command method: "${message.method.valueOf()}"`,
         );

packages/extension/src/iframe.ts

@@ -4,8 +4,11 @@ import {
   MessagePortDuplexStream,
   receiveMessagePort,
 } from '@ocap/streams/browser';
+import { makeLogger } from '@ocap/utils';
 
-main().catch(console.error);
+const logger = makeLogger('[iframe]');
+
+main().catch(logger.error);
 
 /**
  * The main function for the iframe.
@@ -30,5 +33,5 @@ async function main(): Promise<void> {
     commandStream,
   });
 
-  console.log('VatSupervisor initialized with vatId:', vatId);
+  logger.log('VatSupervisor initialized with vatId:', vatId);
 }

packages/extension/src/kernel-integration/iframe-vat-worker.ts

@@ -1,6 +1,8 @@
 import { createWindow } from '@metamask/snaps-utils';
 import type { VatId, VatConfig } from '@ocap/kernel';
 import type { initializeMessageChannel } from '@ocap/streams/browser';
+import { makeLogger } from '@ocap/utils';
+import type { Logger } from '@ocap/utils';
 
 import type { VatWorker } from './VatWorkerServer.ts';
 
@@ -9,8 +11,10 @@ const IFRAME_URI = 'iframe.html';
 export const makeIframeVatWorker = (
   id: VatId,
   getPort: typeof initializeMessageChannel,
+  parentLogger?: Logger,
 ): VatWorker => {
   const vatHtmlId = `ocap-iframe-${id}`;
+  const logger = makeLogger(`[${vatHtmlId}]`, parentLogger);
   return {
     launch: async (_vatConfig: VatConfig) => {
       const newWindow = await createWindow({
@@ -27,7 +31,7 @@ export const makeIframeVatWorker = (
     terminate: async (): Promise<void> => {
       const iframe = document.getElementById(vatHtmlId);
       if (iframe === null) {
-        console.error(
+        logger.error(
           `iframe of vat with id "${id}" already removed from DOM (#${vatHtmlId})`,
         );
         return undefined;

packages/extension/src/kernel-integration/kernel-worker.ts

@@ -88,9 +88,9 @@ async function main(): Promise<void> {
     (async () => {
       if (launchDefaultSubcluster) {
         const result = await kernel.launchSubcluster(defaultSubcluster);
-        console.log(`Subcluster launched: ${JSON.stringify(result)}`);
+        logger.log(`Subcluster launched: ${JSON.stringify(result)}`);
       } else {
-        console.log(`Resuming kernel execution`);
+        logger.log(`Resuming kernel execution`);
       }
     })(),
   ]);

packages/extension/src/offscreen.ts

@@ -61,7 +61,7 @@ async function makeKernelWorker(): Promise<{
 
   const vatWorkerServer = ExtensionVatWorkerServer.make(
     worker as PostMessageTarget,
-    (vatId) => makeIframeVatWorker(vatId, initializeMessageChannel),
+    (vatId) => makeIframeVatWorker(vatId, initializeMessageChannel, logger),
   );
 
   return {