liangzimixin 0.3.3 → 0.3.5

package/dist/index.cjs

@@ -17458,20 +17458,48 @@ var AccountConfigSchema = external_exports.object({
    * 🟡 Bot 自己的用户 ID — 用于 anti-loop 检查
    * 如果不填，需要通过其他 API 在运行时获取。
    */
-  botUserId: external_exports.string().optional()
+  botUserId: external_exports.string().optional(),
+  /** 🟡 部署环境 — staging=联调, production=线上 */
+  env: external_exports.enum(["staging", "production"]).optional()
 }).transform((raw) => ({
   appId: raw.appId,
   appSecret: raw.appSecret,
   quantumAccount: raw["quantum-account"],
   quantumAppId: raw["quantum-appId"],
   quantumAppSecret: raw["quantum-appSecret"],
-  botUserId: raw.botUserId
+  botUserId: raw.botUserId,
+  env: raw.env
 }));
+var ENV_PRESETS = {
+  /** 联调环境 */
+  staging: {
+    apiBaseUrl: "https://mxpre.zdxlz.com:1443/open-apis/v1",
+    wsBaseUrl: "wss://mxpre.zdxlz.com:1443/open-apis/v1",
+    msgBaseUrl: "https://mxpre.zdxlz.com:1443/open-apis/v1",
+    fileBaseUrl: "https://mxpre.zdxlz.com:1443/open-apis/v1"
+  },
+  /** 线上环境 */
+  production: {
+    apiBaseUrl: "https://imtwo.zdxlz.com/open-apis/v1",
+    wsBaseUrl: "wss://imtwo.zdxlz.com/open-apis/v1",
+    msgBaseUrl: "https://imtwo.zdxlz.com/open-apis/v1",
+    fileBaseUrl: "https://imtwo.zdxlz.com/open-apis/v1"
+  }
+};
+function resolveEnv(accountEnv) {
+  if (accountEnv) return accountEnv;
+  const raw = (process.env.LZMX_ENV || "").trim().toLowerCase();
+  if (raw === "staging" || raw === "test" || raw === "dev") return "staging";
+  return "production";
+}
+var CURRENT_ENV = resolveEnv();
+var PRESET = ENV_PRESETS[CURRENT_ENV];
 var DEFAULT_INTERNAL_CONFIG = {
   pluginId: CHANNEL_ID,
+  env: CURRENT_ENV,
   logLevel: "info",
   transport: {
-    wsUrl: process.env.LZMX_WS_URL || "wss://im.example.com/ws",
+    wsUrl: process.env.LZMX_WS_URL || PRESET.wsBaseUrl,
     heartbeatIntervalMs: 3e4,
     heartbeatTimeoutMs: 1e4,
     reconnectBaseMs: 1e3,
@@ -17483,7 +17511,7 @@ var DEFAULT_INTERNAL_CONFIG = {
     }
   },
   auth: {
-    serverUrl: process.env.LZMX_AUTH_URL || "https://imtwo.zdxlz.com/open-apis/v1",
+    serverUrl: process.env.LZMX_AUTH_URL || PRESET.apiBaseUrl,
     refreshAheadMs: 3e5
   },
   crypto: {
@@ -17492,10 +17520,10 @@ var DEFAULT_INTERNAL_CONFIG = {
     envKey: "QUANTUM_ENCRYPTION_KEY"
   },
   message: {
-    messageServiceBaseUrl: process.env.LZMX_MSG_URL || "https://msg.example.com/api/v1"
+    messageServiceBaseUrl: process.env.LZMX_MSG_URL || PRESET.msgBaseUrl
   },
   file: {
-    fileServiceBaseUrl: process.env.LZMX_FILE_URL || "https://fs.example.com/api/v1",
+    fileServiceBaseUrl: process.env.LZMX_FILE_URL || PRESET.fileBaseUrl,
     maxFileSizeMb: 30,
     chunkSizeMb: 5,
     allowedLocalRoots: ["/tmp/openclaw"],
@@ -17504,7 +17532,28 @@ var DEFAULT_INTERNAL_CONFIG = {
   }
 };
 function buildPluginConfig(accountConfig, internalOverrides) {
-  const internal = { ...DEFAULT_INTERNAL_CONFIG, ...internalOverrides };
+  const env = resolveEnv(accountConfig.env);
+  const preset = ENV_PRESETS[env];
+  const envAwareDefaults = {
+    ...DEFAULT_INTERNAL_CONFIG,
+    env,
+    transport: {
+      ...DEFAULT_INTERNAL_CONFIG.transport,
+      wsUrl: process.env.LZMX_WS_URL || preset.wsBaseUrl
+    },
+    auth: {
+      ...DEFAULT_INTERNAL_CONFIG.auth,
+      serverUrl: process.env.LZMX_AUTH_URL || preset.apiBaseUrl
+    },
+    message: {
+      messageServiceBaseUrl: process.env.LZMX_MSG_URL || preset.msgBaseUrl
+    },
+    file: {
+      ...DEFAULT_INTERNAL_CONFIG.file,
+      fileServiceBaseUrl: process.env.LZMX_FILE_URL || preset.fileBaseUrl
+    }
+  };
+  const internal = { ...envAwareDefaults, ...internalOverrides };
   return {
     ...internal,
     credentials: accountConfig
@@ -17971,7 +18020,7 @@ async function resolveAndUploadMedia(params) {
       };
     }
     const msgType = fileType;
-    const contentPayload = fileType === "file" ? { fileKey: uploadResult.fileKey, filename: fileName, size: uploadResult.fileSize } : { fileKey: uploadResult.fileKey };
+    const contentPayload = fileType === "file" ? { fileId: uploadResult.fileKey, fileName, size: uploadResult.fileSize } : { fileId: uploadResult.fileKey };
     await messagePipe.sendMessage({
       chatId,
       senderId: chatId,
@@ -17981,7 +18030,7 @@ async function resolveAndUploadMedia(params) {
     });
     log3.info("media:sent", {
       chatId,
-      fileKey: uploadResult.fileKey,
+      fileId: uploadResult.fileKey,
       msgType
     });
     return {
@@ -18108,20 +18157,20 @@ ${body}` : body || raw.content;
     }
     case "image": {
       const c = parsed;
-      fileId = c?.fileKey;
+      fileId = c?.fileId;
       text = c?.altText ?? (fileId ? `![image](${fileId})` : "[image]");
       break;
     }
     case "file": {
       const c = parsed;
-      fileId = c?.fileKey;
-      fileName = c?.filename;
+      fileId = c?.fileId;
+      fileName = c?.fileName;
       text = fileName ? `[File: ${fileName}]` : "[file]";
       break;
     }
     case "voice": {
       const c = parsed;
-      fileId = c?.fileKey;
+      fileId = c?.fileId;
       const durationMs = c?.duration;
       const durationStr = durationMs != null ? ` ${(durationMs / 1e3).toFixed(1)}s` : "";
       text = `[Voice${durationStr}]`;
@@ -18129,7 +18178,7 @@ ${body}` : body || raw.content;
     }
     case "video": {
       const c = parsed;
-      fileId = c?.fileKey;
+      fileId = c?.fileId;
       const durationMs = c?.duration;
       const durationStr = durationMs != null ? ` ${(durationMs / 1e3).toFixed(1)}s` : "";
       text = `[Video${durationStr}]`;
@@ -18489,6 +18538,13 @@ var QUANTUM_IM_CONFIG_JSON_SCHEMA = {
       type: "string",
       title: "Bot \u7528\u6237 ID",
       description: "\u7528\u4E8E anti-loop \u68C0\u67E5\uFF0C\u9632\u6B62\u5904\u7406\u81EA\u5DF1\u53D1\u9001\u7684\u6D88\u606F"
+    },
+    env: {
+      type: "string",
+      title: "\u90E8\u7F72\u73AF\u5883",
+      description: "\u9009\u62E9\u5BF9\u63A5\u7684\u670D\u52A1\u5668\u73AF\u5883\u3002staging = \u8054\u8C03\u73AF\u5883\uFF0Cproduction = \u7EBF\u4E0A\u73AF\u5883",
+      enum: ["staging", "production"],
+      default: "production"
     }
   }
 };
@@ -19752,11 +19808,18 @@ var MessagePipe = class {
       log21.warn("inbound:data-parse-error", { error: err.message });
       return;
     }
-    if (callbackData.eventType !== "MessageReceived") {
+    if (callbackData.eventType !== "callback:direct") {
       log21.debug("inbound:event-ignored", { eventType: callbackData.eventType });
       return;
     }
-    const msg = callbackData.content;
+    const msg = {
+      messageId: callbackData.msgUid,
+      chatId: callbackData.groupId || callbackData.userId,
+      senderId: callbackData.userId,
+      msgType: callbackData.type,
+      content: JSON.stringify(callbackData.content),
+      timestamp: Date.now()
+    };
     log21.debug("inbound:frame", { messageId: msg.messageId, eventType: callbackData.eventType });
     if (this.dedup.isDuplicate(msg.messageId)) {
       log21.debug("inbound:dedup-hit", { messageId: msg.messageId });
@@ -19817,10 +19880,14 @@ var ConnectionManager = class {
     this.running = true;
     this.reconnectAttempts = 0;
     const token = await tokenFn();
+    const wsUrl = url2.replace(/\/+$/, "") + "/events/stream";
     await this.client.connect({
-      url: url2,
+      url: wsUrl,
       token,
-      headers: this.appId ? { "X-App-ID": this.appId } : void 0
+      headers: {
+        "Authorization": token,
+        ...this.appId ? { "X-App-ID": this.appId } : {}
+      }
     });
     this.client.on("close", () => {
       if (this.running) {
@@ -19873,10 +19940,14 @@ var ConnectionManager = class {
       this.reconnectAttempts++;
       try {
         const token = await this.tokenFn();
+        const wsUrl = this.url.replace(/\/+$/, "") + "/events/stream";
         await this.client.connect({
-          url: this.url,
+          url: wsUrl,
           token,
-          headers: this.appId ? { "X-App-ID": this.appId } : void 0
+          headers: {
+            "Authorization": token,
+            ...this.appId ? { "X-App-ID": this.appId } : {}
+          }
         });
         this.reconnectAttempts = 0;
         this.startHeartbeat();

package/dist/index.d.cts

@@ -22,6 +22,10 @@ declare const AccountConfigSchema: z.ZodPipe<z.ZodObject<{
     'quantum-appId': z.ZodString;
     'quantum-appSecret': z.ZodString;
     botUserId: z.ZodOptional<z.ZodString>;
+    env: z.ZodOptional<z.ZodEnum<{
+        staging: "staging";
+        production: "production";
+    }>>;
 }, z.core.$strip>, z.ZodTransform<{
     appId: string;
     appSecret: string;
@@ -29,6 +33,7 @@ declare const AccountConfigSchema: z.ZodPipe<z.ZodObject<{
     quantumAppId: string;
     quantumAppSecret: string;
     botUserId: string | undefined;
+    env: "staging" | "production" | undefined;
 }, {
     appId: string;
     appSecret: string;
@@ -36,12 +41,17 @@ declare const AccountConfigSchema: z.ZodPipe<z.ZodObject<{
     'quantum-appId': string;
     'quantum-appSecret': string;
     botUserId?: string | undefined;
+    env?: "staging" | "production" | undefined;
 }>>;
 type AccountConfig = z.output<typeof AccountConfigSchema>;
+/** 支持的部署环境 */
+type DeployEnv = 'staging' | 'production';
 /** 运维级内部配置 — 由运维提供，直接在代码或环境变量中设定 */
 interface InternalConfig {
     /** 🟡 插件唯一标识 */
     pluginId: string;
+    /** 🟡 当前部署环境 */
+    env: DeployEnv;
     /** 🟡 日志级别 */
     logLevel: 'debug' | 'info' | 'warn' | 'error';
     transport: {
@@ -114,6 +124,8 @@ interface PluginConfig extends InternalConfig {
 /**
  * 合并用户配置与内部配置，生成完整的运行时配置。
  *
+ * 如果用户在 openclaw.json 中指定了 env 字段，会自动切换到对应环境的 URL 预设。
+ *
  * @param accountConfig - 已解析的用户账户配置
  * @param internalOverrides - 可选的内部配置覆盖（用于测试或特殊部署）
  */
@@ -146,10 +158,10 @@ interface InboundMessage {
      * 根据 msgType 解析为对应的 Content 类型:
      * - text:     `{"content": "你好"}`
      * - markdown: `{"title": "标题", "content": "正文", "recommendations": [...]}`
-     * - image:    `{"fileKey": "f_abc", "width": 800, "height": 600}`
-     * - file:     `{"fileKey": "f_xyz", "filename": "报告.pdf", "size": 1048576}`
-     * - voice:    `{"fileKey": "f_aud", "duration": 5000}`
-     * - video:    `{"fileKey": "f_vid", "duration": 120, "width": 1920, "height": 1080}`
+     * - image:    `{"fileId": "xxx", "width": 1920, "height": 1200}`
+     * - file:     `{"fileId": "xxx", "fileName": "test.xlsx", "size": 9763}`
+     * - voice:    `{"fileId": "xxx", "duration": 2914.23}`
+     * - video:    `{"fileId": "xxx", "duration": 5291667.32, "width": 1200}`
      * - system:   `{"text": "用户已加入会话"}`
      */
     content: string;
@@ -1035,6 +1047,13 @@ declare const QUANTUM_IM_CONFIG_JSON_SCHEMA: {
             readonly title: "Bot 用户 ID";
             readonly description: "用于 anti-loop 检查，防止处理自己发送的消息";
         };
+        readonly env: {
+            readonly type: "string";
+            readonly title: "部署环境";
+            readonly description: "选择对接的服务器环境。staging = 联调环境，production = 线上环境";
+            readonly enum: readonly ["staging", "production"];
+            readonly default: "production";
+        };
     };
 };
 

package/dist/setup-entry.cjs

@@ -4120,7 +4120,7 @@ async function resolveAndUploadMedia(params) {
       };
     }
     const msgType = fileType;
-    const contentPayload = fileType === "file" ? { fileKey: uploadResult.fileKey, filename: fileName, size: uploadResult.fileSize } : { fileKey: uploadResult.fileKey };
+    const contentPayload = fileType === "file" ? { fileId: uploadResult.fileKey, fileName, size: uploadResult.fileSize } : { fileId: uploadResult.fileKey };
     await messagePipe.sendMessage({
       chatId,
       senderId: chatId,
@@ -4130,7 +4130,7 @@ async function resolveAndUploadMedia(params) {
     });
     log3.info("media:sent", {
       chatId,
-      fileKey: uploadResult.fileKey,
+      fileId: uploadResult.fileKey,
       msgType
     });
     return {
@@ -18014,20 +18014,48 @@ var AccountConfigSchema = external_exports.object({
    * 🟡 Bot 自己的用户 ID — 用于 anti-loop 检查
    * 如果不填，需要通过其他 API 在运行时获取。
    */
-  botUserId: external_exports.string().optional()
+  botUserId: external_exports.string().optional(),
+  /** 🟡 部署环境 — staging=联调, production=线上 */
+  env: external_exports.enum(["staging", "production"]).optional()
 }).transform((raw) => ({
   appId: raw.appId,
   appSecret: raw.appSecret,
   quantumAccount: raw["quantum-account"],
   quantumAppId: raw["quantum-appId"],
   quantumAppSecret: raw["quantum-appSecret"],
-  botUserId: raw.botUserId
+  botUserId: raw.botUserId,
+  env: raw.env
 }));
+var ENV_PRESETS = {
+  /** 联调环境 */
+  staging: {
+    apiBaseUrl: "https://mxpre.zdxlz.com:1443/open-apis/v1",
+    wsBaseUrl: "wss://mxpre.zdxlz.com:1443/open-apis/v1",
+    msgBaseUrl: "https://mxpre.zdxlz.com:1443/open-apis/v1",
+    fileBaseUrl: "https://mxpre.zdxlz.com:1443/open-apis/v1"
+  },
+  /** 线上环境 */
+  production: {
+    apiBaseUrl: "https://imtwo.zdxlz.com/open-apis/v1",
+    wsBaseUrl: "wss://imtwo.zdxlz.com/open-apis/v1",
+    msgBaseUrl: "https://imtwo.zdxlz.com/open-apis/v1",
+    fileBaseUrl: "https://imtwo.zdxlz.com/open-apis/v1"
+  }
+};
+function resolveEnv(accountEnv) {
+  if (accountEnv) return accountEnv;
+  const raw = (process.env.LZMX_ENV || "").trim().toLowerCase();
+  if (raw === "staging" || raw === "test" || raw === "dev") return "staging";
+  return "production";
+}
+var CURRENT_ENV = resolveEnv();
+var PRESET = ENV_PRESETS[CURRENT_ENV];
 var DEFAULT_INTERNAL_CONFIG = {
   pluginId: CHANNEL_ID,
+  env: CURRENT_ENV,
   logLevel: "info",
   transport: {
-    wsUrl: process.env.LZMX_WS_URL || "wss://im.example.com/ws",
+    wsUrl: process.env.LZMX_WS_URL || PRESET.wsBaseUrl,
     heartbeatIntervalMs: 3e4,
     heartbeatTimeoutMs: 1e4,
     reconnectBaseMs: 1e3,
@@ -18039,7 +18067,7 @@ var DEFAULT_INTERNAL_CONFIG = {
     }
   },
   auth: {
-    serverUrl: process.env.LZMX_AUTH_URL || "https://imtwo.zdxlz.com/open-apis/v1",
+    serverUrl: process.env.LZMX_AUTH_URL || PRESET.apiBaseUrl,
     refreshAheadMs: 3e5
   },
   crypto: {
@@ -18048,10 +18076,10 @@ var DEFAULT_INTERNAL_CONFIG = {
     envKey: "QUANTUM_ENCRYPTION_KEY"
   },
   message: {
-    messageServiceBaseUrl: process.env.LZMX_MSG_URL || "https://msg.example.com/api/v1"
+    messageServiceBaseUrl: process.env.LZMX_MSG_URL || PRESET.msgBaseUrl
   },
   file: {
-    fileServiceBaseUrl: process.env.LZMX_FILE_URL || "https://fs.example.com/api/v1",
+    fileServiceBaseUrl: process.env.LZMX_FILE_URL || PRESET.fileBaseUrl,
     maxFileSizeMb: 30,
     chunkSizeMb: 5,
     allowedLocalRoots: ["/tmp/openclaw"],
@@ -18060,7 +18088,28 @@ var DEFAULT_INTERNAL_CONFIG = {
   }
 };
 function buildPluginConfig(accountConfig, internalOverrides) {
-  const internal = { ...DEFAULT_INTERNAL_CONFIG, ...internalOverrides };
+  const env = resolveEnv(accountConfig.env);
+  const preset = ENV_PRESETS[env];
+  const envAwareDefaults = {
+    ...DEFAULT_INTERNAL_CONFIG,
+    env,
+    transport: {
+      ...DEFAULT_INTERNAL_CONFIG.transport,
+      wsUrl: process.env.LZMX_WS_URL || preset.wsBaseUrl
+    },
+    auth: {
+      ...DEFAULT_INTERNAL_CONFIG.auth,
+      serverUrl: process.env.LZMX_AUTH_URL || preset.apiBaseUrl
+    },
+    message: {
+      messageServiceBaseUrl: process.env.LZMX_MSG_URL || preset.msgBaseUrl
+    },
+    file: {
+      ...DEFAULT_INTERNAL_CONFIG.file,
+      fileServiceBaseUrl: process.env.LZMX_FILE_URL || preset.fileBaseUrl
+    }
+  };
+  const internal = { ...envAwareDefaults, ...internalOverrides };
   return {
     ...internal,
     credentials: accountConfig
@@ -19010,11 +19059,18 @@ var MessagePipe = class {
       log12.warn("inbound:data-parse-error", { error: err.message });
       return;
     }
-    if (callbackData.eventType !== "MessageReceived") {
+    if (callbackData.eventType !== "callback:direct") {
       log12.debug("inbound:event-ignored", { eventType: callbackData.eventType });
       return;
     }
-    const msg = callbackData.content;
+    const msg = {
+      messageId: callbackData.msgUid,
+      chatId: callbackData.groupId || callbackData.userId,
+      senderId: callbackData.userId,
+      msgType: callbackData.type,
+      content: JSON.stringify(callbackData.content),
+      timestamp: Date.now()
+    };
     log12.debug("inbound:frame", { messageId: msg.messageId, eventType: callbackData.eventType });
     if (this.dedup.isDuplicate(msg.messageId)) {
       log12.debug("inbound:dedup-hit", { messageId: msg.messageId });
@@ -19075,10 +19131,14 @@ var ConnectionManager = class {
     this.running = true;
     this.reconnectAttempts = 0;
     const token = await tokenFn();
+    const wsUrl = url2.replace(/\/+$/, "") + "/events/stream";
     await this.client.connect({
-      url: url2,
+      url: wsUrl,
       token,
-      headers: this.appId ? { "X-App-ID": this.appId } : void 0
+      headers: {
+        "Authorization": token,
+        ...this.appId ? { "X-App-ID": this.appId } : {}
+      }
     });
     this.client.on("close", () => {
       if (this.running) {
@@ -19131,10 +19191,14 @@ var ConnectionManager = class {
       this.reconnectAttempts++;
       try {
         const token = await this.tokenFn();
+        const wsUrl = this.url.replace(/\/+$/, "") + "/events/stream";
         await this.client.connect({
-          url: this.url,
+          url: wsUrl,
           token,
-          headers: this.appId ? { "X-App-ID": this.appId } : void 0
+          headers: {
+            "Authorization": token,
+            ...this.appId ? { "X-App-ID": this.appId } : {}
+          }
         });
         this.reconnectAttempts = 0;
         this.startHeartbeat();
@@ -19589,6 +19653,13 @@ var QUANTUM_IM_CONFIG_JSON_SCHEMA = {
       type: "string",
       title: "Bot \u7528\u6237 ID",
       description: "\u7528\u4E8E anti-loop \u68C0\u67E5\uFF0C\u9632\u6B62\u5904\u7406\u81EA\u5DF1\u53D1\u9001\u7684\u6D88\u606F"
+    },
+    env: {
+      type: "string",
+      title: "\u90E8\u7F72\u73AF\u5883",
+      description: "\u9009\u62E9\u5BF9\u63A5\u7684\u670D\u52A1\u5668\u73AF\u5883\u3002staging = \u8054\u8C03\u73AF\u5883\uFF0Cproduction = \u7EBF\u4E0A\u73AF\u5883",
+      enum: ["staging", "production"],
+      default: "production"
     }
   }
 };
@@ -19702,20 +19773,20 @@ ${body}` : body || raw.content;
     }
     case "image": {
       const c = parsed;
-      fileId = c?.fileKey;
+      fileId = c?.fileId;
       text = c?.altText ?? (fileId ? `![image](${fileId})` : "[image]");
       break;
     }
     case "file": {
       const c = parsed;
-      fileId = c?.fileKey;
-      fileName = c?.filename;
+      fileId = c?.fileId;
+      fileName = c?.fileName;
       text = fileName ? `[File: ${fileName}]` : "[file]";
       break;
     }
     case "voice": {
       const c = parsed;
-      fileId = c?.fileKey;
+      fileId = c?.fileId;
       const durationMs = c?.duration;
       const durationStr = durationMs != null ? ` ${(durationMs / 1e3).toFixed(1)}s` : "";
       text = `[Voice${durationStr}]`;
@@ -19723,7 +19794,7 @@ ${body}` : body || raw.content;
     }
     case "video": {
       const c = parsed;
-      fileId = c?.fileKey;
+      fileId = c?.fileId;
       const durationMs = c?.duration;
       const durationStr = durationMs != null ? ` ${(durationMs / 1e3).toFixed(1)}s` : "";
       text = `[Video${durationStr}]`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liangzimixin",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Quantum-encrypted IM channel plugin for OpenClaw",
   "type": "module",
   "main": "dist/index.cjs",