r2-relay-channel 0.4.1 → 0.4.2

package/dist/config.d.ts

@@ -1,6 +1,8 @@
 import { z } from "zod";
 import type { ChannelPlugin, OpenClawConfig } from "openclaw/plugin-sdk/core";
-export declare const DEFAULT_POLL_INTERVAL_MS = 5000;
+export declare const DEFAULT_POLL_INTERVAL_MS = 3000;
+export declare const MIN_POLL_INTERVAL_MS = 2000;
+export declare const MAX_POLL_INTERVAL_MS = 60000;
 export declare const DEFAULT_BACKOFF_MAX_MS = 40000;
 export declare const DEFAULT_TTL_DAYS = 7;
 export declare const DEFAULT_IDENTITY_TTL_DAYS = 1;
@@ -16,7 +18,7 @@ export declare const R2RelaySidecarConfigSchema: z.ZodObject<{
     accessKeyId: z.ZodString;
     secretAccessKey: z.ZodString;
     serverId: z.ZodOptional<z.ZodString>;
-    pollIntervalMs: z.ZodOptional<z.ZodNumber>;
+    pollIntervalMs: z.ZodOptional<z.ZodUnknown>;
     backoffMaxMs: z.ZodOptional<z.ZodNumber>;
     defaultTtlDays: z.ZodOptional<z.ZodNumber>;
     ttl: z.ZodOptional<z.ZodObject<{
@@ -70,6 +72,7 @@ export declare function resolveDefaultServerId(_cfg: OpenClawConfig): string;
 export declare function normalizeServerId(value?: string | null): string | null;
 export declare function resolveRelayConfigFilePath(configFile?: string | null): string;
 export declare function loadR2RelaySidecarConfig(configFile: string): R2RelayAccountConfig;
+export declare function normalizePollIntervalMs(value: unknown): number;
 export declare function resolveR2RelayAccount(params: {
     cfg: OpenClawConfig;
     accountId?: string | null;

package/dist/config.js

@@ -5,7 +5,9 @@ import { z } from "zod";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { buildJsonChannelConfigSchema } from "openclaw/plugin-sdk/channel-config-schema";
 import { getPersistedRelayServerId } from "./runtime.js";
-export const DEFAULT_POLL_INTERVAL_MS = 5_000;
+export const DEFAULT_POLL_INTERVAL_MS = 3_000;
+export const MIN_POLL_INTERVAL_MS = 2_000;
+export const MAX_POLL_INTERVAL_MS = 60_000;
 export const DEFAULT_BACKOFF_MAX_MS = 40_000;
 export const DEFAULT_TTL_DAYS = 7;
 export const DEFAULT_IDENTITY_TTL_DAYS = 1;
@@ -23,7 +25,7 @@ export const R2RelaySidecarConfigSchema = z.object({
     accessKeyId: z.string().min(1),
     secretAccessKey: z.string().min(1),
     serverId: z.string().trim().min(1).optional(),
-    pollIntervalMs: z.number().int().positive().optional(),
+    pollIntervalMs: z.unknown().optional(),
     backoffMaxMs: z.number().int().positive().optional(),
     defaultTtlDays: z.number().positive().optional(),
     ttl: z.object({
@@ -39,6 +41,7 @@ export const r2RelayChannelConfigSchema = buildJsonChannelConfigSchema({
     properties: {
         enabled: { type: "boolean" },
         configFile: { type: "string", minLength: 1 },
+        pollIntervalMs: { type: "number" },
     },
 });
 export function getR2RelayConfig(cfg) {
@@ -80,16 +83,31 @@ export function loadR2RelaySidecarConfig(configFile) {
         return {};
     }
 }
+export function normalizePollIntervalMs(value) {
+    if (typeof value !== "number" || !Number.isFinite(value)) {
+        return DEFAULT_POLL_INTERVAL_MS;
+    }
+    return Math.min(MAX_POLL_INTERVAL_MS, Math.max(MIN_POLL_INTERVAL_MS, Math.round(value)));
+}
 export function resolveR2RelayAccount(params) {
     const relayCfg = getR2RelayConfig(params.cfg) ?? {};
     const configFile = resolveRelayConfigFilePath(relayCfg.configFile);
     const rawFileCfg = loadR2RelaySidecarConfig(configFile);
     const parsedFileCfg = R2RelaySidecarConfigSchema.safeParse(rawFileCfg);
-    const fileCfg = parsedFileCfg.success ? parsedFileCfg.data : {};
+    let fileCfg = {};
+    if (parsedFileCfg.success) {
+        fileCfg = {
+            ...parsedFileCfg.data,
+            pollIntervalMs: typeof parsedFileCfg.data.pollIntervalMs === "number"
+                ? parsedFileCfg.data.pollIntervalMs
+                : undefined,
+        };
+    }
     const mergedCfg = {
         ...fileCfg,
         enabled: relayCfg.enabled ?? fileCfg.enabled,
         configFile,
+        pollIntervalMs: relayCfg.pollIntervalMs ?? fileCfg.pollIntervalMs,
     };
     const endpoint = mergedCfg.endpoint?.trim() ?? "";
     const bucket = mergedCfg.bucket?.trim() ?? "";
@@ -114,7 +132,7 @@ export function resolveR2RelayAccount(params) {
         serverId: normalizeServerId(mergedCfg.serverId) ?? resolveDefaultServerId(params.cfg),
         region: DEFAULT_REGION,
         forcePathStyle: DEFAULT_FORCE_PATH_STYLE,
-        pollIntervalMs: mergedCfg.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS,
+        pollIntervalMs: normalizePollIntervalMs(mergedCfg.pollIntervalMs),
         backoffMaxMs: mergedCfg.backoffMaxMs ?? DEFAULT_BACKOFF_MAX_MS,
         defaultTtlDays: mergedCfg.defaultTtlDays ?? DEFAULT_TTL_DAYS,
         ttl,

package/dist/config.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/config.test.js

@@ -0,0 +1,34 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { DEFAULT_POLL_INTERVAL_MS, MAX_POLL_INTERVAL_MS, MIN_POLL_INTERVAL_MS, normalizePollIntervalMs, resolveR2RelayAccount, } from "./config.js";
+test("poll interval defaults to 3 seconds and clamps to the supported range", () => {
+    assert.equal(DEFAULT_POLL_INTERVAL_MS, 3_000);
+    assert.equal(normalizePollIntervalMs(undefined), 3_000);
+    assert.equal(normalizePollIntervalMs(1_000), MIN_POLL_INTERVAL_MS);
+    assert.equal(normalizePollIntervalMs(90_000), MAX_POLL_INTERVAL_MS);
+});
+test("invalid optional poll interval does not invalidate relay credentials", (t) => {
+    const directory = fs.mkdtempSync(path.join(os.tmpdir(), "r2-relay-config-"));
+    t.after(() => fs.rmSync(directory, { recursive: true, force: true }));
+    const configFile = path.join(directory, "r2relay.config.json");
+    fs.writeFileSync(configFile, JSON.stringify({
+        endpoint: "https://example.r2.cloudflarestorage.com",
+        bucket: "relay-bucket",
+        accessKeyId: "access-key",
+        secretAccessKey: "secret-key",
+        serverId: "relay-server",
+        pollIntervalMs: "invalid",
+    }));
+    const account = resolveR2RelayAccount({
+        cfg: {
+            channels: {
+                "r2-relay-channel": { enabled: true, configFile },
+            },
+        },
+    });
+    assert.equal(account.configured, true);
+    assert.equal(account.pollIntervalMs, DEFAULT_POLL_INTERVAL_MS);
+});

package/dist/inbound.js

@@ -264,12 +264,16 @@ export async function dispatchInboundMessage(params) {
                     textHasMediaDirective: text.includes("MEDIA:"),
                 });
                 if (streamState.active && text.trim().length > 0) {
-                    if (streamState.lastText && !text.startsWith(streamState.lastText)) {
-                        return;
-                    }
                     streamState.lastText = text;
                     streamState.lastEmitAt = Date.now();
                 }
+                const finalStream = streamState.active
+                    ? {
+                        stream_id: streamState.streamId,
+                        seq: streamState.seq + 1,
+                        state: "final",
+                    }
+                    : undefined;
                 try {
                     await sendRelayPayloadMessage({
                         cfg: params.cfg,
@@ -287,6 +291,7 @@ export async function dispatchInboundMessage(params) {
                         meta: {
                             route: outboundMeta.route,
                             workspaceDir: resolveAgentWorkspaceDirFromConfig(params.cfg, route.agentId),
+                            stream: finalStream,
                         },
                     });
                     emitRelayDebug(params.log, `[${params.account.accountId}] sent relay final reply`, {

package/dist/openclaw.plugin.json

@@ -13,13 +13,8 @@
         "additionalProperties": false,
         "properties": {
           "enabled": { "type": "boolean" },
-          "configFile": { "type": "string" }
-        }
-      },
-      "uiHints": {
-        "configFile": {
-          "label": "Config file",
-          "placeholder": "/path/to/r2relay.config.json"
+          "configFile": { "type": "string" },
+          "pollIntervalMs": { "type": "number" }
         }
       }
     }
@@ -33,7 +28,8 @@
         "additionalProperties": false,
         "properties": {
           "enabled": { "type": "boolean" },
-          "configFile": { "type": "string" }
+          "configFile": { "type": "string" },
+          "pollIntervalMs": { "type": "number" }
         }
       }
     }

package/dist/outbound.d.ts

@@ -19,6 +19,11 @@ export declare function sendRelayPayloadMessage(params: {
         mediaAccess?: OutboundMediaAccess;
         mediaLocalRoots?: readonly string[];
         mediaReadFile?: (filePath: string) => Promise<Buffer>;
+        stream?: {
+            stream_id: string;
+            seq: number;
+            state: "partial" | "final";
+        };
     };
 }): Promise<{
     channel: string;

package/dist/outbound.js

@@ -54,6 +54,7 @@ export async function sendRelayPayloadMessage(params) {
     const result = await service.sendMessage(target.peer, {
         route,
         content: relayContentFromPayload(fallbackText, attachments, params.payload.channelData),
+        delivery: params.meta?.stream ? { stream: params.meta.stream } : undefined,
     });
     emitRelayDebug(params.log, `[${account.accountId}] outbound relay message sent`, {
         source: params.source ?? "unknown",

package/dist/setup.js

@@ -171,8 +171,6 @@ export const r2RelaySetupWizard = {
     status: {
         configuredLabel: "Configured",
         unconfiguredLabel: "Not configured",
-        configuredHint: "R2 endpoint, bucket, and credentials are present.",
-        unconfiguredHint: "Add your R2 bucket details to enable the dedicated OpenClaw app flow.",
         resolveConfigured: ({ cfg }) => {
             const section = getSidecarSection(cfg);
             return Boolean(section.endpoint?.trim() &&
@@ -193,7 +191,6 @@ export const r2RelaySetupWizard = {
             if (section.serverId?.trim()) {
                 lines.push(`Server ID: ${section.serverId.trim()}`);
             }
-            lines.push(`Config file: ${getConfigFilePath(cfg)}`);
             return lines;
         },
     },

package/openclaw.plugin.json

@@ -13,13 +13,8 @@
         "additionalProperties": false,
         "properties": {
           "enabled": { "type": "boolean" },
-          "configFile": { "type": "string" }
-        }
-      },
-      "uiHints": {
-        "configFile": {
-          "label": "Config file",
-          "placeholder": "/path/to/r2relay.config.json"
+          "configFile": { "type": "string" },
+          "pollIntervalMs": { "type": "number" }
         }
       }
     }
@@ -33,7 +28,8 @@
         "additionalProperties": false,
         "properties": {
           "enabled": { "type": "boolean" },
-          "configFile": { "type": "string" }
+          "configFile": { "type": "string" },
+          "pollIntervalMs": { "type": "number" }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "r2-relay-channel",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "R2 Relay Channel is a secure, decentralized OpenClaw messaging channel that keeps delivery simple while preserving data ownership without relying on an IM provider.",
   "type": "module",
   "main": "dist/r2-relay.js",