prefer chrome to chromium, distinguish between old and new verb requirements. Closes #4653

Author: cscheid

src/core/cri/cri.ts

@@ -76,6 +76,31 @@ export async function criClient(appPath?: string, port?: number) {
   }
   const app: string = appPath || await getBrowserExecutablePath();
 
+  const version = Deno.run({
+    cmd: [app, "--version"],
+    stdout: "piped",
+    stderr: "piped",
+  });
+  const [status, stdout, _stderr] = await Promise.all([
+    version.status(),
+    version.output(),
+    version.stderrOutput(),
+  ]);
+  if (!status.success) {
+    throw new Error(`Failed to get chrome version`);
+  }
+  const versionString = new TextDecoder().decode(stdout);
+  let versionNumber = 0;
+
+  const chromeMatch = versionString.match(/Google Chrome (\d+)/);
+  if (chromeMatch) {
+    versionNumber = Number(chromeMatch[1]);
+  }
+  const chromiumMatch = versionString.match(/Chromium (\d+)/);
+  if (chromiumMatch) {
+    versionNumber = Number(chromiumMatch[1]);
+  }
+
   const cmd = [
     app,
     "--headless",
@@ -113,7 +138,7 @@ export async function criClient(appPath?: string, port?: number) {
       const maxTries = 5;
       for (let i = 0; i < maxTries; ++i) {
         try {
-          client = await cdp({ port });
+          client = await cdp({ port, version: versionNumber });
           break;
         } catch (e) {
           if (i === maxTries - 1) {

src/core/cri/deno-cri/devtools.js

@@ -50,6 +50,14 @@ export async function New(options) {
   if (Object.prototype.hasOwnProperty.call(options, "url")) {
     options.path += `?${options.url}`;
   }
+  // we don't mutate here because we don't want other
+  // calls to have PUT as the method
+  if (options.version >= 109) {
+    options = {
+      ...options,
+      method: "PUT",
+    };
+  }
   const result = await devToolsInterface(options);
   return JSON.parse(result);
 }

src/core/cri/deno-cri/external-request.js

@@ -18,7 +18,11 @@ export default async function externalRequest(options) {
     }*/
 
   const url = `${options.protocol}:/${options.host}:${options.port}${options.path}`;
-  const response = await fetch(url);
+  const fetchOpts = {};
+  if (options.method) {
+    fetchOpts.method = options.method;
+  }
+  const response = await fetch(url, options);
   const text = await response.text();
 
   if (response.status !== 200) {

src/core/puppeteer.ts

@@ -244,18 +244,18 @@ export async function getBrowserExecutablePath() {
 
   let executablePath: string | undefined = undefined;
 
-  if (availableRevisions.length > 0) {
+  if (executablePath === undefined) {
+    executablePath = await findChrome();
+  }
+
+  if (executablePath === undefined && availableRevisions.length > 0) {
     // get the latest available revision
     availableRevisions.sort((a: string, b: string) => Number(b) - Number(a));
     const revision = availableRevisions[0];
     const revisionInfo = browserFetcher.revisionInfo(revision);
     executablePath = revisionInfo.executablePath;
   }
 
-  if (executablePath === undefined) {
-    executablePath = await findChrome();
-  }
-
   if (executablePath === undefined) {
     error("Chrome not found");
     info(