gatsby-source-notion-churnotion 1.1.29 → 1.1.30

package/README.md

@@ -6,6 +6,21 @@ This plugin recursively collects categories from a single Notion database, which
 
 If you're considering Notion as your CMS for Gatsby, this plugin could be a great choice as it supports recursive category collection.
 
+## What's New in v1.1.29
+
+- **Added support for more Notion block types**: 
+  - bookmark, breadcrumb, callout, code, column, column_list, divider, embed, equation, file, link_preview, pdf, table, table_of_contents, toggle, to_do, video, audio
+- **Improved performance**:
+  - Added parallel processing for Notion API requests with concurrency limits
+  - Implemented caching to reduce duplicate API calls
+  - Added batch processing for large datasets
+  - Added timeout handling for long-running operations
+- **Code refactoring**:
+  - Modular block processor architecture
+  - Better error handling
+  - Improved type safety
+  - Fixed ES Module import issue with p-limit
+
 ## Install
 
 ```shell
@@ -64,7 +79,7 @@ When the development server is running, `gatsby-source-notion-churnotion` will f
 
 ### Explore in GraphQL
 
-Once the data is fetched, go to http://localhost:8000/__graphql, where you’ll find new nodes such as `Churnotion`, `NBook`, `NCategory`, and `NTag` as shown below:
+Once the data is fetched, go to http://localhost:8000/__graphql, where you'll find new nodes such as `Churnotion`, `NBook`, `NCategory`, and `NTag` as shown below:
 
 ![alt text](readme2.png)
 

package/dist/api/getPages.js

@@ -40,15 +40,22 @@ const getPages = async ({ databaseId, reporter, getCache, actions, createNode, c
                     reporter.info(`[SUCCESS] total pages > ${result.results.length}`);
                     // 페이지 ID 목록 수집
                     const pageIds = result.results.map((page) => page.id);
-                    // 페이지 블록들을 병렬로 가져오기
-                    const pagesBlocks = await notionService.getMultiplePagesBlocks(pageIds);
-                    // 페이지 데이터와 블록 결합
-                    for (const page of result.results) {
-                        const pageData = {
-                            page,
-                            blocks: pagesBlocks[page.id] || [],
-                        };
-                        pagesToProcess.push(pageData);
+                    // 페이지 블록들을 병렬로 가져오기 - 최대 50개씩 배치 처리
+                    for (let i = 0; i < pageIds.length; i += 50) {
+                        const batch = pageIds.slice(i, i + 50);
+                        reporter.info(`[BATCH] Processing pages ${i + 1} to ${i + batch.length} of ${pageIds.length}`);
+                        const batchBlocks = await notionService.getMultiplePagesBlocks(batch);
+                        // 페이지 데이터와 블록 결합
+                        for (const pageId of batch) {
+                            const page = result.results.find((p) => p.id === pageId);
+                            if (page) {
+                                const pageData = {
+                                    page,
+                                    blocks: batchBlocks[pageId] || [],
+                                };
+                                pagesToProcess.push(pageData);
+                            }
+                        }
                     }
                 }
             }

package/dist/api/service/notionService.d.ts

@@ -12,6 +12,8 @@ export declare class NotionService {
     private cache;
     private limiter;
     constructor(options: NotionServiceOptions);
+    private initLimiter;
+    private createSimpleLimiter;
     /**
      * 데이터베이스 쿼리
      */
@@ -33,5 +35,5 @@ export declare class NotionService {
     /**
      * 병렬 처리 제한 설정
      */
-    setParallelLimit(limit: number): void;
+    setParallelLimit(limit: number): Promise<void>;
 }

package/dist/api/service/notionService.js

@@ -1,11 +1,40 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotionService = void 0;
 const fetchData_1 = require("../../util/fetchData");
-const p_limit_1 = __importDefault(require("p-limit"));
 class NotionService {
     reporter;
     parallelLimit;
@@ -17,7 +46,44 @@ class NotionService {
         this.parallelLimit = options.parallelLimit || 5; // 기본 동시 요청 수
         this.enableCaching = options.enableCaching !== false; // 기본값은 캐싱 활성화
         this.cache = new Map();
-        this.limiter = (0, p_limit_1.default)(this.parallelLimit);
+        this.initLimiter();
+    }
+    async initLimiter() {
+        try {
+            const pLimitModule = await Promise.resolve().then(() => __importStar(require("p-limit")));
+            const pLimit = pLimitModule.default;
+            this.limiter = pLimit(this.parallelLimit);
+        }
+        catch (error) {
+            this.reporter.error(`Failed to initialize p-limit: ${error}`);
+            this.limiter = this.createSimpleLimiter(this.parallelLimit);
+        }
+    }
+    createSimpleLimiter(limit) {
+        let running = 0;
+        const queue = [];
+        const next = () => {
+            running--;
+            if (queue.length > 0) {
+                const run = queue.shift();
+                if (run)
+                    run();
+            }
+        };
+        return (fn) => {
+            return new Promise((resolve, reject) => {
+                const run = () => {
+                    running++;
+                    fn().then(resolve).catch(reject).finally(next);
+                };
+                if (running < limit) {
+                    run();
+                }
+                else {
+                    queue.push(run);
+                }
+            });
+        };
     }
     /**
      * 데이터베이스 쿼리
@@ -69,6 +135,9 @@ class NotionService {
      * 여러 페이지의 블록 병렬 처리
      */
     async getMultiplePagesBlocks(pageIds) {
+        if (!this.limiter) {
+            await this.initLimiter();
+        }
         this.reporter.info(`[NOTION] Fetching blocks for ${pageIds.length} pages in parallel (limit: ${this.parallelLimit})`);
         const tasks = pageIds.map((pageId) => this.limiter(async () => {
             try {
@@ -96,9 +165,9 @@ class NotionService {
     /**
      * 병렬 처리 제한 설정
      */
-    setParallelLimit(limit) {
+    async setParallelLimit(limit) {
         this.parallelLimit = limit;
-        this.limiter = (0, p_limit_1.default)(limit);
+        await this.initLimiter();
         this.reporter.info(`[NOTION] Updated parallel request limit to ${limit}`);
     }
 }

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.29",
+  "version": "1.1.30",
   "skipLibCheck": true,
   "license": "0BSD",
   "main": "./dist/gatsby-node.js",