@or-sdk/contacts 3.5.12-beta.2310.0 → 3.5.12-beta.2313.0

package/README.md

@@ -61,7 +61,7 @@ const { bulkCreateApi } = new Contacts({
 // operation successfully, however, if bulk fails due to PostgreSQL
 // server workload, you can try to decrease the batch size with the
 // appropriated option
-const { created, failed } = await bulkCreateApi.bulkCreateContacts(
+const { created, failed } = bulkCreateApi.bulkCreateContacts(
   'some bulk name', // bulkName
   {
     contact_book: 'some book id', // optional
@@ -78,9 +78,34 @@ const { created, failed } = await bulkCreateApi.bulkCreateContacts(
  ```
 
  ## Track bulk progress
+
+ ### With trackBulkProgress
+
+Pay attention, please, the `getBulkProgress` should be run in parallel with bulkCreateContacts process!
+
+ ```typescript
+ const { bulkCreateApi } = new Contacts({
+  contactsApiUrl: ..., 
+  accountId: ..., 
+  token: ...,
+  withKeepAliveAgents: true
+});
+
+const {
+  totalBatches,
+  totalContacts,
+  completedBatches,
+  completedContacts,
+} = await bulkCreateApi.getBulkProgress('bulkName');
+
+ ```
+
+ ### With onProgress callback
+
 ```typescript
 import { Contacts } from '@or-sdk/contacts'
 
+// always use 'withKeepAliveAgents' option for bulk create
 const { bulkCreateApi } = new Contacts({
   contactsApiUrl: ..., 
   accountId: ..., 
@@ -88,16 +113,42 @@ const { bulkCreateApi } = new Contacts({
   withKeepAliveAgents: true
 });
 
-for await (const bulkResults of bulkCreateApi.trackBulkCreateContacts('bulkName', data)) {
-  if (bulkResults.type === 'progress') {
-    const progress = bulkResults.results;
-    // do progress related operations here
-  } else {
-    const results = bulkResults.results;
-    // process final results here
-  }
+const onBulkProgressCallback = ({
+  totalBatches,
+  completedBatches,
+  totalContacts,
+  completedContacts,
+}) => {
+  // go your progress logic here; code bellow is just an example
+  console.log('totalBatches = ', totalBatches);
+  console.log('completedBatches = ', completedBatches);
+  console.log('totalContacts = ', totalContacts);
+  console.log('completedContacts = ', completedContacts);
 
 }
 
+const { created, failed } = bulkCreateApi.bulkCreateContacts(
+  'some bulk name',
+  {
+    contact_book: 'some book id',
+    contacts: [...] 
+  },
+  { batchSize: 4000000 },
+  onBulkProgressCallback
+);
  ```
- 
+
+ Also note that onBulkProgressCallback can be passed as the 3-rd argument, if you don't need to specify any additional bulk options:
+
+ ```typescript
+ const { created, failed } = bulkCreateApi.bulkCreateContacts(
+  'some bulk name',
+  {
+    contact_book: 'some book id',
+    contacts: [...] 
+  },
+  { batchSize: 4000000 },
+  onBulkProgressCallback
+);
+
+ ```

package/dist/cjs/Contacts.js

@@ -69,18 +69,14 @@ var Contacts = (function (_super) {
         return parsedError;
     };
     Contacts.prototype.logApiError = function (e) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         console.error("url           : ".concat((_a = e.config) === null || _a === void 0 ? void 0 : _a.url));
         console.error("method        : ".concat(e.request.method));
         console.error("params        : ".concat(JSON.stringify(((_b = e.config) === null || _b === void 0 ? void 0 : _b.params) || {})));
-        console.error("data          : ".concat((function () {
-            var _a;
-            var str = JSON.stringify(((_a = e.config) === null || _a === void 0 ? void 0 : _a.data) || {});
-            return str.length > 150 ? str.slice(0, 149) + '...' : str;
-        })()));
+        console.error("data          : ".concat(JSON.stringify(((_c = e.config) === null || _c === void 0 ? void 0 : _c.data) || {})));
         console.error("status code   : ".concat(e.request.res.statusCode));
         console.error("status message: ".concat(e.request.res.statusMessage));
-        console.error("authorization : ".concat((_c = e.config) === null || _c === void 0 ? void 0 : _c.headers.Authorization));
+        console.error("authorization : ".concat((_d = e.config) === null || _d === void 0 ? void 0 : _d.headers.Authorization));
     };
     return Contacts;
 }(base_1.Base));

package/dist/cjs/Contacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"Contacts.js","sourceRoot":"","sources":["../../src/Contacts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Contacts.js","sourceRoot":"","sources":["../../src/Contacts.ts"],"names":[],"mappings":"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"}

package/dist/cjs/api/bulkContactsCreateApi.js

@@ -61,14 +61,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -80,17 +72,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -108,126 +89,126 @@ var BulkContactsCreateApi = (function (_super) {
         _this.apiBasePath = 'bulk-create';
         return _this;
     }
-    BulkContactsCreateApi.prototype.bulkCreateContacts = function (bulkName, data, options) {
-        var e_1, _a;
-        if (options === void 0) { options = {}; }
+    BulkContactsCreateApi.prototype.bulkCreateContacts = function (bulkName, data, onProgressOrOptions, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _b, _c, _d, type, results, e_1_1;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        _e.trys.push([0, 5, 6, 11]);
-                        _b = __asyncValues(this.trackBulkCreateContacts(bulkName, data, options));
-                        _e.label = 1;
-                    case 1: return [4, _b.next()];
-                    case 2:
-                        if (!(_c = _e.sent(), !_c.done)) return [3, 4];
-                        _d = _c.value, type = _d.type, results = _d.results;
-                        if (type === 'results') {
-                            return [2, results];
-                        }
-                        _e.label = 3;
-                    case 3: return [3, 1];
-                    case 4: return [3, 11];
-                    case 5:
-                        e_1_1 = _e.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3, 11];
-                    case 6:
-                        _e.trys.push([6, , 9, 10]);
-                        if (!(_c && !_c.done && (_a = _b.return))) return [3, 8];
-                        return [4, _a.call(_b)];
-                    case 7:
-                        _e.sent();
-                        _e.label = 8;
-                    case 8: return [3, 10];
-                    case 9:
-                        if (e_1) throw e_1.error;
-                        return [7];
-                    case 10: return [7];
-                    case 11: return [2, {
-                            created: {},
-                            failed: {},
-                        }];
-                }
-            });
-        });
-    };
-    BulkContactsCreateApi.prototype.trackBulkCreateContacts = function (bulkName, data, options) {
-        if (options === void 0) { options = {}; }
-        return __asyncGenerator(this, arguments, function trackBulkCreateContacts_1() {
-            var dataWithContactKeys, contacts, rest, contactsMaxSize, contactsChunks, _a, _b, progress, e_2_1, indicesOnBatchId, results;
-            var e_2, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _a, onProgressCallback, bulkOptions, dataWithContactKeys, _b, batchSize, results, contacts, rest, contactsMaxSize, contactsChunks, indicesOnBatchId_1;
+            var _this = this;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
+                        _a = this.getBulkDefaultArgs(onProgressOrOptions, options), onProgressCallback = _a[0], bulkOptions = _a[1];
                         dataWithContactKeys = this.updateContactsWithContactKeys(data);
-                        return [4, __await(this.indicesOff())];
+                        _b = bulkOptions.batchSize, batchSize = _b === void 0 ? constants_1.REQUEST_PAYLOAD_MAX_BYTES : _b;
+                        return [4, this.indicesOff()];
                     case 1:
-                        _d.sent();
-                        _d.label = 2;
+                        _c.sent();
+                        results = {
+                            created: {},
+                            failed: {},
+                        };
+                        return [4, this.setBulkProgress(bulkName)];
                     case 2:
-                        _d.trys.push([2, , 18, 20]);
+                        _c.sent();
+                        _c.label = 3;
+                    case 3:
+                        _c.trys.push([3, , 10, 12]);
                         contacts = dataWithContactKeys.contacts, rest = __rest(dataWithContactKeys, ["contacts"]);
-                        contactsMaxSize = options.batchSize || constants_1.REQUEST_PAYLOAD_MAX_BYTES - (0, utils_1.getObjectSizeInBytes)(__assign({}, rest));
+                        contactsMaxSize = batchSize - (0, utils_1.getObjectSizeInBytes)(__assign({}, rest));
                         contactsChunks = (0, utils_1.chunkArrByMaxSize)(contacts, contactsMaxSize);
-                        if (!(contactsChunks.length === 1 || options.batchesToProcess === 1)) return [3, 4];
-                        return [4, __await(this.createContactsInSingleBatch(dataWithContactKeys, bulkName))];
-                    case 3:
-                        _d.sent();
-                        return [3, 17];
+                        return [4, this.updateBulkProgress(bulkName, {
+                                totalBatches: contactsChunks.length,
+                                totalContacts: contacts.length,
+                                completedBatches: 0,
+                                completedContacts: 0,
+                            })];
                     case 4:
-                        _d.trys.push([4, 11, 12, 17]);
-                        _a = __asyncValues(this.createContactsInMultiBatches(contactsChunks, rest, bulkName, options));
-                        _d.label = 5;
-                    case 5: return [4, __await(_a.next())];
+                        _c.sent();
+                        if (!(contactsChunks.length === 1)) return [3, 7];
+                        return [4, this.createContactsInSingleBatch(dataWithContactKeys, bulkName)];
+                    case 5:
+                        _c.sent();
+                        return [4, this.increaseBulkProgress(bulkName, 1, dataWithContactKeys.contacts.length)];
                     case 6:
-                        if (!(_b = _d.sent(), !_b.done)) return [3, 10];
-                        progress = _b.value;
-                        return [4, __await({
-                                type: 'progress',
-                                results: progress,
-                            })];
-                    case 7: return [4, _d.sent()];
+                        _c.sent();
+                        return [3, 9];
+                    case 7: return [4, this.createContactsInMultiBatches(contactsChunks, rest, bulkName, onProgressCallback, bulkOptions)];
                     case 8:
-                        _d.sent();
-                        _d.label = 9;
-                    case 9: return [3, 5];
-                    case 10: return [3, 17];
+                        _c.sent();
+                        _c.label = 9;
+                    case 9: return [3, 12];
+                    case 10:
+                        indicesOnBatchId_1 = (0, uuid_1.v4)();
+                        this.indicesOn(indicesOnBatchId_1);
+                        return [4, (0, utils_1.debouncePromise)(function () { return _this.polling(indicesOnBatchId_1); }, 3000)];
                     case 11:
-                        e_2_1 = _d.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3, 17];
-                    case 12:
-                        _d.trys.push([12, , 15, 16]);
-                        if (!(_b && !_b.done && (_c = _a.return))) return [3, 14];
-                        return [4, __await(_c.call(_a))];
-                    case 13:
-                        _d.sent();
-                        _d.label = 14;
-                    case 14: return [3, 16];
-                    case 15:
-                        if (e_2) throw e_2.error;
+                        _c.sent();
                         return [7];
-                    case 16: return [7];
-                    case 17: return [3, 20];
-                    case 18:
-                        indicesOnBatchId = (0, uuid_1.v4)();
-                        return [4, __await(this.indicesOn(indicesOnBatchId))];
-                    case 19:
-                        _d.sent();
-                        return [7];
-                    case 20: return [4, __await(this.getBulkCreateResults(bulkName, options))];
-                    case 21:
-                        results = _d.sent();
-                        return [4, __await({
-                                type: 'results',
-                                results: results,
-                            })];
-                    case 22: return [4, _d.sent()];
-                    case 23:
-                        _d.sent();
-                        return [2];
+                    case 12: return [2, results];
+                }
+            });
+        });
+    };
+    BulkContactsCreateApi.prototype.getBulkDefaultArgs = function (onProgressOrOptions, options) {
+        if (typeof onProgressOrOptions === 'object' && options !== undefined) {
+            throw new Error('Wrong arguments, type of the onProgressOrOptions should be either a function or object and options, if passed, should be of object type.');
+        }
+        if (typeof onProgressOrOptions === 'function' && typeof options === 'object') {
+            return [onProgressOrOptions, options];
+        }
+        if (typeof onProgressOrOptions === 'object') {
+            return [function () { }, onProgressOrOptions];
+        }
+        return [function () { }, {}];
+    };
+    BulkContactsCreateApi.prototype.getBulkProgress = function (bulkName) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.apiCall({
+                        method: 'GET',
+                        route: "".concat(this.apiBasePath, "/bulk-progress/").concat(bulkName),
+                    })];
+            });
+        });
+    };
+    BulkContactsCreateApi.prototype.setBulkProgress = function (bulkName) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.apiCall({
+                        method: 'POST',
+                        route: "".concat(this.apiBasePath, "/bulk-progress/").concat(bulkName),
+                    })];
+            });
+        });
+    };
+    BulkContactsCreateApi.prototype.updateBulkProgress = function (bulkName, progress) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.apiCall({
+                        method: 'PATCH',
+                        route: "".concat(this.apiBasePath, "/bulk-progress/").concat(bulkName),
+                        data: progress,
+                    })];
+            });
+        });
+    };
+    BulkContactsCreateApi.prototype.increaseBulkProgress = function (bulkName, batchesDelta, contactsDelta) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, totalBatches, totalContacts, completedBatches, completedContacts, progress;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4, this.getBulkProgress(bulkName)];
+                    case 1:
+                        _a = _b.sent(), totalBatches = _a.totalBatches, totalContacts = _a.totalContacts, completedBatches = _a.completedBatches, completedContacts = _a.completedContacts;
+                        progress = {
+                            totalBatches: totalBatches,
+                            totalContacts: totalContacts,
+                            completedBatches: completedBatches + batchesDelta,
+                            completedContacts: completedContacts + contactsDelta,
+                        };
+                        return [4, this.updateBulkProgress(bulkName, progress)];
+                    case 2:
+                        _b.sent();
+                        return [2, progress];
                 }
             });
         });
@@ -244,19 +225,11 @@ var BulkContactsCreateApi = (function (_super) {
     };
     BulkContactsCreateApi.prototype.indicesOn = function (batchId) {
         return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.apiCall({
-                            method: 'POST',
-                            route: "".concat(this.apiBasePath, "/indices-on/").concat(batchId),
-                        });
-                        return [4, (0, utils_1.debouncePromise)(function () { return _this.polling(batchId); }, 3000)];
-                    case 1:
-                        _a.sent();
-                        return [2];
-                }
+                return [2, this.apiCall({
+                        method: 'POST',
+                        route: "".concat(this.apiBasePath, "/indices-on/").concat(batchId),
+                    })];
             });
         });
     };
@@ -280,22 +253,21 @@ var BulkContactsCreateApi = (function (_super) {
             }
         });
     };
-    BulkContactsCreateApi.prototype.getBulkCreateResults = function (batchGroupId, options) {
+    BulkContactsCreateApi.prototype.getBulkCreateResults = function (batchGroupId) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, total, firstResults, size, results, pageSize, i, nextResults;
+            var _a, total, firstResults, size, results, i, nextResults;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4, this.callGetBulkResults(batchGroupId, 0)];
                     case 1:
                         _a = _b.sent(), total = _a.total, firstResults = _a.results, size = _a.size;
                         results = __assign({}, firstResults);
-                        pageSize = options.bulkResultsPageSize || constants_1.BULK_RESULT_PAGE_SIZE;
                         if (!(total > size)) return [3, 5];
                         i = 1;
                         _b.label = 2;
                     case 2:
                         if (!(i <= Math.ceil((total - size) / size))) return [3, 5];
-                        return [4, this.callGetBulkResults(batchGroupId, i * pageSize)];
+                        return [4, this.callGetBulkResults(batchGroupId, i * 500)];
                     case 3:
                         nextResults = (_b.sent()).results;
                         results = {
@@ -314,10 +286,13 @@ var BulkContactsCreateApi = (function (_super) {
     BulkContactsCreateApi.prototype.callGetBulkResults = function (batchGroupId, skip) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2, this.apiCall({
-                        method: 'GET',
-                        route: "".concat(this.apiBasePath, "/bulk-results/").concat(batchGroupId, "/").concat(skip),
-                    })];
+                switch (_a.label) {
+                    case 0: return [4, this.apiCall({
+                            method: 'GET',
+                            route: "".concat(this.apiBasePath, "/bulk-results/").concat(batchGroupId, "/").concat(skip),
+                        })];
+                    case 1: return [2, _a.sent()];
+                }
             });
         });
     };
@@ -342,9 +317,9 @@ var BulkContactsCreateApi = (function (_super) {
             });
         });
     };
-    BulkContactsCreateApi.prototype.createContactsInMultiBatches = function (contactsBatches, data, batchGroupId, options) {
-        return __asyncGenerator(this, arguments, function createContactsInMultiBatches_1() {
-            var batchPromises, parallelBatchesAmount, progress, i, batch;
+    BulkContactsCreateApi.prototype.createContactsInMultiBatches = function (contactsBatches, data, batchGroupId, onProgress, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var batchPromises, promisesBatchSize, i, batch, contactsInBatches, currentProgress;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -355,35 +330,27 @@ var BulkContactsCreateApi = (function (_super) {
                                 return [2, this.createContactsInSingleBatch(__assign({ contacts: chunkContacts }, data), batchGroupId)];
                             });
                         }); }; });
-                        parallelBatchesAmount = options.parallelBatchesAmount || constants_1.MAX_PARALLEL_BATCH_PROCESSING;
-                        progress = {
-                            totalBatches: contactsBatches.length,
-                            totalContacts: contactsBatches.map(function (b) { return b.length; }).reduce(function (acc, curr) { return acc + curr; }, 0),
-                            completedBatches: 0,
-                            completedContacts: 0,
-                        };
+                        promisesBatchSize = options.parallelBatchesAmount || 4;
                         i = 0;
                         _a.label = 1;
                     case 1:
-                        if (!(i < (options.batchesToProcess || batchPromises.length))) return [3, 6];
-                        batch = batchPromises.slice(i, i + parallelBatchesAmount);
-                        return [4, __await(Promise.all(batch.map(function (p) { return p(); })))];
+                        if (!(i < batchPromises.length)) return [3, 5];
+                        batch = batchPromises.slice(i, i + promisesBatchSize);
+                        return [4, Promise.all(batch.map(function (p) { return p(); }))];
                     case 2:
                         _a.sent();
-                        progress.completedBatches += batch.length;
-                        progress.completedContacts += contactsBatches
-                            .slice(i, i + parallelBatchesAmount)
-                            .map(function (batch) { return batch.length; })
-                            .reduce(function (acc, curr) { return acc + curr; }, 0);
-                        return [4, __await(progress)];
-                    case 3: return [4, _a.sent()];
+                        contactsInBatches = contactsBatches
+                            .slice(i, i + promisesBatchSize)
+                            .reduce(function (acc, batch) { return acc + batch.length; }, 0);
+                        return [4, this.increaseBulkProgress(batchGroupId, batch.length, contactsInBatches)];
+                    case 3:
+                        currentProgress = _a.sent();
+                        onProgress(currentProgress);
+                        _a.label = 4;
                     case 4:
-                        _a.sent();
-                        _a.label = 5;
-                    case 5:
-                        i += parallelBatchesAmount;
+                        i += promisesBatchSize;
                         return [3, 1];
-                    case 6: return [2];
+                    case 5: return [2];
                 }
             });
         });

package/dist/cjs/api/bulkContactsCreateApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulkContactsCreateApi.js","sourceRoot":"","sources":["../../../src/api/bulkContactsCreateApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bulkContactsCreateApi.js","sourceRoot":"","sources":["../../../src/api/bulkContactsCreateApi.ts"],"names":[],"mappings":"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"}