@invago/mixin 1.0.9 → 1.0.11

package/src/config-schema.ts

@@ -32,6 +32,21 @@ export const MixinConversationConfigSchema = z.object({
 
 export type MixinConversationConfig = z.infer<typeof MixinConversationConfigSchema>;
 
+export const MixinMixpayConfigSchema = z.object({
+  enabled: z.boolean().optional().default(false),
+  apiBaseUrl: z.string().optional(),
+  payeeId: z.string().optional(),
+  defaultQuoteAssetId: z.string().optional(),
+  defaultSettlementAssetId: z.string().optional(),
+  expireMinutes: z.number().positive().optional().default(15),
+  pollIntervalSec: z.number().positive().optional().default(30),
+  allowedCreators: z.array(z.string()).optional().default([]),
+  notifyOnPending: z.boolean().optional().default(false),
+  notifyOnPaidLess: z.boolean().optional().default(true),
+});
+
+export type MixinMixpayConfig = z.infer<typeof MixinMixpayConfigSchema>;
+
 export const MixinAccountConfigSchema = z.object({
   name: z.string().optional(),
   enabled: z.boolean().optional().default(true),
@@ -49,6 +64,7 @@ export const MixinAccountConfigSchema = z.object({
   audioAutoDetectDuration: z.boolean().optional().default(true),
   audioSendAsVoiceByDefault: z.boolean().optional().default(true),
   audioRequireFfprobe: z.boolean().optional().default(false),
+  mixpay: MixinMixpayConfigSchema.optional(),
   conversations: z.record(z.string(), MixinConversationConfigSchema.optional()).optional(),
   debug: z.boolean().optional().default(false),
   proxy: MixinProxyConfigSchema.optional(),

package/src/config.ts

@@ -1,9 +1,10 @@
-import type { OpenClawConfig } from "openclaw/plugin-sdk";
+import type { OpenClawConfig } from "openclaw/plugin-sdk";
 import {
   MixinAccountConfigSchema,
   MixinConversationConfigSchema,
   type MixinAccountConfig,
   type MixinConversationConfig,
+  type MixinMixpayConfig,
 } from "./config-schema.js";
 
 type RawMixinConfig = Partial<MixinAccountConfig> & {
@@ -11,8 +12,53 @@ type RawMixinConfig = Partial<MixinAccountConfig> & {
   accounts?: Record<string, Partial<MixinAccountConfig> | undefined>;
 };
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function hasLegacyMixinConfig(raw: Record<string, unknown>): boolean {
+  const typed = raw as Partial<MixinAccountConfig> & {
+    defaultAccount?: unknown;
+    accounts?: unknown;
+  };
+
+  return Boolean(
+    typed.defaultAccount ||
+      typed.accounts ||
+      typed.appId ||
+      typed.sessionId ||
+      typed.serverPublicKey ||
+      typed.sessionPrivateKey ||
+      typed.name,
+  );
+}
+
 function getRawConfig(cfg: OpenClawConfig): RawMixinConfig {
-  return ((cfg.channels as Record<string, unknown>)?.mixin ?? {}) as RawMixinConfig;
+  const root = cfg as unknown as Record<string, unknown>;
+  const channels = isRecord(root.channels) ? root.channels : undefined;
+  const channelConfig = channels && isRecord(channels.mixin) ? channels.mixin : undefined;
+  if (channelConfig) {
+    return channelConfig as RawMixinConfig;
+  }
+  const plugins = isRecord(root.plugins) ? root.plugins : undefined;
+  const entries = plugins && isRecord(plugins.entries) ? plugins.entries : undefined;
+  const mixinEntry = entries && isRecord(entries.mixin) ? entries.mixin : undefined;
+  const pluginEntryConfig = mixinEntry && isRecord(mixinEntry.config) ? mixinEntry.config : undefined;
+  if (pluginEntryConfig) {
+    return pluginEntryConfig as RawMixinConfig;
+  }
+
+
+  const legacyNamedConfig = isRecord(root.mixin) ? root.mixin : undefined;
+  if (legacyNamedConfig) {
+    return legacyNamedConfig as RawMixinConfig;
+  }
+
+  if (hasLegacyMixinConfig(root)) {
+    return root as RawMixinConfig;
+  }
+
+  return {};
 }
 
 function hasTopLevelAccountConfig(raw: RawMixinConfig): boolean {
@@ -58,7 +104,9 @@ export function getAccountConfig(cfg: OpenClawConfig, accountId?: string): Mixin
   }
 
   const result = MixinAccountConfigSchema.safeParse(accountRaw);
-  if (result.success) return result.data;
+  if (result.success) {
+    return result.data;
+  }
   return MixinAccountConfigSchema.parse({});
 }
 
@@ -87,6 +135,10 @@ export function resolveMediaMaxMb(cfg: OpenClawConfig, accountId?: string): numb
   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);
@@ -149,4 +201,6 @@ export function describeAccount(account: ReturnType<typeof resolveAccount>) {
     configured: account.configured,
     enabled: account.enabled,
   };
-}
+}
+
+

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;