@zbruceli/openclaw-dchat 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zbruceli/openclaw-dchat",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "OpenClaw D-Chat/nMobile channel plugin — decentralized E2E encrypted messaging over the NKN relay network",
   "type": "module",
   "main": "index.ts",

package/src/channel.ts

@@ -12,7 +12,7 @@ import {
 } from "openclaw/plugin-sdk";
 import {
   type CoreConfig,
-  DchatConfigSchema,
+  dchatAccountSchema,
   listDchatAccountIds,
   resolveDchatAccount,
   resolveDchatAccountConfig,
@@ -66,7 +66,7 @@ export const dchatPlugin: ChannelPlugin<ResolvedDchatAccount> = {
     polls: false,
   },
   reload: { configPrefixes: ["channels.dchat"] },
-  configSchema: buildChannelConfigSchema(DchatConfigSchema),
+  configSchema: buildChannelConfigSchema(dchatAccountSchema),
   pairing: {
     idLabel: "nknAddress",
     normalizeAllowEntry: (entry) => entry.replace(/^dchat:/i, ""),
@@ -106,7 +106,7 @@ export const dchatPlugin: ChannelPlugin<ResolvedDchatAccount> = {
     }),
     resolveAllowFrom: ({ cfg, accountId }) => {
       const dchatConfig = resolveDchatAccountConfig({ cfg: cfg as CoreConfig, accountId });
-      return (dchatConfig.dm?.allowFrom ?? []).map((entry) => String(entry));
+      return (dchatConfig.allowFrom ?? []).map((entry) => String(entry));
     },
     formatAllowFrom: ({ allowFrom }) =>
       allowFrom.map((entry) => String(entry).replace(/^dchat:/i, "")),
@@ -116,12 +116,12 @@ export const dchatPlugin: ChannelPlugin<ResolvedDchatAccount> = {
       const accountId = account.accountId;
       const prefix =
         accountId && accountId !== "default"
-          ? `channels.dchat.accounts.${accountId}.dm`
-          : "channels.dchat.dm";
+          ? `channels.dchat.accounts.${accountId}`
+          : "channels.dchat";
       return {
-        policy: account.config.dm?.policy ?? "pairing",
-        allowFrom: account.config.dm?.allowFrom ?? [],
-        policyPath: `${prefix}.policy`,
+        policy: account.config.dmPolicy ?? "pairing",
+        allowFrom: account.config.allowFrom ?? [],
+        policyPath: `${prefix}.dmPolicy`,
         allowFromPath: `${prefix}.allowFrom`,
         approveHint: formatPairingApproveHint("dchat"),
         normalizeEntry: (raw: string) => raw.replace(/^dchat:/i, ""),
@@ -383,8 +383,8 @@ export const dchatPlugin: ChannelPlugin<ResolvedDchatAccount> = {
 
               // Resolve command authorization for slash commands (/status, /stop, etc.)
               const isGroup = inbound.chatType === "group";
-              const dmPolicy = account.config.dm?.policy ?? "pairing";
-              const configAllowFrom = (account.config.dm?.allowFrom ?? []).map((v) => String(v));
+              const dmPolicy = account.config.dmPolicy ?? "pairing";
+              const configAllowFrom = (account.config.allowFrom ?? []).map((v) => String(v));
 
               const isSenderAllowed = (senderId: string, allowFrom: string[]) => {
                 const lower = senderId.toLowerCase();

package/src/config-schema.ts

@@ -17,7 +17,7 @@ const DEFAULT_ACCOUNT_ID = "default";
 
 /* ── Zod config schema (powers web UI form via buildChannelConfigSchema) ── */
 
-const dchatAccountSchema = z.object({
+export const dchatAccountSchema = z.object({
   name: z.string().optional(),
   enabled: z.boolean().optional(),
   seed: z.string().optional(),
@@ -25,12 +25,8 @@ const dchatAccountSchema = z.object({
   keystorePassword: z.string().optional(),
   numSubClients: z.number().optional(),
   ipfsGateway: z.string().optional(),
-  dm: z
-    .object({
-      policy: z.enum(["pairing", "allowlist", "open", "disabled"]).optional(),
-      allowFrom: z.array(z.string()).optional(),
-    })
-    .optional(),
+  dmPolicy: z.enum(["pairing", "allowlist", "open", "disabled"]).optional(),
+  allowFrom: z.array(z.string()).optional(),
 });
 
 export const DchatConfigSchema = dchatAccountSchema.extend({
@@ -91,7 +87,8 @@ export function resolveDchatAccountConfig(params: {
     return {
       ...dchatConfig,
       ...acct,
-      dm: { ...dchatConfig.dm, ...acct.dm },
+      dmPolicy: acct.dmPolicy ?? dchatConfig.dmPolicy,
+      allowFrom: acct.allowFrom ?? dchatConfig.allowFrom,
     };
   }
 

package/src/onboarding.ts

@@ -12,7 +12,7 @@ import { listDchatAccountIds, resolveDchatAccount, type CoreConfig } from "./con
 const channel = "dchat" as const;
 
 function setDchatDmPolicy(cfg: CoreConfig, policy: DmPolicy) {
-  const existingAllowFrom = cfg.channels?.dchat?.dm?.allowFrom ?? [];
+  const existingAllowFrom = cfg.channels?.dchat?.allowFrom ?? [];
   const allowFrom =
     policy === "open"
       ? addWildcardAllowFrom(existingAllowFrom)
@@ -23,11 +23,8 @@ function setDchatDmPolicy(cfg: CoreConfig, policy: DmPolicy) {
       ...cfg.channels,
       dchat: {
         ...cfg.channels?.dchat,
-        dm: {
-          ...cfg.channels?.dchat?.dm,
-          policy,
-          allowFrom,
-        },
+        dmPolicy: policy,
+        allowFrom,
       },
     },
   };
@@ -38,7 +35,7 @@ async function promptDchatAllowFrom(params: {
   prompter: WizardPrompter;
 }): Promise<CoreConfig> {
   const { cfg, prompter } = params;
-  const existingAllowFrom = cfg.channels?.dchat?.dm?.allowFrom ?? [];
+  const existingAllowFrom = cfg.channels?.dchat?.allowFrom ?? [];
 
   const entry = await prompter.text({
     message: "NKN address to allow (full public key hex)",
@@ -60,11 +57,8 @@ async function promptDchatAllowFrom(params: {
       dchat: {
         ...cfg.channels?.dchat,
         enabled: true,
-        dm: {
-          ...cfg.channels?.dchat?.dm,
-          policy: "allowlist",
-          allowFrom: unique,
-        },
+        dmPolicy: "allowlist",
+        allowFrom: unique,
       },
     },
   };
@@ -73,9 +67,9 @@ async function promptDchatAllowFrom(params: {
 const dmPolicy: ChannelOnboardingDmPolicy = {
   label: "D-Chat",
   channel,
-  policyKey: "channels.dchat.dm.policy",
-  allowFromKey: "channels.dchat.dm.allowFrom",
-  getCurrent: (cfg) => ((cfg as CoreConfig).channels?.dchat?.dm?.policy as DmPolicy) ?? "pairing",
+  policyKey: "channels.dchat.dmPolicy",
+  allowFromKey: "channels.dchat.allowFrom",
+  getCurrent: (cfg) => ((cfg as CoreConfig).channels?.dchat?.dmPolicy as DmPolicy) ?? "pairing",
   setPolicy: (cfg, policy) => setDchatDmPolicy(cfg as CoreConfig, policy),
   promptAllowFrom: promptDchatAllowFrom,
 };

package/src/types.ts

@@ -118,10 +118,8 @@ export interface DchatAccountConfig {
   ipfsGateway?: string; // default: "64.225.88.71:80"
   enabled?: boolean;
   name?: string;
-  dm?: {
-    allowFrom?: string[];
-    policy?: string;
-  };
+  dmPolicy?: string;
+  allowFrom?: string[];
 }
 
 export interface ResolvedDchatAccount {