@soyeht/soyeht 0.2.8 → 0.2.9

package/openclaw.plugin.json

@@ -5,7 +5,7 @@
   ],
   "name": "Soyeht",
   "description": "Channel plugin for the Soyeht Flutter mobile app",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soyeht/soyeht",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "OpenClaw channel plugin for the Soyeht Flutter mobile app",
   "type": "module",
   "main": "src/index.ts",

package/src/config.ts

@@ -71,14 +71,32 @@ function readAccountsSection(
   return section?.["accounts"] as Record<string, unknown> | undefined;
 }
 
+/**
+ * Read flat config from `channels.soyeht.*` (all keys except "accounts").
+ * Used as defaults when no explicit account entry exists.
+ */
+function readFlatConfig(cfg: OpenClawConfig): Record<string, unknown> {
+  const section = readConfigSection(cfg);
+  if (!section) return {};
+  const flat: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(section)) {
+    if (key !== "accounts") {
+      flat[key] = value;
+    }
+  }
+  return flat;
+}
+
 function readAccountConfig(
   cfg: OpenClawConfig,
   accountId: string,
 ): Record<string, unknown> {
+  const flat = readFlatConfig(cfg);
   const accounts = readAccountsSection(cfg);
-  if (!accounts) return {};
-  const entry = accounts[accountId];
-  return entry && typeof entry === "object" ? (entry as Record<string, unknown>) : {};
+  const entry = accounts?.[accountId];
+  const accountRaw = entry && typeof entry === "object" ? (entry as Record<string, unknown>) : {};
+  // Merge: flat config as defaults, account-specific overrides
+  return { ...flat, ...accountRaw };
 }
 
 // ---------------------------------------------------------------------------
@@ -199,8 +217,16 @@ export function resolveSoyehtAccount(
 
 export function listSoyehtAccountIds(cfg: OpenClawConfig): string[] {
   const accounts = readAccountsSection(cfg);
-  return listConfiguredAccountIds({
+  const ids = listConfiguredAccountIds({
     accounts: accounts as Record<string, unknown> | undefined,
     normalizeAccountId,
   });
+  // If no explicit accounts but flat config exists, treat as "default" account
+  if (ids.length === 0) {
+    const flat = readFlatConfig(cfg);
+    if (Object.keys(flat).length > 0) {
+      return [DEFAULT_ACCOUNT_ID];
+    }
+  }
+  return ids;
 }

package/src/http.ts

@@ -126,9 +126,23 @@ export function processInboundEnvelope(
 // GET /soyeht/health
 // ---------------------------------------------------------------------------
 
-export function healthHandler(_api: OpenClawPluginApi) {
+export function healthHandler(_api: OpenClawPluginApi, v2deps?: SecurityV2Deps) {
   return async (_req: IncomingMessage, res: ServerResponse) => {
-    sendJson(res, 200, { ok: true, plugin: "soyeht", version: PLUGIN_VERSION });
+    const ready = v2deps?.ready ?? false;
+    const identityLoaded = Boolean(v2deps?.identity);
+    const activeSessions = v2deps?.sessions.size ?? 0;
+    const pairedPeers = v2deps?.peers.size ?? 0;
+    const queueStats = v2deps?.outboundQueue.stats() ?? { accounts: 0, totalMessages: 0 };
+
+    sendJson(res, ready ? 200 : 503, {
+      ok: ready,
+      plugin: "soyeht",
+      version: PLUGIN_VERSION,
+      identity: identityLoaded,
+      peers: pairedPeers,
+      sessions: activeSessions,
+      queue: queueStats,
+    });
   };
 }
 

package/src/index.ts

@@ -104,7 +104,7 @@ const soyehtPlugin: OpenClawPluginDefinition = {
     api.registerHttpRoute({
       path: "/soyeht/health",
       auth: "plugin",
-      handler: healthHandler(api),
+      handler: healthHandler(api, v2deps),
     });
     api.registerHttpRoute({
       path: "/soyeht/webhook/deliver",

package/src/outbound-queue.ts

@@ -41,6 +41,8 @@ export type OutboundQueue = {
   prune(): number;
   clear(): void;
 
+  stats(): { accounts: number; totalMessages: number };
+
   // Stream token management (for SSE auth)
   createStreamToken(accountId: string, expiresAt: number): string;
   validateStreamToken(token: string): StreamTokenInfo | null;
@@ -217,12 +219,21 @@ export function createOutboundQueue(opts: OutboundQueueOptions = {}): OutboundQu
     }
   }
 
+  function stats(): { accounts: number; totalMessages: number } {
+    let totalMessages = 0;
+    for (const q of queues.values()) {
+      totalMessages += q.length;
+    }
+    return { accounts: queues.size, totalMessages };
+  }
+
   return {
     enqueue,
     subscribe,
     hasSubscribers,
     prune,
     clear,
+    stats,
     createStreamToken,
     validateStreamToken,
     revokeStreamTokensForAccount,

package/src/types.ts

@@ -31,54 +31,57 @@ export type SoyehtAccountConfig = {
   };
 };
 
-export const SoyehtAccountConfigSchema: JsonSchema = {
-  type: "object",
-  additionalProperties: false,
-  properties: {
-    enabled: { type: "boolean" },
-    backendBaseUrl: { type: "string" },
-    pluginAuthToken: { type: "string" },
-    gatewayUrl: { type: "string" },
-    allowProactive: { type: "boolean" },
-    audio: {
-      type: "object",
-      additionalProperties: false,
-      properties: {
-        transcribeInbound: { type: "boolean" },
-        ttsOutbound: { type: "boolean" },
-      },
+// Shared properties object — reused at account level and channel top level
+const accountConfigProperties: Record<string, unknown> = {
+  enabled: { type: "boolean" },
+  backendBaseUrl: { type: "string" },
+  pluginAuthToken: { type: "string" },
+  gatewayUrl: { type: "string" },
+  allowProactive: { type: "boolean" },
+  audio: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      transcribeInbound: { type: "boolean" },
+      ttsOutbound: { type: "boolean" },
     },
-    files: {
-      type: "object",
-      additionalProperties: false,
-      properties: {
-        acceptInbound: { type: "boolean" },
-        maxBytes: { type: "number" },
-      },
+  },
+  files: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      acceptInbound: { type: "boolean" },
+      maxBytes: { type: "number" },
     },
-    security: {
-      type: "object",
-      additionalProperties: false,
-      properties: {
-        enabled: { type: "boolean" },
-        timestampToleranceMs: { type: "number" },
-        dhRatchetIntervalMessages: { type: "number" },
-        dhRatchetIntervalMs: { type: "number" },
-        sessionMaxAgeMs: { type: "number" },
-        rateLimit: {
-          type: "object",
-          additionalProperties: false,
-          properties: {
-            maxRequests: { type: "number" },
-            windowMs: { type: "number" },
-          },
+  },
+  security: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      enabled: { type: "boolean" },
+      timestampToleranceMs: { type: "number" },
+      dhRatchetIntervalMessages: { type: "number" },
+      dhRatchetIntervalMs: { type: "number" },
+      sessionMaxAgeMs: { type: "number" },
+      rateLimit: {
+        type: "object",
+        additionalProperties: false,
+        properties: {
+          maxRequests: { type: "number" },
+          windowMs: { type: "number" },
         },
       },
     },
   },
 };
 
-export type SoyehtChannelConfig = {
+export const SoyehtAccountConfigSchema: JsonSchema = {
+  type: "object",
+  additionalProperties: false,
+  properties: accountConfigProperties,
+};
+
+export type SoyehtChannelConfig = SoyehtAccountConfig & {
   accounts?: Record<string, SoyehtAccountConfig>;
 };
 
@@ -86,6 +89,9 @@ export const SoyehtChannelConfigSchema: JsonSchema = {
   type: "object",
   additionalProperties: false,
   properties: {
+    // Top-level account fields (flat config shorthand for single-account setups)
+    ...accountConfigProperties,
+    // Named accounts (multi-account support)
     accounts: {
       type: "object",
       additionalProperties: SoyehtAccountConfigSchema,

package/src/version.ts

@@ -1 +1 @@
-export const PLUGIN_VERSION = "0.2.8";
+export const PLUGIN_VERSION = "0.2.9";