apaas-oapi-client 0.1.22 → 0.1.24

package/dist/index.js

@@ -169,12 +169,17 @@ class Client {
                     let total = 0;
                     let page = 0;
                     let totalPages = 0;
+                    let hasMore = true;
                     const pageSize = data.page_size || 100;
-                    do {
+                    while (hasMore) {
                         await functionLimiter(async () => {
                             var _a, _b, _c, _d;
                             const mergedData = { ...data };
-                            if (nextPageToken) {
+                            // 如果使用 page_token，第一页需要传空字符串
+                            if (data.use_page_token) {
+                                mergedData.page_token = nextPageToken || '';
+                            }
+                            else if (nextPageToken) {
                                 mergedData.page_token = nextPageToken;
                             }
                             const res = await this.object.search.records({
@@ -197,15 +202,17 @@ class Client {
                                 this.log(LoggerLevel.info, `[object.search.recordsWithIterator] Starting paginated query: ${object_name}, total=${total}, pages=${totalPages}`);
                             }
                             nextPageToken = (_a = res.data) === null || _a === void 0 ? void 0 : _a.next_page_token;
+                            // 检查是否还有更多数据：next_page_token 存在且不为空字符串
+                            hasMore = !!(nextPageToken && nextPageToken !== '' && nextPageToken !== 'null');
                             const padLength = totalPages.toString().length;
                             const pageStr = page.toString().padStart(padLength, '0');
                             const totalPagesStr = totalPages.toString().padStart(padLength, '0');
                             this.log(LoggerLevel.info, `[object.search.recordsWithIterator] Page completed: [${pageStr}/${totalPagesStr}]`);
-                            this.log(LoggerLevel.debug, `[object.search.recordsWithIterator] Page ${page} details: items=${(_c = (_b = res.data) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.length}, nextToken=${nextPageToken || 'none'}`);
+                            this.log(LoggerLevel.debug, `[object.search.recordsWithIterator] Page ${page} details: items=${(_c = (_b = res.data) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.length}, nextToken=${nextPageToken || 'none'}, hasMore=${hasMore}`);
                             this.log(LoggerLevel.trace, `[object.search.recordsWithIterator] Page ${page} data: ${JSON.stringify((_d = res.data) === null || _d === void 0 ? void 0 : _d.items)}`);
                             return res;
                         });
-                    } while (nextPageToken);
+                    }
                     return { total, items: results };
                 }
             },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "apaas-oapi-client",
-    "version": "0.1.22",
+    "version": "0.1.24",
     "main": "dist/index.js",
     "exports": {
         ".": "./dist/index.js",
@@ -11,6 +11,7 @@
     "scripts": {
         "build": "rollup -c",
         "test": "jest",
+        "test:manual": "tsx test/test.ts",
         "dev": "ts-node src/index.ts",
         "release": "npm run build && npm version patch && git push origin main --follow-tags"
     },

package/src/index.ts

@@ -309,13 +309,17 @@ class Client {
                 let total = 0;
                 let page = 0;
                 let totalPages = 0;
+                let hasMore = true;
 
                 const pageSize = data.page_size || 100;
 
-                do {
+                while (hasMore) {
                     const pageRes = await functionLimiter(async () => {
                         const mergedData: any = { ...data };
-                        if (nextPageToken) {
+                        // 如果使用 page_token，第一页需要传空字符串
+                        if (data.use_page_token) {
+                            mergedData.page_token = nextPageToken || '';
+                        } else if (nextPageToken) {
                             mergedData.page_token = nextPageToken;
                         }
 
@@ -345,18 +349,21 @@ class Client {
                         }
 
                         nextPageToken = res.data?.next_page_token;
+                        
+                        // 检查是否还有更多数据：next_page_token 存在且不为空字符串
+                        hasMore = !!(nextPageToken && nextPageToken !== '' && nextPageToken !== 'null');
 
                         const padLength = totalPages.toString().length;
                         const pageStr = page.toString().padStart(padLength, '0');
                         const totalPagesStr = totalPages.toString().padStart(padLength, '0');
 
                         this.log(LoggerLevel.info, `[object.search.recordsWithIterator] Page completed: [${pageStr}/${totalPagesStr}]`);
-                        this.log(LoggerLevel.debug, `[object.search.recordsWithIterator] Page ${page} details: items=${res.data?.items?.length}, nextToken=${nextPageToken || 'none'}`);
+                        this.log(LoggerLevel.debug, `[object.search.recordsWithIterator] Page ${page} details: items=${res.data?.items?.length}, nextToken=${nextPageToken || 'none'}, hasMore=${hasMore}`);
                         this.log(LoggerLevel.trace, `[object.search.recordsWithIterator] Page ${page} data: ${JSON.stringify(res.data?.items)}`);
 
                         return res;
                     });
-                } while (nextPageToken);
+                }
 
                 return { total, items: results };
             }