@nmshd/transport 1.1.0 → 1.1.4

package/dist/modules/tokens/TokenController.js

@@ -70,11 +70,31 @@ class TokenController extends TransportController_1.TransportController {
         return tokenDoc ? await Token_1.Token.from(tokenDoc) : undefined;
     }
     async updateCache(ids) {
-        const resultItems = (await this.client.getTokens({ ids })).value;
+        if (ids.length < 1) {
+            return [];
+        }
         const promises = [];
-        for await (const resultItem of resultItems) {
+        for (const id of ids) {
+            const result = await this.client.getToken(id);
+            if (result.isError) {
+                if (result.error.code === "error.transport.recordNotFound" ||
+                    result.error.code === "error.transport.request.notFound") {
+                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
+                    continue;
+                }
+                throw result.error;
+            }
+            const resultItem = result.value;
             promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem));
         }
+        /*
+        // TODO: Optimize once backbone handling is clarified
+        const resultItems = (await this.client.getTokens({ ids })).value
+        const promises = []
+        for await (const resultItem of resultItems) {
+            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem))
+        }
+        */
         return await Promise.all(promises);
     }
     async fetchCaches(ids) {

package/dist/modules/tokens/TokenController.js.map

@@ -1 +1 @@
-{"version":3,"file":"TokenController.js","sourceRoot":"","sources":["../../../src/modules/tokens/TokenController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TokenController.js","sourceRoot":"","sources":["../../../src/modules/tokens/TokenController.ts"],"names":[],"mappings":"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"}

package/lib-web/nmshd.transport.js

@@ -15,11 +15,11 @@ exports.buildInformation = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 exports.buildInformation = {
-    version: "1.1.0",
-    build: "12",
-    date: "2021-11-24T08:13:17+00:00",
-    commit: "79449175787ac5c327066c6846fba4deb209606e",
-    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.1.1","axios":"^0.24.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.1.1","qs":"^6.10.1","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
+    version: "1.1.4",
+    build: "16",
+    date: "2022-01-03T10:30:14+00:00",
+    commit: "d2352a36a63834c46a5fc86dd75e6d703aaba74f",
+    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.1.1","axios":"^0.24.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.2.0","qs":"^6.10.2","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
     libraries: {
         crypto: crypto_1.buildInformation,
         serval: ts_serval_1.buildInformation
@@ -2828,11 +2828,7 @@ class AccountController {
         }
         const identity = await Identity_1.Identity.from({
             address: core_1.CoreAddress.from(deviceResponse.address),
-            createdAt: core_1.CoreDate.from(deviceResponse.createdAt),
-            description: "",
-            name: "",
             realm: realm,
-            type: "unknown" /* UNKNOWN */,
             publicKey: identityKeypair.publicKey
         });
         const deviceId = core_1.CoreId.from(deviceResponse.device.id);
@@ -2970,18 +2966,6 @@ class IdentityController extends core_1.TransportController {
     get realm() {
         return this._identity.realm;
     }
-    get name() {
-        return this._identity.name;
-    }
-    get description() {
-        return this._identity.description;
-    }
-    get createdAt() {
-        return this._identity.createdAt;
-    }
-    get type() {
-        return this._identity.type;
-    }
     get identity() {
         return this._identity;
     }
@@ -2996,9 +2980,7 @@ class IdentityController extends core_1.TransportController {
     isMe(address) {
         return this.address.equals(address);
     }
-    async update(name, description) {
-        this.identity.name = name;
-        this.identity.description = description;
+    async update() {
         await this.parent.info.set("identity", this.identity);
     }
     async sign(content) {
@@ -3145,7 +3127,13 @@ var Realm;
 })(Realm = exports.Realm || (exports.Realm = {}));
 let Identity = Identity_1 = class Identity extends CoreSerializableAsync_1.CoreSerializableAsync {
     static async from(value) {
-        return await super.fromT(value, Identity_1);
+        const identity = await super.fromT(value, Identity_1);
+        // TODO: Remove these default values once we're sure that nobody is accessing the deprecated properties anymore
+        identity.name = "";
+        identity.description = "";
+        identity.type = "unknown";
+        identity.createdAt = CoreDate_1.CoreDate.from("2020-01-01T00:00:00Z");
+        return identity;
     }
 };
 __decorate([
@@ -3164,22 +3152,26 @@ __decorate([
     __metadata("design:type", String)
 ], Identity.prototype, "realm", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Identity.prototype, "name", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Identity.prototype, "description", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    __metadata("design:type", CoreDate_1.CoreDate)
+    __metadata("design:type", CoreDate_1.CoreDate
+    /**
+     * @deprecated
+     */
+    )
 ], Identity.prototype, "createdAt", void 0);
 __decorate([
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Identity.prototype, "type", void 0);
@@ -5257,11 +5249,31 @@ class FileController extends TransportController_1.TransportController {
         return await Promise.all(decryptionPromises);
     }
     async updateCache(ids) {
-        const resultItems = (await this.client.getFiles({ ids })).value;
+        if (ids.length < 1) {
+            return [];
+        }
         const promises = [];
-        for await (const resultItem of resultItems) {
+        for (const id of ids) {
+            const result = await this.client.getFile(id);
+            if (result.isError) {
+                if (result.error.code === "error.transport.recordNotFound" ||
+                    result.error.code === "error.transport.request.notFound") {
+                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
+                    continue;
+                }
+                throw result.error;
+            }
+            const resultItem = result.value;
             promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem));
         }
+        /*
+        // TODO: Optimize once backbone handling is clarified
+        const resultItems = (await this.client.getFiles({ ids })).value
+        const promises = []
+        for await (const resultItem of resultItems) {
+            promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem))
+        }
+        */
         return await Promise.all(promises);
     }
     async updateCacheOfExistingFileInDb(id, response) {
@@ -6174,6 +6186,9 @@ class MessageController extends TransportController_1.TransportController {
         return messageDoc ? await Message_1.Message.from(messageDoc) : undefined;
     }
     async updateCache(ids) {
+        if (ids.length < 1) {
+            return [];
+        }
         const paginator = (await this.client.getMessages({ ids })).value;
         const promises = [];
         for await (const resultItem of paginator) {
@@ -7141,11 +7156,31 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         return await this.parseArray(templateDocs, RelationshipTemplate_1.RelationshipTemplate);
     }
     async updateCache(ids) {
-        const resultItems = (await this.client.getRelationshipTemplates({ ids })).value;
+        if (ids.length < 1) {
+            return [];
+        }
         const promises = [];
-        for await (const resultItem of resultItems) {
+        for (const id of ids) {
+            const result = await this.client.getRelationshipTemplate(id);
+            if (result.isError) {
+                if (result.error.code === "error.transport.recordNotFound" ||
+                    result.error.code === "error.transport.request.notFound") {
+                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
+                    continue;
+                }
+                throw result.error;
+            }
+            const resultItem = result.value;
             promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem));
         }
+        /*
+        // TODO: Optimize once backbone handling is clarified
+        const resultItems = (await this.client.getRelationshipTemplates({ ids })).value
+        const promises = []
+        for await (const resultItem of resultItems) {
+            promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem))
+        }
+        */
         return await Promise.all(promises);
     }
     async fetchCaches(ids) {
@@ -7928,6 +7963,9 @@ class RelationshipsController extends core_1.TransportController {
         return await this.parseArray(relationshipDocs, Relationship_1.Relationship);
     }
     async updateCache(ids) {
+        if (ids.length < 1) {
+            return [];
+        }
         const resultItems = (await this.client.getRelationships({ ids })).value;
         const promises = [];
         for await (const resultItem of resultItems) {
@@ -11024,11 +11062,31 @@ class TokenController extends TransportController_1.TransportController {
         return tokenDoc ? await Token_1.Token.from(tokenDoc) : undefined;
     }
     async updateCache(ids) {
-        const resultItems = (await this.client.getTokens({ ids })).value;
+        if (ids.length < 1) {
+            return [];
+        }
         const promises = [];
-        for await (const resultItem of resultItems) {
+        for (const id of ids) {
+            const result = await this.client.getToken(id);
+            if (result.isError) {
+                if (result.error.code === "error.transport.recordNotFound" ||
+                    result.error.code === "error.transport.request.notFound") {
+                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
+                    continue;
+                }
+                throw result.error;
+            }
+            const resultItem = result.value;
             promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem));
         }
+        /*
+        // TODO: Optimize once backbone handling is clarified
+        const resultItems = (await this.client.getTokens({ ids })).value
+        const promises = []
+        for await (const resultItem of resultItems) {
+            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem))
+        }
+        */
         return await Promise.all(promises);
     }
     async fetchCaches(ids) {
@@ -38191,8 +38249,7 @@ var Duration = /*#__PURE__*/function () {
 
         var i = Math.trunc(own);
         built[k] = i;
-        accumulated[k] = own - i; // we'd like to absorb these fractions in another unit
-        // plus anything further down the chain that should be rolled up in to this
+        accumulated[k] = (own * 1000 - i * 1000) / 1000; // plus anything further down the chain that should be rolled up in to this
 
         for (var down in vals) {
           if (orderedUnits$1.indexOf(down) > orderedUnits$1.indexOf(k)) {
@@ -39953,14 +40010,19 @@ function dateTimeFromMatches(matches) {
     }
   };
 
-  var zone;
+  var zone = null;
+  var specificOffset;
 
-  if (!isUndefined(matches.Z)) {
-    zone = new FixedOffsetZone(matches.Z);
-  } else if (!isUndefined(matches.z)) {
+  if (!isUndefined(matches.z)) {
     zone = IANAZone.create(matches.z);
-  } else {
-    zone = null;
+  }
+
+  if (!isUndefined(matches.Z)) {
+    if (!zone) {
+      zone = new FixedOffsetZone(matches.Z);
+    }
+
+    specificOffset = matches.Z;
   }
 
   if (!isUndefined(matches.q)) {
@@ -39992,7 +40054,7 @@ function dateTimeFromMatches(matches) {
 
     return r;
   }, {});
-  return [vals, zone];
+  return [vals, zone, specificOffset];
 }
 
 var dummyDateTimeCache = null;
@@ -40064,9 +40126,10 @@ function explainFromTokens(locale, input, format) {
         _match = match(input, regex, handlers),
         rawMatches = _match[0],
         matches = _match[1],
-        _ref6 = matches ? dateTimeFromMatches(matches) : [null, null],
+        _ref6 = matches ? dateTimeFromMatches(matches) : [null, null, undefined],
         result = _ref6[0],
-        zone = _ref6[1];
+        zone = _ref6[1],
+        specificOffset = _ref6[2];
 
     if (hasOwnProperty(matches, "a") && hasOwnProperty(matches, "H")) {
       throw new ConflictingSpecificationError("Can't include meridiem when specifying 24-hour format");
@@ -40079,7 +40142,8 @@ function explainFromTokens(locale, input, format) {
       rawMatches: rawMatches,
       matches: matches,
       result: result,
-      zone: zone
+      zone: zone,
+      specificOffset: specificOffset
     };
   }
 }
@@ -40087,9 +40151,10 @@ function parseFromTokens(locale, input, format) {
   var _explainFromTokens = explainFromTokens(locale, input, format),
       result = _explainFromTokens.result,
       zone = _explainFromTokens.zone,
+      specificOffset = _explainFromTokens.specificOffset,
       invalidReason = _explainFromTokens.invalidReason;
 
-  return [result, zone, invalidReason];
+  return [result, zone, specificOffset, invalidReason];
 }
 
 var nonLeapLadder = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334],
@@ -40377,14 +40442,15 @@ function adjustTime(inst, dur) {
 // by handling the zone options
 
 
-function parseDataToDateTime(parsed, parsedZone, opts, format, text) {
+function parseDataToDateTime(parsed, parsedZone, opts, format, text, specificOffset) {
   var setZone = opts.setZone,
       zone = opts.zone;
 
   if (parsed && Object.keys(parsed).length !== 0) {
     var interpretationZone = parsedZone || zone,
         inst = DateTime.fromObject(parsed, _extends({}, opts, {
-      zone: interpretationZone
+      zone: interpretationZone,
+      specificOffset: specificOffset
     }));
     return setZone ? inst : inst.setZone(zone);
   } else {
@@ -40929,7 +40995,7 @@ var DateTime = /*#__PURE__*/function () {
     }
 
     var tsNow = Settings.now(),
-        offsetProvis = zoneToUse.offset(tsNow),
+        offsetProvis = !isUndefined(opts.specificOffset) ? opts.specificOffset : zoneToUse.offset(tsNow),
         normalized = normalizeObject(obj, normalizeUnit),
         containsOrdinal = !isUndefined(normalized.ordinal),
         containsGregorYear = !isUndefined(normalized.year),
@@ -41133,12 +41199,13 @@ var DateTime = /*#__PURE__*/function () {
         _parseFromTokens = parseFromTokens(localeToUse, text, fmt),
         vals = _parseFromTokens[0],
         parsedZone = _parseFromTokens[1],
-        invalid = _parseFromTokens[2];
+        specificOffset = _parseFromTokens[2],
+        invalid = _parseFromTokens[3];
 
     if (invalid) {
       return DateTime.invalid(invalid);
     } else {
-      return parseDataToDateTime(vals, parsedZone, opts, "format " + fmt, text);
+      return parseDataToDateTime(vals, parsedZone, opts, "format " + fmt, text, specificOffset);
     }
   }
   /**
@@ -42776,7 +42843,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.1.1";
+var VERSION = "2.2.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;
@@ -43630,6 +43697,7 @@ var arrayPrefixGenerators = {
 };
 
 var isArray = Array.isArray;
+var split = String.prototype.split;
 var push = Array.prototype.push;
 var pushToArray = function (arr, valueOrArray) {
     push.apply(arr, isArray(valueOrArray) ? valueOrArray : [valueOrArray]);
@@ -43666,6 +43734,8 @@ var isNonNullishPrimitive = function isNonNullishPrimitive(v) {
         || typeof v === 'bigint';
 };
 
+var sentinel = {};
+
 var stringify = function stringify(
     object,
     prefix,
@@ -43685,8 +43755,23 @@ var stringify = function stringify(
 ) {
     var obj = object;
 
-    if (sideChannel.has(object)) {
-        throw new RangeError('Cyclic object value');
+    var tmpSc = sideChannel;
+    var step = 0;
+    var findFlag = false;
+    while ((tmpSc = tmpSc.get(sentinel)) !== undefined && !findFlag) {
+        // Where object last appeared in the ref tree
+        var pos = tmpSc.get(object);
+        step += 1;
+        if (typeof pos !== 'undefined') {
+            if (pos === step) {
+                throw new RangeError('Cyclic object value');
+            } else {
+                findFlag = true; // Break while
+            }
+        }
+        if (typeof tmpSc.get(sentinel) === 'undefined') {
+            step = 0;
+        }
     }
 
     if (typeof filter === 'function') {
@@ -43713,6 +43798,14 @@ var stringify = function stringify(
     if (isNonNullishPrimitive(obj) || utils.isBuffer(obj)) {
         if (encoder) {
             var keyValue = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder, charset, 'key', format);
+            if (generateArrayPrefix === 'comma' && encodeValuesOnly) {
+                var valuesArray = split.call(String(obj), ',');
+                var valuesJoined = '';
+                for (var i = 0; i < valuesArray.length; ++i) {
+                    valuesJoined += (i === 0 ? '' : ',') + formatter(encoder(valuesArray[i], defaults.encoder, charset, 'value', format));
+                }
+                return [formatter(keyValue) + '=' + valuesJoined];
+            }
             return [formatter(keyValue) + '=' + formatter(encoder(obj, defaults.encoder, charset, 'value', format))];
         }
         return [formatter(prefix) + '=' + formatter(String(obj))];
@@ -43735,8 +43828,8 @@ var stringify = function stringify(
         objKeys = sort ? keys.sort(sort) : keys;
     }
 
-    for (var i = 0; i < objKeys.length; ++i) {
-        var key = objKeys[i];
+    for (var j = 0; j < objKeys.length; ++j) {
+        var key = objKeys[j];
         var value = typeof key === 'object' && key.value !== undefined ? key.value : obj[key];
 
         if (skipNulls && value === null) {
@@ -43747,8 +43840,9 @@ var stringify = function stringify(
             ? typeof generateArrayPrefix === 'function' ? generateArrayPrefix(prefix, key) : prefix
             : prefix + (allowDots ? '.' + key : '[' + key + ']');
 
-        sideChannel.set(object, true);
+        sideChannel.set(object, step);
         var valueSideChannel = getSideChannel();
+        valueSideChannel.set(sentinel, sideChannel);
         pushToArray(values, stringify(
             value,
             keyPrefix,
@@ -44089,6 +44183,7 @@ var encode = function encode(str, defaultEncoder, charset, kind, format) {
 
         i += 1;
         c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
+        /* eslint operator-linebreak: [2, "before"] */
         out += hexTable[0xF0 | (c >> 18)]
             + hexTable[0x80 | ((c >> 12) & 0x3F)]
             + hexTable[0x80 | ((c >> 6) & 0x3F)]