note-connector 0.2.11 → 0.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "note-connector",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "publishConfig": {
     "access": "public"
   },

package/py/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "note-connector"
-version = "0.2.11"
+version = "0.2.13"
 description = "note-connector: MCP server and ChatGPT connector for note.com"
 readme = "README.md"
 requires-python = ">=3.13"

package/py/src/note_mcp/api/images.py

@@ -677,59 +677,166 @@ def _validate_image_bytes(data: bytes, mime_type: str) -> None:
             )
 
 
-async def upload_eyecatch_base64(
+# =============================================================================
+# Chunked Base64 Image Upload
+# =============================================================================
+
+# Max chunk size for safe MCP transport (64KB base64)
+MAX_CHUNK_SIZE: int = 64 * 1024
+
+# In-memory chunk buffer: upload_id -> chunk state
+# Each entry: {"chunks": {index: bytes}, "total_chunks": int, "mime_type": str, "note_id": str}
+_chunk_buffer: dict[str, dict[str, Any]] = {}
+
+
+def _reset_chunk_state(upload_id: str) -> None:
+    """Clear chunk buffer state for an upload_id."""
+    _chunk_buffer.pop(upload_id, None)
+
+
+def _get_chunk_state(upload_id: str) -> dict[str, Any] | None:
+    """Get chunk buffer state for an upload_id."""
+    return _chunk_buffer.get(upload_id)
+
+
+async def upload_eyecatch_chunked(
     session: Session,
+    upload_id: str,
     note_id: str,
     mime_type: str,
-    image_base64: str,
-) -> Image:
-    """Upload an eyecatch image from base64-encoded data.
+    chunk: str,
+    chunk_index: int,
+    total_chunks: int,
+) -> Image | None:
+    """Upload an eyecatch image in base64 chunks.
 
-    Decodes base64 image data, validates it, writes to a temporary file,
-    and uploads via the standard image upload flow. The temporary file is
-    cleaned up after upload (success or failure).
+    Receives base64-encoded chunks of an image, buffers them, and on the
+    final chunk assembles the complete image, validates it, and uploads
+    to note.com as an eyecatch.
+
+    This is designed for ChatGPT where large base64 strings may be
+    truncated during MCP tool argument transmission.
 
     Args:
         session: Authenticated session
-        note_id: The note ID to associate the image with (numeric or key format)
-        mime_type: MIME type of the image (e.g., "image/png")
-        image_base64: Base64-encoded image data (with or without data URL prefix)
+        upload_id: Unique ID for this upload session (generated by ChatGPT)
+        note_id: The note ID to associate the image with
+        mime_type: MIME type of the image
+        chunk: Base64-encoded chunk data
+        chunk_index: 0-based index of this chunk
+        total_chunks: Total number of chunks expected
 
     Returns:
-        Image object with upload result
+        Image object on final chunk success, None for intermediate chunks
 
     Raises:
         NoteAPIError: If validation fails or API request fails
     """
-    # Step 1: Validate MIME type
-    _validate_mime_type(mime_type)
+    # Validate parameters
+    if not upload_id.strip():
+        raise NoteAPIError(
+            code=ErrorCode.INVALID_INPUT,
+            message="upload_id が空です。",
+        )
 
-    # Step 2: Decode base64
-    image_bytes = _decode_base64_image(image_base64)
+    if total_chunks < 1:
+        raise NoteAPIError(
+            code=ErrorCode.INVALID_INPUT,
+            message=f"total_chunks は1以上である必要があります: {total_chunks}",
+        )
 
-    # Step 3: Validate image bytes
-    _validate_image_bytes(image_bytes, mime_type)
+    if chunk_index < 0 or chunk_index >= total_chunks:
+        raise NoteAPIError(
+            code=ErrorCode.INVALID_INPUT,
+            message=(f"chunk_index が範囲外です: {chunk_index} (有効範囲: 0〜{total_chunks - 1})"),
+        )
+
+    if not chunk.strip():
+        raise NoteAPIError(
+            code=ErrorCode.INVALID_BASE64,
+            message=f"chunk {chunk_index + 1}/{total_chunks} が空です。",
+        )
+
+    # Validate MIME type (only on first chunk to avoid repeat checks)
+    if chunk_index == 0:
+        _validate_mime_type(mime_type)
+
+    # Initialize or get chunk state
+    state = _get_chunk_state(upload_id)
+    if state is None:
+        state = {
+            "chunks": {},
+            "total_chunks": total_chunks,
+            "mime_type": mime_type,
+            "note_id": note_id,
+        }
+        _chunk_buffer[upload_id] = state
+    else:
+        # Validate consistency
+        if state["total_chunks"] != total_chunks:
+            raise NoteAPIError(
+                code=ErrorCode.INVALID_INPUT,
+                message=(f"total_chunks が一致しません: (前回: {state['total_chunks']}, 今回: {total_chunks})"),
+            )
+        if state["mime_type"] != mime_type:
+            raise NoteAPIError(
+                code=ErrorCode.INVALID_INPUT,
+                message=(f"mime_type が一致しません: (前回: {state['mime_type']}, 今回: {mime_type})"),
+            )
 
-    # Step 4: Determine file extension
-    extension = MIME_TO_EXTENSION.get(mime_type, ".bin")
+    # Store raw base64 chunk (decode happens after assembly to avoid
+    # base64 alignment issues when splitting across 3-byte boundaries)
+    state["chunks"][chunk_index] = chunk.strip()
 
-    # Step 5: Write to temp file and upload
-    tmp_path: str | None = None
+    received = len(state["chunks"])
+    logger.debug(
+        "Chunk %d/%d for upload_id=%s, received=%d/%d",
+        chunk_index + 1,
+        total_chunks,
+        upload_id,
+        received,
+        total_chunks,
+    )
+
+    # Return early if not all chunks received
+    if received < total_chunks:
+        return None
+
+    # All chunks received - assemble base64 and decode
     try:
-        fd, tmp_path = tempfile.mkstemp(suffix=extension)
-        os.close(fd)
+        # Concatenate base64 chunks in order
+        chunks_list = state["chunks"]
+        assembled_b64 = "".join(chunks_list[i] for i in range(total_chunks))
 
-        with open(tmp_path, "wb") as f:
-            f.write(image_bytes)
+        # Decode the complete base64 string
+        image_bytes = _decode_base64_image(assembled_b64)
 
-        image = await _upload_image_internal(
-            session=session,
-            file_path=tmp_path,
-            note_id=note_id,
-            image_type=ImageType.EYECATCH,
-        )
-        return image
+        # Validate the assembled image
+        _validate_image_bytes(image_bytes, mime_type)
+
+        # Determine file extension
+        extension = MIME_TO_EXTENSION.get(mime_type, ".bin")
+
+        # Write to temp file and upload
+        tmp_path: str | None = None
+        try:
+            fd, tmp_path = tempfile.mkstemp(suffix=extension)
+            os.close(fd)
+
+            with open(tmp_path, "wb") as f:
+                f.write(image_bytes)
+
+            image = await _upload_image_internal(
+                session=session,
+                file_path=tmp_path,
+                note_id=note_id,
+                image_type=ImageType.EYECATCH,
+            )
+            return image
+        finally:
+            if tmp_path is not None:
+                with contextlib.suppress(OSError):
+                    os.unlink(tmp_path)
     finally:
-        if tmp_path is not None:
-            with contextlib.suppress(OSError):
-                os.unlink(tmp_path)
+        # Always clean up state
+        _reset_chunk_state(upload_id)

package/py/src/note_mcp/server.py

@@ -25,7 +25,7 @@ from note_mcp.api.articles import (
 from note_mcp.api.images import (
     insert_image_via_api,
     upload_body_image,
-    upload_eyecatch_base64,
+    upload_eyecatch_chunked,
     upload_eyecatch_image,
 )
 from note_mcp.api.preview import get_preview_html
@@ -293,34 +293,55 @@ async def note_upload_eyecatch(
 @mcp.tool()
 @require_session
 @handle_api_error
-async def note_set_eyecatch_base64(
+async def note_set_eyecatch_base64_chunked(
     session: Session,
+    upload_id: Annotated[str, "アップロードセッションを識別する一意なID（UUID推奨）"],
     note_id: Annotated[str, "アイキャッチ画像を設定する記事のID（数値IDまたは記事キー n... 形式）"],
     mime_type: Annotated[str, "画像のMIMEタイプ（image/png, image/jpeg, image/webp など）"],
-    image_base64: Annotated[str, "base64エンコードされた画像データ（data:image/...;base64, 形式も可）"],
+    chunk: Annotated[str, "base64エンコードされた画像データのチャンク"],
+    chunk_index: Annotated[int, "このチャンクの0ベースのインデックス"],
+    total_chunks: Annotated[int, "全チャンク数"],
 ) -> str:
-    """base64画像データから記事のアイキャッチ画像を設定します。
+    """base64画像を分割（チャンク）で送信し、アイキャッチ画像を設定します。
 
-    ChatGPTなどで生成した画像をbase64形式で直接渡すことで、
-    ファイルパスを必要とせずにnote記事のサムネイル/見出し画像を設定できます。
+    大きなbase64画像をChatGPT経由で安全に転送するためのツールです。
+    base64文字列を複数チャンクに分割して順次送信し、全チャンクが
+    揃った時点で画像を組み立ててnote.comにアップロードします。
+
+    使い方:
+    1. ChatGPT側でbase64を分割（例: 50KBずつ）
+    2. upload_id（UUID）を生成
+    3. 各チャンクを note_set_eyecatch_base64_chunked で送信
+    4. 全チャンク送信後、自動的に画像が組み立てられアップロードされる
 
     対応形式: PNG, JPEG, WebP, GIF
-    最大サイズ: 10MB
+    最大合計サイズ: 10MB
+    1チャンクあたり推奨サイズ: 64KB以下
 
     Args:
-        note_id: アイキャッチ画像を設定する記事のID（数値IDまたは記事キー n... 形式）
+        upload_id: アップロードセッションの一意なID
+        note_id: アイキャッチ画像を設定する記事のID
         mime_type: 画像のMIMEタイプ
-        image_base64: base64エンコードされた画像データ
+        chunk: base64エンコードされたチャンクデータ
+        chunk_index: このチャンクのインデックス（0始まり）
+        total_chunks: 全チャンク数
 
     Returns:
-        設定結果（画像URLを含む）
+        中間チャンクでは受信状況、最終チャンクでは設定結果
     """
-    image = await upload_eyecatch_base64(
+    image = await upload_eyecatch_chunked(
         session=session,
+        upload_id=upload_id,
         note_id=note_id,
         mime_type=mime_type,
-        image_base64=image_base64,
+        chunk=chunk,
+        chunk_index=chunk_index,
+        total_chunks=total_chunks,
     )
+
+    if image is None:
+        return f"チャンク {chunk_index + 1}/{total_chunks} を受信しました。 upload_id: {upload_id}"
+
     if image.url:
         return f"アイキャッチ画像を設定しました。URL: {image.url}"
     return "アイキャッチ画像を設定しました。"