@nmshd/transport 1.1.7 → 1.1.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.
- package/dist/buildInformation.js +4 -4
- package/dist/modules/tokens/TokenController.js +14 -3
- package/dist/modules/tokens/TokenController.js.map +1 -1
- package/lib-web/nmshd.transport.js +18 -7
- package/lib-web/nmshd.transport.js.map +1 -1
- package/lib-web/nmshd.transport.min.js +1 -1
- package/lib-web/nmshd.transport.min.js.map +1 -1
- package/package.json +6 -6
package/dist/buildInformation.js
CHANGED
|
@@ -4,10 +4,10 @@ exports.buildInformation = void 0;
|
|
|
4
4
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
5
5
|
const crypto_1 = require("@nmshd/crypto");
|
|
6
6
|
exports.buildInformation = {
|
|
7
|
-
version: "1.1.
|
|
8
|
-
build: "
|
|
9
|
-
date: "2022-
|
|
10
|
-
commit: "
|
|
7
|
+
version: "1.1.8",
|
|
8
|
+
build: "20",
|
|
9
|
+
date: "2022-02-01T06:24:18+00:00",
|
|
10
|
+
commit: "800bbdcdec148918ad48e3c0d8851fd04876a2df",
|
|
11
11
|
dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.1","@js-soft/ts-utils":"1.1.1","axios":"^0.25.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.3.0","qs":"^6.10.3","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
|
|
12
12
|
libraries: {
|
|
13
13
|
crypto: crypto_1.buildInformation,
|
|
@@ -96,7 +96,8 @@ class TokenController extends TransportController_1.TransportController {
|
|
|
96
96
|
promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem))
|
|
97
97
|
}
|
|
98
98
|
*/
|
|
99
|
-
|
|
99
|
+
const isToken = (item) => !!item;
|
|
100
|
+
return (await Promise.all(promises)).filter(isToken);
|
|
100
101
|
}
|
|
101
102
|
async fetchCaches(ids) {
|
|
102
103
|
if (ids.length === 0)
|
|
@@ -112,7 +113,8 @@ class TokenController extends TransportController_1.TransportController {
|
|
|
112
113
|
async updateCacheOfExistingTokenInDb(id, response) {
|
|
113
114
|
const tokenDoc = await this.tokens.read(id);
|
|
114
115
|
if (!tokenDoc) {
|
|
115
|
-
|
|
116
|
+
core_1.TransportErrors.general.recordNotFound(Token_1.Token, id).logWith(this._log);
|
|
117
|
+
return;
|
|
116
118
|
}
|
|
117
119
|
const token = await Token_1.Token.from(tokenDoc);
|
|
118
120
|
await this.updateCacheOfToken(token, response);
|
|
@@ -155,7 +157,16 @@ class TokenController extends TransportController_1.TransportController {
|
|
|
155
157
|
async loadPeerToken(id, secretKey, ephemeral) {
|
|
156
158
|
const tokenDoc = await this.tokens.read(id.toString());
|
|
157
159
|
if (tokenDoc) {
|
|
158
|
-
|
|
160
|
+
let token = await Token_1.Token.from(tokenDoc);
|
|
161
|
+
if (token.cache) {
|
|
162
|
+
return token;
|
|
163
|
+
}
|
|
164
|
+
token = await this.updateCacheOfExistingTokenInDb(id.toString());
|
|
165
|
+
if (!token) {
|
|
166
|
+
// This should not happen, we only update the cache if we found the tokenDoc
|
|
167
|
+
throw new Error(`Tried to update a token (with ID: '${id.toString()}') that doesn't exist in the local database.`);
|
|
168
|
+
}
|
|
169
|
+
return token;
|
|
159
170
|
}
|
|
160
171
|
const token = await Token_1.Token.from({
|
|
161
172
|
id: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenController.js","sourceRoot":"","sources":["../../../src/modules/tokens/TokenController.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TokenController.js","sourceRoot":"","sources":["../../../src/modules/tokens/TokenController.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,10 +15,10 @@ exports.buildInformation = void 0;
|
|
|
15
15
|
const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
|
|
16
16
|
const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
|
|
17
17
|
exports.buildInformation = {
|
|
18
|
-
version: "1.1.
|
|
19
|
-
build: "
|
|
20
|
-
date: "2022-
|
|
21
|
-
commit: "
|
|
18
|
+
version: "1.1.8",
|
|
19
|
+
build: "20",
|
|
20
|
+
date: "2022-02-01T06:24:18+00:00",
|
|
21
|
+
commit: "800bbdcdec148918ad48e3c0d8851fd04876a2df",
|
|
22
22
|
dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.1","@js-soft/ts-utils":"1.1.1","axios":"^0.25.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.3.0","qs":"^6.10.3","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
|
|
23
23
|
libraries: {
|
|
24
24
|
crypto: crypto_1.buildInformation,
|
|
@@ -11090,7 +11090,8 @@ class TokenController extends TransportController_1.TransportController {
|
|
|
11090
11090
|
promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem))
|
|
11091
11091
|
}
|
|
11092
11092
|
*/
|
|
11093
|
-
|
|
11093
|
+
const isToken = (item) => !!item;
|
|
11094
|
+
return (await Promise.all(promises)).filter(isToken);
|
|
11094
11095
|
}
|
|
11095
11096
|
async fetchCaches(ids) {
|
|
11096
11097
|
if (ids.length === 0)
|
|
@@ -11106,7 +11107,8 @@ class TokenController extends TransportController_1.TransportController {
|
|
|
11106
11107
|
async updateCacheOfExistingTokenInDb(id, response) {
|
|
11107
11108
|
const tokenDoc = await this.tokens.read(id);
|
|
11108
11109
|
if (!tokenDoc) {
|
|
11109
|
-
|
|
11110
|
+
core_1.TransportErrors.general.recordNotFound(Token_1.Token, id).logWith(this._log);
|
|
11111
|
+
return;
|
|
11110
11112
|
}
|
|
11111
11113
|
const token = await Token_1.Token.from(tokenDoc);
|
|
11112
11114
|
await this.updateCacheOfToken(token, response);
|
|
@@ -11149,7 +11151,16 @@ class TokenController extends TransportController_1.TransportController {
|
|
|
11149
11151
|
async loadPeerToken(id, secretKey, ephemeral) {
|
|
11150
11152
|
const tokenDoc = await this.tokens.read(id.toString());
|
|
11151
11153
|
if (tokenDoc) {
|
|
11152
|
-
|
|
11154
|
+
let token = await Token_1.Token.from(tokenDoc);
|
|
11155
|
+
if (token.cache) {
|
|
11156
|
+
return token;
|
|
11157
|
+
}
|
|
11158
|
+
token = await this.updateCacheOfExistingTokenInDb(id.toString());
|
|
11159
|
+
if (!token) {
|
|
11160
|
+
// This should not happen, we only update the cache if we found the tokenDoc
|
|
11161
|
+
throw new Error(`Tried to update a token (with ID: '${id.toString()}') that doesn't exist in the local database.`);
|
|
11162
|
+
}
|
|
11163
|
+
return token;
|
|
11153
11164
|
}
|
|
11154
11165
|
const token = await Token_1.Token.from({
|
|
11155
11166
|
id: id,
|