@feihan-im/openclaw-plugin 0.1.15 → 0.1.17

package/src/channel.ts

@@ -5,12 +5,15 @@ import {
   createChatChannelPlugin,
   createChannelPluginBase,
 } from "openclaw/plugin-sdk/core";
+import { createHybridChannelConfigBase } from "openclaw/plugin-sdk/channel-config-helpers";
 import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
 import { listAccountIds, resolveAccountConfig } from "./config.js";
 import { sendText } from "./messaging/outbound.js";
 import { parseTarget } from "./targets.js";
 import type { FeihanAccountConfig } from "./types.js";
 
+const BASE_FIELDS = ["appId", "appSecret", "backendUrl", "enabled", "enableEncryption", "requestTimeout"];
+
 export const base = createChannelPluginBase<FeihanAccountConfig>({
   id: "feihan",
 
@@ -28,37 +31,42 @@ export const base = createChannelPluginBase<FeihanAccountConfig>({
   },
 
   config: {
-    listAccountIds: (cfg: OpenClawConfig) => listAccountIds(cfg),
-    resolveAccount: (cfg: OpenClawConfig, accountId?: string | null) =>
-      resolveAccountConfig(cfg, accountId ?? undefined),
-    inspectAccount(cfg: OpenClawConfig, accountId?: string | null) {
-      const resolved = resolveAccountConfig(cfg, accountId ?? undefined);
-      const hasConfig = Boolean(
-        resolved.appId && resolved.appSecret && resolved.backendUrl,
-      );
-      return {
-        enabled: resolved.enabled,
-        configured: hasConfig,
-        tokenStatus: hasConfig ? "available" : "missing",
-      };
-    },
+    ...createHybridChannelConfigBase<FeihanAccountConfig>({
+      sectionKey: "feihan",
+      listAccountIds: (cfg) => listAccountIds(cfg),
+      resolveAccount: (cfg, accountId) =>
+        resolveAccountConfig(cfg, accountId ?? undefined),
+      defaultAccountId: () => "default",
+      inspectAccount(cfg, accountId) {
+        const resolved = resolveAccountConfig(cfg, accountId ?? undefined);
+        const hasConfig = Boolean(
+          resolved.appId && resolved.appSecret && resolved.backendUrl,
+        );
+        return {
+          enabled: resolved.enabled,
+          configured: hasConfig,
+          tokenStatus: hasConfig ? "available" : "missing",
+        };
+      },
+      clearBaseFields: BASE_FIELDS,
+    }),
   },
 
   setup: {
     validateInput: ({ input }) => {
       const missing: string[] = [];
-      if (!input.appToken) missing.push("--app-token (App ID)");
-      if (!input.token) missing.push("--token (App Secret)");
-      if (!input.url) missing.push("--url (Backend URL)");
+      if (!input.appToken) missing.push("--app-token (App ID from Admin Console)");
+      if (!input.token) missing.push("--token (App Secret from Admin Console)");
+      if (!input.url) missing.push("--url (your Feihan server address)");
       if (missing.length > 0) {
         return [
           `Missing required flags: ${missing.join(", ")}`,
           "",
-          "Either provide all flags:",
+          "Usage:",
           `  openclaw channels add --channel feihan --app-token <APP_ID> --token <APP_SECRET> --url <BACKEND_URL>`,
           "",
-          "Or use the interactive wizard:",
-          "  openclaw channels add",
+          "You can find App ID and App Secret in:",
+          "  Feihan Admin Console → Workplace → App Management → App Details",
         ].join("\n");
       }
       return null;
@@ -76,21 +84,15 @@ export const base = createChannelPluginBase<FeihanAccountConfig>({
       const appSecret = input.token;
       const backendUrl = input.url;
 
-      if (accountId && accountId !== "default") {
-        // Multi-account: write under accounts.<accountId>
-        if (!section.accounts) section.accounts = {};
-        const accounts = section.accounts as Record<string, Record<string, unknown>>;
-        if (!accounts[accountId]) accounts[accountId] = {};
-        const account = accounts[accountId];
-        if (appId) account.appId = appId;
-        if (appSecret) account.appSecret = appSecret;
-        if (backendUrl) account.backendUrl = backendUrl;
-      } else {
-        // Single-account: write at top level
-        if (appId) section.appId = appId;
-        if (appSecret) section.appSecret = appSecret;
-        if (backendUrl) section.backendUrl = backendUrl;
-      }
+      const id = accountId || "default";
+
+      if (!section.accounts) section.accounts = {};
+      const accounts = section.accounts as Record<string, Record<string, unknown>>;
+      if (!accounts[id]) accounts[id] = {};
+      const account = accounts[id];
+      if (appId) account.appId = appId;
+      if (appSecret) account.appSecret = appSecret;
+      if (backendUrl) account.backendUrl = backendUrl;
 
       return updated as OpenClawConfig;
     },
@@ -117,7 +119,8 @@ export const base = createChannelPluginBase<FeihanAccountConfig>({
         preferredEnvVar: "FEIHAN_APP_ID",
         envPrompt: "Use FEIHAN_APP_ID from environment?",
         keepPrompt: "Keep current App ID?",
-        inputPrompt: "Enter your Feihan App ID:",
+        inputPrompt:
+          "Enter App ID (from Feihan Admin Console → Workplace → App Management → App Details):",
         inspect: ({ cfg, accountId }) => {
           const resolved = resolveAccountConfig(cfg, accountId ?? undefined);
           return {
@@ -133,7 +136,8 @@ export const base = createChannelPluginBase<FeihanAccountConfig>({
         preferredEnvVar: "FEIHAN_APP_SECRET",
         envPrompt: "Use FEIHAN_APP_SECRET from environment?",
         keepPrompt: "Keep current App Secret?",
-        inputPrompt: "Enter your Feihan App Secret:",
+        inputPrompt:
+          "Enter App Secret (from the same App Details page, keep this value confidential):",
         inspect: ({ cfg, accountId }) => {
           const resolved = resolveAccountConfig(cfg, accountId ?? undefined);
           return {
@@ -145,11 +149,12 @@ export const base = createChannelPluginBase<FeihanAccountConfig>({
       {
         inputKey: "url",
         providerHint: "feihan",
-        credentialLabel: "Backend URL",
+        credentialLabel: "Feihan Server URL",
         preferredEnvVar: "FEIHAN_BACKEND_URL",
         envPrompt: "Use FEIHAN_BACKEND_URL from environment?",
-        keepPrompt: "Keep current Backend URL?",
-        inputPrompt: "Enter your Feihan backend server URL:",
+        keepPrompt: "Keep current Feihan Server URL?",
+        inputPrompt:
+          "Enter your Feihan server address (e.g. http://192.168.10.10:21000):",
         inspect: ({ cfg, accountId }) => {
           const resolved = resolveAccountConfig(cfg, accountId ?? undefined);
           return {

package/src/config.test.ts

@@ -16,8 +16,8 @@ describe("listAccountIds", () => {
     expect(listAccountIds(undefined)).toEqual([]);
   });
 
-  it("returns ['default'] for flat single-account config", () => {
-    const cfg = { channels: { feihan: { appId: "app_1" } } };
+  it("returns ['default'] for single-account config", () => {
+    const cfg = { channels: { feihan: { accounts: { default: { appId: "app_1" } } } } };
     expect(listAccountIds(cfg)).toEqual(["default"]);
   });
 
@@ -48,13 +48,17 @@ describe("listAccountIds", () => {
 });
 
 describe("resolveAccountConfig", () => {
-  it("resolves flat config with defaults applied", () => {
+  it("resolves default account with defaults applied", () => {
     const cfg = {
       channels: {
         feihan: {
-          appId: "app_1",
-          appSecret: "secret_1",
-          backendUrl: "https://your-backend-url.com",
+          accounts: {
+            default: {
+              appId: "app_1",
+              appSecret: "secret_1",
+              backendUrl: "https://your-backend-url.com",
+            },
+          },
         },
       },
     };
@@ -118,7 +122,7 @@ describe("resolveAccountConfig", () => {
   it("config values take precedence over env vars", () => {
     process.env.FEIHAN_APP_ID = "env_app";
     const cfg = {
-      channels: { feihan: { appId: "config_app", appSecret: "s", backendUrl: "http://x" } },
+      channels: { feihan: { accounts: { default: { appId: "config_app", appSecret: "s", backendUrl: "http://x" } } } },
     };
     try {
       const account = resolveAccountConfig(cfg);
@@ -205,9 +209,13 @@ describe("resolveAndValidateAccountConfig", () => {
     const cfg = {
       channels: {
         feihan: {
-          appId: "app_1",
-          appSecret: "secret_1",
-          backendUrl: "https://your-backend-url.com",
+          accounts: {
+            default: {
+              appId: "app_1",
+              appSecret: "secret_1",
+              backendUrl: "https://your-backend-url.com",
+            },
+          },
         },
       },
     };

package/src/config.ts

@@ -45,7 +45,6 @@ export function listAccountIds(cfg: unknown): string[] {
     return [];
   }
   if (ch.accounts) return Object.keys(ch.accounts);
-  if (ch.appId) return ["default"];
   // env var fallback
   if (process.env[`${ENV_PREFIX}APP_ID`]) return ["default"];
   return [];
@@ -59,7 +58,7 @@ export function resolveAccountConfig(
   const id = accountId ?? "default";
   const envConfig = readEnvConfig();
 
-  const raw = ch?.accounts?.[id] ?? ch;
+  const raw = ch?.accounts?.[id];
 
   return {
     accountId: id,

package/src/index.test.ts

@@ -151,7 +151,7 @@ describe("service start — config validation", () => {
   it("connects valid accounts normally", async () => {
     const api = createMockApi({
       channels: {
-        feihan: { appId: "a", appSecret: "s", backendUrl: "https://ok.io" },
+        feihan: { accounts: { default: { appId: "a", appSecret: "s", backendUrl: "https://ok.io" } } },
       },
     });
     entry.default.registerFull(api);

package/src/types.ts

@@ -23,12 +23,6 @@ export interface FeihanRawAccountConfig {
 }
 
 export interface FeihanChannelConfig {
-  appId?: string;
-  appSecret?: string;
-  backendUrl?: string;
-  enabled?: boolean;
-  enableEncryption?: boolean;
-  requestTimeout?: number;
   accounts?: Record<string, FeihanRawAccountConfig>;
 }