gatsby-source-notion-churnotion 1.1.29 → 1.1.31

package/README.md

@@ -6,6 +6,28 @@ 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.31
+
+- **Fixed ES Module compatibility issues**:
+  - Removed dependency on external p-limit library
+  - Implemented custom parallel processing queue
+  - Fixed Gatsby build errors related to ESM imports
+  - Improved CommonJS compatibility
+
+## What's New in v1.1.30
+
+- **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
+
 ## Install
 
 ```shell
@@ -64,7 +86,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.js

@@ -1,11 +1,52 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 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 ParallelLimiter {
+    running = 0;
+    queue = [];
+    limit;
+    constructor(limit) {
+        this.limit = limit;
+    }
+    async add(fn) {
+        return new Promise((resolve, reject) => {
+            const run = () => {
+                this.running++;
+                fn()
+                    .then(resolve)
+                    .catch(reject)
+                    .finally(() => {
+                    this.running--;
+                    this.next();
+                });
+            };
+            if (this.running < this.limit) {
+                run();
+            }
+            else {
+                this.queue.push(run);
+            }
+        });
+    }
+    next() {
+        if (this.queue.length > 0 && this.running < this.limit) {
+            const run = this.queue.shift();
+            if (run)
+                run();
+        }
+    }
+    setLimit(limit) {
+        this.limit = limit;
+        // 새 제한 설정 후 큐에서 가능한 작업 실행
+        while (this.running < this.limit && this.queue.length > 0) {
+            this.next();
+        }
+    }
+}
 class NotionService {
     reporter;
     parallelLimit;
@@ -17,7 +58,7 @@ 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.limiter = new ParallelLimiter(this.parallelLimit);
     }
     /**
      * 데이터베이스 쿼리
@@ -70,7 +111,7 @@ class NotionService {
      */
     async getMultiplePagesBlocks(pageIds) {
         this.reporter.info(`[NOTION] Fetching blocks for ${pageIds.length} pages in parallel (limit: ${this.parallelLimit})`);
-        const tasks = pageIds.map((pageId) => this.limiter(async () => {
+        const tasks = pageIds.map((pageId) => this.limiter.add(async () => {
             try {
                 const blocks = await this.getPageBlocks(pageId);
                 return { pageId, blocks };
@@ -97,9 +138,9 @@ class NotionService {
      * 병렬 처리 제한 설정
      */
     setParallelLimit(limit) {
-        this.parallelLimit = limit;
-        this.limiter = (0, p_limit_1.default)(limit);
         this.reporter.info(`[NOTION] Updated parallel request limit to ${limit}`);
+        this.parallelLimit = limit;
+        this.limiter.setLimit(limit);
     }
 }
 exports.NotionService = NotionService;

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.31",
   "skipLibCheck": true,
   "license": "0BSD",
   "main": "./dist/gatsby-node.js",
@@ -51,7 +51,6 @@
     "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": {