chromedriver 147.0.1 → 147.0.2

package/lib/chromedriver.js

@@ -1,48 +1,59 @@
-const fs = require('node:fs');
-const path = require('node:path');
-const tcpPortUsed = require('tcp-port-used');
+const fs = require("node:fs");
+const path = require("node:path");
+const tcpPortUsed = require("tcp-port-used");
 function getPortFromArgs(args) {
-  let port = 9515;
-  if (!args)
-    return port;
-  const portRegexp = /--port=(\d*)/;
+  if (!args || args.length === 0) return;
+  const portRegexp = /--port=(\d+)/;
   const portArg = args.find(function (arg) {
     return portRegexp.test(arg);
   });
-  if (portArg)
-    port = parseInt(portRegexp.exec(portArg)[1]);
+  if (!portArg) {
+    const catchAllPortRegexp = /--port=(\S+)/;
+    const incorrectTypePortArg = args.find(function (arg) {
+      return catchAllPortRegexp.test(arg);
+    });
+    if (incorrectTypePortArg) {
+      console.error("Invalid port.");
+      process.exit(1);
+    } else {
+      return;
+    }
+  }
+  const port = parseInt(portRegexp.exec(portArg)[1]);
   return port;
 }
-process.env.PATH = path.join(__dirname, 'chromedriver') + path.delimiter + process.env.PATH;
-const crpath = process.platform === 'win32' ? path.join(__dirname, 'chromedriver', 'chromedriver.exe') : path.join(__dirname, 'chromedriver', 'chromedriver');
-const version = '147.0.7727.50';
+process.env.PATH = path.join(__dirname, "chromedriver") + path.delimiter + process.env.PATH;
+const crpath =
+  process.platform === "win32"
+    ? path.join(__dirname, "chromedriver", "chromedriver.exe")
+    : path.join(__dirname, "chromedriver", "chromedriver");
+const version = "147.0.7727.56";
 let defaultInstance = null;
 
 function start(args, returnPromise) {
+  args = args || [];
   let command = crpath;
   if (!fs.existsSync(command)) {
-    console.log('Could not find chromedriver in default path: ', command);
-    console.log('Falling back to use global chromedriver bin');
-    command = process.platform === 'win32' ? 'chromedriver.exe' : 'chromedriver';
+    console.log("Could not find chromedriver in default path: ", command);
+    console.log("Falling back to use global chromedriver bin");
+    command = process.platform === "win32" ? "chromedriver.exe" : "chromedriver";
   }
-  const cp = require('child_process').spawn(command, args);
+  const port = getPortFromArgs(args);
+  if (!port) args.push("--port=9515");
+  const cp = require("child_process").spawn(command, args);
   cp.stdout.pipe(process.stdout);
   cp.stderr.pipe(process.stderr);
   defaultInstance = cp;
-  if (!returnPromise)
-    return cp;
-  const port = getPortFromArgs(args);
+  if (!returnPromise) return cp;
   const pollInterval = 100;
   const timeout = 10000;
-  return tcpPortUsed.waitUntilUsed(port, pollInterval, timeout)
-    .then(function () {
-      return cp;
-    });
+  return tcpPortUsed.waitUntilUsed(port, pollInterval, timeout).then(function () {
+    return cp;
+  });
 }
 
 function stop() {
-  if (defaultInstance != null)
-    defaultInstance.kill();
+  if (defaultInstance != null) defaultInstance.kill();
   defaultInstance = null;
 }
 
@@ -53,5 +64,5 @@ module.exports = {
   stop,
   get defaultInstance() {
     return defaultInstance;
-  }
+  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chromedriver",
-  "version": "147.0.1",
+  "version": "147.0.2",
   "keywords": [
     "chromedriver",
     "selenium"