@trunkrs/common 1.6.13 → 1.6.16
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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { ResponseType } from 'axios';
|
|
1
2
|
import Cache from '../../utils/caching/Cache';
|
|
2
|
-
import { HttpClient
|
|
3
|
+
import { HttpClient } from './HttpClient';
|
|
3
4
|
import MachineTokenClient from './MachineTokenClient';
|
|
4
|
-
declare type ResponseType = HttpRequestParams['responseType'];
|
|
5
5
|
declare class MachineClient {
|
|
6
6
|
protected readonly machineTokenClient: MachineTokenClient;
|
|
7
7
|
protected readonly httpClient: HttpClient;
|
|
@@ -9,7 +9,6 @@ declare class MachineClient {
|
|
|
9
9
|
protected readonly secretCacheKey: string;
|
|
10
10
|
protected readonly baseUrl: string;
|
|
11
11
|
protected bearerTokenInterceptorId?: number;
|
|
12
|
-
private tokenResponseInterceptorId?;
|
|
13
12
|
constructor(machineTokenClient: MachineTokenClient, httpClient: HttpClient, cache: Cache, secretCacheKey: string, baseUrl: string);
|
|
14
13
|
protected createUrl(resource: string): string;
|
|
15
14
|
protected get axiosClient(): import("axios").AxiosInstance;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tokens_1 = require("../../utils/tokens");
|
|
4
3
|
class MachineClient {
|
|
5
4
|
constructor(machineTokenClient, httpClient, cache, secretCacheKey, baseUrl) {
|
|
6
5
|
this.machineTokenClient = machineTokenClient;
|
|
@@ -60,14 +59,9 @@ class MachineClient {
|
|
|
60
59
|
return token;
|
|
61
60
|
}
|
|
62
61
|
async checkBearerToken() {
|
|
63
|
-
|
|
64
|
-
if (
|
|
65
|
-
await this.cache.remove(this.secretCacheKey);
|
|
66
|
-
token = await this.getBearerToken();
|
|
67
|
-
}
|
|
68
|
-
if (this.bearerTokenInterceptorId && this.tokenResponseInterceptorId) {
|
|
62
|
+
const token = await this.getBearerToken();
|
|
63
|
+
if (this.bearerTokenInterceptorId) {
|
|
69
64
|
this.axiosClient.interceptors.request.eject(this.bearerTokenInterceptorId);
|
|
70
|
-
this.axiosClient.interceptors.response.eject(this.tokenResponseInterceptorId);
|
|
71
65
|
}
|
|
72
66
|
this.bearerTokenInterceptorId = this.axiosClient.interceptors.request.use((config) => {
|
|
73
67
|
const modifiedHeaders = {
|
|
@@ -76,15 +70,6 @@ class MachineClient {
|
|
|
76
70
|
};
|
|
77
71
|
return Object.assign(config, { headers: modifiedHeaders });
|
|
78
72
|
});
|
|
79
|
-
this.tokenResponseInterceptorId =
|
|
80
|
-
this.axiosClient.interceptors.response.use(async (response) => {
|
|
81
|
-
if (response.status !== 401) {
|
|
82
|
-
return response;
|
|
83
|
-
}
|
|
84
|
-
await this.cache.remove(this.secretCacheKey);
|
|
85
|
-
await this.checkBearerToken();
|
|
86
|
-
return this.axiosClient.request(response.config);
|
|
87
|
-
});
|
|
88
73
|
}
|
|
89
74
|
}
|
|
90
75
|
exports.default = MachineClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MachineClient.js","sourceRoot":"","sources":["../../../services/client/MachineClient.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"MachineClient.js","sourceRoot":"","sources":["../../../services/client/MachineClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,12 +27,15 @@ class RedisCache extends Cache_1.default {
|
|
|
27
27
|
return deserializedItem.value;
|
|
28
28
|
}
|
|
29
29
|
async getOrAdd(key, factory) {
|
|
30
|
+
console.info('[REDIS-CACHE]: attempting to get item');
|
|
30
31
|
const item = await this.client.get(key);
|
|
31
32
|
if (!item) {
|
|
32
33
|
const newValue = await factory();
|
|
34
|
+
console.info('[REDIS-CACHE]: item not found, running factory method');
|
|
33
35
|
await this.add(key, newValue);
|
|
34
36
|
return newValue;
|
|
35
37
|
}
|
|
38
|
+
console.info('[REDIS-CACHE]: item found, returning value');
|
|
36
39
|
const deserializedItem = this.serializer.deserialize(item);
|
|
37
40
|
return deserializedItem.value;
|
|
38
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisCache.js","sourceRoot":"","sources":["../../../utils/caching/RedisCache.ts"],"names":[],"mappings":";;;;;AAAA,oDAA0C;AAI1C,MAAM,UAAW,SAAQ,eAAK;IAC5B,YACE,gBAAwB,EACP,MAAmB,EACnB,UAAsB;QAEvC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QAHN,WAAM,GAAN,MAAM,CAAa;QACnB,eAAU,GAAV,UAAU,CAAY;IAGzC,CAAC;IAEM,KAAK,CAAC,GAAG,CAAS,GAAW,EAAE,KAAa;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACnC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QAEhE,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IAC5E,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,GAAG,CAAS,GAAW;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEvC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,gBAAgB,GAAc,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACrE,OAAO,gBAAgB,CAAC,KAAe,CAAA;IACzC,CAAC;IAEM,KAAK,CAAC,QAAQ,CACnB,GAAW,EACX,OAA8B;QAE9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEvC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,QAAQ,GAAG,MAAM,OAAO,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"RedisCache.js","sourceRoot":"","sources":["../../../utils/caching/RedisCache.ts"],"names":[],"mappings":";;;;;AAAA,oDAA0C;AAI1C,MAAM,UAAW,SAAQ,eAAK;IAC5B,YACE,gBAAwB,EACP,MAAmB,EACnB,UAAsB;QAEvC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QAHN,WAAM,GAAN,MAAM,CAAa;QACnB,eAAU,GAAV,UAAU,CAAY;IAGzC,CAAC;IAEM,KAAK,CAAC,GAAG,CAAS,GAAW,EAAE,KAAa;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACnC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QAEhE,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IAC5E,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,GAAG,CAAS,GAAW;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEvC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,gBAAgB,GAAc,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACrE,OAAO,gBAAgB,CAAC,KAAe,CAAA;IACzC,CAAC;IAEM,KAAK,CAAC,QAAQ,CACnB,GAAW,EACX,OAA8B;QAE9B,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEvC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,QAAQ,GAAG,MAAM,OAAO,EAAE,CAAA;YAEhC,OAAO,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAA;YAErE,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;YAE7B,OAAO,QAAQ,CAAA;SAChB;QAED,OAAO,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAA;QAC1D,MAAM,gBAAgB,GAAc,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACrE,OAAO,gBAAgB,CAAC,KAAe,CAAA;IACzC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAW;QAC7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAEvC,OAAO,CAAC,CAAC,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAW;QAC7B,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC/B,CAAC;CACF;AAED,kBAAe,UAAU,CAAA"}
|