gatsby-source-notion-churnotion 1.1.27 → 1.1.29

package/dist/util/processor.js

@@ -1,14 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processor = void 0;
-const gatsby_source_filesystem_1 = require("gatsby-source-filesystem");
 const metadataProcessor_1 = require("./metadataProcessor");
-const tableOfContent_1 = require("./tableOfContent");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
+const blocks_1 = require("./blocks");
 const processor = async (blocks, actions, getCache, createNodeId, reporter, cache) => {
     const { thumbnail, tableOfContents, updatedBlocks, rawText } = await processBlocksForContent(blocks, actions, getCache, createNodeId, reporter, cache);
     await (0, metadataProcessor_1.processMetadata)(blocks, actions, createNodeId, reporter, cache);
@@ -16,154 +10,46 @@ const processor = async (blocks, actions, getCache, createNodeId, reporter, cach
 };
 exports.processor = processor;
 const processBlocksForContent = async (blocks, actions, getCache, createNodeId, reporter, cache) => {
+    const context = {
+        actions,
+        getCache,
+        createNodeId,
+        reporter,
+        cache,
+    };
+    // 블록 프로세서 레지스트리 생성
+    const processorRegistry = new blocks_1.BlockProcessorRegistry(context);
     const tableOfContents = [];
     let thumbnail = null;
     let rawText = "";
     const updatedBlocks = [];
-    let firstImageBlock = null;
-    for (const block of blocks) {
-        if (isImageBlock(block)) {
-            firstImageBlock = block;
-            break;
-        }
-    }
-    if (firstImageBlock) {
-        const updatedBlock = await processImageBlock(firstImageBlock, actions, getCache, createNodeId, reporter, cache);
-        if (updatedBlock?.image?.fileId) {
-            thumbnail = updatedBlock.image.fileId;
-        }
-        updatedBlocks[blocks.indexOf(firstImageBlock)] =
-            updatedBlock || firstImageBlock;
-    }
-    await Promise.all(blocks.map(async (block, index) => {
-        if (block === firstImageBlock)
-            return;
-        await (0, tableOfContent_1.processTableOfContents)(block, tableOfContents);
-        const plainText = extractPlainText(block);
-        if (plainText) {
-            rawText += plainText + " ";
-        }
-        if (isImageBlock(block)) {
-            const updatedBlock = await processImageBlock(block, actions, getCache, createNodeId, reporter, cache);
-            updatedBlocks[index] = updatedBlock || block;
+    // 첫 번째 이미지 블록을 찾아 썸네일로 사용
+    let firstImageIndex = blocks.findIndex((block) => block.type === "image");
+    // 블록 처리
+    const processResults = await Promise.all(blocks.map(async (block, index) => {
+        const result = await processorRegistry.processBlock(block);
+        // 썸네일 처리
+        if (index === firstImageIndex && result.thumbnail) {
+            thumbnail = result.thumbnail;
+        }
+        // 텍스트 데이터 추가
+        if (result.plainText) {
+            rawText += result.plainText + " ";
+        }
+        // 목차 데이터 추가
+        if (result.tableOfContents) {
+            tableOfContents.push(...result.tableOfContents);
+        }
+        return result;
+    }));
+    // 업데이트된 블록 적용
+    processResults.forEach((result, index) => {
+        if (result.updatedBlock) {
+            updatedBlocks[index] = result.updatedBlock;
         }
         else {
-            updatedBlocks[index] = block;
+            updatedBlocks[index] = blocks[index];
         }
-    }));
+    });
     return { thumbnail, tableOfContents, updatedBlocks, rawText };
 };
-const isTextContentBlock = (block) => {
-    return [
-        "paragraph",
-        "heading_1",
-        "heading_2",
-        "heading_3",
-        "quote",
-        "bulleted_list_item",
-        "numbered_list_item",
-        "callout",
-        "code",
-    ].includes(block.type);
-};
-const extractPlainText = (block) => {
-    if (isTextContentBlock(block)) {
-        const richTextArray = block[block.type]?.rich_text || [];
-        return richTextArray
-            .map((text) => block.type === "code" // code의 \n 제거
-            ? text.plain_text.replace(/\\n/g, "")
-            : text.plain_text)
-            .join(" ");
-    }
-    return null;
-};
-const isImageBlock = (block) => {
-    return block.type === "image" && "image" in block;
-};
-const processImageBlock = async (block, actions, getCache, createNodeId, reporter, cache) => {
-    const { createNode } = actions;
-    if (block.type === "image" && "image" in block) {
-        const imageSourceType = block.image.type;
-        const imageUrl = imageSourceType === `external`
-            ? block.image.external?.url
-            : block.image?.file?.url;
-        if (!imageUrl)
-            return null;
-        // GIF 파일 처리
-        if (imageUrl.endsWith(".gif")) {
-            const staticDir = path_1.default.join(process.cwd(), "static"); // Gatsby의 static 디렉토리
-            const gifFileName = path_1.default.basename(imageUrl); // 파일 이름 추출
-            const gifFilePath = path_1.default.join(staticDir, gifFileName);
-            // 이미 static 디렉토리에 파일이 있는지 확인
-            if (!fs_extra_1.default.existsSync(gifFilePath)) {
-                try {
-                    reporter.info(`[GIF PROCESSING] Downloading GIF: ${imageUrl}`);
-                    const response = await fetch(imageUrl);
-                    if (!response.ok) {
-                        throw new Error(`Failed to download GIF: ${response.statusText}`);
-                    }
-                    const arrayBuffer = await response.arrayBuffer();
-                    const buffer = Buffer.from(arrayBuffer);
-                    await fs_extra_1.default.ensureDir(staticDir); // static 디렉토리 생성
-                    await fs_extra_1.default.writeFile(gifFilePath, buffer); // GIF 파일 저장
-                    reporter.info(`[GIF SUCCESS] Saved GIF to static: ${gifFilePath}`);
-                }
-                catch (error) {
-                    reporter.warn(`[GIF WARNING] Failed to process GIF: ${imageUrl}`);
-                    return null;
-                }
-            }
-            else {
-                reporter.info(`[GIF CACHE HIT] GIF already exists: ${gifFilePath}`);
-            }
-            // GIF 파일을 정적 파일로 추가
-            const updatedBlock = {
-                ...block,
-                image: {
-                    fileId: gifFileName, // static 경로를 기준으로 참조
-                    caption: block.image.caption,
-                },
-            };
-            return updatedBlock;
-        }
-        // GIF가 아닌 경우 기존 로직 유지
-        const cacheKey = `${imageUrl}-post-image`;
-        const cachedFileNodeId = await cache.get(cacheKey);
-        if (cachedFileNodeId) {
-            reporter.info(`[CACHE HIT] Image already processed: ${imageUrl}`);
-            const updatedBlock = {
-                ...block,
-                image: {
-                    fileId: cachedFileNodeId,
-                    caption: block.image.caption,
-                },
-            };
-            return updatedBlock;
-        }
-        try {
-            const fileNode = await (0, gatsby_source_filesystem_1.createRemoteFileNode)({
-                url: imageUrl,
-                parentNodeId: block.id,
-                getCache,
-                createNode,
-                createNodeId,
-            });
-            if (fileNode) {
-                const updatedBlock = {
-                    ...block,
-                    image: {
-                        fileId: fileNode.id,
-                        caption: block.image.caption,
-                    },
-                };
-                reporter.info(`[SUCCESS] Image processed: ${fileNode.id}`);
-                await cache.set(cacheKey, fileNode.id);
-                return updatedBlock;
-            }
-        }
-        catch (error) {
-            reporter.warn(`[WARNING] Failed to download image: ${imageUrl}`);
-        }
-    }
-    return null;
-};

package/dist/util/timeLimit.d.ts

@@ -3,3 +3,11 @@
  * @param {number} ms - Milliseconds to sleep
  */
 export declare const sleep: (ms: number) => Promise<unknown>;
+/**
+ * Promise에 타임아웃을 적용하는 도우미 함수
+ * @param promise 제한할 Promise
+ * @param ms 시간 제한 (밀리초)
+ * @param errorMessage 타임아웃 오류 메시지
+ * @returns 원래 Promise 또는 타임아웃 오류가 발생한 Promise
+ */
+export declare const timeLimit: <T>(promise: Promise<T>, ms: number, errorMessage?: string) => Promise<T>;

package/dist/util/timeLimit.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = void 0;
+exports.timeLimit = exports.sleep = void 0;
 /**
  * Sleep for a given number of milliseconds
  * @param {number} ms - Milliseconds to sleep
@@ -9,3 +9,27 @@ const sleep = (ms) => {
     return new Promise((resolve) => setTimeout(resolve, ms));
 };
 exports.sleep = sleep;
+/**
+ * Promise에 타임아웃을 적용하는 도우미 함수
+ * @param promise 제한할 Promise
+ * @param ms 시간 제한 (밀리초)
+ * @param errorMessage 타임아웃 오류 메시지
+ * @returns 원래 Promise 또는 타임아웃 오류가 발생한 Promise
+ */
+const timeLimit = (promise, ms, errorMessage = "Operation timed out") => {
+    return new Promise((resolve, reject) => {
+        const timeoutId = setTimeout(() => {
+            reject(new Error(errorMessage));
+        }, ms);
+        promise
+            .then((result) => {
+            clearTimeout(timeoutId);
+            resolve(result);
+        })
+            .catch((error) => {
+            clearTimeout(timeoutId);
+            reject(error);
+        });
+    });
+};
+exports.timeLimit = timeLimit;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-notion-churnotion",
   "description": "Gatsby plugin that can connect with One Notion Database RECURSIVELY using official API",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "skipLibCheck": true,
   "license": "0BSD",
   "main": "./dist/gatsby-node.js",
@@ -51,6 +51,7 @@
     "natural": "^8.0.1",
     "notion-to-md": "^3.1.1",
     "notion-types": "^7.1.5",
+    "p-limit": "^6.2.0",
     "typescript": "^5.7.2"
   },
   "devDependencies": {