@sipgate/integration-bridge 0.13.26 → 0.13.29

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 (17) hide show
  1. package/dist/cache/storage-cache.d.ts +1 -0
  2. package/dist/cache/storage-cache.js +21 -11
  3. package/dist/cache/storage-cache.js.map +1 -1
  4. package/dist/models/adapter.model.d.ts +2 -2
  5. package/dist/models/bridge-request.model.d.ts +4 -0
  6. package/dist/models/cache-item-state.model.d.ts +4 -8
  7. package/dist/models/call-event.model.d.ts +3 -0
  8. package/dist/models/controller.model.d.ts +2 -2
  9. package/dist/models/controller.model.js +22 -28
  10. package/dist/models/controller.model.js.map +1 -1
  11. package/dist/util/index.d.ts +1 -0
  12. package/dist/util/index.js +1 -0
  13. package/dist/util/index.js.map +1 -1
  14. package/dist/util/logger.util.d.ts +4 -0
  15. package/dist/util/logger.util.js +20 -0
  16. package/dist/util/logger.util.js.map +1 -0
  17. package/package.json +4 -4
package/dist/cache/storage-cache.d.ts CHANGED
@@ -7,6 +7,7 @@ export declare class StorageCache implements ContactCache {
7
7
  constructor(storageAdapter: StorageAdapter);
8
8
  get(key: string, getFreshValue?: (key: string) => Promise<Contact[]>): Promise<Contact[] | CacheItemState>;
9
9
  set(key: string, contacts: Contact[]): Promise<void>;
10
+ private setCacheState;
10
11
  delete(key: string): Promise<void>;
11
12
  private getRefreshed;
12
13
  private getCacheItemKey;
package/dist/cache/storage-cache.js CHANGED
@@ -47,7 +47,7 @@ class StorageCache {
47
47
  const now = new Date().getTime();
48
48
  const isValueStale = Boolean(!cacheItemState ||
49
49
  (cacheItemState.state === cache_item_state_model_1.CacheItemStateType.CACHED &&
50
- now > cacheItemState.updated + this.cacheRefreshIntervalMs));
50
+ now > cacheItemState.timestamp + this.cacheRefreshIntervalMs));
51
51
  if (getFreshValue && isValueStale) {
52
52
  this.log(`[${anonKey}] cached value was stale, fetching fresh contacts`);
53
53
  // we don't return the fresh value here because we don't want to wait on the result.
@@ -60,10 +60,10 @@ class StorageCache {
60
60
  }
61
61
  }
62
62
  catch (e) {
63
- this.logErr(`[${anonKey}] Unable to get cache".`, e);
63
+ this.logErr(`[${anonKey}] Unable to get contacts from cache`, e);
64
64
  }
65
65
  if (!getFreshValue) {
66
- this.log(`[${anonKey}] No getFreshValue function provided - returning empty array`);
66
+ this.log(`[${anonKey}] No "getFreshValue" function provided - returning empty array`);
67
67
  return [];
68
68
  }
69
69
  this.log(`[${anonKey}] Found no match in cache. Getting fresh value.`);
@@ -82,6 +82,21 @@ class StorageCache {
82
82
  }
83
83
  });
84
84
  }
85
+ setCacheState(key, state, ttl) {
86
+ return __awaiter(this, void 0, void 0, function* () {
87
+ const anonKey = (0, anonymize_key_1.anonymizeKey)(key);
88
+ this.log(`[${anonKey}] Setting cache state to ${state}`);
89
+ try {
90
+ yield this.storage.set(this.getCacheItemKey(key), {
91
+ timestamp: Date.now(),
92
+ state,
93
+ }, ttl);
94
+ }
95
+ catch (error) {
96
+ this.logErr(`[${anonKey}] Unable to set cache state`, error);
97
+ }
98
+ });
99
+ }
85
100
  delete(key) {
86
101
  return __awaiter(this, void 0, void 0, function* () {
87
102
  const anonKey = (0, anonymize_key_1.anonymizeKey)(key);
@@ -90,7 +105,7 @@ class StorageCache {
90
105
  yield this.storage.delete(key);
91
106
  }
92
107
  catch (e) {
93
- this.logErr(`[${anonKey}] Unable to delete cache`, e);
108
+ this.logErr(`[${anonKey}] Unable to remove contacts from cache`, e);
94
109
  }
95
110
  });
96
111
  }
@@ -98,17 +113,12 @@ class StorageCache {
98
113
  return __awaiter(this, void 0, void 0, function* () {
99
114
  const anonKey = (0, anonymize_key_1.anonymizeKey)(key);
100
115
  this.log(`[${anonKey}] Setting cache state to FETCHING`);
101
- yield this.storage.set(this.getCacheItemKey(key), {
102
- state: cache_item_state_model_1.CacheItemStateType.FETCHING,
103
- }, CACHE_STATE_SECONDS_TTL);
116
+ yield this.setCacheState(key, cache_item_state_model_1.CacheItemStateType.FETCHING, CACHE_STATE_SECONDS_TTL);
104
117
  try {
105
118
  const freshValue = yield getFreshValue(key);
106
119
  yield this.set(key, freshValue);
107
120
  this.log(`[${anonKey}] Setting cache state to CACHED`);
108
- yield this.storage.set(this.getCacheItemKey(key), {
109
- state: cache_item_state_model_1.CacheItemStateType.CACHED,
110
- updated: Date.now(),
111
- });
121
+ yield this.setCacheState(key, cache_item_state_model_1.CacheItemStateType.CACHED);
112
122
  return freshValue;
113
123
  }
114
124
  catch (error) {
package/dist/cache/storage-cache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":"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"}
package/dist/models/adapter.model.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Request, Response } from "express";
2
- import { CalendarEvent, CalendarEventTemplate, CalendarFilterOptions, CallEvent, Config, Contact, ContactTemplate, ContactUpdate } from ".";
2
+ import { CalendarEvent, CalendarEventTemplate, CalendarFilterOptions, CallEvent, Config, Contact, ContactTemplate, ContactUpdate, UpdateCallEventBody } from ".";
3
3
  export interface Adapter {
4
4
  getToken?: (config: Config) => Promise<{
5
5
  apiKey: string;
@@ -11,7 +11,7 @@ export interface Adapter {
11
11
  getCalendarEvents?: (config: Config, options?: CalendarFilterOptions | null) => Promise<CalendarEvent[]>;
12
12
  createCalendarEvent?: (config: Config, event: CalendarEventTemplate) => Promise<CalendarEvent>;
13
13
  updateCalendarEvent?: (config: Config, id: string, event: CalendarEventTemplate) => Promise<CalendarEvent>;
14
- updateCallEvent?: (config: Config, id: string, event: CallEvent) => Promise<void>;
14
+ updateCallEvent?: (config: Config, id: string, event: UpdateCallEventBody) => Promise<void>;
15
15
  deleteCalendarEvent?: (config: Config, id: string) => Promise<void>;
16
16
  handleCallEvent?: (config: Config, event: CallEvent) => Promise<string>;
17
17
  handleConnectedEvent?: (config: Config) => Promise<void>;
package/dist/models/bridge-request.model.d.ts CHANGED
@@ -1,5 +1,9 @@
1
1
  import { Request } from "express";
2
2
  import { Config } from "./config.model";
3
+ import { UpdateCallEventBody } from "./call-event.model";
3
4
  export interface BridgeRequest extends Request {
4
5
  providerConfig?: Config;
5
6
  }
7
+ export interface UpdateCallEventBridgeRequest extends BridgeRequest {
8
+ body: UpdateCallEventBody;
9
+ }
package/dist/models/cache-item-state.model.d.ts CHANGED
@@ -2,11 +2,7 @@ export declare enum CacheItemStateType {
2
2
  CACHED = "CACHED",
3
3
  FETCHING = "FETCHING"
4
4
  }
5
- export interface CacheItemStateCached {
6
- state: CacheItemStateType.CACHED;
7
- updated: number;
8
- }
9
- export interface CacheItemStateFetching {
10
- state: CacheItemStateType.FETCHING;
11
- }
12
- export type CacheItemState = CacheItemStateCached | CacheItemStateFetching;
5
+ export type CacheItemState = {
6
+ state: CacheItemStateType;
7
+ timestamp: number;
8
+ };
package/dist/models/call-event.model.d.ts CHANGED
@@ -22,3 +22,6 @@ export interface CallEvent {
22
22
  note: string;
23
23
  state: CallState;
24
24
  }
25
+ export interface UpdateCallEventBody {
26
+ note: string;
27
+ }
package/dist/models/controller.model.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { NextFunction, Request, Response } from "express";
2
- import { Adapter, BridgeRequest, ContactCache } from ".";
2
+ import { Adapter, BridgeRequest, ContactCache, UpdateCallEventBridgeRequest } from ".";
3
3
  export declare class Controller {
4
4
  private adapter;
5
5
  private contactCache;
@@ -15,7 +15,7 @@ export declare class Controller {
15
15
  deleteCalendarEvent(req: BridgeRequest, res: Response, next: NextFunction): Promise<void>;
16
16
  handleCallEvent(req: BridgeRequest, res: Response, next: NextFunction): Promise<void>;
17
17
  handleConnectedEvent(req: BridgeRequest, res: Response, next: NextFunction): Promise<void>;
18
- updateCallEvent(req: BridgeRequest, res: Response, next: NextFunction): Promise<void>;
18
+ updateCallEvent(req: UpdateCallEventBridgeRequest, res: Response, next: NextFunction): Promise<void>;
19
19
  getHealth(req: BridgeRequest, res: Response, next: NextFunction): Promise<void>;
20
20
  oAuth2Redirect(req: Request, res: Response, next: NextFunction): Promise<void>;
21
21
  oAuth2Callback(req: Request, res: Response): Promise<void>;
package/dist/models/controller.model.js CHANGED
@@ -22,6 +22,7 @@ const call_event_util_1 = require("../util/call-event.util");
22
22
  const phone_number_utils_1 = require("../util/phone-number-utils");
23
23
  const validate_1 = require("../util/validate");
24
24
  const cache_item_state_model_1 = require("./cache-item-state.model");
25
+ const logger_util_1 = require("../util/logger.util");
25
26
  const CONTACT_FETCH_TIMEOUT = 3000;
26
27
  function sanitizeContact(contact, locale) {
27
28
  const result = Object.assign(Object.assign({}, contact), { phoneNumbers: contact.phoneNumbers.map((phoneNumber) => (0, phone_number_utils_1.parsePhoneNumber)(phoneNumber, locale)) });
@@ -35,36 +36,35 @@ class Controller {
35
36
  }
36
37
  getContacts(req, res, next) {
37
38
  return __awaiter(this, void 0, void 0, function* () {
38
- const { providerConfig: { apiKey = "", locale = "" } = {} } = req;
39
- const anonKey = (0, anonymize_key_1.anonymizeKey)(apiKey);
39
+ const { providerConfig } = req;
40
40
  try {
41
+ if (!providerConfig) {
42
+ throw new _1.ServerError(400, "Missing parameters");
43
+ }
41
44
  const fetchContacts = () => __awaiter(this, void 0, void 0, function* () {
42
45
  if (!this.adapter.getContacts) {
43
46
  throw new _1.ServerError(501, "Fetching contacts is not implemented");
44
47
  }
45
- if (!req.providerConfig) {
46
- throw new _1.ServerError(400, "Missing parameters");
47
- }
48
- console.log(`[${anonKey}] Fetching contacts`);
49
- const fetchedContacts = yield this.adapter.getContacts(req.providerConfig);
48
+ (0, logger_util_1.infoLogger)(providerConfig, `Fetching contacts…`);
49
+ const fetchedContacts = yield this.adapter.getContacts(providerConfig);
50
50
  if (!(0, validate_1.validate)(this.ajv, schemas_1.contactsSchema, fetchedContacts)) {
51
51
  throw new _1.ServerError(500, "Invalid contacts received");
52
52
  }
53
- return fetchedContacts.map((contact) => sanitizeContact(contact, locale));
53
+ return fetchedContacts.map((contact) => sanitizeContact(contact, providerConfig.locale));
54
54
  });
55
55
  const fetcherPromise = this.contactCache
56
- ? this.contactCache.get(apiKey, fetchContacts)
56
+ ? this.contactCache.get(providerConfig.apiKey, fetchContacts)
57
57
  : fetchContacts();
58
58
  const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve("TIMEOUT"), CONTACT_FETCH_TIMEOUT));
59
59
  const raceResult = yield Promise.race([fetcherPromise, timeoutPromise]);
60
60
  if (raceResult === "TIMEOUT") {
61
- console.log(`[${anonKey}] fetching too slow, returning empty array`);
61
+ (0, logger_util_1.infoLogger)(providerConfig, `Fetching too slow, returning empty array.`);
62
62
  }
63
63
  const responseContacts = Array.isArray(raceResult)
64
64
  ? raceResult
65
65
  : [];
66
66
  const contactsCount = responseContacts.length;
67
- console.log(`[${anonKey}] Found ${contactsCount} cached contacts`);
67
+ (0, logger_util_1.infoLogger)(providerConfig, `Found ${contactsCount} cached contacts.`);
68
68
  if (!Array.isArray(raceResult) &&
69
69
  (raceResult === "TIMEOUT" ||
70
70
  raceResult.state === cache_item_state_model_1.CacheItemStateType.FETCHING)) {
@@ -77,7 +77,7 @@ class Controller {
77
77
  res.status(200).send(responseContacts);
78
78
  }
79
79
  catch (error) {
80
- console.error("Could not get contacts:", error || "Unknown");
80
+ (0, logger_util_1.errorLogger)(providerConfig, "Could not get contacts:", error || "Unknown");
81
81
  next(error);
82
82
  }
83
83
  });
@@ -292,25 +292,25 @@ class Controller {
292
292
  }
293
293
  handleCallEvent(req, res, next) {
294
294
  return __awaiter(this, void 0, void 0, function* () {
295
- const { providerConfig: { apiKey = "" } = {} } = req;
295
+ const { providerConfig } = req;
296
296
  try {
297
+ if (!providerConfig) {
298
+ throw new _1.ServerError(400, "Missing config parameters");
299
+ }
297
300
  if (!this.adapter.handleCallEvent) {
298
301
  throw new _1.ServerError(501, "Handling call event is not implemented");
299
302
  }
300
- if (!req.providerConfig) {
301
- throw new _1.ServerError(400, "Missing config parameters");
302
- }
303
303
  if ((0, call_event_util_1.shouldSkipCallEvent)(req.body)) {
304
- console.log(`[${(0, anonymize_key_1.anonymizeKey)(apiKey)}] skipping call event for call id ${req.body.id}`);
304
+ (0, logger_util_1.infoLogger)(providerConfig, `Skipping call event for call id ${req.body.id}`);
305
305
  res.status(200).send("Skipping call event");
306
306
  return;
307
307
  }
308
- console.log(`[${(0, anonymize_key_1.anonymizeKey)(apiKey)}] Handling call event for key`);
309
- const integrationCallEventRef = yield this.adapter.handleCallEvent(req.providerConfig, req.body);
308
+ (0, logger_util_1.infoLogger)(providerConfig, `Handling call event`);
309
+ const integrationCallEventRef = yield this.adapter.handleCallEvent(providerConfig, req.body);
310
310
  res.status(200).send(integrationCallEventRef);
311
311
  }
312
312
  catch (error) {
313
- console.error("Could not handle call event:", error || "Unknown");
313
+ (0, logger_util_1.errorLogger)(providerConfig, "Could not handle call event:", error || "Unknown");
314
314
  next(error);
315
315
  }
316
316
  });
@@ -337,7 +337,7 @@ class Controller {
337
337
  }
338
338
  updateCallEvent(req, res, next) {
339
339
  return __awaiter(this, void 0, void 0, function* () {
340
- const { providerConfig: { apiKey = "" } = {} } = req;
340
+ const { providerConfig: { apiKey = "" } = {}, body, params } = req;
341
341
  try {
342
342
  if (!this.adapter.updateCallEvent) {
343
343
  throw new _1.ServerError(501, "Updating contacts is not implemented");
@@ -345,14 +345,8 @@ class Controller {
345
345
  if (!req.providerConfig) {
346
346
  throw new _1.ServerError(400, "Missing config parameters");
347
347
  }
348
- if ((0, call_event_util_1.shouldSkipCallEvent)(req.body)) {
349
- console.log(`[${(0, anonymize_key_1.anonymizeKey)(apiKey)}] skipping call event for call id ${req.body.id}`);
350
- res.status(200).send("Skipping call event");
351
- return;
352
- }
353
348
  console.log(`[${(0, anonymize_key_1.anonymizeKey)(apiKey)}] Updating call event`);
354
- //maybe return updated state obj
355
- yield this.adapter.updateCallEvent(req.providerConfig, req.params.id, req.body);
349
+ yield this.adapter.updateCallEvent(req.providerConfig, params.id, body);
356
350
  res.status(200).send();
357
351
  }
358
352
  catch (error) {
package/dist/models/controller.model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"controller.model.js","sourceRoot":"","sources":["../../src/models/controller.model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller.model.js","sourceRoot":"","sources":["../../src/models/controller.model.ts"],"names":[],"mappings":"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"}
package/dist/util/index.d.ts CHANGED
@@ -1,2 +1,3 @@
1
1
  export * from "./phone-number-utils";
2
2
  export * from "./anonymize-key";
3
+ export * from "./logger.util";
package/dist/util/index.js CHANGED
@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./phone-number-utils"), exports);
18
18
  __exportStar(require("./anonymize-key"), exports);
19
+ __exportStar(require("./logger.util"), exports);
19
20
  //# sourceMappingURL=index.js.map
package/dist/util/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,kDAAgC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,kDAAgC;AAChC,gDAA8B"}
package/dist/util/logger.util.d.ts ADDED
@@ -0,0 +1,4 @@
1
+ import { Config } from "../models";
2
+ export declare const infoLogger: ({ apiKey }: Config, message: string, ...args: unknown[]) => void;
3
+ export declare const errorLogger: (config: Config | undefined, message: string, ...args: unknown[]) => void;
4
+ export declare const warnLogger: ({ apiKey }: Config, message: string, ...args: unknown[]) => void;
package/dist/util/logger.util.js ADDED
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.warnLogger = exports.errorLogger = exports.infoLogger = void 0;
4
+ const anonymize_key_1 = require("./anonymize-key");
5
+ const infoLogger = ({ apiKey }, message, ...args) => {
6
+ // eslint-disable-next-line no-console
7
+ console.log(`${(0, anonymize_key_1.anonymizeKey)(apiKey)}: ${message}`, args && args.length ? args : "");
8
+ };
9
+ exports.infoLogger = infoLogger;
10
+ const errorLogger = (config, message, ...args) => {
11
+ // eslint-disable-next-line no-console
12
+ console.error(`${(config === null || config === void 0 ? void 0 : config.apiKey) ? (0, anonymize_key_1.anonymizeKey)(config.apiKey) : ""}: ${message}`, args && args.length ? args : "");
13
+ };
14
+ exports.errorLogger = errorLogger;
15
+ const warnLogger = ({ apiKey }, message, ...args) => {
16
+ // eslint-disable-next-line no-console
17
+ console.warn(`${(0, anonymize_key_1.anonymizeKey)(apiKey)}: ${message}`, args && args.length ? args : "");
18
+ };
19
+ exports.warnLogger = warnLogger;
20
+ //# sourceMappingURL=logger.util.js.map
package/dist/util/logger.util.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.util.js","sourceRoot":"","sources":["../../src/util/logger.util.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAGxC,MAAM,UAAU,GAAG,CACxB,EAAE,MAAM,EAAU,EAClB,OAAe,EACf,GAAG,IAAe,EACZ,EAAE;IACR,sCAAsC;IACtC,OAAO,CAAC,GAAG,CACT,GAAG,IAAA,4BAAY,EAAC,MAAM,CAAC,KAAK,OAAO,EAAE,EACrC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAChC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,UAAU,cAUrB;AAEK,MAAM,WAAW,GAAG,CACzB,MAA0B,EAC1B,OAAe,EACf,GAAG,IAAe,EACZ,EAAE;IACR,sCAAsC;IACtC,OAAO,CAAC,KAAK,CACX,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAC,CAAC,CAAC,IAAA,4BAAY,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,EAAE,EAClE,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAChC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,WAAW,eAUtB;AAEK,MAAM,UAAU,GAAG,CACxB,EAAE,MAAM,EAAU,EAClB,OAAe,EACf,GAAG,IAAe,EACZ,EAAE;IACR,sCAAsC;IACtC,OAAO,CAAC,IAAI,CACV,GAAG,IAAA,4BAAY,EAAC,MAAM,CAAC,KAAK,OAAO,EAAE,EACrC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAChC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,UAAU,cAUrB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sipgate/integration-bridge",
3
- "version": "0.13.26",
3
+ "version": "0.13.29",
4
4
  "description": "sipgate Integration Bridge Framework",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -62,13 +62,13 @@
62
62
  "@types/express": "4.17.17",
63
63
  "@types/jest": "^29.4.0",
64
64
  "@types/lru-cache": "7.10.9",
65
- "@types/node": "18.15.1",
65
+ "@types/node": "18.15.5",
66
66
  "@types/redis": "4.0.10",
67
67
  "husky": "8.0.3",
68
68
  "jest": "^29.4.0",
69
69
  "lint-staged": "13.2.0",
70
- "node-mocks-http": "1.12.1",
71
- "prettier": "2.8.4",
70
+ "node-mocks-http": "1.12.2",
71
+ "prettier": "2.8.6",
72
72
  "rimraf": "3.0.2",
73
73
  "ts-jest": "^29.0.5",
74
74
  "typescript": "4.9.5"