fix(google-meet): share operation timeout clamp

steipete · steipete · commit 650027106b9a · 2026-05-30T03:36:20.000-04:00
diff --git a/extensions/google-meet/index.ts b/extensions/google-meet/index.ts
@@ -20,6 +20,7 @@ import {
 } from "./src/calendar.js";
 import {
   resolveGoogleMeetConfig,
+  resolveGoogleMeetGatewayOperationTimeoutMs,
   type GoogleMeetConfig,
   type GoogleMeetMode,
   type GoogleMeetTransport,
@@ -384,6 +385,7 @@ export const testing = {
     googleMeetToolDeps.platform = next ?? (() => process.platform);
   },
   isGoogleMeetAgentToolActionUnsupportedOnHost,
+  resolveGoogleMeetGatewayOperationTimeoutMs,
 };
 
 /** @deprecated Use `testing`. */
@@ -455,14 +457,6 @@ function assertGoogleMeetAgentToolActionSupported(params: {
   );
 }
 
-function resolveGoogleMeetToolGatewayTimeoutMs(config: GoogleMeetConfig): number {
-  return Math.max(
-    60_000,
-    config.chrome.joinTimeoutMs + 30_000,
-    config.voiceCall.requestTimeoutMs + 10_000,
-  );
-}
-
 function readGatewayErrorDetails(err: unknown): unknown {
   if (!err || typeof err !== "object" || !("details" in err)) {
     return undefined;
@@ -480,7 +474,7 @@ async function callGoogleMeetGatewayFromTool(params: {
       googleMeetGatewayMethodForToolAction(params.action),
       {
         json: true,
-        timeout: String(resolveGoogleMeetToolGatewayTimeoutMs(params.config)),
+        timeout: String(resolveGoogleMeetGatewayOperationTimeoutMs(params.config)),
       },
       params.raw,
       { progress: false },
diff --git a/extensions/google-meet/src/cli.ts b/extensions/google-meet/src/cli.ts
@@ -15,7 +15,12 @@ import {
   listGoogleMeetCalendarEvents,
   type GoogleMeetCalendarLookupResult,
 } from "./calendar.js";
-import type { GoogleMeetConfig, GoogleMeetModeInput, GoogleMeetTransport } from "./config.js";
+import {
+  resolveGoogleMeetGatewayOperationTimeoutMs,
+  type GoogleMeetConfig,
+  type GoogleMeetModeInput,
+  type GoogleMeetTransport,
+} from "./config.js";
 import { hasCreateSpaceConfigInput, resolveCreateSpaceConfig } from "./create.js";
 import {
   buildGoogleMeetPreflightReport,
@@ -59,6 +64,7 @@ type OAuthLoginOptions = {
 
 export const testing = {
   parsePositiveNumber,
+  resolveGoogleMeetGatewayOperationTimeoutMs,
   resolveGoogleMeetGatewayTimeoutMs,
   resolveGoogleMeetOAuthCallbackTimeoutMs,
 };
@@ -331,14 +337,6 @@ async function callGoogleMeetGateway(params: {
   }
 }
 
-function resolveGoogleMeetGatewayOperationTimeoutMs(config: GoogleMeetConfig): number {
-  return Math.max(
-    60_000,
-    config.chrome.joinTimeoutMs + 30_000,
-    config.voiceCall.requestTimeoutMs + 10_000,
-  );
-}
-
 function formatDuration(value: number | undefined): string {
   if (value === undefined) {
     return "n/a";
diff --git a/extensions/google-meet/src/config.test.ts b/extensions/google-meet/src/config.test.ts
@@ -0,0 +1,34 @@
+import { MAX_TIMER_TIMEOUT_MS } from "openclaw/plugin-sdk/number-runtime";
+import { describe, expect, it } from "vitest";
+import { resolveGoogleMeetConfig, resolveGoogleMeetGatewayOperationTimeoutMs } from "./config.js";
+
+describe("google meet gateway operation timeout", () => {
+  it("adds operation grace to normal transport timeouts", () => {
+    expect(resolveGoogleMeetGatewayOperationTimeoutMs(resolveGoogleMeetConfig({}))).toBe(60_000);
+    expect(
+      resolveGoogleMeetGatewayOperationTimeoutMs(
+        resolveGoogleMeetConfig({
+          chrome: { joinTimeoutMs: 120_000 },
+          voiceCall: { requestTimeoutMs: 30_000 },
+        }),
+      ),
+    ).toBe(150_000);
+  });
+
+  it("caps overflowed transport timeout grace", () => {
+    expect(
+      resolveGoogleMeetGatewayOperationTimeoutMs(
+        resolveGoogleMeetConfig({
+          chrome: { joinTimeoutMs: Number.MAX_VALUE },
+        }),
+      ),
+    ).toBe(MAX_TIMER_TIMEOUT_MS);
+    expect(
+      resolveGoogleMeetGatewayOperationTimeoutMs(
+        resolveGoogleMeetConfig({
+          voiceCall: { requestTimeoutMs: Number.MAX_VALUE },
+        }),
+      ),
+    ).toBe(MAX_TIMER_TIMEOUT_MS);
+  });
+});
diff --git a/extensions/google-meet/src/config.ts b/extensions/google-meet/src/config.ts
@@ -1,3 +1,4 @@
+import { addTimerTimeoutGraceMs } from "openclaw/plugin-sdk/number-runtime";
 import {
   REALTIME_VOICE_AGENT_CONSULT_TOOL_NAME,
   resolveRealtimeVoiceAgentConsultToolPolicy,
@@ -91,6 +92,14 @@ export type GoogleMeetConfig = {
   };
 };
 
+export function resolveGoogleMeetGatewayOperationTimeoutMs(config: GoogleMeetConfig): number {
+  return Math.max(
+    60_000,
+    addTimerTimeoutGraceMs(config.chrome.joinTimeoutMs, 30_000) ?? 1,
+    addTimerTimeoutGraceMs(config.voiceCall.requestTimeoutMs, 10_000) ?? 1,
+  );
+}
+
 const SOX_DEFAULT_BUFFER_BYTES = 8192;
 const SOX_MIN_BUFFER_BYTES = 17;
 export const DEFAULT_GOOGLE_MEET_AUDIO_BUFFER_BYTES = SOX_DEFAULT_BUFFER_BYTES / 2;
