Relax ModCDP server readiness version check

Author: pirate

go/modcdp/client/ModCDPClient.go

@@ -43,7 +43,7 @@ var (
 	extIDFromURL = regexp.MustCompile(`^chrome-extension://([a-z]+)/`)
 )
 
-const modcdpReadyExpression = `Boolean(globalThis.ModCDP?.__ModCDPServerVersion === 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)`
+const modcdpReadyExpression = `Boolean(globalThis.ModCDP?.__ModCDPServerVersion >= 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)`
 
 const DefaultCDPSendTimeoutMS = 10_000
 const DefaultEventWaitTimeoutMS = 10_000

go/modcdp/injector/BorrowedExtensionInjector.go

@@ -153,7 +153,7 @@ const __name = (fn) => fn;
 %s
 const ModCDP = installModCDPServer(globalThis);
 return {
-  ok: Boolean(ModCDP?.__ModCDPServerVersion === 1 && ModCDP?.handleCommand && ModCDP?.addCustomEvent),
+  ok: Boolean(ModCDP?.__ModCDPServerVersion >= 1 && ModCDP?.handleCommand && ModCDP?.addCustomEvent),
   extension_id: globalThis.chrome?.runtime?.id ?? null,
   has_tabs: Boolean(globalThis.chrome?.tabs?.query),
   has_debugger: Boolean(globalThis.chrome?.debugger?.sendCommand && globalThis.chrome?.debugger?.getTargets),

go/modcdp/injector/ExtensionInjector.go

@@ -21,7 +21,7 @@ const DefaultTargetSessionPollIntervalMS = 20
 var DefaultModCDPServiceWorkerURLSuffixes = []string{"/modcdp/service_worker.js"}
 var extIDFromURL = regexp.MustCompile(`^chrome-extension://([a-z]+)/`)
 
-const modcdpReadyExpression = `Boolean(globalThis.ModCDP?.__ModCDPServerVersion === 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)`
+const modcdpReadyExpression = `Boolean(globalThis.ModCDP?.__ModCDPServerVersion >= 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)`
 
 type SendCDP = types.SendCDP
 type SessionIDForTarget = types.SessionIDForTarget

js/src/injector/BorrowedExtensionInjector.ts

@@ -4,14 +4,14 @@ import { ExtensionInjector, type ExtensionInjectionResult, type TargetInfo } fro
 
 const EXT_ID_FROM_URL = /^chrome-extension:\/\/([a-z]+)\//;
 const MODCDP_READY_EXPRESSION =
-  "Boolean(globalThis.ModCDP?.__ModCDPServerVersion === 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)";
+  "Boolean(globalThis.ModCDP?.__ModCDPServerVersion >= 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)";
 const bootstrap_modcdp_server_expression = `
   function() {
     const __name = (fn) => fn;
     const installModCDPServer = ${installModCDPServer.toString()};
     const ModCDP = installModCDPServer(globalThis);
     return {
-      ok: Boolean(ModCDP?.__ModCDPServerVersion === 1 && ModCDP?.handleCommand && ModCDP?.addCustomEvent),
+      ok: Boolean(ModCDP?.__ModCDPServerVersion >= 1 && ModCDP?.handleCommand && ModCDP?.addCustomEvent),
       extension_id: globalThis.chrome?.runtime?.id ?? null,
       has_tabs: Boolean(globalThis.chrome?.tabs?.query),
       has_debugger: Boolean(globalThis.chrome?.debugger?.sendCommand && globalThis.chrome?.debugger?.getTargets),

js/src/injector/ExtensionInjector.ts

@@ -9,7 +9,7 @@ export const DEFAULT_MODCDP_EXTENSION_ID = "mdedooklbnfejodmnhmkdpkaedafkehf";
 export const DEFAULT_MODCDP_SERVICE_WORKER_URL_SUFFIXES = ["/modcdp/service_worker.js"];
 export const DEFAULT_MODCDP_WAKE_PATH = "/modcdp/wake.html";
 const MODCDP_READY_EXPRESSION =
-  "Boolean(globalThis.ModCDP?.__ModCDPServerVersion === 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)";
+  "Boolean(globalThis.ModCDP?.__ModCDPServerVersion >= 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)";
 export const DEFAULT_CDP_SEND_TIMEOUT_MS = 10_000;
 export const DEFAULT_EXECUTION_CONTEXT_TIMEOUT_MS = 10_000;
 export const DEFAULT_SERVICE_WORKER_PROBE_TIMEOUT_MS = 10_000;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "modcdp",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/pirate/modcdp.git"

python/modcdp/client/ModCDPClient.py

@@ -164,7 +164,7 @@ def ping(self, **params: Any):
         return self._client._send_command("Mod.ping", params)
 
 MODCDP_READY_EXPRESSION = (
-    "Boolean(globalThis.ModCDP?.__ModCDPServerVersion === 1 && "
+    "Boolean(globalThis.ModCDP?.__ModCDPServerVersion >= 1 && "
     "globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)"
 )
 DEFAULT_SERVER = object()

python/modcdp/injector/BorrowedExtensionInjector.py

@@ -105,7 +105,7 @@ def bootstrap_modcdp_server_expression() -> str:
         f"{installer}\n"
         "const ModCDP = installModCDPServer(globalThis);\n"
         "return {\n"
-        "  ok: Boolean(ModCDP?.__ModCDPServerVersion === 1 && ModCDP?.handleCommand && ModCDP?.addCustomEvent),\n"
+        "  ok: Boolean(ModCDP?.__ModCDPServerVersion >= 1 && ModCDP?.handleCommand && ModCDP?.addCustomEvent),\n"
         "  extension_id: globalThis.chrome?.runtime?.id ?? null,\n"
         "  has_tabs: Boolean(globalThis.chrome?.tabs?.query),\n"
         "  has_debugger: Boolean(globalThis.chrome?.debugger?.sendCommand && globalThis.chrome?.debugger?.getTargets),\n"

python/modcdp/injector/ExtensionInjector.py

@@ -18,7 +18,7 @@
 DEFAULT_MODCDP_SERVICE_WORKER_URL_SUFFIXES = ["/modcdp/service_worker.js"]
 DEFAULT_MODCDP_WAKE_PATH = "/modcdp/wake.html"
 MODCDP_READY_EXPRESSION = (
-    "Boolean(globalThis.ModCDP?.__ModCDPServerVersion === 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)"
+    "Boolean(globalThis.ModCDP?.__ModCDPServerVersion >= 1 && globalThis.ModCDP?.handleCommand && globalThis.ModCDP?.addCustomEvent)"
 )
 DEFAULT_CDP_SEND_TIMEOUT_MS = 10_000
 DEFAULT_EXECUTION_CONTEXT_TIMEOUT_MS = 10_000

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "modcdp"
-version = "0.0.10"
+version = "0.0.11"
 description = "Python client for ModCDP."
 readme = "README.md"
 requires-python = ">=3.11"