@nmshd/transport 2.0.2 → 2.0.4

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: "2.0.2",
-    build: "49",
-    date: "2023-01-13T12:48:49+00:00",
-    commit: "af841f6e9acf215080b46007abbe650ccc115730",
-    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.2","@js-soft/ts-utils":"2.3.0","axios":"1.2.2","deep-equal":"^2.2.0","fast-json-patch":"^3.1.1","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.2.1","qs":"^6.11.0","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^9.0.0"},
+    version: "2.0.4",
+    build: "54",
+    date: "2023-03-10T13:21:02+00:00",
+    commit: "c5397aceb90d4b141e9232fdd0b5c2baeaf69606",
+    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.2","@js-soft/ts-utils":"2.3.1","axios":"^1.3.4","deep-equal":"^2.2.0","fast-json-patch":"^3.1.1","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.3.0","qs":"^6.11.1","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^9.0.0"},
     libraries: {
         crypto: crypto_1.buildInformation,
         serval: ts_serval_1.buildInformation
@@ -1475,8 +1475,6 @@ exports.RESTClient = exports.RESTClientLogDirective = exports.RestPaginationData
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const axios_1 = __importDefault(__webpack_require__(/*! axios */ "./node_modules/axios/dist/browser/axios.cjs"));
 const form_data_1 = __importDefault(__webpack_require__(/*! form-data */ "./node_modules/form-data/lib/browser.js"));
-const http_1 = __webpack_require__(/*! http */ "@nmshd/crypto");
-const https_1 = __webpack_require__(/*! https */ "@nmshd/crypto");
 const lodash_1 = __importDefault(__webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js"));
 const TransportLoggerFactory_1 = __webpack_require__(/*! ../TransportLoggerFactory */ "./dist/core/TransportLoggerFactory.js");
 const types_1 = __webpack_require__(/*! ../types */ "./dist/core/types/index.js");
@@ -1511,25 +1509,12 @@ class RESTClient {
         return (this._logDirective === RESTClientLogDirective.LogResponse ||
             this._logDirective === RESTClientLogDirective.LogAll);
     }
-    createHTTPAgent() {
-        if (this._httpAgent) {
-            return this._httpAgent;
-        }
-        this._httpAgent = new http_1.Agent(this.config.httpAgent);
-        return this._httpAgent;
-    }
-    createHTTPSAgent() {
-        if (this._httpsAgent) {
-            return this._httpsAgent;
-        }
-        this._httpsAgent = new https_1.Agent(this.config.httpsAgent);
-        return this._httpsAgent;
-    }
     async generateRequestId() {
         const id = await types_1.CoreId.generate("HTTP");
         return id.toString();
     }
     constructor(config, requestConfig = {}) {
+        var _a, _b;
         this.config = config;
         this.requestConfig = requestConfig;
         this._logDirective = RESTClientLogDirective.LogAll;
@@ -1545,9 +1530,18 @@ class RESTClient {
         if (this.config.platformAdditionalHeaders) {
             defaults.headers = lodash_1.default.defaultsDeep({}, defaults.headers, this.config.platformAdditionalHeaders);
         }
-        if (typeof http_1.Agent !== "undefined" && typeof https_1.Agent !== "undefined") {
-            defaults.httpAgent = this.createHTTPAgent();
-            defaults.httpsAgent = this.createHTTPSAgent();
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            const agent = (_a = __webpack_require__(/*! http */ "@nmshd/crypto")) === null || _a === void 0 ? void 0 : _a.Agent;
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            const httpsAgent = (_b = __webpack_require__(/*! https */ "@nmshd/crypto")) === null || _b === void 0 ? void 0 : _b.Agent;
+            if (typeof agent !== "undefined" && typeof httpsAgent !== "undefined") {
+                defaults.httpAgent = new agent(this.config.httpAgent);
+                defaults.httpsAgent = new httpsAgent(this.config.httpsAgent);
+            }
+        }
+        catch (e) {
+            // ignore
         }
         this.requestConfig = lodash_1.default.defaultsDeep(this.requestConfig, defaults);
         this._logger = TransportLoggerFactory_1.TransportLoggerFactory.getLogger(RESTClient);
@@ -10696,7 +10690,7 @@ class SyncController extends core_1.TransportController {
         const identityDatawalletVersion = await this.getIdentityDatawalletVersion();
         if (this.config.supportedDatawalletVersion < identityDatawalletVersion) {
             // This means that the datawallet of the identity was upgraded by another device with a higher version.
-            // It is necesssary to update the current device.
+            // It is necessary to update the current device.
             throw core_1.CoreErrors.datawallet.insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion);
         }
         this.log.trace("Synchronization of Datawallet events started...");
@@ -10899,10 +10893,13 @@ class SyncController extends core_1.TransportController {
             throw new core_1.TransportError("There is no active sync run to finalize");
         }
         const { backboneModifications, localModificationIds } = await this.prepareLocalDatawalletModificationsForPush();
-        await this.client.finalizeDatawalletVersionUpgrade(this.currentSyncRun.id.toString(), {
+        const response = await this.client.finalizeDatawalletVersionUpgrade(this.currentSyncRun.id.toString(), {
             newDatawalletVersion,
             datawalletModifications: backboneModifications
         });
+        if (response.isError) {
+            throw response.error;
+        }
         await this.deleteUnpushedDatawalletModifications(localModificationIds);
         const oldDatawalletModificationIndex = await this.getLocalDatawalletModificationIndex();
         const newDatawalletModificationIndex = (oldDatawalletModificationIndex || -1) + backboneModifications.length;
@@ -33430,8 +33427,12 @@ class PolyNumberFormatter {
 class PolyDateFormatter {
   constructor(dt, intl, opts) {
     this.opts = opts;
+    this.originalZone = undefined;
     let z = undefined;
-    if (dt.zone.isUniversal) {
+    if (this.opts.timeZone) {
+      // Don't apply any workarounds if a timeZone is explicitly provided in opts
+      this.dt = dt;
+    } else if (dt.zone.type === "fixed") {
       // UTC-8 or Etc/UTC-8 are not part of tzdata, only Etc/GMT+8 and the like.
       // That is why fixed-offset TZ is set to that unless it is:
       // 1. Representing offset 0 when UTC is used to maintain previous behavior and does not become GMT.
@@ -33444,25 +33445,27 @@ class PolyDateFormatter {
         z = offsetZ;
         this.dt = dt;
       } else {
-        // Not all fixed-offset zones like Etc/+4:30 are present in tzdata.
-        // So we have to make do. Two cases:
-        // 1. The format options tell us to show the zone. We can't do that, so the best
-        // we can do is format the date in UTC.
-        // 2. The format options don't tell us to show the zone. Then we can adjust them
-        // the time and tell the formatter to show it to us in UTC, so that the time is right
-        // and the bad zone doesn't show up.
+        // Not all fixed-offset zones like Etc/+4:30 are present in tzdata so
+        // we manually apply the offset and substitute the zone as needed.
         z = "UTC";
-        if (opts.timeZoneName) {
-          this.dt = dt;
-        } else {
-          this.dt = dt.offset === 0 ? dt : DateTime.fromMillis(dt.ts + dt.offset * 60 * 1000);
-        }
+        this.dt = dt.offset === 0 ? dt : dt.setZone("UTC").plus({
+          minutes: dt.offset
+        });
+        this.originalZone = dt.zone;
       }
     } else if (dt.zone.type === "system") {
       this.dt = dt;
-    } else {
+    } else if (dt.zone.type === "iana") {
       this.dt = dt;
       z = dt.zone.name;
+    } else {
+      // Custom zones can have any offset / offsetName so we just manually
+      // apply the offset and substitute the zone as needed.
+      z = "UTC";
+      this.dt = dt.setZone("UTC").plus({
+        minutes: dt.offset
+      });
+      this.originalZone = dt.zone;
     }
     const intlOpts = {
       ...this.opts
@@ -33471,10 +33474,34 @@ class PolyDateFormatter {
     this.dtf = getCachedDTF(intl, intlOpts);
   }
   format() {
+    if (this.originalZone) {
+      // If we have to substitute in the actual zone name, we have to use
+      // formatToParts so that the timezone can be replaced.
+      return this.formatToParts().map(({
+        value
+      }) => value).join("");
+    }
     return this.dtf.format(this.dt.toJSDate());
   }
   formatToParts() {
-    return this.dtf.formatToParts(this.dt.toJSDate());
+    const parts = this.dtf.formatToParts(this.dt.toJSDate());
+    if (this.originalZone) {
+      return parts.map(part => {
+        if (part.type === "timeZoneName") {
+          const offsetName = this.originalZone.offsetName(this.dt.ts, {
+            locale: this.dt.locale,
+            format: this.opts.timeZoneName
+          });
+          return {
+            ...part,
+            value: offsetName
+          };
+        } else {
+          return part;
+        }
+      });
+    }
+    return parts;
   }
   resolvedOptions() {
     return this.dtf.resolvedOptions();
@@ -34133,7 +34160,10 @@ function objToLocalTS(obj) {
   // for legacy reasons, years between 0 and 99 are interpreted as 19XX; revert that
   if (obj.year < 100 && obj.year >= 0) {
     d = new Date(d);
-    d.setUTCFullYear(d.getUTCFullYear() - 1900);
+    // set the month and day again, this is necessary because year 2000 is a leap year, but year 100 is not
+    // so if obj.year is in 99, but obj.day makes it roll over into year 100,
+    // the calculations done by Date.UTC are using year 2000 - which is incorrect
+    d.setUTCFullYear(obj.year, obj.month - 1, obj.day);
   }
   return +d;
 }
@@ -34365,6 +34395,9 @@ class Formatter {
     return new Formatter(locale, opts);
   }
   static parseFormat(fmt) {
+    // white-space is always considered a literal in user-provided formats
+    // the " " token has a special meaning (see unitForToken)
+
     let current = null,
       currentFull = "",
       bracketed = false;
@@ -34374,7 +34407,7 @@ class Formatter {
       if (c === "'") {
         if (currentFull.length > 0) {
           splits.push({
-            literal: bracketed,
+            literal: bracketed || /^\s+$/.test(currentFull),
             val: currentFull
           });
         }
@@ -34388,7 +34421,7 @@ class Formatter {
       } else {
         if (currentFull.length > 0) {
           splits.push({
-            literal: false,
+            literal: /^\s+$/.test(currentFull),
             val: currentFull
           });
         }
@@ -34398,7 +34431,7 @@ class Formatter {
     }
     if (currentFull.length > 0) {
       splits.push({
-        literal: bracketed,
+        literal: bracketed || /^\s+$/.test(currentFull),
         val: currentFull
       });
     }
@@ -36126,7 +36159,7 @@ class Interval {
     if (!this.isValid) return NaN;
     const start = this.start.startOf(unit),
       end = this.end.startOf(unit);
-    return Math.floor(end.diff(start, unit).get(unit)) + 1;
+    return Math.floor(end.diff(start, unit).get(unit)) + (end.valueOf() !== this.end.valueOf());
   }
 
   /**
@@ -36992,6 +37025,10 @@ function unitForToken(token, loc) {
         // because we don't have any way to figure out what they are
         case "z":
           return simple(/[a-z_+-/]{1,256}?/i);
+        // this special-case "token" represents a place where a macro-token expanded into a white-space literal
+        // in this case we accept any non-newline white-space
+        case " ":
+          return simple(/[^\S\n\r]/);
         default:
           return literal(t);
       }
@@ -37046,9 +37083,10 @@ function tokenForPart(part, formatOpts) {
     value
   } = part;
   if (type === "literal") {
+    const isSpace = /^\s+$/.test(value);
     return {
-      literal: true,
-      val: value
+      literal: !isSpace,
+      val: isSpace ? " " : value
     };
   }
   const style = formatOpts[type];
@@ -37523,7 +37561,7 @@ function parseDataToDateTime(parsed, parsedZone, opts, format, text, specificOff
     setZone,
     zone
   } = opts;
-  if (parsed && Object.keys(parsed).length !== 0) {
+  if (parsed && Object.keys(parsed).length !== 0 || parsedZone) {
     const interpretationZone = parsedZone || zone,
       inst = DateTime.fromObject(parsed, {
         ...opts,
@@ -39570,7 +39608,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.2.1";
+const VERSION = "3.3.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;
@@ -40468,7 +40506,6 @@ 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]);
@@ -40570,14 +40607,6 @@ 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) + (commaRoundTrip && isArray(obj) && valuesArray.length === 1 ? '[]' : '') + '=' + valuesJoined];
-            }
             return [formatter(keyValue) + '=' + formatter(encoder(obj, defaults.encoder, charset, 'value', format))];
         }
         return [formatter(prefix) + '=' + formatter(String(obj))];
@@ -40592,6 +40621,9 @@ var stringify = function stringify(
     var objKeys;
     if (generateArrayPrefix === 'comma' && isArray(obj)) {
         // we need to join elements in
+        if (encodeValuesOnly && encoder) {
+            obj = utils.maybeMap(obj, encoder);
+        }
         objKeys = [{ value: obj.length > 0 ? obj.join(',') || null : void undefined }];
     } else if (isArray(filter)) {
         objKeys = filter;
@@ -40624,7 +40656,7 @@ var stringify = function stringify(
             commaRoundTrip,
             strictNullHandling,
             skipNulls,
-            encoder,
+            generateArrayPrefix === 'comma' && encodeValuesOnly && isArray(obj) ? null : encoder,
             filter,
             sort,
             allowDots,
@@ -45150,7 +45182,7 @@ module.exports = TSServal;
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
-// Axios v1.2.2 Copyright (c) 2022 Matt Zabriskie and contributors
+// Axios v1.3.4 Copyright (c) 2023 Matt Zabriskie and contributors
 
 
 function bind(fn, thisArg) {
@@ -45669,7 +45701,7 @@ const matchAll = (regExp, str) => {
 const isHTMLForm = kindOfTest('HTMLFormElement');
 
 const toCamelCase = str => {
-  return str.toLowerCase().replace(/[_-\s]([a-z\d])(\w*)/g,
+  return str.toLowerCase().replace(/[-_\s]([a-z\d])(\w*)/g,
     function replacer(m, p1, p2) {
       return p1.toUpperCase() + p2;
     }
@@ -45753,6 +45785,37 @@ const toFiniteNumber = (value, defaultValue) => {
   return Number.isFinite(value) ? value : defaultValue;
 };
 
+const ALPHA = 'abcdefghijklmnopqrstuvwxyz';
+
+const DIGIT = '0123456789';
+
+const ALPHABET = {
+  DIGIT,
+  ALPHA,
+  ALPHA_DIGIT: ALPHA + ALPHA.toUpperCase() + DIGIT
+};
+
+const generateString = (size = 16, alphabet = ALPHABET.ALPHA_DIGIT) => {
+  let str = '';
+  const {length} = alphabet;
+  while (size--) {
+    str += alphabet[Math.random() * length|0];
+  }
+
+  return str;
+};
+
+/**
+ * If the thing is a FormData object, return true, otherwise return false.
+ *
+ * @param {unknown} thing - The thing to check.
+ *
+ * @returns {boolean}
+ */
+function isSpecCompliantForm(thing) {
+  return !!(thing && isFunction(thing.append) && thing[Symbol.toStringTag] === 'FormData' && thing[Symbol.iterator]);
+}
+
 const toJSONObject = (obj) => {
   const stack = new Array(10);
 
@@ -45830,6 +45893,9 @@ var utils = {
   findKey,
   global: _global,
   isContextDefined,
+  ALPHABET,
+  generateString,
+  isSpecCompliantForm,
   toJSONObject
 };
 
@@ -45928,10 +45994,8 @@ AxiosError.from = (error, code, config, request, response, customProps) => {
   return axiosError;
 };
 
-/* eslint-env browser */
-var browser = typeof self == 'object' ? self.FormData : window.FormData;
-
-var FormData$2 = browser;
+// eslint-disable-next-line strict
+var httpAdapter = null;
 
 /**
  * Determines if the given thing is a array or js object.
@@ -45988,17 +46052,6 @@ const predicates = utils.toFlatObject(utils, {}, null, function filter(prop) {
   return /^is[A-Z]/.test(prop);
 });
 
-/**
- * If the thing is a FormData object, return true, otherwise return false.
- *
- * @param {unknown} thing - The thing to check.
- *
- * @returns {boolean}
- */
-function isSpecCompliant(thing) {
-  return thing && utils.isFunction(thing.append) && thing[Symbol.toStringTag] === 'FormData' && thing[Symbol.iterator];
-}
-
 /**
  * Convert a data object to FormData
  *
@@ -46028,7 +46081,7 @@ function toFormData(obj, formData, options) {
   }
 
   // eslint-disable-next-line no-param-reassign
-  formData = formData || new (FormData$2 || FormData)();
+  formData = formData || new (FormData)();
 
   // eslint-disable-next-line no-param-reassign
   options = utils.toFlatObject(options, {
@@ -46046,7 +46099,7 @@ function toFormData(obj, formData, options) {
   const dots = options.dots;
   const indexes = options.indexes;
   const _Blob = options.Blob || typeof Blob !== 'undefined' && Blob;
-  const useBlob = _Blob && isSpecCompliant(formData);
+  const useBlob = _Blob && utils.isSpecCompliantForm(formData);
 
   if (!utils.isFunction(visitor)) {
     throw new TypeError('visitor must be a function');
@@ -46091,7 +46144,7 @@ function toFormData(obj, formData, options) {
         value = JSON.stringify(value);
       } else if (
         (utils.isArray(value) && isFlatArray(value)) ||
-        (utils.isFileList(value) || utils.endsWith(key, '[]') && (arr = utils.toArray(value))
+        ((utils.isFileList(value) || utils.endsWith(key, '[]')) && (arr = utils.toArray(value))
         )) {
         // eslint-disable-next-line no-param-reassign
         key = removeBrackets(key);
@@ -46343,7 +46396,9 @@ var transitionalDefaults = {
 
 var URLSearchParams$1 = typeof URLSearchParams !== 'undefined' ? URLSearchParams : AxiosURLSearchParams;
 
-var FormData$1 = FormData;
+var FormData$1 = typeof FormData !== 'undefined' ? FormData : null;
+
+var Blob$1 = typeof Blob !== 'undefined' ? Blob : null;
 
 /**
  * Determine if we're running in a standard browser environment
@@ -46399,7 +46454,7 @@ var platform = {
   classes: {
     URLSearchParams: URLSearchParams$1,
     FormData: FormData$1,
-    Blob
+    Blob: Blob$1
   },
   isStandardBrowserEnv,
   isStandardBrowserWebWorkerEnv,
@@ -46745,11 +46800,15 @@ function isValidHeaderName(str) {
   return /^[-_a-zA-Z]+$/.test(str.trim());
 }
 
-function matchHeaderValue(context, value, header, filter) {
+function matchHeaderValue(context, value, header, filter, isHeaderNameFilter) {
   if (utils.isFunction(filter)) {
     return filter.call(this, value, header);
   }
 
+  if (isHeaderNameFilter) {
+    value = header;
+  }
+
   if (!utils.isString(value)) return;
 
   if (utils.isString(filter)) {
@@ -46853,7 +46912,7 @@ class AxiosHeaders {
     if (header) {
       const key = utils.findKey(this, header);
 
-      return !!(key && (!matcher || matchHeaderValue(this, this[key], key, matcher)));
+      return !!(key && this[key] !== undefined && (!matcher || matchHeaderValue(this, this[key], key, matcher)));
     }
 
     return false;
@@ -46886,8 +46945,20 @@ class AxiosHeaders {
     return deleted;
   }
 
-  clear() {
-    return Object.keys(this).forEach(this.delete.bind(this));
+  clear(matcher) {
+    const keys = Object.keys(this);
+    let i = keys.length;
+    let deleted = false;
+
+    while (i--) {
+      const key = keys[i];
+      if(!matcher || matchHeaderValue(this, this[key], key, matcher, true)) {
+        delete this[key];
+        deleted = true;
+      }
+    }
+
+    return deleted;
   }
 
   normalize(format) {
@@ -46978,7 +47049,7 @@ class AxiosHeaders {
   }
 }
 
-AxiosHeaders.accessor(['Content-Type', 'Content-Length', 'Accept', 'Accept-Encoding', 'User-Agent']);
+AxiosHeaders.accessor(['Content-Type', 'Content-Length', 'Accept', 'Accept-Encoding', 'User-Agent', 'Authorization']);
 
 utils.freezeMethods(AxiosHeaders.prototype);
 utils.freezeMethods(AxiosHeaders);
@@ -47031,9 +47102,6 @@ utils.inherits(CanceledError, AxiosError, {
   __CANCEL__: true
 });
 
-// eslint-disable-next-line strict
-var httpAdapter = null;
-
 /**
  * Resolve or reject a Promise based on response status.
  *
@@ -47734,7 +47802,7 @@ function mergeConfig(config1, config2) {
   return config;
 }
 
-const VERSION = "1.2.2";
+const VERSION = "1.3.4";
 
 const validators$1 = {};