apaas-oapi-client 0.1.12 → 0.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +10 -6
  2. package/package.json +1 -1
  3. package/src/index.ts +14 -6
package/dist/index.js CHANGED
@@ -148,12 +148,13 @@ class Client {
148
148
  let nextPageToken = '';
149
149
  let total = 0;
150
150
  let page = 0;
151
+ const url = `/v1/data/namespaces/${this.namespace}/objects/${object_name}/records_query`;
151
152
  do {
152
153
  await functionLimiter(async () => {
153
154
  const mergedData = { ...data, page_token: nextPageToken || '' };
154
- const res = await this.object.search.records({
155
- object_name,
156
- data: mergedData
155
+ await this.ensureTokenValid();
156
+ const res = await this.axiosInstance.post(url, mergedData, {
157
+ headers: { Authorization: `${this.accessToken}` }
157
158
  });
158
159
  page += 1;
159
160
  if (res.data && Array.isArray(res.data.items)) {
@@ -161,12 +162,15 @@ class Client {
161
162
  }
162
163
  if (page === 1) {
163
164
  total = res.data.total || 0;
164
- this.log(LoggerLevel.info, '[批量查询记录] 🔍 查询object_name=${object_name}, 接口返回 total:', total);
165
+ this.log(LoggerLevel.info, `[批量查询记录] 🔍 object_name=${object_name}, 接口返回 total: ${total}`);
165
166
  }
166
- nextPageToken = res.data.next_page_token;
167
- this.log(LoggerLevel.debug, `[批量查询记录] 🔍 第 ${page} 页查询, nextPageToken: ${nextPageToken || ''}`);
167
+ const totalPages = Math.ceil(total / (data.page_size || 100));
168
+ const padLength = String(totalPages).length;
169
+ this.log(LoggerLevel.info, `[批量查询记录] 🔍 [${String(page).padStart(padLength, '0')}/${totalPages}] 接口调用完成`);
170
+ this.log(LoggerLevel.debug, `[批量查询记录] 🔍 第 ${page} 页查询, nextPageToken: ${res.data.next_page_token || ''}`);
168
171
  this.log(LoggerLevel.debug, `[批量查询记录] 🔍 第 ${page} 页查询完成, items.length: ${res.data.items.length}`);
169
172
  this.log(LoggerLevel.trace, `[批量查询记录] 🔍 第 ${page} 页查询结果: ${JSON.stringify(res.data.items)}`);
173
+ nextPageToken = res.data.next_page_token;
170
174
  return res;
171
175
  });
172
176
  } while (nextPageToken);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apaas-oapi-client",
3
- "version": "0.1.12",
3
+ "version": "0.1.13",
4
4
  "main": "dist/index.js",
5
5
  "exports": {
6
6
  ".": "./dist/index.js",
package/src/index.ts CHANGED
@@ -284,13 +284,16 @@ class Client {
284
284
  let total = 0;
285
285
  let page = 0;
286
286
 
287
+ const url = `/v1/data/namespaces/${this.namespace}/objects/${object_name}/records_query`;
288
+
287
289
  do {
288
290
  const pageRes = await functionLimiter(async () => {
289
291
  const mergedData = { ...data, page_token: nextPageToken || '' };
290
292
 
291
- const res = await this.object.search.records({
292
- object_name,
293
- data: mergedData
293
+ await this.ensureTokenValid();
294
+
295
+ const res = await this.axiosInstance.post(url, mergedData, {
296
+ headers: { Authorization: `${this.accessToken}` }
294
297
  });
295
298
 
296
299
  page += 1;
@@ -301,14 +304,19 @@ class Client {
301
304
 
302
305
  if (page === 1) {
303
306
  total = res.data.total || 0;
304
- this.log(LoggerLevel.info, '[批量查询记录] 🔍 查询object_name=${object_name}, 接口返回 total:', total);
307
+ this.log(LoggerLevel.info, `[批量查询记录] 🔍 object_name=${object_name}, 接口返回 total: ${total}`);
305
308
  }
306
309
 
307
- nextPageToken = res.data.next_page_token;
310
+ const totalPages = Math.ceil(total / (data.page_size || 100));
311
+ const padLength = String(totalPages).length;
308
312
 
309
- this.log(LoggerLevel.debug, `[批量查询记录] 🔍 第 ${page} 页查询, nextPageToken: ${nextPageToken || ''}`);
313
+ this.log(LoggerLevel.info, `[批量查询记录] 🔍 [${String(page).padStart(padLength, '0')}/${totalPages}] 接口调用完成`);
314
+ this.log(LoggerLevel.debug, `[批量查询记录] 🔍 第 ${page} 页查询, nextPageToken: ${res.data.next_page_token || ''}`);
310
315
  this.log(LoggerLevel.debug, `[批量查询记录] 🔍 第 ${page} 页查询完成, items.length: ${res.data.items.length}`);
311
316
  this.log(LoggerLevel.trace, `[批量查询记录] 🔍 第 ${page} 页查询结果: ${JSON.stringify(res.data.items)}`);
317
+
318
+ nextPageToken = res.data.next_page_token;
319
+
312
320
  return res;
313
321
  });
314
322
  } while (nextPageToken);