@sipgate/integration-bridge 0.7.2 → 0.9.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.
- package/README.md +2 -3
- package/dist/cache/storage-cache.d.ts +3 -0
- package/dist/cache/storage-cache.js +22 -12
- package/dist/cache/storage-cache.js.map +1 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +37 -19
- package/dist/index.js.map +1 -1
- package/dist/models/adapter.model.d.ts +3 -3
- package/dist/models/controller.model.js +3 -18
- package/dist/models/controller.model.js.map +1 -1
- package/dist/models/custom-routers.model.d.ts +5 -0
- package/dist/models/custom-routers.model.js +3 -0
- package/dist/models/custom-routers.model.js.map +1 -0
- package/dist/util/get-contact-cache.js +3 -3
- package/dist/util/get-contact-cache.js.map +1 -1
- package/dist/util/phone-number-utils.d.ts +2 -0
- package/dist/util/phone-number-utils.js +6 -1
- package/dist/util/phone-number-utils.js.map +1 -1
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
# sipgate Integration Bridge Framework
|
|
2
2
|
|
|
3
|
-
This is the sipgate Integration Bridge framework to integrate sipgate apps with external services.
|
|
4
|
-
It provides a unified way to connect apps to any provider of external data management, like contacts or calendar events.
|
|
3
|
+
This is the sipgate Integration Bridge framework to integrate sipgate apps with external services. It provides a unified way to connect apps to any provider of external data management, like contacts or calendar events.
|
|
5
4
|
|
|
6
5
|
## Bootstrapping a new bridge
|
|
7
6
|
|
|
@@ -10,7 +9,7 @@ If you want to bootstrap a new sipgate Integration Bridge you can use this repos
|
|
|
10
9
|
## Installation
|
|
11
10
|
|
|
12
11
|
```shell
|
|
13
|
-
npm install
|
|
12
|
+
npm install @sipgate/integration-bridge
|
|
14
13
|
# or
|
|
15
14
|
yarn add @sipgate/integration-bridge
|
|
16
15
|
```
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.StorageCache = void 0;
|
|
13
13
|
const cache_item_state_model_1 = require("../models/cache-item-state.model");
|
|
14
14
|
const anonymize_key_1 = require("../util/anonymize-key");
|
|
15
|
+
const LOG_PREFIX = `[CACHE]`;
|
|
15
16
|
const CACHE_STATE_PREFIX = "cache-state:";
|
|
16
17
|
class StorageCache {
|
|
17
18
|
constructor(storageAdapter) {
|
|
@@ -22,7 +23,7 @@ class StorageCache {
|
|
|
22
23
|
this.cacheRefreshIntervalMs =
|
|
23
24
|
Math.max(Number(CACHE_REFRESH_INTERVAL), 1) * 1000;
|
|
24
25
|
}
|
|
25
|
-
|
|
26
|
+
this.log(`Initialized storage cache with maximum refresh interval of ${this.cacheRefreshIntervalMs / 1000}s.`);
|
|
26
27
|
}
|
|
27
28
|
get(key, getFreshValue) {
|
|
28
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -30,59 +31,59 @@ class StorageCache {
|
|
|
30
31
|
const cacheItemState = yield this.storage.get(this.getCacheItemKey(key));
|
|
31
32
|
if (cacheItemState &&
|
|
32
33
|
cacheItemState.state === cache_item_state_model_1.CacheItemStateType.FETCHING) {
|
|
33
|
-
|
|
34
|
+
this.log(`Not refreshing for key "${(0, anonymize_key_1.anonymizeKey)(key)}" because fetching is already in progress.`);
|
|
34
35
|
return cacheItemState;
|
|
35
36
|
}
|
|
36
37
|
const value = yield this.storage.get(key);
|
|
37
38
|
if (value) {
|
|
38
|
-
|
|
39
|
+
this.log(`Found match for key "${(0, anonymize_key_1.anonymizeKey)(key)}" in cache.`);
|
|
39
40
|
const now = new Date().getTime();
|
|
40
41
|
const isValueStale = Boolean(!cacheItemState ||
|
|
41
42
|
(cacheItemState.state === cache_item_state_model_1.CacheItemStateType.CACHED &&
|
|
42
43
|
now > cacheItemState.updated + this.cacheRefreshIntervalMs));
|
|
43
44
|
if (getFreshValue && isValueStale) {
|
|
44
45
|
this.getRefreshed(key, getFreshValue).catch((error) => {
|
|
45
|
-
|
|
46
|
+
this.logErr(`Unable to get fresh values for"${(0, anonymize_key_1.anonymizeKey)(key)}" with error ${error}`);
|
|
46
47
|
});
|
|
47
48
|
}
|
|
48
49
|
return value;
|
|
49
50
|
}
|
|
50
51
|
}
|
|
51
52
|
catch (e) {
|
|
52
|
-
|
|
53
|
+
this.logErr(`Unable to get cache for key "${(0, anonymize_key_1.anonymizeKey)(key)}".`, e);
|
|
53
54
|
}
|
|
54
55
|
if (!getFreshValue) {
|
|
55
56
|
return [];
|
|
56
57
|
}
|
|
57
|
-
|
|
58
|
+
this.log(`Found no match for key "${(0, anonymize_key_1.anonymizeKey)(key)}" in cache. Getting fresh value.`);
|
|
58
59
|
return this.getRefreshed(key, getFreshValue);
|
|
59
60
|
});
|
|
60
61
|
}
|
|
61
62
|
set(key, value) {
|
|
62
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
-
|
|
64
|
+
this.log(`Saving ${value.length} contacts for key "${(0, anonymize_key_1.anonymizeKey)(key)}" to cache.`);
|
|
64
65
|
try {
|
|
65
66
|
yield this.storage.set(key, value);
|
|
66
67
|
}
|
|
67
68
|
catch (e) {
|
|
68
|
-
|
|
69
|
+
this.logErr(`Unable to set cache for key "${(0, anonymize_key_1.anonymizeKey)(key)}".`, e);
|
|
69
70
|
}
|
|
70
71
|
});
|
|
71
72
|
}
|
|
72
73
|
delete(key) {
|
|
73
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
|
|
75
|
+
this.log(`Removing contacts for key "${(0, anonymize_key_1.anonymizeKey)(key)}" from cache.`);
|
|
75
76
|
try {
|
|
76
77
|
yield this.storage.delete(key);
|
|
77
78
|
}
|
|
78
79
|
catch (e) {
|
|
79
|
-
|
|
80
|
+
this.logErr(`Unable to delete cache for key "${(0, anonymize_key_1.anonymizeKey)(key)}".`, e);
|
|
80
81
|
}
|
|
81
82
|
});
|
|
82
83
|
}
|
|
83
84
|
getRefreshed(key, getFreshValue) {
|
|
84
85
|
return __awaiter(this, void 0, void 0, function* () {
|
|
85
|
-
|
|
86
|
+
this.log(`Refreshing value for ${(0, anonymize_key_1.anonymizeKey)(key)}.`);
|
|
86
87
|
yield this.storage.set(this.getCacheItemKey(key), {
|
|
87
88
|
state: cache_item_state_model_1.CacheItemStateType.FETCHING,
|
|
88
89
|
});
|
|
@@ -98,7 +99,7 @@ class StorageCache {
|
|
|
98
99
|
return freshValue;
|
|
99
100
|
}
|
|
100
101
|
catch (error) {
|
|
101
|
-
|
|
102
|
+
this.log(`Error while refreshing value for ${(0, anonymize_key_1.anonymizeKey)(key)}:`, error);
|
|
102
103
|
this.storage.delete(`${CACHE_STATE_PREFIX}${key}`);
|
|
103
104
|
this.storage.delete(key);
|
|
104
105
|
throw error;
|
|
@@ -108,6 +109,15 @@ class StorageCache {
|
|
|
108
109
|
getCacheItemKey(key) {
|
|
109
110
|
return `${CACHE_STATE_PREFIX}${key}`;
|
|
110
111
|
}
|
|
112
|
+
log(...args) {
|
|
113
|
+
console.log(this.constructLogMessage(args));
|
|
114
|
+
}
|
|
115
|
+
logErr(...args) {
|
|
116
|
+
console.error(this.constructLogMessage(args));
|
|
117
|
+
}
|
|
118
|
+
constructLogMessage(...args) {
|
|
119
|
+
return `${LOG_PREFIX} ${args.map(JSON.stringify).join(" ")}`;
|
|
120
|
+
}
|
|
111
121
|
}
|
|
112
122
|
exports.StorageCache = StorageCache;
|
|
113
123
|
//# sourceMappingURL=storage-cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6EAG0C;AAE1C,yDAAqD;AAErD,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAE1C,MAAa,YAAY;IAIvB,YAAY,cAA8B;QAFlC,2BAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAG5D,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;QAE9B,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;QAC/C,IAAI,sBAAsB,EAAE;YAC1B,IAAI,CAAC,sBAAsB;gBACzB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;SACtD;QAED,
|
|
1
|
+
{"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Server } from "http";
|
|
3
3
|
import { Adapter } from "./models";
|
|
4
|
-
|
|
4
|
+
import { CustomRouter } from "./models/custom-routers.model";
|
|
5
|
+
export declare function start(adapter: Adapter, customRouters?: CustomRouter[]): Server;
|
|
6
|
+
export declare const deleteCacheItem: (key: string) => Promise<void>;
|
|
7
|
+
export declare const getCacheItem: (key: string) => Promise<import("./models").Contact[] | import("./models/cache-item-state.model").CacheItemState>;
|
|
5
8
|
export * from "./models";
|
package/dist/index.js
CHANGED
|
@@ -13,11 +13,20 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
13
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
17
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
18
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
19
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
20
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
21
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
22
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
23
|
+
});
|
|
24
|
+
};
|
|
16
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
17
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
27
|
};
|
|
19
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.start = void 0;
|
|
29
|
+
exports.getCacheItem = exports.deleteCacheItem = exports.start = void 0;
|
|
21
30
|
const body_parser_1 = __importDefault(require("body-parser"));
|
|
22
31
|
const compression_1 = __importDefault(require("compression"));
|
|
23
32
|
const cors_1 = __importDefault(require("cors"));
|
|
@@ -25,7 +34,7 @@ const express_1 = __importDefault(require("express"));
|
|
|
25
34
|
const middlewares_1 = require("./middlewares");
|
|
26
35
|
const models_1 = require("./models");
|
|
27
36
|
const get_contact_cache_1 = require("./util/get-contact-cache");
|
|
28
|
-
const
|
|
37
|
+
const PORT = Number(process.env.PORT) || 8080;
|
|
29
38
|
const app = (0, express_1.default)();
|
|
30
39
|
app.use((0, compression_1.default)());
|
|
31
40
|
app.use((0, cors_1.default)({
|
|
@@ -34,26 +43,35 @@ app.use((0, cors_1.default)({
|
|
|
34
43
|
}));
|
|
35
44
|
app.use(body_parser_1.default.json());
|
|
36
45
|
app.use(middlewares_1.extractHeaderMiddleware);
|
|
37
|
-
|
|
38
|
-
|
|
46
|
+
const cache = (0, get_contact_cache_1.getContactCache)();
|
|
47
|
+
function start(adapter, customRouters = []) {
|
|
39
48
|
const controller = new models_1.Controller(adapter, cache);
|
|
40
|
-
app.get("/contacts", controller.getContacts);
|
|
41
|
-
app.post("/contacts", controller.createContact);
|
|
42
|
-
app.put("/contacts/:id", controller.updateContact);
|
|
43
|
-
app.delete("/contacts/:id", controller.deleteContact);
|
|
44
|
-
app.get("/calendar", controller.getCalendarEvents);
|
|
45
|
-
app.post("/calendar", controller.createCalendarEvent);
|
|
46
|
-
app.put("/calendar/:id", controller.updateCalendarEvent);
|
|
47
|
-
app.delete("/calendar/:id", controller.deleteCalendarEvent);
|
|
48
|
-
app.post("/events/calls", controller.handleCallEvent);
|
|
49
|
-
app.put("/events/calls/:id", controller.updateCallEvent);
|
|
50
|
-
app.post("/events/connected", controller.handleConnectedEvent);
|
|
51
|
-
app.get("/health", controller.getHealth);
|
|
52
|
-
app.get("/oauth2/redirect", controller.oAuth2Redirect);
|
|
53
|
-
app.get("/oauth2/callback", controller.oAuth2Callback);
|
|
49
|
+
app.get("/contacts", (req, res, next) => controller.getContacts(req, res, next));
|
|
50
|
+
app.post("/contacts", (req, res, next) => controller.createContact(req, res, next));
|
|
51
|
+
app.put("/contacts/:id", (req, res, next) => controller.updateContact(req, res, next));
|
|
52
|
+
app.delete("/contacts/:id", (req, res, next) => controller.deleteContact(req, res, next));
|
|
53
|
+
app.get("/calendar", (req, res, next) => controller.getCalendarEvents(req, res, next));
|
|
54
|
+
app.post("/calendar", (req, res, next) => controller.createCalendarEvent(req, res, next));
|
|
55
|
+
app.put("/calendar/:id", (req, res, next) => controller.updateCalendarEvent(req, res, next));
|
|
56
|
+
app.delete("/calendar/:id", (req, res, next) => controller.deleteCalendarEvent(req, res, next));
|
|
57
|
+
app.post("/events/calls", (req, res, next) => controller.handleCallEvent(req, res, next));
|
|
58
|
+
app.put("/events/calls/:id", (req, res, next) => controller.updateCallEvent(req, res, next));
|
|
59
|
+
app.post("/events/connected", (req, res, next) => controller.handleConnectedEvent(req, res, next));
|
|
60
|
+
app.get("/health", (req, res, next) => controller.getHealth(req, res, next));
|
|
61
|
+
app.get("/oauth2/redirect", (req, res, next) => controller.oAuth2Redirect(req, res, next));
|
|
62
|
+
app.get("/oauth2/callback", (req, res) => controller.oAuth2Callback(req, res));
|
|
54
63
|
app.use(middlewares_1.errorHandlerMiddleware);
|
|
55
|
-
|
|
64
|
+
customRouters.forEach(({ path, router }) => app.use(path, router));
|
|
65
|
+
return app.listen(PORT, () => console.log(`Listening on port ${PORT}`));
|
|
56
66
|
}
|
|
57
67
|
exports.start = start;
|
|
68
|
+
const deleteCacheItem = (key) => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
|
+
yield (cache === null || cache === void 0 ? void 0 : cache.delete(key));
|
|
70
|
+
});
|
|
71
|
+
exports.deleteCacheItem = deleteCacheItem;
|
|
72
|
+
const getCacheItem = (key) => __awaiter(void 0, void 0, void 0, function* () {
|
|
73
|
+
return (yield (cache === null || cache === void 0 ? void 0 : cache.get(key))) || [];
|
|
74
|
+
});
|
|
75
|
+
exports.getCacheItem = getCacheItem;
|
|
58
76
|
__exportStar(require("./models"), exports);
|
|
59
77
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Request } from "express";
|
|
1
|
+
import { Request, Response } from "express";
|
|
2
2
|
import { CalendarEvent, CalendarEventTemplate, CalendarFilterOptions, CallEvent, Config, Contact, ContactTemplate, ContactUpdate } from ".";
|
|
3
3
|
export interface Adapter {
|
|
4
4
|
getToken?: (config: Config) => Promise<{
|
|
@@ -16,8 +16,8 @@ export interface Adapter {
|
|
|
16
16
|
handleCallEvent?: (config: Config, event: CallEvent) => Promise<string>;
|
|
17
17
|
handleConnectedEvent?: (config: Config) => Promise<void>;
|
|
18
18
|
getHealth?: () => Promise<void>;
|
|
19
|
-
getOAuth2RedirectUrl?: () => Promise<string>;
|
|
20
|
-
handleOAuth2Callback?: (req: Request) => Promise<{
|
|
19
|
+
getOAuth2RedirectUrl?: (req?: Request, res?: Response) => Promise<string>;
|
|
20
|
+
handleOAuth2Callback?: (req: Request, res?: Response) => Promise<{
|
|
21
21
|
apiKey: string;
|
|
22
22
|
apiUrl: string;
|
|
23
23
|
}>;
|
|
@@ -21,10 +21,9 @@ const anonymize_key_1 = require("../util/anonymize-key");
|
|
|
21
21
|
const phone_number_utils_1 = require("../util/phone-number-utils");
|
|
22
22
|
const validate_1 = require("../util/validate");
|
|
23
23
|
const cache_item_state_model_1 = require("./cache-item-state.model");
|
|
24
|
-
const contact_model_1 = require("./contact.model");
|
|
25
24
|
const CONTACT_FETCH_TIMEOUT = 3000;
|
|
26
25
|
function sanitizeContact(contact, locale) {
|
|
27
|
-
const result = Object.assign(Object.assign({}, contact), { phoneNumbers: contact.phoneNumbers.map((phoneNumber) => (Object.assign(Object.assign({}, phoneNumber), { phoneNumber:
|
|
26
|
+
const result = Object.assign(Object.assign({}, contact), { phoneNumbers: contact.phoneNumbers.map((phoneNumber) => (Object.assign(Object.assign({}, phoneNumber), { phoneNumber: (0, phone_number_utils_1.isDirectDial)(phoneNumber)
|
|
28
27
|
? phoneNumber.phoneNumber
|
|
29
28
|
: (0, phone_number_utils_1.convertPhoneNumberToE164)(phoneNumber.phoneNumber, locale) }))) });
|
|
30
29
|
return result;
|
|
@@ -34,20 +33,6 @@ class Controller {
|
|
|
34
33
|
this.adapter = adapter;
|
|
35
34
|
this.contactCache = contactCache;
|
|
36
35
|
this.ajv = new ajv_1.default();
|
|
37
|
-
this.getContacts = this.getContacts.bind(this);
|
|
38
|
-
this.createContact = this.createContact.bind(this);
|
|
39
|
-
this.updateContact = this.updateContact.bind(this);
|
|
40
|
-
this.deleteContact = this.deleteContact.bind(this);
|
|
41
|
-
this.getCalendarEvents = this.getCalendarEvents.bind(this);
|
|
42
|
-
this.createCalendarEvent = this.createCalendarEvent.bind(this);
|
|
43
|
-
this.updateCalendarEvent = this.updateCalendarEvent.bind(this);
|
|
44
|
-
this.deleteCalendarEvent = this.deleteCalendarEvent.bind(this);
|
|
45
|
-
this.handleCallEvent = this.handleCallEvent.bind(this);
|
|
46
|
-
this.updateCallEvent = this.updateCallEvent.bind(this);
|
|
47
|
-
this.handleConnectedEvent = this.handleConnectedEvent.bind(this);
|
|
48
|
-
this.getHealth = this.getHealth.bind(this);
|
|
49
|
-
this.oAuth2Redirect = this.oAuth2Redirect.bind(this);
|
|
50
|
-
this.oAuth2Callback = this.oAuth2Callback.bind(this);
|
|
51
36
|
}
|
|
52
37
|
getContacts(req, res, next) {
|
|
53
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -383,7 +368,7 @@ class Controller {
|
|
|
383
368
|
if (!this.adapter.getOAuth2RedirectUrl) {
|
|
384
369
|
throw new _1.ServerError(501, "OAuth2 flow not implemented");
|
|
385
370
|
}
|
|
386
|
-
const redirectUrl = yield this.adapter.getOAuth2RedirectUrl();
|
|
371
|
+
const redirectUrl = yield this.adapter.getOAuth2RedirectUrl(req, res);
|
|
387
372
|
res.status(200).send({ redirectUrl });
|
|
388
373
|
}
|
|
389
374
|
catch (error) {
|
|
@@ -404,7 +389,7 @@ class Controller {
|
|
|
404
389
|
if (!this.adapter.handleOAuth2Callback) {
|
|
405
390
|
throw new _1.ServerError(501, "OAuth2 flow not implemented");
|
|
406
391
|
}
|
|
407
|
-
const { apiKey, apiUrl } = yield this.adapter.handleOAuth2Callback(req);
|
|
392
|
+
const { apiKey, apiUrl } = yield this.adapter.handleOAuth2Callback(req, res);
|
|
408
393
|
const params = (0, querystring_1.stringify)({
|
|
409
394
|
name: oAuth2Identifier,
|
|
410
395
|
key: apiKey,
|
|
@@ -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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"custom-routers.model.js","sourceRoot":"","sources":["../../src/models/custom-routers.model.ts"],"names":[],"mappings":""}
|
|
@@ -6,14 +6,14 @@ const storage_1 = require("../cache/storage");
|
|
|
6
6
|
function getContactCache() {
|
|
7
7
|
const { REDIS_URL, CACHE_DISABLED } = process.env;
|
|
8
8
|
if (CACHE_DISABLED && CACHE_DISABLED === "true") {
|
|
9
|
-
console.log("Caching disabled");
|
|
9
|
+
console.log("[CACHE] Caching disabled");
|
|
10
10
|
return null;
|
|
11
11
|
}
|
|
12
12
|
if (REDIS_URL) {
|
|
13
|
-
console.log("Using redis cache");
|
|
13
|
+
console.log("[CACHE] Using redis cache");
|
|
14
14
|
return new cache_1.StorageCache(new storage_1.RedisStorageAdapter(REDIS_URL));
|
|
15
15
|
}
|
|
16
|
-
console.log("Using memory cache");
|
|
16
|
+
console.log("[CACHE] Using memory cache");
|
|
17
17
|
return new cache_1.StorageCache(new storage_1.MemoryStorageAdapter());
|
|
18
18
|
}
|
|
19
19
|
exports.getContactCache = getContactCache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-contact-cache.js","sourceRoot":"","sources":["../../src/util/get-contact-cache.ts"],"names":[],"mappings":";;;AAAA,oCAAwC;AACxC,8CAA6E;AAG7E,SAAgB,eAAe;IAC7B,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAElD,IAAI,cAAc,IAAI,cAAc,KAAK,MAAM,EAAE;QAC/C,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"get-contact-cache.js","sourceRoot":"","sources":["../../src/util/get-contact-cache.ts"],"names":[],"mappings":";;;AAAA,oCAAwC;AACxC,8CAA6E;AAG7E,SAAgB,eAAe;IAC7B,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAElD,IAAI,cAAc,IAAI,cAAc,KAAK,MAAM,EAAE;QAC/C,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,SAAS,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACzC,OAAO,IAAI,oBAAY,CAAC,IAAI,6BAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;KAC7D;IAED,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC1C,OAAO,IAAI,oBAAY,CAAC,IAAI,8BAAoB,EAAE,CAAC,CAAC;AACtD,CAAC;AAfD,0CAeC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.convertPhoneNumberToE164 = void 0;
|
|
3
|
+
exports.isDirectDial = exports.convertPhoneNumberToE164 = void 0;
|
|
4
4
|
const awesome_phonenumber_1 = require("awesome-phonenumber");
|
|
5
|
+
const MIN_PHONE_NUMBER_LENGTH = 5;
|
|
5
6
|
function convertPhoneNumberToE164(phoneNumber, locale) {
|
|
6
7
|
const region = locale.replace(/.+_/, "").toUpperCase();
|
|
7
8
|
try {
|
|
@@ -14,4 +15,8 @@ function convertPhoneNumberToE164(phoneNumber, locale) {
|
|
|
14
15
|
}
|
|
15
16
|
}
|
|
16
17
|
exports.convertPhoneNumberToE164 = convertPhoneNumberToE164;
|
|
18
|
+
const isDirectDial = (phoneNumber) => {
|
|
19
|
+
return phoneNumber.phoneNumber.length < MIN_PHONE_NUMBER_LENGTH;
|
|
20
|
+
};
|
|
21
|
+
exports.isDirectDial = isDirectDial;
|
|
17
22
|
//# sourceMappingURL=phone-number-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phone-number-utils.js","sourceRoot":"","sources":["../../src/util/phone-number-utils.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;
|
|
1
|
+
{"version":3,"file":"phone-number-utils.js","sourceRoot":"","sources":["../../src/util/phone-number-utils.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;AAGvD,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC,SAAgB,wBAAwB,CACtC,WAAmB,EACnB,MAAc;IAEd,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAEvD,IAAI;QACF,MAAM,iBAAiB,GAAG,IAAA,sCAAgB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACjD,OAAO,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,CAAC;KAC5B;IAAC,WAAM;QACN,OAAO,WAAW,CAAC;KACpB;AACH,CAAC;AAbD,4DAaC;AAEM,MAAM,YAAY,GAAG,CAAC,WAAwB,EAAE,EAAE;IACvD,OAAO,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,uBAAuB,CAAC;AAClE,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sipgate/integration-bridge",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.0",
|
|
4
4
|
"description": "sipgate Integration Bridge Framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"@types/body-parser": "1.19.2",
|
|
60
60
|
"@types/compression": "1.7.2",
|
|
61
61
|
"@types/cors": "2.8.12",
|
|
62
|
-
"@types/express": "4.17.
|
|
62
|
+
"@types/express": "4.17.14",
|
|
63
63
|
"@types/jest": "28.1.8",
|
|
64
64
|
"@types/lru-cache": "7.10.9",
|
|
65
65
|
"@types/node": "18.0.6",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"prettier": "2.7.1",
|
|
72
72
|
"rimraf": "3.0.2",
|
|
73
73
|
"ts-jest": "28.0.8",
|
|
74
|
-
"typescript": "4.8.
|
|
74
|
+
"typescript": "4.8.3"
|
|
75
75
|
},
|
|
76
76
|
"dependencies": {
|
|
77
77
|
"ajv": "^8.11.0",
|