fix(mattermost): bound slash callback env port

steipete · steipete · commit 4829d30cf015 · 2026-05-29T02:31:53.000-04:00
diff --git a/extensions/mattermost/src/mattermost/monitor-slash.test.ts b/extensions/mattermost/src/mattermost/monitor-slash.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const listSkillCommandsForAgents = vi.hoisted(() => vi.fn());
-const parseStrictPositiveInteger = vi.hoisted(() => vi.fn());
+const parseTcpPort = vi.hoisted(() => vi.fn());
 const fetchMattermostUserTeams = vi.hoisted(() => vi.fn());
 const normalizeMattermostBaseUrl = vi.hoisted(() => vi.fn((value: string | undefined) => value));
 const isSlashCommandsEnabled = vi.hoisted(() => vi.fn());
@@ -12,7 +12,7 @@ const activateSlashCommands = vi.hoisted(() => vi.fn());
 
 vi.mock("./runtime-api.js", () => ({
   listSkillCommandsForAgents,
-  parseStrictPositiveInteger,
+  parseTcpPort,
 }));
 
 vi.mock("./client.js", async () => {
@@ -59,7 +59,7 @@ describe("mattermost monitor slash", () => {
 
   beforeEach(() => {
     listSkillCommandsForAgents.mockReset();
-    parseStrictPositiveInteger.mockReset();
+    parseTcpPort.mockReset();
     fetchMattermostUserTeams.mockReset();
     normalizeMattermostBaseUrl.mockClear();
     isSlashCommandsEnabled.mockReset();
@@ -94,7 +94,7 @@ describe("mattermost monitor slash", () => {
     vi.stubEnv("OPENCLAW_GATEWAY_PORT", "18888");
     resolveSlashCommandConfig.mockReturnValue({ enabled: true, nativeSkills: true });
     isSlashCommandsEnabled.mockReturnValue(true);
-    parseStrictPositiveInteger.mockReturnValue(18888);
+    parseTcpPort.mockReturnValue(18888);
     fetchMattermostUserTeams.mockResolvedValue([{ id: "team-1" }, { id: "team-2" }]);
     resolveCallbackUrl.mockReturnValue("https://openclaw.test/slash");
     listSkillCommandsForAgents.mockReturnValue([
@@ -166,10 +166,34 @@ describe("mattermost monitor slash", () => {
     );
   });
 
+  it("falls back to the configured gateway port when the env port is out of range", async () => {
+    vi.stubEnv("OPENCLAW_GATEWAY_PORT", "65536");
+    resolveSlashCommandConfig.mockReturnValue({ enabled: true, nativeSkills: false });
+    isSlashCommandsEnabled.mockReturnValue(true);
+    parseTcpPort.mockReturnValue(null);
+    fetchMattermostUserTeams.mockResolvedValue([{ id: "team-1" }]);
+    resolveCallbackUrl.mockReturnValue("https://openclaw.test/slash");
+    registerSlashCommands.mockResolvedValue([{ token: "token-1", trigger: "ping" }]);
+
+    await registerMattermostMonitorSlashCommands({
+      client: {} as never,
+      cfg: { gateway: { port: 18789 } } as never,
+      runtime: { log: vi.fn(), error: vi.fn() } as never,
+      account: { config: { commands: {} }, accountId: "default" } as never,
+      baseUrl: "https://chat.example.com",
+      botUserId: "bot-user",
+    });
+
+    expect(parseTcpPort).toHaveBeenCalledWith("65536");
+    expect(resolveCallbackUrl).toHaveBeenCalledWith(
+      expect.objectContaining({ gatewayPort: 18789 }),
+    );
+  });
+
   it("warns on loopback callback urls and reports partial team failures", async () => {
     resolveSlashCommandConfig.mockReturnValue({ enabled: true, nativeSkills: false });
     isSlashCommandsEnabled.mockReturnValue(true);
-    parseStrictPositiveInteger.mockReturnValue(undefined);
+    parseTcpPort.mockReturnValue(null);
     fetchMattermostUserTeams.mockResolvedValue([{ id: "team-1" }, { id: "team-2" }]);
     resolveCallbackUrl.mockReturnValue("http://127.0.0.1:18789/slash");
     registerSlashCommands
diff --git a/extensions/mattermost/src/mattermost/monitor-slash.ts b/extensions/mattermost/src/mattermost/monitor-slash.ts
@@ -7,7 +7,7 @@ import {
 } from "./client.js";
 import {
   listSkillCommandsForAgents,
-  parseStrictPositiveInteger,
+  parseTcpPort,
   type OpenClawConfig,
   type RuntimeEnv,
 } from "./runtime-api.js";
@@ -149,7 +149,7 @@ export async function registerMattermostMonitorSlashCommands(params: {
 
   try {
     const teams = await fetchMattermostUserTeams(params.client, params.botUserId);
-    const envPort = parseStrictPositiveInteger(process.env.OPENCLAW_GATEWAY_PORT?.trim());
+    const envPort = parseTcpPort(process.env.OPENCLAW_GATEWAY_PORT);
     const slashGatewayPort = envPort ?? params.cfg.gateway?.port ?? 18789;
     const slashCallbackUrl = resolveCallbackUrl({
       config: slashConfig,
diff --git a/extensions/mattermost/src/mattermost/runtime-api.ts b/extensions/mattermost/src/mattermost/runtime-api.ts
@@ -47,3 +47,4 @@ export {
   parseStrictPositiveInteger,
   resolveClientIp,
 } from "openclaw/plugin-sdk/core";
+export { parseTcpPort } from "openclaw/plugin-sdk/number-runtime";
diff --git a/src/plugin-sdk/number-runtime.ts b/src/plugin-sdk/number-runtime.ts
@@ -10,3 +10,4 @@ export {
   parseStrictNonNegativeInteger,
   parseStrictPositiveInteger,
 } from "../shared/number-coercion.js";
+export { MAX_TCP_PORT, parseTcpPort } from "../infra/tcp-port.js";
