gatsby-source-notion-churnotion 1.1.23 → 1.1.25

package/dist/util/fetchData.d.ts

@@ -1,18 +1,19 @@
 /**
- * POST request with retry logic using axios instance
- * @param {string} url - API endpoint URL
- * @param {any} body - Request body
- * @param {number} tryCount - Current retry count
- * @param {number} maxRetries - Maximum retry attempts
- * @returns {Promise<any>}
+ * Notion API에서 모든 블록 데이터를 가져오는 함수 (next_cursor 지원)
+ * @param {string} pageId - Notion 페이지 ID
+ * @returns {Promise<any[]>} 모든 블록 데이터 리스트
  */
-export declare const fetchPostWithRetry: (url: string, body: any, tryCount?: number, maxRetries?: number) => Promise<any>;
+export declare const fetchAllBlocks: (pageId: string) => Promise<any[]>;
 /**
- * General GET/PUT/DELETE request with retry logic using axios instance
- * @param {string} url - API endpoint URL
- * @param {any} options - Axios request options
- * @param {number} tryCount - Current retry count
- * @param {number} maxRetries - Maximum retry attempts
- * @returns {Promise<any>}
+ * Notion API에서 GET 요청을 수행하는 함수 (재시도 로직 포함)
  */
 export declare const fetchGetWithRetry: (url: string, options?: any, tryCount?: number, maxRetries?: number) => Promise<any>;
+/**
+ * Notion API에서 POST 요청을 수행하는 함수 (재시도 로직 포함)
+ * @param {string} url - API endpoint URL
+ * @param {any} body - 요청 데이터
+ * @param {number} tryCount - 현재 재시도 횟수
+ * @param {number} maxRetries - 최대 재시도 횟수
+ * @returns {Promise<any>} API 응답 데이터
+ */
+export declare const fetchPostWithRetry: (url: string, body: any, tryCount?: number, maxRetries?: number) => Promise<any>;

package/dist/util/fetchData.js

@@ -1,89 +1,101 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchGetWithRetry = exports.fetchPostWithRetry = void 0;
+exports.fetchPostWithRetry = exports.fetchGetWithRetry = exports.fetchAllBlocks = void 0;
 const connector_1 = require("../api/connector");
 const constants_1 = require("../constants");
 const timeLimit_1 = require("./timeLimit");
 /**
- * POST request with retry logic using axios instance
- * @param {string} url - API endpoint URL
- * @param {any} body - Request body
- * @param {number} tryCount - Current retry count
- * @param {number} maxRetries - Maximum retry attempts
- * @returns {Promise<any>}
+ * Notion API에서 모든 블록 데이터를 가져오는 함수 (next_cursor 지원)
+ * @param {string} pageId - Notion 페이지 ID
+ * @returns {Promise<any[]>} 모든 블록 데이터 리스트
  */
-const fetchPostWithRetry = async (url, body, tryCount = 0, maxRetries = 5) => {
+const fetchAllBlocks = async (pageId) => {
+    let hasMore = true;
+    let nextCursor = null;
+    let allResults = [];
+    while (hasMore) {
+        const pageUrl = `blocks/${pageId}/children?page_size=100${nextCursor ? `&start_cursor=${nextCursor}` : ""}`;
+        const result = await (0, exports.fetchGetWithRetry)(pageUrl);
+        if (result?.results?.length) {
+            allResults = [...allResults, ...result.results]; // 기존 데이터와 병합
+        }
+        hasMore = result.has_more || false; // 다음 데이터가 있는지 확인
+        nextCursor = result.next_cursor || null; // 다음 페이지 커서 업데이트
+    }
+    return allResults;
+};
+exports.fetchAllBlocks = fetchAllBlocks;
+/**
+ * Notion API에서 GET 요청을 수행하는 함수 (재시도 로직 포함)
+ */
+const fetchGetWithRetry = async (url, options = {}, tryCount = 0, maxRetries = 5) => {
     try {
-        const response = await connector_1.instance.post(url, body);
-        // Return data if the request was successful
-        return response.data;
+        const response = await connector_1.instance.get(url);
+        let results = response.data.results;
+        // Notion API 응답에 has_more가 있으면 추가 블록을 가져와 병합
+        if (response.data.has_more) {
+            const additionalResults = await (0, exports.fetchAllBlocks)(url.split("/")[1]); // pageId 추출
+            results = [...results, ...additionalResults]; // 기존 results에 추가 데이터 병합
+        }
+        return { ...response.data, results }; // 병합된 전체 데이터 반환
     }
     catch (error) {
         const status = error.response?.status;
         const message = error.response?.data?.message || `Unknown error`;
-        // Handle rate limit errors with exponential backoff
+        // Rate limit 오류 처리 (Exponential Backoff)
         if (status === constants_1.NOTION_LIMIT_ERROR && tryCount < maxRetries) {
-            const delay = Math.pow(2, tryCount) * 1000; // Exponential backoff: 1s, 2s, 4s...
+            const delay = Math.pow(2, tryCount) * 1000;
             console.log(`[${constants_1.PLUGIN_NAME}] Rate limit hit. Retrying in ${delay / 1000}s...`);
             await (0, timeLimit_1.sleep)(delay);
-            return (0, exports.fetchPostWithRetry)(url, body, tryCount + 1, maxRetries);
+            return (0, exports.fetchGetWithRetry)(url, options, tryCount + 1, maxRetries);
         }
-        // Handle unexpected errors with retry
+        // 기타 예외 처리 (Exponential Backoff)
         if (tryCount < maxRetries) {
-            const delay = Math.pow(2, tryCount) * 1000; // Exponential backoff
+            const delay = Math.pow(2, tryCount) * 1000;
             console.log(`[${constants_1.PLUGIN_NAME}] Unexpected error. Retrying in ${delay / 1000}s...`);
             await (0, timeLimit_1.sleep)(delay);
-            return (0, exports.fetchPostWithRetry)(url, body, tryCount + 1, maxRetries);
+            return (0, exports.fetchGetWithRetry)(url, options, tryCount + 1, maxRetries);
         }
-        // Log and throw the error if all retries fail
+        // 최대 재시도 초과 시 오류 출력 후 throw
         console.error(`[${constants_1.PLUGIN_NAME}] Failed after ${tryCount} retries:`, message);
         throw error;
     }
 };
-exports.fetchPostWithRetry = fetchPostWithRetry;
+exports.fetchGetWithRetry = fetchGetWithRetry;
 /**
- * General GET/PUT/DELETE request with retry logic using axios instance
+ * Notion API에서 POST 요청을 수행하는 함수 (재시도 로직 포함)
  * @param {string} url - API endpoint URL
- * @param {any} options - Axios request options
- * @param {number} tryCount - Current retry count
- * @param {number} maxRetries - Maximum retry attempts
- * @returns {Promise<any>}
+ * @param {any} body - 요청 데이터
+ * @param {number} tryCount - 현재 재시도 횟수
+ * @param {number} maxRetries - 최대 재시도 횟수
+ * @returns {Promise<any>} API 응답 데이터
  */
-const fetchGetWithRetry = async (url, options = {}, tryCount = 0, maxRetries = 5) => {
+const fetchPostWithRetry = async (url, body, tryCount = 0, maxRetries = 5) => {
     try {
-        const response = await connector_1.instance.get(url);
-        const results = response.data.results;
-        for (const block of results) {
-            if (block.has_children) {
-                block.children = [];
-                const pageUrl = `blocks/${block.id}/children?page_size=100`;
-                const childData = await (0, exports.fetchGetWithRetry)(pageUrl);
-                const childResults = childData.results;
-                block.children.push(...childResults);
-            }
-        }
+        const response = await connector_1.instance.post(url, body);
+        // 요청 성공 시 데이터 반환
         return response.data;
     }
     catch (error) {
         const status = error.response?.status;
         const message = error.response?.data?.message || `Unknown error`;
-        // Handle rate limit errors with exponential backoff
+        // Rate limit 오류 처리 (Exponential Backoff)
         if (status === constants_1.NOTION_LIMIT_ERROR && tryCount < maxRetries) {
-            const delay = Math.pow(2, tryCount) * 1000; // Exponential backoff: 1s, 2s, 4s...
+            const delay = Math.pow(2, tryCount) * 1000;
             console.log(`[${constants_1.PLUGIN_NAME}] Rate limit hit. Retrying in ${delay / 1000}s...`);
             await (0, timeLimit_1.sleep)(delay);
-            return (0, exports.fetchGetWithRetry)(url, options, tryCount + 1, maxRetries);
+            return (0, exports.fetchPostWithRetry)(url, body, tryCount + 1, maxRetries);
         }
-        // Handle unexpected errors with retry
+        // 기타 예외 처리 (Exponential Backoff)
         if (tryCount < maxRetries) {
-            const delay = Math.pow(2, tryCount) * 1000; // Exponential backoff
+            const delay = Math.pow(2, tryCount) * 1000;
             console.log(`[${constants_1.PLUGIN_NAME}] Unexpected error. Retrying in ${delay / 1000}s...`);
             await (0, timeLimit_1.sleep)(delay);
-            return (0, exports.fetchGetWithRetry)(url, options, tryCount + 1, maxRetries);
+            return (0, exports.fetchPostWithRetry)(url, body, tryCount + 1, maxRetries);
         }
-        // Log and throw the error if all retries fail
+        // 최대 재시도 초과 시 오류 출력 후 throw
         console.error(`[${constants_1.PLUGIN_NAME}] Failed after ${tryCount} retries:`, message);
         throw error;
     }
 };
-exports.fetchGetWithRetry = fetchGetWithRetry;
+exports.fetchPostWithRetry = fetchPostWithRetry;

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