@or-sdk/contacts 3.2.2-beta.1737.0 → 3.2.2-beta.1747.0
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.
|
@@ -72,17 +72,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
72
72
|
}
|
|
73
73
|
return t;
|
|
74
74
|
};
|
|
75
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
76
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
77
|
-
if (ar || !(i in from)) {
|
|
78
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
79
|
-
ar[i] = from[i];
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
83
|
-
};
|
|
84
75
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
85
|
-
var types_contacts_api_1 = require("@onereach/types-contacts-api");
|
|
86
76
|
var baseApi_1 = require("./baseApi");
|
|
87
77
|
var utils_1 = require("../utils");
|
|
88
78
|
var constants_1 = require("../constants");
|
|
@@ -229,70 +219,55 @@ var ContactApi = (function (_super) {
|
|
|
229
219
|
});
|
|
230
220
|
});
|
|
231
221
|
};
|
|
232
|
-
ContactApi.prototype.createContactsInSingleBatch = function (data
|
|
233
|
-
if (repeats === void 0) { repeats = 0; }
|
|
222
|
+
ContactApi.prototype.createContactsInSingleBatch = function (data) {
|
|
234
223
|
return __awaiter(this, void 0, void 0, function () {
|
|
235
|
-
var
|
|
224
|
+
var batchProcess, batchProcessResult, contactIds, importedContacts;
|
|
236
225
|
return __generator(this, function (_a) {
|
|
237
226
|
switch (_a.label) {
|
|
238
|
-
case 0:
|
|
239
|
-
|
|
240
|
-
|
|
227
|
+
case 0: return [4, this.apiCall({
|
|
228
|
+
method: 'POST',
|
|
229
|
+
route: "".concat(this.apiBasePath, "/bulk"),
|
|
230
|
+
data: data,
|
|
231
|
+
})];
|
|
241
232
|
case 1:
|
|
242
|
-
_a.trys.push([1, 5, , 6]);
|
|
243
|
-
return [4, this.apiCall({
|
|
244
|
-
method: 'POST',
|
|
245
|
-
route: "".concat(this.apiBasePath, "/bulk"),
|
|
246
|
-
data: data,
|
|
247
|
-
})];
|
|
248
|
-
case 2:
|
|
249
233
|
batchProcess = _a.sent();
|
|
250
234
|
return [4, this.polling(batchProcess.id)];
|
|
251
|
-
case
|
|
235
|
+
case 2:
|
|
252
236
|
batchProcessResult = _a.sent();
|
|
253
237
|
contactIds = batchProcessResult.results.flatMap(function (i) { return JSON.parse(i); });
|
|
254
238
|
return [4, this.getSafelyContactsList(contactIds, data.contact_book)];
|
|
255
|
-
case
|
|
239
|
+
case 3:
|
|
256
240
|
importedContacts = _a.sent();
|
|
257
|
-
|
|
258
|
-
return [3, 6];
|
|
259
|
-
case 5:
|
|
260
|
-
e_1 = _a.sent();
|
|
261
|
-
if (repeats < constants_1.FAILED_REQUEST_REPEATS) {
|
|
262
|
-
return [2, this.createContactsInSingleBatch(data, repeats + 1)];
|
|
263
|
-
}
|
|
264
|
-
throw e_1;
|
|
265
|
-
case 6: return [2, contacts];
|
|
241
|
+
return [2, importedContacts.items];
|
|
266
242
|
}
|
|
267
243
|
});
|
|
268
244
|
});
|
|
269
245
|
};
|
|
270
246
|
ContactApi.prototype.createContactsInMultiBatches = function (contactsChunks, data) {
|
|
271
247
|
return __awaiter(this, void 0, void 0, function () {
|
|
272
|
-
var batchPromises, results,
|
|
248
|
+
var batchPromises, results, _i, batchPromises_1, fn, singleBatchResults;
|
|
273
249
|
var _this = this;
|
|
274
250
|
return __generator(this, function (_a) {
|
|
275
251
|
switch (_a.label) {
|
|
276
252
|
case 0:
|
|
277
|
-
batchPromises = contactsChunks.map(function (
|
|
253
|
+
batchPromises = contactsChunks.map(function (chunkContacts) { return function () { return __awaiter(_this, void 0, void 0, function () {
|
|
278
254
|
return __generator(this, function (_a) {
|
|
279
|
-
return [2, this.createContactsInSingleBatch(__assign({ contacts:
|
|
255
|
+
return [2, this.createContactsInSingleBatch(__assign({ contacts: chunkContacts }, data))];
|
|
280
256
|
});
|
|
281
257
|
}); }; });
|
|
282
258
|
results = [];
|
|
283
|
-
|
|
284
|
-
i = 0;
|
|
259
|
+
_i = 0, batchPromises_1 = batchPromises;
|
|
285
260
|
_a.label = 1;
|
|
286
261
|
case 1:
|
|
287
|
-
if (!(
|
|
288
|
-
|
|
289
|
-
return [4,
|
|
262
|
+
if (!(_i < batchPromises_1.length)) return [3, 4];
|
|
263
|
+
fn = batchPromises_1[_i];
|
|
264
|
+
return [4, fn()];
|
|
290
265
|
case 2:
|
|
291
|
-
|
|
292
|
-
results.push.apply(results,
|
|
266
|
+
singleBatchResults = _a.sent();
|
|
267
|
+
results.push.apply(results, singleBatchResults);
|
|
293
268
|
_a.label = 3;
|
|
294
269
|
case 3:
|
|
295
|
-
|
|
270
|
+
_i++;
|
|
296
271
|
return [3, 1];
|
|
297
272
|
case 4: return [2, results];
|
|
298
273
|
}
|
|
@@ -300,24 +275,21 @@ var ContactApi = (function (_super) {
|
|
|
300
275
|
});
|
|
301
276
|
};
|
|
302
277
|
ContactApi.prototype.polling = function (batchId, repeats) {
|
|
303
|
-
if (repeats === void 0) { repeats = 0; }
|
|
304
278
|
return __awaiter(this, void 0, void 0, function () {
|
|
305
279
|
var batchProcessState;
|
|
306
280
|
var _this = this;
|
|
307
281
|
return __generator(this, function (_a) {
|
|
308
282
|
switch (_a.label) {
|
|
309
283
|
case 0: return [4, this.batchProcessApi.getBatchProcess(batchId).catch(function (e) {
|
|
284
|
+
repeats = repeats || 0;
|
|
310
285
|
if (repeats < constants_1.FAILED_REQUEST_REPEATS) {
|
|
311
286
|
return _this.polling(batchId, repeats + 1);
|
|
312
287
|
}
|
|
313
|
-
throw e;
|
|
288
|
+
throw new Error(e);
|
|
314
289
|
})];
|
|
315
290
|
case 1:
|
|
316
291
|
batchProcessState = _a.sent();
|
|
317
|
-
|
|
318
|
-
throw new Error(batchProcessState.messages.join(', '));
|
|
319
|
-
}
|
|
320
|
-
return [2, batchProcessState.status === types_contacts_api_1.BatchProcessStatus.pending ? this.polling(batchId) : batchProcessState];
|
|
292
|
+
return [2, batchProcessState.status === 'pending' ? this.polling(batchId) : batchProcessState];
|
|
321
293
|
}
|
|
322
294
|
});
|
|
323
295
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contactApi.js","sourceRoot":"","sources":["../../../src/api/contactApi.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contactApi.js","sourceRoot":"","sources":["../../../src/api/contactApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,6 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
18
18
|
}
|
|
19
19
|
return t;
|
|
20
20
|
};
|
|
21
|
-
import { BatchProcessStatus, } from '@onereach/types-contacts-api';
|
|
22
21
|
import { BaseApi } from './baseApi';
|
|
23
22
|
import { getObjectSizeInBytes, chunkArrByMaxSize } from '../utils';
|
|
24
23
|
import { REQUEST_PAYLOAD_MAX_BYTES, FAILED_REQUEST_REPEATS, CONTACTS_DELETE_MAX_AMOUNT } from '../constants';
|
|
@@ -141,56 +140,42 @@ export default class ContactApi extends BaseApi {
|
|
|
141
140
|
yield this.polling(batchProcess.id);
|
|
142
141
|
});
|
|
143
142
|
}
|
|
144
|
-
createContactsInSingleBatch(data
|
|
143
|
+
createContactsInSingleBatch(data) {
|
|
145
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const importedContacts = yield this.getSafelyContactsList(contactIds, data.contact_book);
|
|
156
|
-
contacts = importedContacts.items;
|
|
157
|
-
}
|
|
158
|
-
catch (e) {
|
|
159
|
-
if (repeats < FAILED_REQUEST_REPEATS) {
|
|
160
|
-
return this.createContactsInSingleBatch(data, repeats + 1);
|
|
161
|
-
}
|
|
162
|
-
throw e;
|
|
163
|
-
}
|
|
164
|
-
return contacts;
|
|
145
|
+
const batchProcess = yield this.apiCall({
|
|
146
|
+
method: 'POST',
|
|
147
|
+
route: `${this.apiBasePath}/bulk`,
|
|
148
|
+
data,
|
|
149
|
+
});
|
|
150
|
+
const batchProcessResult = yield this.polling(batchProcess.id);
|
|
151
|
+
const contactIds = batchProcessResult.results.flatMap(i => JSON.parse(i));
|
|
152
|
+
const importedContacts = yield this.getSafelyContactsList(contactIds, data.contact_book);
|
|
153
|
+
return importedContacts.items;
|
|
165
154
|
});
|
|
166
155
|
}
|
|
167
156
|
createContactsInMultiBatches(contactsChunks, data) {
|
|
168
157
|
return __awaiter(this, void 0, void 0, function* () {
|
|
169
|
-
const batchPromises = contactsChunks.map((
|
|
170
|
-
return this.createContactsInSingleBatch(Object.assign({ contacts }, data));
|
|
158
|
+
const batchPromises = contactsChunks.map((chunkContacts) => () => __awaiter(this, void 0, void 0, function* () {
|
|
159
|
+
return this.createContactsInSingleBatch(Object.assign({ contacts: chunkContacts }, data));
|
|
171
160
|
}));
|
|
172
161
|
const results = [];
|
|
173
|
-
const
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
const chunkResults = yield Promise.all(chunk.map((p) => p()));
|
|
177
|
-
results.push(...chunkResults.reduce((acc, r) => ([...acc, ...r]), []));
|
|
162
|
+
for (const fn of batchPromises) {
|
|
163
|
+
const singleBatchResults = yield fn();
|
|
164
|
+
results.push(...singleBatchResults);
|
|
178
165
|
}
|
|
179
166
|
return results;
|
|
180
167
|
});
|
|
181
168
|
}
|
|
182
|
-
polling(batchId, repeats
|
|
169
|
+
polling(batchId, repeats) {
|
|
183
170
|
return __awaiter(this, void 0, void 0, function* () {
|
|
184
171
|
const batchProcessState = yield this.batchProcessApi.getBatchProcess(batchId).catch((e) => {
|
|
172
|
+
repeats = repeats || 0;
|
|
185
173
|
if (repeats < FAILED_REQUEST_REPEATS) {
|
|
186
174
|
return this.polling(batchId, repeats + 1);
|
|
187
175
|
}
|
|
188
|
-
throw e;
|
|
176
|
+
throw new Error(e);
|
|
189
177
|
});
|
|
190
|
-
|
|
191
|
-
throw new Error(batchProcessState.messages.join(', '));
|
|
192
|
-
}
|
|
193
|
-
return batchProcessState.status === BatchProcessStatus.pending ? this.polling(batchId) : batchProcessState;
|
|
178
|
+
return batchProcessState.status === 'pending' ? this.polling(batchId) : batchProcessState;
|
|
194
179
|
});
|
|
195
180
|
}
|
|
196
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contactApi.js","sourceRoot":"","sources":["../../../src/api/contactApi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"contactApi.js","sourceRoot":"","sources":["../../../src/api/contactApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contactApi.d.ts","sourceRoot":"","sources":["../../../src/api/contactApi.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"contactApi.d.ts","sourceRoot":"","sources":["../../../src/api/contactApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAEhB,kBAAkB,EAClB,gBAAgB,EAChB,yBAAyB,EACzB,2BAA2B,EAC3B,sBAAsB,EACtB,gBAAgB,EAChB,yBAAyB,EACzB,oBAAoB,EACpB,qBAAqB,EACrB,2BAA2B,EAC3B,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAIhD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAE3C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC;IACnE,OAAO,CAAC,eAAe;gBADJ,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,EAC3D,eAAe,EAAE,eAAe;IAK1C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IAOzC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAY7E,WAAW,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAa3E,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAa9E,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAatE,WAAW,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7D,aAAa,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAY5D,kBAAkB,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAexF,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAanF,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlE,iBAAiB,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAajE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtE,mBAAmB,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;YAQvD,qBAAqB;YAkBrB,kBAAkB;YASlB,2BAA2B;YAY3B,4BAA4B;YAoB5B,OAAO;CAWtB"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "3.2.2-beta.
|
|
2
|
+
"version": "3.2.2-beta.1747.0",
|
|
3
3
|
"name": "@or-sdk/contacts",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
5
|
"module": "dist/esm/index.js",
|
|
@@ -25,6 +25,6 @@
|
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@onereach/types-contacts-api": "4.3.2-beta.2135.0",
|
|
28
|
-
"@or-sdk/base": "^0.28.
|
|
28
|
+
"@or-sdk/base": "^0.28.4-beta.1747.0"
|
|
29
29
|
}
|
|
30
30
|
}
|
package/src/api/contactApi.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
2
|
BatchProcessResponseDto,
|
|
3
|
-
BatchProcessStatus,
|
|
4
3
|
ContactParamsDto,
|
|
5
4
|
ContactRequestDto,
|
|
6
5
|
ContactResponseDto,
|
|
@@ -215,47 +214,31 @@ export default class ContactApi extends BaseApi {
|
|
|
215
214
|
await this.polling(batchProcess.id);
|
|
216
215
|
}
|
|
217
216
|
|
|
218
|
-
private async createContactsInSingleBatch(
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
});
|
|
229
|
-
const batchProcessResult = await this.polling(batchProcess.id);
|
|
230
|
-
const contactIds = batchProcessResult.results.flatMap<string>(i => JSON.parse(i));
|
|
231
|
-
const importedContacts = await this.getSafelyContactsList(contactIds, data.contact_book);
|
|
232
|
-
contacts = importedContacts.items;
|
|
233
|
-
} catch (e) {
|
|
234
|
-
if (repeats < FAILED_REQUEST_REPEATS) {
|
|
235
|
-
return this.createContactsInSingleBatch(data, repeats + 1);
|
|
236
|
-
}
|
|
237
|
-
throw e;
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
return contacts;
|
|
217
|
+
private async createContactsInSingleBatch(data: CreateMultipleContactsDto): Promise<ContactResponseDto[]> {
|
|
218
|
+
const batchProcess = await this.apiCall<BatchProcessResponseDto>({
|
|
219
|
+
method: 'POST',
|
|
220
|
+
route: `${this.apiBasePath}/bulk`,
|
|
221
|
+
data,
|
|
222
|
+
});
|
|
223
|
+
const batchProcessResult = await this.polling(batchProcess.id);
|
|
224
|
+
const contactIds = batchProcessResult.results.flatMap<string>(i => JSON.parse(i));
|
|
225
|
+
const importedContacts = await this.getSafelyContactsList(contactIds, data.contact_book);
|
|
226
|
+
return importedContacts.items;
|
|
241
227
|
}
|
|
242
228
|
|
|
243
229
|
private async createContactsInMultiBatches(
|
|
244
230
|
contactsChunks: ContactRequestDto[][],
|
|
245
231
|
data: Omit<CreateMultipleContactsDto, 'contacts'>
|
|
246
232
|
): Promise<ContactResponseDto[]> {
|
|
247
|
-
const batchPromises = contactsChunks.map(
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
}));
|
|
233
|
+
const batchPromises = contactsChunks.map((chunkContacts) => async () => this.createContactsInSingleBatch({
|
|
234
|
+
contacts: chunkContacts,
|
|
235
|
+
...data,
|
|
236
|
+
}));
|
|
252
237
|
|
|
253
238
|
const results: ContactResponseDto[] = [];
|
|
254
|
-
const
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
const chunkResults = await Promise.all(chunk.map((p) => p()));
|
|
258
|
-
results.push(...chunkResults.reduce((acc, r) => ([...acc, ...r]), []));
|
|
239
|
+
for (const fn of batchPromises) {
|
|
240
|
+
const singleBatchResults = await fn();
|
|
241
|
+
results.push(...singleBatchResults);
|
|
259
242
|
}
|
|
260
243
|
return results;
|
|
261
244
|
}
|
|
@@ -263,17 +246,15 @@ export default class ContactApi extends BaseApi {
|
|
|
263
246
|
/**
|
|
264
247
|
* Pols specific batch process until status of it isn't turned from 'pending to something else.
|
|
265
248
|
*/
|
|
266
|
-
private async polling(batchId: string, repeats
|
|
249
|
+
private async polling(batchId: string, repeats?: number): Promise<BatchProcessResponseDto> {
|
|
267
250
|
const batchProcessState = await this.batchProcessApi.getBatchProcess(batchId).catch((e) => {
|
|
251
|
+
repeats = repeats || 0;
|
|
268
252
|
if (repeats < FAILED_REQUEST_REPEATS) {
|
|
269
253
|
return this.polling(batchId, repeats + 1);
|
|
270
254
|
}
|
|
271
|
-
throw e;
|
|
255
|
+
throw new Error(e);
|
|
272
256
|
});
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
throw new Error(batchProcessState.messages.join(', '));
|
|
276
|
-
}
|
|
277
|
-
return batchProcessState.status === BatchProcessStatus.pending ? this.polling(batchId) : batchProcessState;
|
|
257
|
+
// value 'pending' is used because of https://onereach.atlassian.net/browse/CU-562
|
|
258
|
+
return batchProcessState.status === 'pending' ? this.polling(batchId) : batchProcessState;
|
|
278
259
|
}
|
|
279
260
|
}
|