chore: added download of canary to ci

Author: nroscino

.github/workflows/run-tests.yml

@@ -41,6 +41,12 @@ jobs:
         shell: bash
         run: npm ci
 
+      - name: Install Chrome Canary
+        shell: bash
+        run: |
+          CANARY_PATH=$(npx @puppeteer/browsers install chrome@canary --format "{{path}}")
+          echo "CANARY_EXECUTABLE_PATH=$CANARY_PATH" >> $GITHUB_ENV
+
       - name: Build
         run: npm run bundle
         env:

src/McpContext.ts

@@ -940,7 +940,7 @@ export class McpContext implements Context {
   }
 
   async triggerExtensionAction(id: string): Promise<void> {
-    const page = this.getSelectedPage();
+    const page = this.getSelectedPptrPage();
     // @ts-expect-error internal puppeteer api is needed since we don't have a way to get
     // a tab id at the moment
     const theTarget = page._tabId;

tests/tools/extensions.test.ts

@@ -10,6 +10,7 @@ import {afterEach, describe, it} from 'node:test';
 
 import sinon from 'sinon';
 
+import type { ParsedArguments } from '../../src/cli.js';
 import type {McpResponse} from '../../src/McpResponse.js';
 import {
   installExtension,
@@ -18,8 +19,13 @@ import {
   reloadExtension,
   triggerExtensionAction,
 } from '../../src/tools/extensions.js';
+import { listPages } from '../../src/tools/pages.js';
 import {withMcpContext} from '../utils.js';
 
+const EXTENSION_WITH_SW_PATH = path.join(
+  import.meta.dirname,
+  '../../../tests/tools/fixtures/extension-sw',
+);
 const EXTENSION_PATH = path.join(
   import.meta.dirname,
   '../../../tests/tools/fixtures/extension',
@@ -129,39 +135,74 @@ describe('extension', () => {
       assert.ok(reinstalled, 'Extension should be present after reload');
     });
   });
-
   it('triggers an extension action', async () => {
     await withMcpContext(
       async (response, context) => {
-        const triggerSpy = sinon.spy(context, 'triggerExtensionAction');
-
         await installExtension.handler(
-          {params: {path: EXTENSION_PATH}},
+          {params: {path: EXTENSION_WITH_SW_PATH}},
           response,
           context,
         );
 
         const extensionId = extractId(response);
+
         response.resetResponseLineForTesting();
+        const listPageDef = listPages({
+          categoryExtensions: true,
+        } as ParsedArguments);
+        await listPageDef.handler(
+          {params: {}, page: context.getSelectedMcpPage()},
+          response,
+          context,
+        );
+        let result = await response.handle(listPageDef.name, context);
+        let textContent = result.content.find(c => c.type === 'text') as {
+          type: 'text';
+          text: string;
+        };
+        assert.ok(
+          !textContent.text.includes(extensionId),
+          'Response should not contain extension service worker id',
+        );
 
         await triggerExtensionAction.handler(
           {params: {id: extensionId}},
           response,
           context,
         );
+        
+        const swTarget = await context.browser.waitForTarget(
+          t =>
+            t.type() === 'service_worker' &&
+            t.url().includes(extensionId),
+        );
+        const swUrl = swTarget.url();
 
-        assert.ok(
-          triggerSpy.calledOnceWithExactly(extensionId),
-          'triggerExtensionAction should be called with correct params',
+        response.resetResponseLineForTesting();
+        await listPageDef.handler(
+          {params: {}, page: context.getSelectedMcpPage()},
+          response,
+          context,
         );
+        result = await response.handle(listPageDef.name, context);
+        textContent = result.content.find(c => c.type === 'text') as {
+          type: 'text';
+          text: string;
+        };
         assert.ok(
-          response.responseLines[0].includes(
-            `Extension action triggered. Id: ${extensionId}`,
-          ),
-          'Response should indicate action triggered',
+          textContent.text.includes(swUrl),
+          'Response should contain extension service worker url',
         );
       },
-      {channel: 'chrome-canary'},
+      {
+        channel: process.env.CANARY_EXECUTABLE_PATH
+          ? undefined
+          : 'chrome-canary',
+        executablePath: process.env.CANARY_EXECUTABLE_PATH,
+      },
+      {
+        categoryExtensions: true,
+      } as ParsedArguments
     );
   });
 });

tests/tools/fixtures/extension-sw/sw.js

@@ -1 +1,3 @@
-console.log('Service worker loaded');
+chrome.action.onClicked.addListener((tab) => {
+  console.log('Action clicked');
+});

tests/utils.ts

@@ -48,11 +48,19 @@ let context: McpContext | undefined;
 
 export async function withBrowser(
   cb: (browser: Browser, page: Page) => Promise<void>,
-  options: {debug?: boolean; autoOpenDevTools?: boolean; channel?: string} = {},
+  options: {
+    debug?: boolean;
+    autoOpenDevTools?: boolean;
+    channel?: string;
+    executablePath?: string;
+  } = {},
 ) {
   const launchOptions: LaunchOptions = {
-    executablePath: process.env.PUPPETEER_EXECUTABLE_PATH,
-    channel: options.channel as ChromeReleaseChannel,
+    executablePath:
+      options.executablePath ?? process.env.PUPPETEER_EXECUTABLE_PATH,
+    channel: (options.executablePath
+      ? undefined
+      : options.channel) as ChromeReleaseChannel,
     headless: !options.debug,
     defaultViewport: null,
     devtools: options.autoOpenDevTools ?? false,
@@ -88,6 +96,7 @@ export async function withMcpContext(
     autoOpenDevTools?: boolean;
     performanceCrux?: boolean;
     channel?: string;
+    executablePath?: string;
   } = {},
   args: ParsedArguments = {} as ParsedArguments,
 ) {