@byted-apaas/server-sdk-node 1.1.17-beta.3 → 1.1.17-beta.5

package/context/db/impl/IObject.d.ts

@@ -155,21 +155,7 @@ export interface _IKQuery<T> {
      *   如果未设置排序字段，默认以 _id 增序查询；
      *   如果有设置排序字段，必须设置具有唯一属性的字段，否则会有数据重复的风险；
      * @param handler 业务处理函数
-     * @example
-     * ```
-     * await application.data.object('_user').findStream(async (records) => {
-     *     // doSomething ...
-     * });
-     * ```
-     */
-    findStream(handler: (records: object[]) => Promise<void>): Promise<void>;
-    /**
-     * 遍历全部符合条件的记录
-     * 注：
-     *   如果未设置排序字段，默认以 _id 增序查询；
-     *   如果有设置排序字段，必须设置具有唯一属性的字段，否则会有数据重复的风险；
-     * @param handler 业务处理函数
-     * @param pageLimit 分页查询的数量
+     * @param pageLimit 分页查询的数量，可选参数，默认值为 200，
      * @example
      * ```
      * await application.data.object('_user').findStream(async (records) => {
@@ -177,7 +163,7 @@ export interface _IKQuery<T> {
      * }, 300);
      * ```
      */
-    findStream(handler: (records: object[]) => Promise<void>, pageLimit: number): Promise<void>;
+    findStream: (handler: (records: object[]) => Promise<void>, pageLimit?: number) => Promise<void>;
     /**
      * 无需入参，返回符合条件的记录，单次返回 200 条
      * @example

package/context/db/impl/object.d.ts

@@ -1,7 +1,7 @@
 import { _Cond, _Record, _WhereCond } from '../../../types/types';
 import { _IKAsyncEndpoint, _IKQuery, _IKSyncEndpoint } from './IObject';
 import { AppCtx } from '../../../application/application';
-import { BatchResult } from "../../../common/structs";
+import { BatchResult } from '../../../common/structs';
 /**
  * _KObject is kunlun object, every method new a _KQuery object to deal.
  */
@@ -92,7 +92,7 @@ declare class _KQuery<T> implements _IKQuery<T> {
      * @Deprecated Use FindStream instead.
      */
     findAll(): Promise<_Record<T>[]>;
-    findStream(handler: (records: object[]) => Promise<void>): Promise<void>;
+    findStream(handler: (records: object[]) => Promise<void>, pageLimit?: number): Promise<void>;
     private walkRecordsByID;
     private walkRecordsByLimitOffset;
     private getRecordsByPage;

package/context/db/impl/object.js

@@ -139,9 +139,8 @@ class _KObjectSync {
         }
         recordMapList = permissionUtils.batchDelUnauthField(recordMapList).newRecords;
         let data = (this.appCtx && this.appCtx.mode == 'openSDK') ?
-            await (0, common_1.runCtxForOpenSDK)(this.appCtx, async () => {
-                return await Request.GetInstance().openSDKCreateRecordsBySync(this.apiName, recordMapList);
-            }) : await Request.GetInstance().createRecordsBySync(this.apiName, recordMapList, this.authType);
+            await (0, common_1.runCtxForOpenSDK)(this.appCtx, async () => await Request.GetInstance().openSDKCreateRecordsBySync(this.apiName, recordMapList))
+            : await Request.GetInstance().createRecordsBySync(this.apiName, recordMapList, this.authType);
         // todo: 确定函数返回值
         if (!(data instanceof Array) && data.record_ids) {
             return data.record_ids;
@@ -451,7 +450,7 @@ class _KQuery {
             offset = queryBuilder.getOffset();
             orders = queryBuilder.getOrder();
         }
-        if (pageLimit == 0) {
+        if (pageLimit === 0) {
             pageLimit = queryBuilder_1.defaultLimit;
         }
         if (orders.length === 0 && offset === 0) {
@@ -481,12 +480,15 @@ class _KQuery {
         let criterion;
         if (appCtx) {
             criterionV2 = (0, logicV2_1.buildCriterionV2)(queryV2.filter);
+            criterionV2.push({ leftValue: '_id', operator: operator_1.operates.GT, rightValue: maxId });
         }
         else {
             criterion = (0, logic_1.buildCriterion)(queryBuilder.getLogic(), apiName);
             if (queryBuilder.getLogic().logics.length > 0) { // 有自定义搜索条件时，需要获取 fields
                 criterion = await (0, logic_1.handleCriterion)(criterion);
             }
+            // 在最后，添加 _id>maxId 条件
+            criterion = (0, logic_1.addIDCriterion)(criterion, apiName, maxId);
         }
         while (true) {
             let newLimit = pageLimit;
@@ -498,7 +500,7 @@ class _KQuery {
             }
             let rs;
             if (appCtx) {
-                criterionV2.push({ leftValue: '_id', operator: operator_1.operates.GT, rightValue: maxId });
+                criterionV2[criterionV2.length - 1].rightValue = maxId;
                 const param = {
                     limit: newLimit,
                     offset: 0,
@@ -512,8 +514,8 @@ class _KQuery {
                 });
             }
             else {
-                // 添加 _id>maxId 条件
-                criterion = (0, logic_1.addIDCriterion)(criterion, apiName, maxId);
+                // 更新 maxId
+                criterion.conditions[criterion.conditions.length - 1].right.settings.data = maxId;
                 // 发起请求
                 rs = await Request.GetInstance().getRecordsOrCountByCriterion(apiName, criterion, queryBuilder.fuzzySearch, [new order_1.Order('_id', 'asc')], false, queryBuilder.getSelect(), 0, newLimit, false, this.authType);
             }
@@ -562,20 +564,24 @@ class _KQuery {
         let criterion;
         if (appCtx) {
             criterionV2 = (0, logicV2_1.buildCriterionV2)(queryV2.filter);
+            criterionV2.push({ leftValue: '_id', operator: operator_1.operates.GT, rightValue: maxId });
         }
         else {
             criterion = (0, logic_1.buildCriterion)(queryBuilder.getLogic(), apiName);
-            if (queryBuilder.getLogic().logics.length > 0) {
+            if (queryBuilder.getLogic().logics.length > 0) { // 有自定义搜索条件时，需要获取 fields
                 criterion = await (0, logic_1.handleCriterion)(criterion);
             }
+            // 在最后，添加 _id>maxId 条件
+            criterion = (0, logic_1.addIDCriterion)(criterion, apiName, maxId);
         }
-        for (let i = offset; !limit || i < offset + limit; i += pageLimit) {
+        let curOffset = offset;
+        while (true) {
             let newLimit = function () {
                 if (limit == 0) {
                     return pageLimit;
                 }
-                if (offset + limit - i < pageLimit) {
-                    return offset + limit - i;
+                if (offset + limit - curOffset < pageLimit) {
+                    return offset + limit - curOffset;
                 }
                 return pageLimit;
             }();
@@ -584,10 +590,10 @@ class _KQuery {
             }
             let rs;
             if (appCtx) {
-                criterionV2.push({ leftValue: '_id', operator: operator_1.operates.GT, rightValue: maxId });
+                criterionV2[criterionV2.length - 1].rightValue = maxId;
                 const param = {
                     limit: newLimit,
-                    offset: i,
+                    offset: curOffset,
                     sort: orders,
                     fields: selectFields,
                     count: false,
@@ -598,10 +604,10 @@ class _KQuery {
                 });
             }
             else {
-                // 添加 _id>maxId 条件
-                criterion = (0, logic_1.addIDCriterion)(criterion, apiName, maxId);
+                // 更新 maxId
+                criterion.conditions[criterion.conditions.length - 1].right.settings.data = maxId;
                 // 发起请求
-                rs = await Request.GetInstance().getRecordsOrCountByCriterion(apiName, criterion, queryBuilder.fuzzySearch, orders, false, selectFields, i, newLimit, false, this.authType);
+                rs = await Request.GetInstance().getRecordsOrCountByCriterion(apiName, criterion, queryBuilder.fuzzySearch, orders, false, selectFields, curOffset, newLimit, false, this.authType);
             }
             queryCount += rs.length;
             try {
@@ -615,6 +621,7 @@ class _KQuery {
             if (rs.length < pageLimit) {
                 break;
             }
+            curOffset += pageLimit;
         }
     }
     async getRecordsByPage() {

package/kunlun/operator/impl/logic.js

@@ -179,7 +179,7 @@ exports.buildExpression = buildExpression;
  */
 function addIDCriterion(criterion, apiName, maxId) {
     criterion.conditions.push(buildExpression(apiName, '_id', new Condition('_id', maxId, operator_1.operates.GT), criterion.conditions.length + 1));
-    let logics = criterion.logic.split('');
+    const logics = criterion.logic.split('');
     logics.splice(0, 0, '(');
     logics.push(' and ', `${criterion.conditions.length}`, ')');
     criterion.logic = logics.join('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.1.17-beta.3",
+  "version": "1.1.17-beta.5",
   "description": "aPaaS Server SDK",
   "author": "zhouwexin <zhouwexin@bytedance.com>",
   "homepage": "",

package/request/openapi.js

@@ -301,7 +301,7 @@ async function getRecordsOrCountByCriterion(objectApiName, criterion, fuzzySearc
     }
     // 3.请求
     options.json = {
-        'criterion': criterion,
+        criterion,
         order,
         'ignore_back_lookup_field': ignoreBackLookupField,
         'field_api_names': fieldApiNames,