@invago/mixin 1.0.8 → 1.0.10

package/src/config.ts

@@ -1,26 +1,61 @@
 import type { OpenClawConfig } from "openclaw/plugin-sdk";
-import { MixinAccountConfigSchema, type MixinAccountConfig, type MixinConfig } from "./config-schema.js";
+import {
+  MixinAccountConfigSchema,
+  MixinConversationConfigSchema,
+  type MixinAccountConfig,
+  type MixinConversationConfig,
+  type MixinMixpayConfig,
+} from "./config-schema.js";
 
-function getRawConfig(cfg: OpenClawConfig): any {
-  return (cfg.channels as Record<string, unknown>)?.mixin ?? {};
+type RawMixinConfig = Partial<MixinAccountConfig> & {
+  defaultAccount?: string;
+  accounts?: Record<string, Partial<MixinAccountConfig> | undefined>;
+};
+
+function getRawConfig(cfg: OpenClawConfig): RawMixinConfig {
+  return ((cfg.channels as Record<string, unknown>)?.mixin ?? {}) as RawMixinConfig;
 }
 
-export function listAccountIds(cfg: OpenClawConfig): string[] {
+function hasTopLevelAccountConfig(raw: RawMixinConfig): boolean {
+  return Boolean(raw.appId || raw.sessionId || raw.serverPublicKey || raw.sessionPrivateKey || raw.name);
+}
+
+export function resolveDefaultAccountId(cfg: OpenClawConfig): string {
   const raw = getRawConfig(cfg);
+  const configuredDefault = raw.defaultAccount?.trim();
+  if (configuredDefault && raw.accounts?.[configuredDefault]) {
+    return configuredDefault;
+  }
+  if (configuredDefault === "default") {
+    return "default";
+  }
   if (raw.accounts && Object.keys(raw.accounts).length > 0) {
-    return Object.keys(raw.accounts);
+    if (hasTopLevelAccountConfig(raw)) {
+      return "default";
+    }
+    return Object.keys(raw.accounts)[0] ?? "default";
+  }
+  return "default";
+}
+
+export function listAccountIds(cfg: OpenClawConfig): string[] {
+  const raw = getRawConfig(cfg);
+  const accountIds = raw.accounts ? Object.keys(raw.accounts) : [];
+  if (hasTopLevelAccountConfig(raw) || accountIds.length === 0) {
+    return ["default", ...accountIds.filter((accountId) => accountId !== "default")];
   }
-  return ["default"];
+  return accountIds;
 }
 
 export function getAccountConfig(cfg: OpenClawConfig, accountId?: string): MixinAccountConfig {
   const raw = getRawConfig(cfg);
+  const resolvedAccountId = accountId ?? resolveDefaultAccountId(cfg);
   let accountRaw: Partial<MixinAccountConfig>;
 
-  if (accountId && accountId !== "default" && raw.accounts?.[accountId]) {
-    accountRaw = raw.accounts[accountId] as Partial<MixinAccountConfig>;
+  if (resolvedAccountId !== "default" && raw.accounts?.[resolvedAccountId]) {
+    accountRaw = raw.accounts[resolvedAccountId] as Partial<MixinAccountConfig>;
   } else {
-    accountRaw = raw as MixinConfig as Partial<MixinAccountConfig>;
+    accountRaw = raw;
   }
 
   const result = MixinAccountConfigSchema.safeParse(accountRaw);
@@ -29,7 +64,7 @@ export function getAccountConfig(cfg: OpenClawConfig, accountId?: string): Mixin
 }
 
 export function resolveAccount(cfg: OpenClawConfig, accountId?: string) {
-  const id = accountId ?? "default";
+  const id = accountId ?? resolveDefaultAccountId(cfg);
   const config = getAccountConfig(cfg, id);
   const configured = Boolean(config.appId && config.sessionId && config.serverPublicKey && config.sessionPrivateKey);
   return {
@@ -49,6 +84,64 @@ export function resolveAccount(cfg: OpenClawConfig, accountId?: string) {
   };
 }
 
+export function resolveMediaMaxMb(cfg: OpenClawConfig, accountId?: string): number | undefined {
+  return getAccountConfig(cfg, accountId).mediaMaxMb;
+}
+
+export function getMixpayConfig(cfg: OpenClawConfig, accountId?: string): MixinMixpayConfig | undefined {
+  return getAccountConfig(cfg, accountId).mixpay;
+}
+
+function getRawAccountConfig(cfg: OpenClawConfig, accountId?: string): Partial<MixinAccountConfig> {
+  const raw = getRawConfig(cfg);
+  const resolvedAccountId = accountId ?? resolveDefaultAccountId(cfg);
+  if (resolvedAccountId !== "default" && raw.accounts?.[resolvedAccountId]) {
+    return raw.accounts[resolvedAccountId] as Partial<MixinAccountConfig>;
+  }
+  return raw;
+}
+
+export function getConversationConfig(
+  cfg: OpenClawConfig,
+  accountId: string,
+  conversationId: string,
+): {
+  exists: boolean;
+  config: MixinConversationConfig;
+} {
+  const accountRaw = getRawAccountConfig(cfg, accountId);
+  const conversationRaw = accountRaw.conversations?.[conversationId] as Partial<MixinConversationConfig> | undefined;
+  const result = MixinConversationConfigSchema.safeParse(conversationRaw ?? {});
+  return {
+    exists: Boolean(conversationRaw),
+    config: result.success ? result.data : MixinConversationConfigSchema.parse({}),
+  };
+}
+
+export function resolveConversationPolicy(
+  cfg: OpenClawConfig,
+  accountId: string,
+  conversationId: string,
+): {
+  enabled: boolean;
+  requireMention: boolean;
+  mediaBypassMention: boolean;
+  groupPolicy: MixinAccountConfig["groupPolicy"];
+  groupAllowFrom: string[];
+  hasConversationOverride: boolean;
+} {
+  const accountConfig = getAccountConfig(cfg, accountId);
+  const conversation = getConversationConfig(cfg, accountId, conversationId);
+  return {
+    enabled: conversation.config.enabled !== false,
+    requireMention: conversation.config.requireMention ?? accountConfig.requireMentionInGroup,
+    mediaBypassMention: conversation.config.mediaBypassMention ?? accountConfig.mediaBypassMentionInGroup,
+    groupPolicy: conversation.config.groupPolicy ?? accountConfig.groupPolicy,
+    groupAllowFrom: conversation.config.allowFrom ?? accountConfig.groupAllowFrom ?? [],
+    hasConversationOverride: conversation.exists,
+  };
+}
+
 export function isConfigured(account: ReturnType<typeof resolveAccount>): boolean {
   return account.configured;
 }

package/src/crypto.ts

@@ -12,6 +12,11 @@ function aes256CbcDecrypt(key: Buffer, iv: Buffer, ciphertext: Buffer): Buffer {
   const final = Buffer.concat([decrypted, decipher.final()]);
   const padLen = final[final.length - 1];
   if (padLen > 0 && padLen <= 16) {
+    for (let i = final.length - padLen; i < final.length; i++) {
+      if (final[i] !== padLen) {
+        return final;
+      }
+    }
     return final.slice(0, final.length - padLen);
   }
   return final;