feishu-user-plugin 1.3.5 → 1.3.7

package/src/{client.js → clients/user.js}

@@ -1,6 +1,6 @@
 const path = require('path');
 const protobuf = require('protobufjs');
-const { generateRequestId, generateCid, parseCookie, formatCookie, fetchWithTimeout } = require('./utils');
+const { generateRequestId, generateCid, parseCookie, formatCookie, fetchWithTimeout } = require('../utils');
 
 const GATEWAY_URL = 'https://internal-api-lark-api.feishu.cn/im/gateway/';
 const CSRF_URL = 'https://internal-api-lark-api.feishu.cn/accounts/csrf';
@@ -34,7 +34,10 @@ class LarkUserClient {
   }
 
   async init() {
-    this.proto = await protobuf.load(path.join(__dirname, '..', 'proto', 'lark.proto'));
+    // Path: clients/user.js → ../../proto/lark.proto. Phase A refactor moved
+    // the file from src/client.js to src/clients/user.js but didn't deepen the
+    // relative path, so cookie init would ENOENT. Fixed here as part of B2.
+    this.proto = await protobuf.load(path.join(__dirname, '..', '..', 'proto', 'lark.proto'));
     await this._getCsrfToken();
     await this._getUserInfo();
     if (!this.userId) {
@@ -90,8 +93,10 @@ class LarkUserClient {
     this._heartbeatTimer = setInterval(async () => {
       try {
         await this._getCsrfToken();
-        // Lazy require to avoid circular dependency at module load time
-        const { persistToConfig } = require('./config');
+        // Lazy require to avoid circular dependency at module load time.
+        // auth/credentials writes to credentials.json (single source of truth)
+        // when it exists; falls back to legacy mcpServers persistence otherwise.
+        const { persistToConfig } = require('../auth/credentials');
         persistToConfig({ LARK_COOKIE: this.cookieStr });
         console.error('[feishu-user-plugin] Cookie heartbeat: session refreshed and persisted');
       } catch (e) {
@@ -195,7 +200,20 @@ class LarkUserClient {
     if (rootId) req.rootId = rootId;
     if (parentId) req.parentId = parentId;
     const { packet, ok } = await this._gateway(5, 'PutMessageRequest', req, '5.7.0');
-    return { success: ok && (packet.status === 0 || packet.status == null), status: packet.status };
+    if (!ok) {
+      // The cookie protobuf gateway returns HTTP 400 when our wire format is
+      // missing required fields. Verified for IMAGE (v1.3.7 testing): the
+      // simple {imageKey} content payload is rejected — Feishu Web encodes
+      // images with extra metadata (image dimensions, mime type, etc.) that
+      // we don't have in proto/lark.proto. Reverse-engineering requires Chrome
+      // DevTools capture and is deferred to v1.3.8. Surface a clear error
+      // routing the user to send_message_as_bot, which works.
+      if (type === MsgType.IMAGE) {
+        throw new Error('send_image_as_user: Feishu cookie protobuf gateway rejected the IMAGE wire format (HTTP 400). User-identity image sends are not yet supported — wire format reverse-engineering is deferred to v1.3.8. Workaround: use send_message_as_bot(chat_id, msg_type="image", payload={image_key:"..."}).');
+      }
+      throw new Error(`_sendMsg: cookie protobuf gateway returned non-2xx for type=${type}. The wire format likely doesn't match what Feishu expects.`);
+    }
+    return { success: true, status: packet.status };
   }
 
   // --- Send Text Message ---
@@ -275,18 +293,6 @@ class LarkUserClient {
     return this._sendMsg(MsgType.FILE, chatId, { fileKey, fileName }, opts);
   }
 
-  // --- Send Audio ---
-
-  async sendAudio(chatId, audioKey, opts = {}) {
-    return this._sendMsg(MsgType.AUDIO, chatId, { audioKey }, opts);
-  }
-
-  // --- Send Sticker ---
-
-  async sendSticker(chatId, stickerId, stickerSetId, opts = {}) {
-    return this._sendMsg(MsgType.STICKER, chatId, { stickerId, stickerSetId }, opts);
-  }
-
   // --- Send Rich Text / POST ---
 
   async sendPost(chatId, title, paragraphs, opts = {}) {

package/src/doc-blocks.js

@@ -1,10 +1,8 @@
 // Helpers for constructing docx block payloads.
 //
-// Right now (v1.3.4) only the image path is implemented — enough to cover the
-// create_doc_block / update_doc_block image shortcuts. More block builders
-// (heading / list / code / table) will land in v1.3.5 when the local-markdown
-// → wiki-docx sync feature is built; parking the skeleton here now so the
-// later additions don't introduce a new file.
+// v1.3.4 added image block builders. v1.3.6 adds file block builders so the
+// create_doc_block / update_doc_block tools can attach arbitrary file
+// attachments (PDF / zip / etc.) the same way they handle images.
 
 // docx v1 block_type enum (relevant subset).
 // Docs: https://open.feishu.cn/document/server-docs/docs/docs/docx-v1/document-block/create
@@ -63,8 +61,25 @@ function buildReplaceImagePayload(imageToken) {
   return { replace_image: { token: imageToken } };
 }
 
+// File-block flow mirrors the image-block flow but uses block_type=23 (FILE)
+// and parent_type=docx_file when uploading the binary, and replace_file in
+// the PATCH body. See official.js::createDocBlockWithFile.
+
+/** Empty file block placeholder for step 1 of file attachment flow. */
+function buildEmptyFileBlock() {
+  return { block_type: BLOCK_TYPE.FILE, file: {} };
+}
+
+/** Patch body that swaps an empty file block's content with an uploaded file token. */
+function buildReplaceFilePayload(fileToken) {
+  if (!fileToken) throw new Error('buildReplaceFilePayload: fileToken is required');
+  return { replace_file: { token: fileToken } };
+}
+
 module.exports = {
   BLOCK_TYPE,
   buildEmptyImageBlock,
   buildReplaceImagePayload,
+  buildEmptyFileBlock,
+  buildReplaceFilePayload,
 };