@devrev/ts-adaas 1.10.1-beta.6 → 1.10.1-beta.8

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.
@@ -1 +1 @@
1
- {"version":3,"file":"attachments-streaming-pool.d.ts","sourceRoot":"","sources":["../../src/attachments-streaming/attachments-streaming-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAIzF,qBAAa,wBAAwB,CAAC,cAAc;IAClD,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,WAAW,CAAyB;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,MAAM,CAA4C;IAE1D,OAAO,CAAC,mBAAmB,CAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAM;gBAEnC,EACV,OAAO,EACP,WAAW,EACX,SAAc,EACd,MAAM,GACP,EAAE,8BAA8B,CAAC,cAAc,CAAC;YAQnC,cAAc;IAQtB,SAAS,IAAI,OAAO,CAAC,2BAA2B,CAAC;IAuCjD,kBAAkB;CAwEzB"}
1
+ {"version":3,"file":"attachments-streaming-pool.d.ts","sourceRoot":"","sources":["../../src/attachments-streaming/attachments-streaming-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,2BAA2B,EAC5B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAIzF,qBAAa,wBAAwB,CAAC,cAAc;IAClD,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,WAAW,CAAyB;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,MAAM,CAA4C;IAE1D,OAAO,CAAC,mBAAmB,CAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAM;gBAEnC,EACV,OAAO,EACP,WAAW,EACX,SAAc,EACd,MAAM,GACP,EAAE,8BAA8B,CAAC,cAAc,CAAC;YAQnC,cAAc;IAQtB,SAAS,IAAI,OAAO,CAAC,2BAA2B,CAAC;IAuCjD,kBAAkB;CA0EzB"}
@@ -76,7 +76,7 @@ class AttachmentsStreamingPool {
76
76
  return;
77
77
  }
78
78
  if (response === null || response === void 0 ? void 0 : response.error) {
79
- console.warn(`Skipping attachment with ID ${attachment.id} due to error: ${response.error}`);
79
+ console.warn(`Skipping attachment with ID ${attachment.id} due to error returned by the stream function`, response.error);
80
80
  await this.updateProgress();
81
81
  continue;
82
82
  }
@@ -87,7 +87,7 @@ class AttachmentsStreamingPool {
87
87
  await this.updateProgress();
88
88
  }
89
89
  catch (error) {
90
- console.warn(`Skipping attachment with ID ${attachment.id} due to error: ${error}`);
90
+ console.warn(`Skipping attachment with ID ${attachment.id} due to error in processAttachment function`, error);
91
91
  await this.updateProgress();
92
92
  }
93
93
  }
@@ -167,7 +167,7 @@ describe(attachments_streaming_pool_1.AttachmentsStreamingPool.name, () => {
167
167
  stream: mockStream
168
168
  });
169
169
  await pool.streamAll();
170
- expect(console.warn).toHaveBeenCalledWith('Skipping attachment with ID attachment-2 due to error: Error: Processing failed');
170
+ expect(console.warn).toHaveBeenCalledWith('Skipping attachment with ID attachment-2 due to error in processAttachment function', error);
171
171
  expect(mockAdapter.state.toDevRev.attachmentsMetadata.lastProcessedAttachmentsIdsList).toEqual([
172
172
  'attachment-1',
173
173
  'attachment-3'
@@ -54,5 +54,5 @@ exports.AIRDROP_DEFAULT_ITEM_TYPES = {
54
54
  exports.LIBRARY_VERSION = (0, helpers_1.getLibraryVersion)();
55
55
  exports.DEFAULT_LAMBDA_TIMEOUT = 10 * 60 * 1000; // 10 minutes
56
56
  exports.HARD_TIMEOUT_MULTIPLIER = 1.3;
57
- exports.MEMORY_LOG_INTERVAL = 10 * 1000; // 10 seconds
57
+ exports.MEMORY_LOG_INTERVAL = 30 * 1000; // 30 seconds
58
58
  exports.DEFAULT_SLEEP_DELAY_MS = 3 * 60 * 1000; // 3 minutes
@@ -26,5 +26,5 @@ export interface MemoryInfo {
26
26
  arrayBuffersMB: string;
27
27
  formattedMessage: string;
28
28
  }
29
- export declare function getMemoryUsage(): MemoryInfo | null;
29
+ export declare function getMemoryUsage(): MemoryInfo;
30
30
  //# sourceMappingURL=helpers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,UAAU,EACV,eAAe,EACf,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAM1B,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,GAAG;IAC9D,SAAS,EAAE,kBAAkB,GAAG,eAAe,CAAC;CACjD,CAiEA;AAED,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,YAAY,CAAA;CAAE,UAElE;AAED,wBAAgB,cAAc,CAAC,EAC7B,kBAAkB,EAClB,SAAS,GACV,EAAE;IACD,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B,GAAG,UAAU,EAAE,CA8Bf;AAED,wBAAgB,uBAAuB,CAAC,EACtC,aAAa,EACb,MAAM,GACP,EAAE;IACD,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,MAAM,EAAE,YAAY,CAAC;CACtB,GAAG,YAAY,EAAE,CA4BjB;AAGD,wBAAgB,mBAAmB,KAGzB,KAAK,GAAG,EAAE,OAAO,GAAG,SAS7B;AAGD,wBAAgB,iBAAiB,QAiBhC;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAG/B;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmBzD;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,cAAc,IAAI,UAAU,GAAG,IAAI,CAyClD"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,UAAU,EACV,eAAe,EACf,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAM1B,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,GAAG;IAC9D,SAAS,EAAE,kBAAkB,GAAG,eAAe,CAAC;CACjD,CAiEA;AAED,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,YAAY,CAAA;CAAE,UAElE;AAED,wBAAgB,cAAc,CAAC,EAC7B,kBAAkB,EAClB,SAAS,GACV,EAAE;IACD,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B,GAAG,UAAU,EAAE,CA8Bf;AAED,wBAAgB,uBAAuB,CAAC,EACtC,aAAa,EACb,MAAM,GACP,EAAE;IACD,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,MAAM,EAAE,YAAY,CAAC;CACtB,GAAG,YAAY,EAAE,CA4BjB;AAGD,wBAAgB,mBAAmB,KAGzB,KAAK,GAAG,EAAE,OAAO,GAAG,SAS7B;AAGD,wBAAgB,iBAAiB,QAiBhC;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAG/B;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmBzD;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,cAAc,IAAI,UAAU,CAyC3C"}
@@ -226,7 +226,7 @@ function getMemoryUsage() {
226
226
  };
227
227
  }
228
228
  catch (err) {
229
- console.error('Error retrieving memory usage:', err.message);
230
- return null;
229
+ console.warn('Error retrieving memory usage', err);
230
+ throw err;
231
231
  }
232
232
  }
@@ -1 +1 @@
1
- {"version":3,"file":"axios-client-internal.d.ts","sourceRoot":"","sources":["../../src/http/axios-client-internal.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,WAAW,+BAEf,CAAC;AAsEH,OAAO,EAAE,WAAW,EAAE,CAAC"}
1
+ {"version":3,"file":"axios-client-internal.d.ts","sourceRoot":"","sources":["../../src/http/axios-client-internal.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,WAAW,+BAEf,CAAC;AAmFH,OAAO,EAAE,WAAW,EAAE,CAAC"}
@@ -28,11 +28,15 @@ exports.axiosClient = axiosClient;
28
28
  // This will retry requests after 2, 4, 8, 16 and 32 seconds
29
29
  const delay = axios_retry_1.default.exponentialDelay(retryCount, error, 1000);
30
30
  const delayInSeconds = Math.round(delay / 1000);
31
- console.warn(`Retrying ${(_h = error.config) === null || _h === void 0 ? void 0 : _h.method} request to ${(_j = error.config) === null || _j === void 0 ? void 0 : _j.url} in ${delayInSeconds}s due to ${(_k = error.response) === null || _k === void 0 ? void 0 : _k.status} error.`);
31
+ // Handle network errors (no response) vs HTTP errors
32
+ const errorDescription = ((_h = error.response) === null || _h === void 0 ? void 0 : _h.status)
33
+ ? `${error.response.status} error`
34
+ : 'network (no response) error';
35
+ console.warn(`Retrying ${(_j = error.config) === null || _j === void 0 ? void 0 : _j.method} request to ${(_k = error.config) === null || _k === void 0 ? void 0 : _k.url} in ${delayInSeconds}s due to ${errorDescription}.`);
32
36
  return delay;
33
37
  },
34
38
  retryCondition: (error) => {
35
- var _a, _b, _c, _d, _e, _f;
39
+ var _a, _b, _c, _d, _e, _f, _g;
36
40
  const retryAfter = ((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b['retry-after']) ||
37
41
  ((_d = (_c = error.response) === null || _c === void 0 ? void 0 : _c.headers) === null || _d === void 0 ? void 0 : _d['Retry-After']);
38
42
  // 5xx errors
@@ -47,6 +51,11 @@ exports.axiosClient = axiosClient;
47
51
  Number(retryAfter) >= 0) {
48
52
  return true;
49
53
  }
54
+ // Network errors for idempotent requests if not 429, because 429 is handled above
55
+ else if (axios_retry_1.default.isNetworkOrIdempotentRequestError(error) &&
56
+ ((_g = error.response) === null || _g === void 0 ? void 0 : _g.status) !== 429) {
57
+ return true;
58
+ }
50
59
  // all other errors
51
60
  else {
52
61
  return false;
@@ -1 +1 @@
1
- {"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/workers/spawn.ts"],"names":[],"mappings":"AAYA,OAAO,EAIL,qBAAqB,EACrB,cAAc,EACf,MAAM,kBAAkB,CAAC;AA4D1B;;;;;;;;;;GAUG;AACH,wBAAsB,KAAK,CAAC,cAAc,EAAE,EAC1C,KAAK,EACL,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,OAAO,GACR,EAAE,qBAAqB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiEvD;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,wBAAwB,CAA6C;IAC7E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAA4C;gBAE/C,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;IAqE/D,OAAO,CAAC,aAAa;YAYP,kBAAkB;CA2BjC"}
1
+ {"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/workers/spawn.ts"],"names":[],"mappings":"AAYA,OAAO,EAIL,qBAAqB,EACrB,cAAc,EACf,MAAM,kBAAkB,CAAC;AA4D1B;;;;;;;;;;GAUG;AACH,wBAAsB,KAAK,CAAC,cAAc,EAAE,EAC1C,KAAK,EACL,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,OAAO,GACR,EAAE,qBAAqB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiEvD;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,wBAAwB,CAA6C;IAC7E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAA4C;gBAE/C,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;IAiF/D,OAAO,CAAC,aAAa;YAYP,kBAAkB;CA6BjC"}
@@ -182,11 +182,21 @@ class Spawn {
182
182
  this.alreadyEmitted = true;
183
183
  }
184
184
  });
185
- // Log memory usage every 10 seconds
185
+ // Log memory usage every 30 seconds
186
186
  this.memoryMonitoringInterval = setInterval(() => {
187
- const memoryInfo = (0, helpers_2.getMemoryUsage)();
188
- if (memoryInfo) {
189
- this.logger.info(memoryInfo.formattedMessage);
187
+ try {
188
+ const memoryInfo = (0, helpers_2.getMemoryUsage)();
189
+ if (memoryInfo) {
190
+ this.logger.info(memoryInfo.formattedMessage);
191
+ }
192
+ }
193
+ catch (error) {
194
+ // If memory monitoring fails, log the warning and clear the interval to prevent further issues
195
+ this.logger.warn('Memory monitoring failed, stopping logging of memory usage interval', error);
196
+ if (this.memoryMonitoringInterval) {
197
+ clearInterval(this.memoryMonitoringInterval);
198
+ this.memoryMonitoringInterval = undefined;
199
+ }
190
200
  }
191
201
  }, constants_1.MEMORY_LOG_INTERVAL);
192
202
  }
@@ -202,6 +212,7 @@ class Spawn {
202
212
  }
203
213
  }
204
214
  async exitFromMainThread() {
215
+ this.clearTimeouts();
205
216
  if (this.alreadyEmitted) {
206
217
  this.resolve();
207
218
  return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@devrev/ts-adaas",
3
- "version": "1.10.1-beta.6",
3
+ "version": "1.10.1-beta.8",
4
4
  "description": "Typescript library containing the ADaaS(AirDrop as a Service) control protocol.",
5
5
  "type": "commonjs",
6
6
  "main": "./dist/index.js",