@pod-os/core 0.12.1-6af5683.0 → 0.12.1-a971174.0

package/lib/index.js

@@ -60,22 +60,22 @@ var PodOS = (() => {
       var NumberIsNaN = Number.isNaN || function NumberIsNaN2(value6) {
         return value6 !== value6;
       };
-      function EventEmitter3() {
-        EventEmitter3.init.call(this);
+      function EventEmitter2() {
+        EventEmitter2.init.call(this);
       }
-      module3.exports = EventEmitter3;
+      module3.exports = EventEmitter2;
       module3.exports.once = once;
-      EventEmitter3.EventEmitter = EventEmitter3;
-      EventEmitter3.prototype._events = void 0;
-      EventEmitter3.prototype._eventsCount = 0;
-      EventEmitter3.prototype._maxListeners = void 0;
+      EventEmitter2.EventEmitter = EventEmitter2;
+      EventEmitter2.prototype._events = void 0;
+      EventEmitter2.prototype._eventsCount = 0;
+      EventEmitter2.prototype._maxListeners = void 0;
       var defaultMaxListeners = 10;
       function checkListener(listener) {
         if (typeof listener !== "function") {
           throw new TypeError('The "listener" argument must be of type Function. Received type ' + typeof listener);
         }
       }
-      Object.defineProperty(EventEmitter3, "defaultMaxListeners", {
+      Object.defineProperty(EventEmitter2, "defaultMaxListeners", {
         enumerable: true,
         get: function() {
           return defaultMaxListeners;
@@ -87,14 +87,14 @@ var PodOS = (() => {
           defaultMaxListeners = arg2;
         }
       });
-      EventEmitter3.init = function() {
+      EventEmitter2.init = function() {
         if (this._events === void 0 || this._events === Object.getPrototypeOf(this)._events) {
           this._events = /* @__PURE__ */ Object.create(null);
           this._eventsCount = 0;
         }
         this._maxListeners = this._maxListeners || void 0;
       };
-      EventEmitter3.prototype.setMaxListeners = function setMaxListeners(n2) {
+      EventEmitter2.prototype.setMaxListeners = function setMaxListeners(n2) {
         if (typeof n2 !== "number" || n2 < 0 || NumberIsNaN(n2)) {
           throw new RangeError('The value of "n" is out of range. It must be a non-negative number. Received ' + n2 + ".");
         }
@@ -103,13 +103,13 @@ var PodOS = (() => {
       };
       function _getMaxListeners(that) {
         if (that._maxListeners === void 0)
-          return EventEmitter3.defaultMaxListeners;
+          return EventEmitter2.defaultMaxListeners;
         return that._maxListeners;
       }
-      EventEmitter3.prototype.getMaxListeners = function getMaxListeners() {
+      EventEmitter2.prototype.getMaxListeners = function getMaxListeners() {
         return _getMaxListeners(this);
       };
-      EventEmitter3.prototype.emit = function emit(type5) {
+      EventEmitter2.prototype.emit = function emit(type5) {
         var args = [];
         for (var i = 1; i < arguments.length; i++) args.push(arguments[i]);
         var doError = type5 === "error";
@@ -186,11 +186,11 @@ var PodOS = (() => {
         }
         return target5;
       }
-      EventEmitter3.prototype.addListener = function addListener(type5, listener) {
+      EventEmitter2.prototype.addListener = function addListener(type5, listener) {
         return _addListener(this, type5, listener, false);
       };
-      EventEmitter3.prototype.on = EventEmitter3.prototype.addListener;
-      EventEmitter3.prototype.prependListener = function prependListener(type5, listener) {
+      EventEmitter2.prototype.on = EventEmitter2.prototype.addListener;
+      EventEmitter2.prototype.prependListener = function prependListener(type5, listener) {
         return _addListener(this, type5, listener, true);
       };
       function onceWrapper() {
@@ -209,17 +209,17 @@ var PodOS = (() => {
         state2.wrapFn = wrapped;
         return wrapped;
       }
-      EventEmitter3.prototype.once = function once2(type5, listener) {
+      EventEmitter2.prototype.once = function once2(type5, listener) {
         checkListener(listener);
         this.on(type5, _onceWrap(this, type5, listener));
         return this;
       };
-      EventEmitter3.prototype.prependOnceListener = function prependOnceListener(type5, listener) {
+      EventEmitter2.prototype.prependOnceListener = function prependOnceListener(type5, listener) {
         checkListener(listener);
         this.prependListener(type5, _onceWrap(this, type5, listener));
         return this;
       };
-      EventEmitter3.prototype.removeListener = function removeListener(type5, listener) {
+      EventEmitter2.prototype.removeListener = function removeListener(type5, listener) {
         var list, events3, position4, i, originalListener;
         checkListener(listener);
         events3 = this._events;
@@ -259,8 +259,8 @@ var PodOS = (() => {
         }
         return this;
       };
-      EventEmitter3.prototype.off = EventEmitter3.prototype.removeListener;
-      EventEmitter3.prototype.removeAllListeners = function removeAllListeners(type5) {
+      EventEmitter2.prototype.off = EventEmitter2.prototype.removeListener;
+      EventEmitter2.prototype.removeAllListeners = function removeAllListeners(type5) {
         var listeners, events3, i;
         events3 = this._events;
         if (events3 === void 0)
@@ -300,7 +300,7 @@ var PodOS = (() => {
         }
         return this;
       };
-      function _listeners(target5, type5, unwrap3) {
+      function _listeners(target5, type5, unwrap) {
         var events3 = target5._events;
         if (events3 === void 0)
           return [];
@@ -308,23 +308,23 @@ var PodOS = (() => {
         if (evlistener === void 0)
           return [];
         if (typeof evlistener === "function")
-          return unwrap3 ? [evlistener.listener || evlistener] : [evlistener];
-        return unwrap3 ? unwrapListeners(evlistener) : arrayClone(evlistener, evlistener.length);
+          return unwrap ? [evlistener.listener || evlistener] : [evlistener];
+        return unwrap ? unwrapListeners(evlistener) : arrayClone(evlistener, evlistener.length);
       }
-      EventEmitter3.prototype.listeners = function listeners(type5) {
+      EventEmitter2.prototype.listeners = function listeners(type5) {
         return _listeners(this, type5, true);
       };
-      EventEmitter3.prototype.rawListeners = function rawListeners(type5) {
+      EventEmitter2.prototype.rawListeners = function rawListeners(type5) {
         return _listeners(this, type5, false);
       };
-      EventEmitter3.listenerCount = function(emitter, type5) {
+      EventEmitter2.listenerCount = function(emitter, type5) {
         if (typeof emitter.listenerCount === "function") {
           return emitter.listenerCount(type5);
         } else {
           return listenerCount.call(emitter, type5);
         }
       };
-      EventEmitter3.prototype.listenerCount = listenerCount;
+      EventEmitter2.prototype.listenerCount = listenerCount;
       function listenerCount(type5) {
         var events3 = this._events;
         if (events3 !== void 0) {
@@ -337,7 +337,7 @@ var PodOS = (() => {
         }
         return 0;
       }
-      EventEmitter3.prototype.eventNames = function eventNames() {
+      EventEmitter2.prototype.eventNames = function eventNames() {
         return this._eventsCount > 0 ? ReflectOwnKeys(this._events) : [];
       };
       function arrayClone(arr, n2) {
@@ -7770,7 +7770,7 @@ var PodOS = (() => {
             return t3[e2] = r2;
           };
         }
-        function wrap3(t2, e2, r2, n3) {
+        function wrap(t2, e2, r2, n3) {
           var i2 = e2 && e2.prototype instanceof Generator ? e2 : Generator, a2 = Object.create(i2.prototype), c2 = new Context(n3 || []);
           return o(a2, "_invoke", {
             value: makeInvokeMethod(t2, r2, c2)
@@ -7789,7 +7789,7 @@ var PodOS = (() => {
             };
           }
         }
-        e.wrap = wrap3;
+        e.wrap = wrap;
         var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {};
         function Generator() {
         }
@@ -7935,7 +7935,7 @@ var PodOS = (() => {
           return this;
         }), e.AsyncIterator = AsyncIterator, e.async = function(t2, r2, n3, o2, i2) {
           void 0 === i2 && (i2 = Promise);
-          var a2 = new AsyncIterator(wrap3(t2, r2, n3, o2), i2);
+          var a2 = new AsyncIterator(wrap(t2, r2, n3, o2), i2);
           return e.isGeneratorFunction(r2) ? a2 : a2.next().then(function(t3) {
             return t3.done ? t3.value : a2.next();
           });
@@ -10088,6 +10088,8 @@ var PodOS = (() => {
             return buf.push("<?", node2.target, " ", node2.data, "?>");
           case ENTITY_REFERENCE_NODE:
             return buf.push("&", node2.nodeName, ";");
+          //case ENTITY_NODE:
+          //case NOTATION_NODE:
           default:
             buf.push("??", node2.nodeName);
         }
@@ -10098,6 +10100,11 @@ var PodOS = (() => {
           case ELEMENT_NODE:
             node22 = node2.cloneNode(false);
             node22.ownerDocument = doc;
+          //var attrs = node2.attributes;
+          //var len = attrs.length;
+          //for(var i=0;i<len;i++){
+          //node2.setAttributeNodeNS(importNode(doc,attrs.item(i),deep));
+          //}
           case DOCUMENT_FRAGMENT_NODE:
             break;
           case ATTRIBUTE_NODE:
@@ -12500,6 +12507,7 @@ var PodOS = (() => {
                 }
                 end2++;
                 break;
+              // end elment
               case "?":
                 locator && position4(tagStart);
                 end2 = parseInstruction(source8, tagStart, domBuilder);
@@ -12635,6 +12643,7 @@ var PodOS = (() => {
                 case S_ATTR_SPACE:
                   el.closed = true;
                   break;
+                //case S_EQ:
                 default:
                   throw new Error("attribute invalid close char('/')");
               }
@@ -12653,7 +12662,9 @@ var PodOS = (() => {
                 case S_TAG_SPACE:
                 case S_TAG_CLOSE:
                   break;
+                //normal
                 case S_ATTR_NOQUOT_VALUE:
+                //Compatible state
                 case S_ATTR:
                   value6 = source8.slice(start2, p);
                   if (value6.slice(-1) === "/") {
@@ -12678,6 +12689,7 @@ var PodOS = (() => {
                   throw new Error("attribute value missed!!");
               }
               return p;
+            /*xml space '\x20' | #x9 | #xD | #xA; */
             case "\x80":
               c = " ";
             default:
@@ -12701,6 +12713,9 @@ var PodOS = (() => {
                 }
               } else {
                 switch (s) {
+                  //case S_TAG:void();break;
+                  //case S_ATTR:void();break;
+                  //case S_ATTR_NOQUOT_VALUE:void();break;
                   case S_ATTR_SPACE:
                     var tagName = el.tagName;
                     if (!NAMESPACE.isHTML(currentNSMap[""]) || !attrName.match(/^(?:disabled|checked|selected)$/i)) {
@@ -13562,7 +13577,7 @@ var PodOS = (() => {
           }
           return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
         }
-        function decode4(input2) {
+        function decode3(input2) {
           var output2 = [], inputLength = input2.length, out, i = 0, n2 = initialN, bias = initialBias, basic, j, index2, oldi, w, k, digit, t, baseMinusT;
           basic = input2.lastIndexOf(delimiter);
           if (basic < 0) {
@@ -13666,7 +13681,7 @@ var PodOS = (() => {
         }
         function toUnicode(input2) {
           return mapDomain(input2, function(string2) {
-            return regexPunycode.test(string2) ? decode4(string2.slice(4).toLowerCase()) : string2;
+            return regexPunycode.test(string2) ? decode3(string2.slice(4).toLowerCase()) : string2;
           });
         }
         function toASCII(input2) {
@@ -13692,7 +13707,7 @@ var PodOS = (() => {
             "decode": ucs2decode,
             "encode": ucs2encode
           },
-          "decode": decode4,
+          "decode": decode3,
           "encode": encode3,
           "toASCII": toASCII,
           "toUnicode": toUnicode
@@ -14716,14 +14731,14 @@ var PodOS = (() => {
           var protoTag = obj instanceof Object ? "" : "null prototype";
           var stringTag = !isPlainObject && toStringTag && Object(obj) === obj && toStringTag in obj ? $slice.call(toStr(obj), 8, -1) : protoTag ? "Object" : "";
           var constructorTag = isPlainObject || typeof obj.constructor !== "function" ? "" : obj.constructor.name ? obj.constructor.name + " " : "";
-          var tag3 = constructorTag + (stringTag || protoTag ? "[" + $join.call($concat.call([], stringTag || [], protoTag || []), ": ") + "] " : "");
+          var tag4 = constructorTag + (stringTag || protoTag ? "[" + $join.call($concat.call([], stringTag || [], protoTag || []), ": ") + "] " : "");
           if (ys.length === 0) {
-            return tag3 + "{}";
+            return tag4 + "{}";
           }
           if (indent) {
-            return tag3 + "{" + indentedJoin(ys, indent) + "}";
+            return tag4 + "{" + indentedJoin(ys, indent) + "}";
           }
-          return tag3 + "{ " + $join.call(ys, ", ") + " }";
+          return tag4 + "{ " + $join.call(ys, ", ") + " }";
         }
         return String(obj);
       };
@@ -15236,7 +15251,7 @@ var PodOS = (() => {
           return acc;
         }, target5);
       };
-      var decode4 = function(str, decoder2, charset) {
+      var decode3 = function(str, decoder2, charset) {
         var strWithoutPlus = str.replace(/\+/g, " ");
         if (charset === "iso-8859-1") {
           return strWithoutPlus.replace(/%[0-9a-f]{2}/gi, unescape);
@@ -15339,7 +15354,7 @@ var PodOS = (() => {
         assign,
         combine,
         compact,
-        decode: decode4,
+        decode: decode3,
         encode: encode3,
         isBuffer,
         isRegExp,
@@ -15655,6 +15670,7 @@ var PodOS = (() => {
         parameterLimit: 1e3,
         parseArrays: true,
         plainObjects: false,
+        strictDepth: false,
         strictNullHandling: false
       };
       var interpretNumericEntities = function(str) {
@@ -15673,6 +15689,7 @@ var PodOS = (() => {
       var parseValues = function parseQueryStringValues(str, options) {
         var obj = { __proto__: null };
         var cleanStr = options.ignoreQueryPrefix ? str.replace(/^\?/, "") : str;
+        cleanStr = cleanStr.replace(/%5B/gi, "[").replace(/%5D/gi, "]");
         var limit3 = options.parameterLimit === Infinity ? void 0 : options.parameterLimit;
         var parts = cleanStr.split(options.delimiter, limit3);
         var skipIndex = -1;
@@ -15732,7 +15749,7 @@ var PodOS = (() => {
           var obj;
           var root = chain2[i];
           if (root === "[]" && options.parseArrays) {
-            obj = options.allowEmptyArrays && leaf === "" ? [] : [].concat(leaf);
+            obj = options.allowEmptyArrays && (leaf === "" || options.strictNullHandling && leaf === null) ? [] : [].concat(leaf);
           } else {
             obj = options.plainObjects ? /* @__PURE__ */ Object.create(null) : {};
             var cleanRoot = root.charAt(0) === "[" && root.charAt(root.length - 1) === "]" ? root.slice(1, -1) : root;
@@ -15780,6 +15797,9 @@ var PodOS = (() => {
           keys.push(segment[1]);
         }
         if (segment) {
+          if (options.strictDepth === true) {
+            throw new RangeError("Input depth exceeded depth option of " + options.depth + " and strictDepth is true");
+          }
           keys.push("[" + key3.slice(segment.index) + "]");
         }
         return parseObject(keys, val, options, valuesParsed);
@@ -15826,6 +15846,7 @@ var PodOS = (() => {
           parameterLimit: typeof opts.parameterLimit === "number" ? opts.parameterLimit : defaults.parameterLimit,
           parseArrays: opts.parseArrays !== false,
           plainObjects: typeof opts.plainObjects === "boolean" ? opts.plainObjects : defaults.plainObjects,
+          strictDepth: typeof opts.strictDepth === "boolean" ? !!opts.strictDepth : defaults.strictDepth,
           strictNullHandling: typeof opts.strictNullHandling === "boolean" ? opts.strictNullHandling : defaults.strictNullHandling
         };
       };
@@ -21859,7 +21880,7 @@ var PodOS = (() => {
                     throw new Error("Can't serialize object of type " + st3.object.termType + " into XML");
                 }
               }
-              var tag3 = type5 ? qname(type5) : "rdf:Description";
+              var tag4 = type5 ? qname(type5) : "rdf:Description";
               var attrs = "";
               if (subject5.termType === "BlankNode") {
                 if (!stats.incoming[subject5] || stats.incoming[subject5].length !== 1) {
@@ -21868,7 +21889,7 @@ var PodOS = (() => {
               } else {
                 attrs = ' rdf:about="' + relURI(subject5) + '"';
               }
-              return ["<" + tag3 + attrs + ">"].concat([results]).concat(["</" + tag3 + ">"]);
+              return ["<" + tag4 + attrs + ">"].concat([results]).concat(["</" + tag4 + ">"]);
             }
             var subjectXMLTree = subjectXMLTreeMethod.bind(this);
             function collectionXMLTree(subject5, stats) {
@@ -23777,6 +23798,7 @@ var PodOS = (() => {
                 return new BlankNode(term3.value);
               case CollectionTermType:
                 return term3;
+              // non-RDF/JS type, should just need to cast
               case DefaultGraphTermType:
                 return new DefaultGraph();
               case EmptyTermType:
@@ -23898,6 +23920,7 @@ var PodOS = (() => {
                   break;
                 case "Literal":
                 case "BlankNode":
+                // @ts-ignore Collections can appear here
                 case "Collection":
                   this.add(target5, st3.predicate, st3.object.copy(this));
               }
@@ -24629,7 +24652,7 @@ var PodOS = (() => {
           return utftext;
         },
         // public method for url decoding
-        decode: function decode3(utftext) {
+        decode: function decode2(utftext) {
           var string2 = "";
           var i = 0;
           while (i < utftext.length) {
@@ -28992,15 +29015,15 @@ var PodOS = (() => {
           }
           return resolved;
         }
-        _cacheResolvedContext({ key: key3, resolved, tag: tag3 }) {
+        _cacheResolvedContext({ key: key3, resolved, tag: tag4 }) {
           this.perOpCache.set(key3, resolved);
-          if (tag3 !== void 0) {
+          if (tag4 !== void 0) {
             let tagMap = this.sharedCache.get(key3);
             if (!tagMap) {
               tagMap = /* @__PURE__ */ new Map();
               this.sharedCache.set(key3, tagMap);
             }
-            tagMap.set(tag3, resolved);
+            tagMap.set(tag4, resolved);
           }
           return resolved;
         }
@@ -34734,6 +34757,7 @@ var PodOS = (() => {
                   }
                   break;
                 }
+              // Fall through in case the type is an IRI
               case "<":
                 if (match = this._unescapedIri.exec(input2))
                   type5 = "IRI", value6 = match[1];
@@ -34799,6 +34823,7 @@ var PodOS = (() => {
                   matchLength = 1;
                   break;
                 }
+              // Fall through to numerical case (could be a decimal dot)
               case "0":
               case "1":
               case "2":
@@ -35346,19 +35371,23 @@ var PodOS = (() => {
         // ### `_readInTopContext` reads a token when in the top context
         _readInTopContext(token) {
           switch (token.type) {
+            // If an EOF token arrives in the top context, signal that we're done
             case "eof":
               if (this._graph !== null)
                 return this._error("Unclosed graph", token);
               delete this._prefixes._;
               return this._callback(null, null, this._prefixes);
+            // It could be a prefix declaration
             case "PREFIX":
               this._sparqlStyle = true;
             case "@prefix":
               return this._readPrefix;
+            // It could be a base declaration
             case "BASE":
               this._sparqlStyle = true;
             case "@base":
               return this._readBaseIRI;
+            // It could be a graph
             case "{":
               if (this._supportsNamedGraphs) {
                 this._graph = "";
@@ -35368,6 +35397,7 @@ var PodOS = (() => {
             case "GRAPH":
               if (this._supportsNamedGraphs)
                 return this._readNamedGraphLabel;
+            // Otherwise, the next token must be a subject
             default:
               return this._readSubject(token);
           }
@@ -35376,6 +35406,7 @@ var PodOS = (() => {
         _readEntity(token, quantifier) {
           let value6;
           switch (token.type) {
+            // Read a relative or absolute IRI
             case "IRI":
             case "typeIRI":
               const iri = this._resolveIRI(token.value);
@@ -35383,6 +35414,7 @@ var PodOS = (() => {
                 return this._error("Invalid IRI", token);
               value6 = this._namedNode(iri);
               break;
+            // Read a prefixed name
             case "type":
             case "prefixed":
               const prefix2 = this._prefixes[token.prefix];
@@ -35390,12 +35422,15 @@ var PodOS = (() => {
                 return this._error(`Undefined prefix "${token.prefix}:"`, token);
               value6 = this._namedNode(prefix2 + token.value);
               break;
+            // Read a blank node
             case "blank":
               value6 = this._blankNode(this._prefixes[token.prefix] + token.value);
               break;
+            // Read a variable
             case "var":
               value6 = this._variable(token.value.substr(1));
               break;
+            // Everything else is not an entity
             default:
               return this._error(`Expected entity but got ${token.type}`, token);
           }
@@ -35699,6 +35734,7 @@ var PodOS = (() => {
         _completeLiteral(token) {
           let literal5 = this._literal(this._literalValue);
           switch (token.type) {
+            // Create a datatyped literal
             case "type":
             case "typeIRI":
               const datatype = this._readEntity(token);
@@ -35706,6 +35742,7 @@ var PodOS = (() => {
               literal5 = this._literal(this._literalValue, datatype);
               token = null;
               break;
+            // Create a language-tagged string
             case "langcode":
               literal5 = this._literal(this._literalValue, token.value);
               token = null;
@@ -35747,23 +35784,28 @@ var PodOS = (() => {
           let next3, graph4 = this._graph;
           const subject5 = this._subject, inversePredicate = this._inversePredicate;
           switch (token.type) {
+            // A closing brace ends a graph
             case "}":
               if (this._graph === null)
                 return this._error("Unexpected graph closing", token);
               if (this._n3Mode)
                 return this._readFormulaTail(token);
               this._graph = null;
+            // A dot just ends the statement, without sharing anything with the next
             case ".":
               this._subject = null;
               next3 = this._contextStack.length ? this._readSubject : this._readInTopContext;
               if (inversePredicate) this._inversePredicate = false;
               break;
+            // Semicolon means the subject is shared; predicate and object are different
             case ";":
               next3 = this._readPredicate;
               break;
+            // Comma means both the subject and predicate are shared; the object is different
             case ",":
               next3 = this._readObject;
               break;
+            // {| means that the current triple is annotated with predicate-object pairs.
             case "{|":
               if (!this._supportsRDFStar)
                 return this._error("Unexpected RDF* syntax", token);
@@ -35771,6 +35813,7 @@ var PodOS = (() => {
               this._subject = this._quad(subject5, predicate2, object6, this.DEFAULTGRAPH);
               next3 = this._readPredicate;
               break;
+            // |} means that the current quoted triple in annotation syntax is finalized.
             case "|}":
               if (this._subject.termType !== "Quad")
                 return this._error("Unexpected asserted triple closing", token);
@@ -35797,9 +35840,11 @@ var PodOS = (() => {
         _readBlankNodePunctuation(token) {
           let next3;
           switch (token.type) {
+            // Semicolon means the subject is shared; predicate and object are different
             case ";":
               next3 = this._readPredicate;
               break;
+            // Comma means both the subject and predicate are shared; the object is different
             case ",":
               next3 = this._readObject;
               break;
@@ -35922,10 +35967,13 @@ var PodOS = (() => {
         // ### `_readPath` reads a potential path
         _readPath(token) {
           switch (token.type) {
+            // Forward path
             case "!":
               return this._readForwardPath;
+            // Backward path
             case "^":
               return this._readBackwardPath;
+            // Not a path; resume reading where we left off
             default:
               const stack = this._contextStack, parent4 = stack.length && stack[stack.length - 1];
               if (parent4 && parent4.type === "item") {
@@ -36031,12 +36079,16 @@ var PodOS = (() => {
           if (!iri.length)
             return this._base;
           switch (iri[0]) {
+            // Resolve relative fragment IRIs against the base IRI
             case "#":
               return this._base + iri;
+            // Resolve relative query string IRIs by replacing the query string
             case "?":
               return this._base.replace(/(?:\?.*)?$/, iri);
+            // Resolve root-relative IRIs at the root of the base IRI
             case "/":
               return (iri[1] === "/" ? this._baseScheme : this._baseRoot) + this._removeDotSegments(iri);
+            // Resolve all other IRIs at the base IRI's path
             default:
               return /^[^/:]*:/.test(iri) ? null : this._removeDotSegments(this._basePath + iri);
           }
@@ -36049,6 +36101,7 @@ var PodOS = (() => {
           let result5 = "", i = -1, pathStart = -1, segmentStart = 0, next3 = "/";
           while (i < length2) {
             switch (next3) {
+              // The path starts with the first slash after the authority
               case ":":
                 if (pathStart < 0) {
                   if (iri[++i] === "/" && iri[++i] === "/")
@@ -36056,22 +36109,27 @@ var PodOS = (() => {
                       i = pathStart;
                 }
                 break;
+              // Don't modify a query string or fragment
               case "?":
               case "#":
                 i = length2;
                 break;
+              // Handle '/.' or '/..' path segments
               case "/":
                 if (iri[i + 1] === ".") {
                   next3 = iri[++i + 1];
                   switch (next3) {
+                    // Remove a '/.' segment
                     case "/":
                       result5 += iri.substring(segmentStart, i - 1);
                       segmentStart = i + 1;
                       break;
+                    // Remove a trailing '/.' segment
                     case void 0:
                     case "?":
                     case "#":
                       return result5 + iri.substring(segmentStart, i) + iri.substr(i + 1);
+                    // Remove a '/..' segment
                     case ".":
                       next3 = iri[++i + 1];
                       if (next3 === void 0 || next3 === "/" || next3 === "?" || next3 === "#") {
@@ -37954,7 +38012,7 @@ var PodOS = (() => {
             };
             if (support2.formData) {
               this.formData = function() {
-                return this.text().then(decode4);
+                return this.text().then(decode3);
               };
             }
             this.json = function() {
@@ -37967,10 +38025,10 @@ var PodOS = (() => {
             var upcased = method5.toUpperCase();
             return methods.indexOf(upcased) > -1 ? upcased : method5;
           }
-          function Request2(input2, options) {
+          function Request(input2, options) {
             options = options || {};
             var body = options.body;
-            if (input2 instanceof Request2) {
+            if (input2 instanceof Request) {
               if (input2.bodyUsed) {
                 throw new TypeError("Already read");
               }
@@ -38002,10 +38060,10 @@ var PodOS = (() => {
             }
             this._initBody(body);
           }
-          Request2.prototype.clone = function() {
-            return new Request2(this, { body: this._bodyInit });
+          Request.prototype.clone = function() {
+            return new Request(this, { body: this._bodyInit });
           };
-          function decode4(body) {
+          function decode3(body) {
             var form2 = new FormData();
             body.trim().split("&").forEach(function(bytes) {
               if (bytes) {
@@ -38030,8 +38088,8 @@ var PodOS = (() => {
             });
             return headers;
           }
-          Body.call(Request2.prototype);
-          function Response5(bodyInit, options) {
+          Body.call(Request.prototype);
+          function Response4(bodyInit, options) {
             if (!options) {
               options = {};
             }
@@ -38043,26 +38101,26 @@ var PodOS = (() => {
             this.url = options.url || "";
             this._initBody(bodyInit);
           }
-          Body.call(Response5.prototype);
-          Response5.prototype.clone = function() {
-            return new Response5(this._bodyInit, {
+          Body.call(Response4.prototype);
+          Response4.prototype.clone = function() {
+            return new Response4(this._bodyInit, {
               status: this.status,
               statusText: this.statusText,
               headers: new Headers3(this.headers),
               url: this.url
             });
           };
-          Response5.error = function() {
-            var response6 = new Response5(null, { status: 0, statusText: "" });
+          Response4.error = function() {
+            var response6 = new Response4(null, { status: 0, statusText: "" });
             response6.type = "error";
             return response6;
           };
           var redirectStatuses = [301, 302, 303, 307, 308];
-          Response5.redirect = function(url7, status9) {
+          Response4.redirect = function(url7, status9) {
             if (redirectStatuses.indexOf(status9) === -1) {
               throw new RangeError("Invalid status code");
             }
-            return new Response5(null, { status: status9, headers: { location: url7 } });
+            return new Response4(null, { status: status9, headers: { location: url7 } });
           };
           exports2.DOMException = self2.DOMException;
           try {
@@ -38077,9 +38135,9 @@ var PodOS = (() => {
             exports2.DOMException.prototype = Object.create(Error.prototype);
             exports2.DOMException.prototype.constructor = exports2.DOMException;
           }
-          function fetch3(input2, init) {
+          function fetch2(input2, init) {
             return new Promise(function(resolve, reject2) {
-              var request2 = new Request2(input2, init);
+              var request2 = new Request(input2, init);
               if (request2.signal && request2.signal.aborted) {
                 return reject2(new exports2.DOMException("Aborted", "AbortError"));
               }
@@ -38095,7 +38153,7 @@ var PodOS = (() => {
                 };
                 options.url = "responseURL" in xhr ? xhr.responseURL : options.headers.get("X-Request-URL");
                 var body = "response" in xhr ? xhr.response : xhr.responseText;
-                resolve(new Response5(body, options));
+                resolve(new Response4(body, options));
               };
               xhr.onerror = function() {
                 reject2(new TypeError("Network request failed"));
@@ -38129,17 +38187,17 @@ var PodOS = (() => {
               xhr.send(typeof request2._bodyInit === "undefined" ? null : request2._bodyInit);
             });
           }
-          fetch3.polyfill = true;
+          fetch2.polyfill = true;
           if (!self2.fetch) {
-            self2.fetch = fetch3;
+            self2.fetch = fetch2;
             self2.Headers = Headers3;
-            self2.Request = Request2;
-            self2.Response = Response5;
+            self2.Request = Request;
+            self2.Response = Response4;
           }
           exports2.Headers = Headers3;
-          exports2.Request = Request2;
-          exports2.Response = Response5;
-          exports2.fetch = fetch3;
+          exports2.Request = Request;
+          exports2.Response = Response4;
+          exports2.fetch = fetch2;
           Object.defineProperty(exports2, "__esModule", { value: true });
           return exports2;
         }({});
@@ -40959,6 +41017,7 @@ var PodOS = (() => {
               case "text/n3":
               case "text/turtle":
               case "application/x-turtle":
+              // Legacy
               case "application/n3":
                 documentString = sz.statementsToN3(data2);
                 break;
@@ -41150,14 +41209,11 @@ var PodOS = (() => {
   });
 
   // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/namespaces.js
-  var rdf3, vcard, solid, pim, dc;
+  var vcard, dc;
   var init_namespaces = __esm({
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/namespaces.js"() {
       init_esm();
-      rdf3 = Namespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#");
       vcard = Namespace("http://www.w3.org/2006/vcard/ns#");
-      solid = Namespace("http://www.w3.org/ns/solid/terms#");
-      pim = Namespace("http://www.w3.org/ns/pim/space#");
       dc = Namespace("http://purl.org/dc/elements/1.1/");
     }
   });
@@ -41504,25 +41560,32 @@ var PodOS = (() => {
     }
   });
 
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/generate-id.js
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/identifier/generate-id.js
   function generateId() {
     return uid.rnd(6);
   }
   var import_short_unique_id, uid;
   var init_generate_id = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/generate-id.js"() {
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/identifier/generate-id.js"() {
       import_short_unique_id = __toESM(require_short_unique_id(), 1);
       uid = new import_short_unique_id.default({ length: 10 });
     }
   });
 
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/identifier/index.js
+  var init_identifier = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/identifier/index.js"() {
+      init_generate_id();
+    }
+  });
+
   // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/AddressBookQuery.js
   var AddressBookQuery;
   var init_AddressBookQuery = __esm({
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/AddressBookQuery.js"() {
       init_esm();
       init_namespaces();
-      init_generate_id();
+      init_identifier();
       AddressBookQuery = class {
         constructor(store, addressBookNode) {
           this.store = store;
@@ -41640,11 +41703,37 @@ var PodOS = (() => {
     }
   });
 
+  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/GroupQuery.js
+  var GroupQuery;
+  var init_GroupQuery = __esm({
+    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/GroupQuery.js"() {
+      init_esm();
+      init_namespaces();
+      GroupQuery = class {
+        constructor(store, groupNode) {
+          this.store = store;
+          this.groupNode = groupNode;
+          this.groupDoc = groupNode.doc();
+        }
+        queryName() {
+          return this.store.anyValue(this.groupNode, vcard("fn"), void 0, this.groupDoc) ?? "";
+        }
+        queryMembers() {
+          return this.store.each(this.groupNode, vcard("hasMember"), null, this.groupDoc).filter((it) => isNamedNode(it)).map((node2) => ({
+            uri: node2.value,
+            name: this.store.anyValue(node2, vcard("fn"), null, this.groupDoc) ?? ""
+          }));
+        }
+      };
+    }
+  });
+
   // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/index.js
   var init_queries = __esm({
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/index.js"() {
       init_AddressBookQuery();
       init_ContactQuery();
+      init_GroupQuery();
     }
   });
 
@@ -41664,14 +41753,251 @@ var PodOS = (() => {
       uri: uri6,
       deletions: [],
       insertions,
-      filesToCreate: [{ uri: nameEmailIndexUri }, { uri: groupIndexUri }]
+      filesToCreate: [{ url: nameEmailIndexUri }, { url: groupIndexUri }]
     };
   }
   var init_createAddressBook = __esm({
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/createAddressBook.js"() {
       init_esm();
       init_namespaces();
-      init_generate_id();
+      init_identifier();
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/web-operations/executeUpdate.js
+  async function executeUpdate(fetcher3, updater, operation3) {
+    await updater.updateMany(operation3.deletions, operation3.insertions);
+    operation3.filesToCreate.map((file2) => {
+      createEmptyTurtleFile(fetcher3, file2.url);
+    });
+  }
+  function createEmptyTurtleFile(fetcher3, url7) {
+    return fetcher3.webOperation("PUT", url7, {
+      contentType: "text/turtle"
+    });
+  }
+  var init_executeUpdate = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/web-operations/executeUpdate.js"() {
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/web-operations/fetchNode.js
+  async function fetchNode(fetcher3, node2) {
+    if (node2) {
+      await fetcher3.load(node2.value);
+    }
+  }
+  var init_fetchNode = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/web-operations/fetchNode.js"() {
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/web-operations/index.js
+  var init_web_operations = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/web-operations/index.js"() {
+      init_executeUpdate();
+      init_fetchNode();
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/namespaces/index.js
+  var rdf3, solid, pim, ldp;
+  var init_namespaces2 = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/namespaces/index.js"() {
+      init_esm();
+      rdf3 = Namespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+      solid = Namespace("http://www.w3.org/ns/solid/terms#");
+      pim = Namespace("http://www.w3.org/ns/pim/space#");
+      ldp = Namespace("http://www.w3.org/ns/ldp#");
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/queries/PreferencesQuery.js
+  var PreferencesQuery;
+  var init_PreferencesQuery = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/queries/PreferencesQuery.js"() {
+      init_esm();
+      init_namespaces2();
+      PreferencesQuery = class {
+        constructor(store, webIdNode, preferencesDoc) {
+          this.store = store;
+          this.webIdNode = webIdNode;
+          this.preferencesDoc = preferencesDoc;
+        }
+        /**
+         * Look up the private type index. Returns null if none is found or if the predicated does not link to a proper named node
+         */
+        queryPrivateTypeIndex() {
+          const node2 = this.store.any(this.webIdNode, solid("privateTypeIndex"), null, this.preferencesDoc);
+          if (isNamedNode(node2)) {
+            return node2;
+          }
+          return null;
+        }
+      };
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/queries/ProfileQuery.js
+  var ProfileQuery;
+  var init_ProfileQuery = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/queries/ProfileQuery.js"() {
+      init_esm();
+      init_namespaces2();
+      ProfileQuery = class {
+        constructor(webIdNode, store) {
+          this.webIdNode = webIdNode;
+          this.store = store;
+        }
+        /**
+         * Look up the public type index. Returns null if none is found or if the predicated does not link to a proper named node
+         */
+        queryPublicTypeIndex() {
+          const predicate2 = solid("publicTypeIndex");
+          return this.queryNamedNode(predicate2);
+        }
+        /**
+         * Look up the preferences file. Returns null if none is found or if the predicated does not link to a proper named node
+         */
+        queryPreferencesFile() {
+          const predicate2 = pim("preferencesFile");
+          return this.queryNamedNode(predicate2);
+        }
+        queryNamedNode(predicate2) {
+          const node2 = this.store.any(this.webIdNode, predicate2, null, this.webIdNode.doc());
+          if (isNamedNode(node2)) {
+            return node2;
+          }
+          return null;
+        }
+      };
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/queries/TypeIndexQuery.js
+  var TypeIndexQuery;
+  var init_TypeIndexQuery = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/queries/TypeIndexQuery.js"() {
+      init_esm();
+      init_namespaces2();
+      TypeIndexQuery = class {
+        constructor(store, typeIndexDoc) {
+          this.store = store;
+          this.typeIndexDoc = typeIndexDoc;
+        }
+        /**
+         * Look up the instances in the type registration for the given RDF class
+         * @param type - The RDF class to look up
+         * @returns A list of the URIs of the found instances
+         */
+        queryInstancesForClass(type5) {
+          const registrations = this.store.each(null, solid("forClass"), type5, this.typeIndexDoc);
+          return registrations.flatMap((registration) => {
+            if (!isNamedNode(registration))
+              return [];
+            return this.getInstanceValues(registration);
+          });
+        }
+        getInstanceValues(registration) {
+          return this.store.each(registration, solid("instance"), null, this.typeIndexDoc).map((it) => it.value);
+        }
+      };
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/queries/index.js
+  var init_queries2 = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/queries/index.js"() {
+      init_PreferencesQuery();
+      init_ProfileQuery();
+      init_TypeIndexQuery();
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/module/ModuleSupport.js
+  var ModuleSupport;
+  var init_ModuleSupport = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/module/ModuleSupport.js"() {
+      init_esm();
+      init_dist();
+      init_namespaces2();
+      ModuleSupport = class {
+        constructor(config2) {
+          this.store = config2.store;
+          this.fetcher = config2.fetcher;
+          this.updater = config2.updater;
+        }
+        /**
+         * Nullsafe fetching of a node
+         * @param node - A node to fetch, or null to do nothing at all
+         */
+        async fetchNode(node2) {
+          return fetchNode(this.fetcher, node2);
+        }
+        /**
+         * Fetch all the given nodes in parallel
+         * @param nodes
+         */
+        async fetchAll(nodes) {
+          return Promise.all(nodes.map((it) => this.fetchNode(it)));
+        }
+        /**
+         * Checks whether the resource identified by the given URL is a LDP container
+         * @param storageUrl - The URL to check
+         * @returns true if it is a container, false otherwise
+         */
+        async isContainer(storageUrl) {
+          const storageNode = namedNode2(storageUrl);
+          await this.fetcher.load(storageNode.value);
+          return this.store.holds(storageNode, rdf3("type"), ldp("Container"), storageNode.doc());
+        }
+      };
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/module/index.js
+  var init_module = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/module/index.js"() {
+      init_ModuleSupport();
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/update-operations/addInstanceToTypeIndex.js
+  function addInstanceToTypeIndex(typeIndexDoc, instanceUri, type5) {
+    const registrationNode = namedNode2(`${typeIndexDoc.value}#${generateId()}`);
+    return {
+      deletions: [],
+      filesToCreate: [],
+      insertions: [
+        st2(registrationNode, rdf3("type"), solid("TypeRegistration"), typeIndexDoc),
+        st2(registrationNode, solid("forClass"), type5, typeIndexDoc),
+        st2(registrationNode, solid("instance"), namedNode2(instanceUri), typeIndexDoc)
+      ]
+    };
+  }
+  var init_addInstanceToTypeIndex = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/update-operations/addInstanceToTypeIndex.js"() {
+      init_esm();
+      init_identifier();
+      init_namespaces2();
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/update-operations/index.js
+  var init_update_operations = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/update-operations/index.js"() {
+      init_addInstanceToTypeIndex();
+    }
+  });
+
+  // ../node_modules/@solid-data-modules/rdflib-utils/dist/index.js
+  var init_dist = __esm({
+    "../node_modules/@solid-data-modules/rdflib-utils/dist/index.js"() {
+      init_web_operations();
+      init_queries2();
+      init_module();
+      init_update_operations();
+      init_namespaces2();
     }
   });
 
@@ -41707,42 +42033,7 @@ var PodOS = (() => {
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/createNewContact.js"() {
       init_esm();
       init_namespaces();
-    }
-  });
-
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/index.js
-  var init_update_operations = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/index.js"() {
-      init_createAddressBook();
-      init_createNewContact();
-    }
-  });
-
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/web-operations/executeUpdate.js
-  async function executeUpdate(fetcher3, updater, operation3) {
-    await updater.updateMany(operation3.deletions, operation3.insertions);
-    operation3.filesToCreate.map((file2) => {
-      createEmptyTurtleFile(fetcher3, file2.uri);
-    });
-  }
-  function createEmptyTurtleFile(fetcher3, uri6) {
-    return fetcher3.webOperation("PUT", uri6, {
-      contentType: "text/turtle"
-    });
-  }
-  var init_executeUpdate = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/web-operations/executeUpdate.js"() {
-    }
-  });
-
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/web-operations/fetchNode.js
-  async function fetchNode(fetcher3, node2) {
-    if (node2) {
-      await fetcher3.load(node2.value);
-    }
-  }
-  var init_fetchNode = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/web-operations/fetchNode.js"() {
+      init_dist();
     }
   });
 
@@ -41770,31 +42061,7 @@ var PodOS = (() => {
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/createNewGroup.js"() {
       init_esm();
       init_namespaces();
-    }
-  });
-
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/GroupQuery.js
-  var GroupQuery;
-  var init_GroupQuery = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/GroupQuery.js"() {
-      init_esm();
-      init_namespaces();
-      GroupQuery = class {
-        constructor(store, groupNode) {
-          this.store = store;
-          this.groupNode = groupNode;
-          this.groupDoc = groupNode.doc();
-        }
-        queryName() {
-          return this.store.anyValue(this.groupNode, vcard("fn"), void 0, this.groupDoc) ?? "";
-        }
-        queryMembers() {
-          return this.store.each(this.groupNode, vcard("hasMember"), null, this.groupDoc).filter((it) => isNamedNode(it)).map((node2) => ({
-            uri: node2.value,
-            name: this.store.anyValue(node2, vcard("fn"), null, this.groupDoc) ?? ""
-          }));
-        }
-      };
+      init_dist();
     }
   });
 
@@ -41802,7 +42069,6 @@ var PodOS = (() => {
   function addContactToGroup(contactQuery, groupQuery) {
     const name7 = contactQuery.queryName();
     return {
-      uri: "",
       insertions: [
         st2(groupQuery.groupNode, vcard("hasMember"), contactQuery.contactNode, groupQuery.groupNode.doc()),
         st2(contactQuery.contactNode, vcard("fn"), lit2(name7), groupQuery.groupNode.doc())
@@ -41818,27 +42084,25 @@ var PodOS = (() => {
     }
   });
 
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removeContactFromGroup.js
-  function removeContactFromGroup(contactQuery, groupQuery) {
-    const contactUri = contactQuery.contactNode.uri;
-    const member9 = groupQuery.queryMembers().find((it) => it.uri === contactUri);
-    if (!member9) {
-      throw new Error("member not found in group");
-    }
+  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/addNewEmailAddress.js
+  function addNewEmailAddress(contactNode, emailAddress) {
+    const id6 = generateId();
+    const uri6 = `${contactNode.doc().uri}#${id6}`;
     return {
-      uri: "",
-      insertions: [],
-      deletions: [
-        st2(groupQuery.groupNode, vcard("hasMember"), contactQuery.contactNode, groupQuery.groupNode.doc()),
-        st2(contactQuery.contactNode, vcard("fn"), lit2(member9.name), groupQuery.groupNode.doc())
+      uri: uri6,
+      insertions: [
+        st2(contactNode, vcard("hasEmail"), namedNode2(uri6), contactNode.doc()),
+        st2(namedNode2(uri6), vcard("value"), namedNode2("mailto:" + emailAddress), contactNode.doc())
       ],
+      deletions: [],
       filesToCreate: []
     };
   }
-  var init_removeContactFromGroup = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removeContactFromGroup.js"() {
+  var init_addNewEmailAddress = __esm({
+    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/addNewEmailAddress.js"() {
       init_esm();
       init_namespaces();
+      init_identifier();
     }
   });
 
@@ -41859,48 +42123,29 @@ var PodOS = (() => {
   var init_addNewPhoneNumber = __esm({
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/addNewPhoneNumber.js"() {
       init_esm();
-      init_generate_id();
       init_namespaces();
+      init_identifier();
     }
   });
 
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/addNewEmailAddress.js
-  function addNewEmailAddress(contactNode, emailAddress) {
-    const id6 = generateId();
-    const uri6 = `${contactNode.doc().uri}#${id6}`;
-    return {
-      uri: uri6,
-      insertions: [
-        st2(contactNode, vcard("hasEmail"), namedNode2(uri6), contactNode.doc()),
-        st2(namedNode2(uri6), vcard("value"), namedNode2("mailto:" + emailAddress), contactNode.doc())
-      ],
-      deletions: [],
-      filesToCreate: []
-    };
-  }
-  var init_addNewEmailAddress = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/addNewEmailAddress.js"() {
-      init_esm();
-      init_generate_id();
-      init_namespaces();
+  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removeContactFromGroup.js
+  function removeContactFromGroup(contactQuery, groupQuery) {
+    const contactUri = contactQuery.contactNode.uri;
+    const member9 = groupQuery.queryMembers().find((it) => it.uri === contactUri);
+    if (!member9) {
+      throw new Error("member not found in group");
     }
-  });
-
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removePhoneNumber.js
-  function removePhoneNumber(contactNode, phoneNode, store) {
-    const phoneStatements = store.statementsMatching(phoneNode, null, null, phoneNode.doc());
     return {
-      uri: "",
       insertions: [],
       deletions: [
-        ...phoneStatements,
-        st2(contactNode, vcard("hasTelephone"), phoneNode, contactNode.doc())
+        st2(groupQuery.groupNode, vcard("hasMember"), contactQuery.contactNode, groupQuery.groupNode.doc()),
+        st2(contactQuery.contactNode, vcard("fn"), lit2(member9.name), groupQuery.groupNode.doc())
       ],
       filesToCreate: []
     };
   }
-  var init_removePhoneNumber = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removePhoneNumber.js"() {
+  var init_removeContactFromGroup = __esm({
+    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removeContactFromGroup.js"() {
       init_esm();
       init_namespaces();
     }
@@ -41910,7 +42155,6 @@ var PodOS = (() => {
   function removeEmailAddress(contactNode, emailNode, store) {
     const emailStatements = store.statementsMatching(emailNode, null, null, emailNode.doc());
     return {
-      uri: "",
       insertions: [],
       deletions: [
         ...emailStatements,
@@ -41926,82 +42170,22 @@ var PodOS = (() => {
     }
   });
 
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/ProfileQuery.js
-  var ProfileQuery;
-  var init_ProfileQuery = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/ProfileQuery.js"() {
-      init_esm();
-      init_namespaces();
-      ProfileQuery = class {
-        constructor(webIdNode, store) {
-          this.webIdNode = webIdNode;
-          this.store = store;
-        }
-        queryPublicTypeIndex() {
-          const predicate2 = solid("publicTypeIndex");
-          return this.queryNamedNode(predicate2);
-        }
-        queryPreferencesFile() {
-          const predicate2 = pim("preferencesFile");
-          return this.queryNamedNode(predicate2);
-        }
-        queryNamedNode(predicate2) {
-          const node2 = this.store.any(this.webIdNode, predicate2, null, this.webIdNode.doc());
-          if (isNamedNode(node2)) {
-            return node2;
-          }
-          return null;
-        }
-      };
-    }
-  });
-
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/TypeIndexQuery.js
-  var TypeIndexQuery;
-  var init_TypeIndexQuery = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/TypeIndexQuery.js"() {
-      init_esm();
-      init_namespaces();
-      TypeIndexQuery = class {
-        constructor(store, typeIndexDoc) {
-          this.store = store;
-          this.typeIndexDoc = typeIndexDoc;
-        }
-        queryAddressBookInstances() {
-          const addressBookRegistrations = this.store.each(null, solid("forClass"), vcard("AddressBook"), this.typeIndexDoc);
-          return addressBookRegistrations.flatMap((registration) => {
-            if (!isNamedNode(registration))
-              return [];
-            return this.getInstanceValues(registration);
-          });
-        }
-        getInstanceValues(registration) {
-          return this.store.each(registration, solid("instance"), null, this.typeIndexDoc).map((it) => it.value);
-        }
-      };
-    }
-  });
-
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/PreferencesQuery.js
-  var PreferencesQuery;
-  var init_PreferencesQuery = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/queries/PreferencesQuery.js"() {
+  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removePhoneNumber.js
+  function removePhoneNumber(contactNode, phoneNode, store) {
+    const phoneStatements = store.statementsMatching(phoneNode, null, null, phoneNode.doc());
+    return {
+      insertions: [],
+      deletions: [
+        ...phoneStatements,
+        st2(contactNode, vcard("hasTelephone"), phoneNode, contactNode.doc())
+      ],
+      filesToCreate: []
+    };
+  }
+  var init_removePhoneNumber = __esm({
+    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/removePhoneNumber.js"() {
       init_esm();
       init_namespaces();
-      PreferencesQuery = class {
-        constructor(store, webIdNode, preferencesDoc) {
-          this.store = store;
-          this.webIdNode = webIdNode;
-          this.preferencesDoc = preferencesDoc;
-        }
-        queryPrivateTypeIndex() {
-          const node2 = this.store.any(this.webIdNode, solid("privateTypeIndex"), null, this.preferencesDoc);
-          if (isNamedNode(node2)) {
-            return node2;
-          }
-          return null;
-        }
-      };
     }
   });
 
@@ -42010,7 +42194,6 @@ var PodOS = (() => {
     const deletions = store.statementsMatching(contactNode, vcard("fn"), null, null);
     const insertions = deletions.map((it) => st2(it.subject, it.predicate, lit2(newName), it.graph));
     return {
-      uri: "",
       insertions,
       deletions,
       filesToCreate: []
@@ -42023,25 +42206,23 @@ var PodOS = (() => {
     }
   });
 
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/addAddressBookToTypeIndex.js
-  function addAddressBookToTypeIndex(typeIndexDoc, addressBookUri) {
-    const registrationNode = namedNode2(`${typeIndexDoc.value}#${generateId()}`);
+  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/updateEmailAddress.js
+  function updateEmailAddress(emailAddressNode, newEmailAddress, store) {
+    const oldValue = store.any(emailAddressNode, vcard("value"));
+    const deletions = oldValue ? [st2(emailAddressNode, vcard("value"), oldValue, emailAddressNode.doc())] : [];
+    const insertions = [
+      st2(emailAddressNode, vcard("value"), namedNode2("mailto:" + newEmailAddress), emailAddressNode.doc())
+    ];
     return {
-      deletions: [],
-      filesToCreate: [],
-      insertions: [
-        st2(registrationNode, rdf3("type"), solid("TypeRegistration"), typeIndexDoc),
-        st2(registrationNode, solid("forClass"), vcard("AddressBook"), typeIndexDoc),
-        st2(registrationNode, solid("instance"), namedNode2(addressBookUri), typeIndexDoc)
-      ],
-      uri: ""
+      insertions,
+      deletions,
+      filesToCreate: []
     };
   }
-  var init_addAddressBookToTypeIndex = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/addAddressBookToTypeIndex.js"() {
+  var init_updateEmailAddress = __esm({
+    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/updateEmailAddress.js"() {
       init_esm();
       init_namespaces();
-      init_generate_id();
     }
   });
 
@@ -42053,7 +42234,6 @@ var PodOS = (() => {
       st2(phoneNumberNode, vcard("value"), namedNode2("tel:" + newPhoneNumber), phoneNumberNode.doc())
     ];
     return {
-      uri: "",
       insertions,
       deletions,
       filesToCreate: []
@@ -42066,69 +42246,49 @@ var PodOS = (() => {
     }
   });
 
-  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/updateEmailAddress.js
-  function updateEmailAddress(emailAddressNode, newEmailAddress, store) {
-    const oldValue = store.any(emailAddressNode, vcard("value"));
-    const deletions = oldValue ? [st2(emailAddressNode, vcard("value"), oldValue, emailAddressNode.doc())] : [];
-    const insertions = [
-      st2(emailAddressNode, vcard("value"), namedNode2("mailto:" + newEmailAddress), emailAddressNode.doc())
-    ];
-    return {
-      uri: "",
-      insertions,
-      deletions,
-      filesToCreate: []
-    };
-  }
-  var init_updateEmailAddress = __esm({
-    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/updateEmailAddress.js"() {
-      init_esm();
-      init_namespaces();
+  // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/index.js
+  var init_update_operations2 = __esm({
+    "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/update-operations/index.js"() {
+      init_createAddressBook();
+      init_createNewContact();
+      init_createNewGroup();
+      init_addContactToGroup();
+      init_addNewEmailAddress();
+      init_addNewPhoneNumber();
+      init_removeContactFromGroup();
+      init_removeEmailAddress();
+      init_removePhoneNumber();
+      init_renameContact();
+      init_updateEmailAddress();
+      init_updatePhoneNumber();
     }
   });
 
   // ../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/ContactsModuleRdfLib.js
-  var ContactsModuleRdfLib;
+  var VCARD_ADDRESS_BOOK, ContactsModuleRdfLib;
   var init_ContactsModuleRdfLib = __esm({
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/rdflib/ContactsModuleRdfLib.js"() {
       init_esm();
       init_queries();
-      init_update_operations();
-      init_executeUpdate();
-      init_fetchNode();
-      init_createNewGroup();
-      init_GroupQuery();
-      init_addContactToGroup();
-      init_removeContactFromGroup();
-      init_addNewPhoneNumber();
-      init_addNewEmailAddress();
-      init_removePhoneNumber();
-      init_removeEmailAddress();
-      init_ProfileQuery();
-      init_TypeIndexQuery();
-      init_PreferencesQuery();
-      init_renameContact();
-      init_addAddressBookToTypeIndex();
-      init_updatePhoneNumber();
-      init_updateEmailAddress();
+      init_update_operations2();
+      init_dist();
+      init_namespaces();
+      VCARD_ADDRESS_BOOK = vcard("AddressBook");
       ContactsModuleRdfLib = class {
         constructor(config2) {
+          this.support = new ModuleSupport(config2);
           this.store = config2.store;
           this.fetcher = config2.fetcher;
           this.updater = config2.updater;
         }
         async readAddressBook(uri6) {
           const addressBookNode = namedNode2(uri6);
-          await this.fetchNode(addressBookNode);
+          await this.support.fetchNode(addressBookNode);
           const query4 = new AddressBookQuery(this.store, addressBookNode);
           const title9 = query4.queryTitle();
           const nameEmailIndex = query4.queryNameEmailIndex();
           const groupIndex = query4.queryGroupIndex();
-          await Promise.allSettled([
-            this.fetchNode(nameEmailIndex),
-            this.fetchNode(groupIndex)
-          ]);
-          await this.fetchAll([nameEmailIndex, groupIndex]);
+          await this.support.fetchAll([nameEmailIndex, groupIndex]);
           const contacts = query4.queryContacts();
           const groups = query4.queryGroups();
           return {
@@ -42138,12 +42298,6 @@ var PodOS = (() => {
             groups
           };
         }
-        async fetchNode(node2) {
-          return fetchNode(this.fetcher, node2);
-        }
-        async fetchAll(nodes) {
-          return Promise.all(nodes.map((it) => this.fetchNode(it)));
-        }
         async createAddressBook({ containerUri, name: name7, ownerWebId }) {
           const operation3 = createAddressBook(containerUri, name7);
           await executeUpdate(this.fetcher, this.updater, operation3);
@@ -42154,14 +42308,14 @@ var PodOS = (() => {
         }
         async updatePrivateTypeIndex(ownerWebId, addressBookUri) {
           const profileNode = namedNode2(ownerWebId);
-          await this.fetchNode(profileNode);
+          await this.support.fetchNode(profileNode);
           const profileQuery = new ProfileQuery(profileNode, this.store);
           const preferencesFile2 = profileQuery.queryPreferencesFile();
           const privateTypeIndex2 = await this.fetchPrivateTypeIndex(profileNode, preferencesFile2);
           if (!privateTypeIndex2) {
             throw new Error(`Private type not found for WebID ${ownerWebId}.`);
           }
-          const operation3 = addAddressBookToTypeIndex(privateTypeIndex2, addressBookUri);
+          const operation3 = addInstanceToTypeIndex(privateTypeIndex2, addressBookUri, VCARD_ADDRESS_BOOK);
           await executeUpdate(this.fetcher, this.updater, operation3);
         }
         async createNewContact({ addressBookUri, contact: contact4, groupUris }) {
@@ -42171,7 +42325,7 @@ var PodOS = (() => {
         }
         async executeAddContactToGroups(groupUris, contactQuery) {
           const groupNodes = (groupUris ?? []).map((it) => namedNode2(it));
-          await this.fetchAll(groupNodes);
+          await this.support.fetchAll(groupNodes);
           const groupUpdates = groupNodes.map((groupNode) => {
             const groupQuery = new GroupQuery(this.store, groupNode);
             const operation3 = addContactToGroup(contactQuery, groupQuery);
@@ -42181,14 +42335,14 @@ var PodOS = (() => {
         }
         async executeCreateNewContact(addressBookUri, contact4) {
           const addressBookNode = namedNode2(addressBookUri);
-          await this.fetchNode(addressBookNode);
+          await this.support.fetchNode(addressBookNode);
           const operation3 = createNewContact(new AddressBookQuery(this.store, addressBookNode), contact4);
           await executeUpdate(this.fetcher, this.updater, operation3);
           return new ContactQuery(this.store, namedNode2(operation3.uri));
         }
         async readContact(uri6) {
           const contactNode = namedNode2(uri6);
-          await this.fetchNode(contactNode);
+          await this.support.fetchNode(contactNode);
           const query4 = new ContactQuery(this.store, contactNode);
           const name7 = query4.queryName();
           const emails = query4.queryEmails();
@@ -42202,7 +42356,7 @@ var PodOS = (() => {
         }
         async createNewGroup({ addressBookUri, groupName }) {
           const addressBookNode = namedNode2(addressBookUri);
-          await this.fetchNode(addressBookNode);
+          await this.support.fetchNode(addressBookNode);
           const query4 = new AddressBookQuery(this.store, addressBookNode);
           const operation3 = createNewGroup(query4, groupName);
           await executeUpdate(this.fetcher, this.updater, operation3);
@@ -42210,7 +42364,7 @@ var PodOS = (() => {
         }
         async readGroup(uri6) {
           const groupNode = namedNode2(uri6);
-          await this.fetchNode(groupNode);
+          await this.support.fetchNode(groupNode);
           const query4 = new GroupQuery(this.store, groupNode);
           const name7 = query4.queryName();
           const members4 = query4.queryMembers();
@@ -42223,7 +42377,7 @@ var PodOS = (() => {
         async addContactToGroup({ contactUri, groupUri }) {
           const contactNode = namedNode2(contactUri);
           const groupNode = namedNode2(groupUri);
-          await this.fetchNode(contactNode);
+          await this.support.fetchNode(contactNode);
           const contactQuery = new ContactQuery(this.store, contactNode);
           const groupQuery = new GroupQuery(this.store, groupNode);
           const operation3 = addContactToGroup(contactQuery, groupQuery);
@@ -42232,7 +42386,7 @@ var PodOS = (() => {
         async removeContactFromGroup({ contactUri, groupUri }) {
           const contactNode = namedNode2(contactUri);
           const groupNode = namedNode2(groupUri);
-          await this.fetchNode(groupNode);
+          await this.support.fetchNode(groupNode);
           const contactQuery = new ContactQuery(this.store, contactNode);
           const groupQuery = new GroupQuery(this.store, groupNode);
           const operation3 = removeContactFromGroup(contactQuery, groupQuery);
@@ -42253,32 +42407,32 @@ var PodOS = (() => {
         async removePhoneNumber({ contactUri, phoneNumberUri }) {
           const contactNode = namedNode2(contactUri);
           const phoneNumberNode = namedNode2(phoneNumberUri);
-          await this.fetchNode(phoneNumberNode);
+          await this.support.fetchNode(phoneNumberNode);
           const operation3 = removePhoneNumber(contactNode, phoneNumberNode, this.store);
           await executeUpdate(this.fetcher, this.updater, operation3);
         }
         async removeEmailAddress({ contactUri, emailAddressUri }) {
           const contactNode = namedNode2(contactUri);
           const emailAddressNode = namedNode2(emailAddressUri);
-          await this.fetchNode(emailAddressNode);
+          await this.support.fetchNode(emailAddressNode);
           const operation3 = removeEmailAddress(contactNode, emailAddressNode, this.store);
           await executeUpdate(this.fetcher, this.updater, operation3);
         }
         async updatePhoneNumber({ phoneNumberUri, newPhoneNumber }) {
           const phoneNumberNode = namedNode2(phoneNumberUri);
-          await this.fetchNode(phoneNumberNode);
+          await this.support.fetchNode(phoneNumberNode);
           const operation3 = updatePhoneNumber(phoneNumberNode, newPhoneNumber, this.store);
           await executeUpdate(this.fetcher, this.updater, operation3);
         }
         async updateEmailAddress({ emailAddressUri, newEmailAddress }) {
           const emailAddressNode = namedNode2(emailAddressUri);
-          await this.fetchNode(emailAddressNode);
+          await this.support.fetchNode(emailAddressNode);
           const operation3 = updateEmailAddress(emailAddressNode, newEmailAddress, this.store);
           await executeUpdate(this.fetcher, this.updater, operation3);
         }
         async listAddressBooks(webId) {
           const profileNode = namedNode2(webId);
-          await this.fetchNode(profileNode);
+          await this.support.fetchNode(profileNode);
           const profileQuery = new ProfileQuery(profileNode, this.store);
           const publicTypeIndexNode = profileQuery.queryPublicTypeIndex();
           const preferencesFile2 = profileQuery.queryPreferencesFile();
@@ -42298,20 +42452,20 @@ var PodOS = (() => {
           if (!publicTypeIndexNode) {
             return [];
           }
-          await this.fetchNode(publicTypeIndexNode);
-          return new TypeIndexQuery(this.store, publicTypeIndexNode).queryAddressBookInstances();
+          await this.support.fetchNode(publicTypeIndexNode);
+          return new TypeIndexQuery(this.store, publicTypeIndexNode).queryInstancesForClass(VCARD_ADDRESS_BOOK);
         }
         async fetchPrivateTypeIndex(profileNode, preferencesFile2) {
           if (!preferencesFile2) {
             return null;
           }
-          await this.fetchNode(preferencesFile2);
+          await this.support.fetchNode(preferencesFile2);
           const preferencesQuery = new PreferencesQuery(this.store, profileNode, preferencesFile2);
           return preferencesQuery.queryPrivateTypeIndex();
         }
         async renameContact({ contactUri, newName }) {
           const contactNode = namedNode2(contactUri);
-          await this.fetchNode(contactNode);
+          await this.support.fetchNode(contactNode);
           const operation3 = renameContact(this.store, contactNode, newName);
           await executeUpdate(this.fetcher, this.updater, operation3);
         }
@@ -42325,7 +42479,7 @@ var PodOS = (() => {
     default: () => dist_default
   });
   var dist_default;
-  var init_dist = __esm({
+  var init_dist2 = __esm({
     "../node_modules/@solid-data-modules/contacts-rdflib/dist/index.js"() {
       init_ContactsModuleRdfLib();
       dist_default = ContactsModuleRdfLib;
@@ -42369,20 +42523,20 @@ var PodOS = (() => {
           if (obj === null || obj === void 0) {
             return obj;
           }
-          var clone = /* @__PURE__ */ Object.create(null), keys = Object.keys(obj);
+          var clone2 = /* @__PURE__ */ Object.create(null), keys = Object.keys(obj);
           for (var i = 0; i < keys.length; i++) {
             var key3 = keys[i], val = obj[key3];
             if (Array.isArray(val)) {
-              clone[key3] = val.slice();
+              clone2[key3] = val.slice();
               continue;
             }
             if (typeof val === "string" || typeof val === "number" || typeof val === "boolean") {
-              clone[key3] = val;
+              clone2[key3] = val;
               continue;
             }
             throw new TypeError("clone is not deep and does not support nested objects");
           }
-          return clone;
+          return clone2;
         };
         lunr2.FieldRef = function(docRef, fieldName, stringValue) {
           this.docRef = docRef;
@@ -45763,18 +45917,11 @@ var PodOS = (() => {
     }) : identity;
   }
 
-  // ../node_modules/@inrupt/solid-client-authn-core/dist/index.mjs
-  var import_events = __toESM(require_events(), 1);
-
-  // ../node_modules/@inrupt/universal-fetch/dist/index-browser.mjs
-  var indexBrowser = globalThis.fetch;
-  var { fetch: fetch2, Response, Request, Headers } = globalThis;
-
-  // ../node_modules/jose/dist/browser/runtime/webcrypto.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/webcrypto.js
   var webcrypto_default = crypto;
   var isCryptoKey = (key3) => key3 instanceof CryptoKey;
 
-  // ../node_modules/jose/dist/browser/lib/buffer_utils.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/buffer_utils.js
   var encoder = new TextEncoder();
   var decoder = new TextDecoder();
   var MAX_INT32 = 2 ** 32;
@@ -45782,14 +45929,14 @@ var PodOS = (() => {
     const size4 = buffers.reduce((acc, { length: length2 }) => acc + length2, 0);
     const buf = new Uint8Array(size4);
     let i = 0;
-    buffers.forEach((buffer) => {
+    for (const buffer of buffers) {
       buf.set(buffer, i);
       i += buffer.length;
-    });
+    }
     return buf;
   }
 
-  // ../node_modules/jose/dist/browser/runtime/base64url.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/base64url.js
   var encodeBase64 = (input2) => {
     let unencoded = input2;
     if (typeof unencoded === "string") {
@@ -45821,44 +45968,45 @@ var PodOS = (() => {
     encoded = encoded.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, "");
     try {
       return decodeBase64(encoded);
-    } catch (_a) {
+    } catch {
       throw new TypeError("The input to be decoded is not correctly encoded.");
     }
   };
 
-  // ../node_modules/jose/dist/browser/util/errors.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/util/errors.js
   var JOSEError = class extends Error {
     static get code() {
       return "ERR_JOSE_GENERIC";
     }
     constructor(message4) {
-      var _a;
       super(message4);
       this.code = "ERR_JOSE_GENERIC";
       this.name = this.constructor.name;
-      (_a = Error.captureStackTrace) === null || _a === void 0 ? void 0 : _a.call(Error, this, this.constructor);
+      Error.captureStackTrace?.(this, this.constructor);
     }
   };
   var JWTClaimValidationFailed = class extends JOSEError {
     static get code() {
       return "ERR_JWT_CLAIM_VALIDATION_FAILED";
     }
-    constructor(message4, claim2 = "unspecified", reason2 = "unspecified") {
+    constructor(message4, payload4, claim2 = "unspecified", reason2 = "unspecified") {
       super(message4);
       this.code = "ERR_JWT_CLAIM_VALIDATION_FAILED";
       this.claim = claim2;
       this.reason = reason2;
+      this.payload = payload4;
     }
   };
   var JWTExpired = class extends JOSEError {
     static get code() {
       return "ERR_JWT_EXPIRED";
     }
-    constructor(message4, claim2 = "unspecified", reason2 = "unspecified") {
+    constructor(message4, payload4, claim2 = "unspecified", reason2 = "unspecified") {
       super(message4);
       this.code = "ERR_JWT_EXPIRED";
       this.claim = claim2;
       this.reason = reason2;
+      this.payload = payload4;
     }
   };
   var JOSEAlgNotAllowed = class extends JOSEError {
@@ -45897,6 +46045,45 @@ var PodOS = (() => {
       return "ERR_JWT_INVALID";
     }
   };
+  var JWKSInvalid = class extends JOSEError {
+    constructor() {
+      super(...arguments);
+      this.code = "ERR_JWKS_INVALID";
+    }
+    static get code() {
+      return "ERR_JWKS_INVALID";
+    }
+  };
+  var JWKSNoMatchingKey = class extends JOSEError {
+    constructor() {
+      super(...arguments);
+      this.code = "ERR_JWKS_NO_MATCHING_KEY";
+      this.message = "no applicable key found in the JSON Web Key Set";
+    }
+    static get code() {
+      return "ERR_JWKS_NO_MATCHING_KEY";
+    }
+  };
+  var JWKSMultipleMatchingKeys = class extends JOSEError {
+    constructor() {
+      super(...arguments);
+      this.code = "ERR_JWKS_MULTIPLE_MATCHING_KEYS";
+      this.message = "multiple matching keys found in the JSON Web Key Set";
+    }
+    static get code() {
+      return "ERR_JWKS_MULTIPLE_MATCHING_KEYS";
+    }
+  };
+  var JWKSTimeout = class extends JOSEError {
+    constructor() {
+      super(...arguments);
+      this.code = "ERR_JWKS_TIMEOUT";
+      this.message = "request timed out";
+    }
+    static get code() {
+      return "ERR_JWKS_TIMEOUT";
+    }
+  };
   var JWSSignatureVerificationFailed = class extends JOSEError {
     constructor() {
       super(...arguments);
@@ -45908,10 +46095,7 @@ var PodOS = (() => {
     }
   };
 
-  // ../node_modules/jose/dist/browser/runtime/random.js
-  var random_default = webcrypto_default.getRandomValues.bind(webcrypto_default);
-
-  // ../node_modules/jose/dist/browser/lib/crypto_key.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/crypto_key.js
   function unusable(name7, prop = "algorithm.name") {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name7}`);
   }
@@ -46005,8 +46189,9 @@ var PodOS = (() => {
     checkUsage(key3, usages);
   }
 
-  // ../node_modules/jose/dist/browser/lib/invalid_key_input.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/invalid_key_input.js
   function message(msg2, actual2, ...types2) {
+    types2 = types2.filter(Boolean);
     if (types2.length > 2) {
       const last3 = types2.pop();
       msg2 += `one of type ${types2.join(", ")}, or ${last3}.`;
@@ -46020,7 +46205,7 @@ var PodOS = (() => {
     } else if (typeof actual2 === "function" && actual2.name) {
       msg2 += ` Received function ${actual2.name}`;
     } else if (typeof actual2 === "object" && actual2 != null) {
-      if (actual2.constructor && actual2.constructor.name) {
+      if (actual2.constructor?.name) {
         msg2 += ` Received an instance of ${actual2.constructor.name}`;
       }
     }
@@ -46033,13 +46218,16 @@ var PodOS = (() => {
     return message(`Key for the ${alg} algorithm must be `, actual2, ...types2);
   }
 
-  // ../node_modules/jose/dist/browser/runtime/is_key_like.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/is_key_like.js
   var is_key_like_default = (key3) => {
-    return isCryptoKey(key3);
+    if (isCryptoKey(key3)) {
+      return true;
+    }
+    return key3?.[Symbol.toStringTag] === "KeyObject";
   };
   var types = ["CryptoKey"];
 
-  // ../node_modules/jose/dist/browser/lib/is_disjoint.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/is_disjoint.js
   var isDisjoint = (...headers) => {
     const sources = headers.filter(Boolean);
     if (sources.length === 0 || sources.length === 1) {
@@ -46063,7 +46251,7 @@ var PodOS = (() => {
   };
   var is_disjoint_default = isDisjoint;
 
-  // ../node_modules/jose/dist/browser/lib/is_object.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/is_object.js
   function isObjectLike(value6) {
     return typeof value6 === "object" && value6 !== null;
   }
@@ -46081,7 +46269,7 @@ var PodOS = (() => {
     return Object.getPrototypeOf(input2) === proto;
   }
 
-  // ../node_modules/jose/dist/browser/runtime/check_key_length.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/check_key_length.js
   var check_key_length_default = (alg, key3) => {
     if (alg.startsWith("RS") || alg.startsWith("PS")) {
       const { modulusLength } = key3.algorithm;
@@ -46091,49 +46279,25 @@ var PodOS = (() => {
     }
   };
 
-  // ../node_modules/jose/dist/browser/runtime/jwk_to_key.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/is_jwk.js
+  function isJWK(key3) {
+    return isObject(key3) && typeof key3.kty === "string";
+  }
+  function isPrivateJWK(key3) {
+    return key3.kty !== "oct" && typeof key3.d === "string";
+  }
+  function isPublicJWK(key3) {
+    return key3.kty !== "oct" && typeof key3.d === "undefined";
+  }
+  function isSecretJWK(key3) {
+    return isJWK(key3) && key3.kty === "oct" && typeof key3.k === "string";
+  }
+
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/jwk_to_key.js
   function subtleMapping(jwk) {
     let algorithm3;
     let keyUsages;
     switch (jwk.kty) {
-      case "oct": {
-        switch (jwk.alg) {
-          case "HS256":
-          case "HS384":
-          case "HS512":
-            algorithm3 = { name: "HMAC", hash: `SHA-${jwk.alg.slice(-3)}` };
-            keyUsages = ["sign", "verify"];
-            break;
-          case "A128CBC-HS256":
-          case "A192CBC-HS384":
-          case "A256CBC-HS512":
-            throw new JOSENotSupported(`${jwk.alg} keys cannot be imported as CryptoKey instances`);
-          case "A128GCM":
-          case "A192GCM":
-          case "A256GCM":
-          case "A128GCMKW":
-          case "A192GCMKW":
-          case "A256GCMKW":
-            algorithm3 = { name: "AES-GCM" };
-            keyUsages = ["encrypt", "decrypt"];
-            break;
-          case "A128KW":
-          case "A192KW":
-          case "A256KW":
-            algorithm3 = { name: "AES-KW" };
-            keyUsages = ["wrapKey", "unwrapKey"];
-            break;
-          case "PBES2-HS256+A128KW":
-          case "PBES2-HS384+A192KW":
-          case "PBES2-HS512+A256KW":
-            algorithm3 = { name: "PBKDF2" };
-            keyUsages = ["deriveBits"];
-            break;
-          default:
-            throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
-        }
-        break;
-      }
       case "RSA": {
         switch (jwk.alg) {
           case "PS256":
@@ -46213,19 +46377,15 @@ var PodOS = (() => {
     return { algorithm: algorithm3, keyUsages };
   }
   var parse = async (jwk) => {
-    var _a, _b;
     if (!jwk.alg) {
       throw new TypeError('"alg" argument is required when "jwk.alg" is not present');
     }
     const { algorithm: algorithm3, keyUsages } = subtleMapping(jwk);
     const rest3 = [
       algorithm3,
-      (_a = jwk.ext) !== null && _a !== void 0 ? _a : false,
-      (_b = jwk.key_ops) !== null && _b !== void 0 ? _b : keyUsages
+      jwk.ext ?? false,
+      jwk.key_ops ?? keyUsages
     ];
-    if (algorithm3.name === "PBKDF2") {
-      return webcrypto_default.subtle.importKey("raw", decode(jwk.k), ...rest3);
-    }
     const keyData = { ...jwk };
     delete keyData.alg;
     delete keyData.use;
@@ -46233,9 +46393,74 @@ var PodOS = (() => {
   };
   var jwk_to_key_default = parse;
 
-  // ../node_modules/jose/dist/browser/key/import.js
-  async function importJWK(jwk, alg, octAsKeyObject) {
-    var _a;
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/normalize_key.js
+  var exportKeyValue = (k) => decode(k);
+  var privCache;
+  var pubCache;
+  var isKeyObject = (key3) => {
+    return key3?.[Symbol.toStringTag] === "KeyObject";
+  };
+  var importAndCache = async (cache, key3, jwk, alg, freeze = false) => {
+    let cached = cache.get(key3);
+    if (cached?.[alg]) {
+      return cached[alg];
+    }
+    const cryptoKey = await jwk_to_key_default({ ...jwk, alg });
+    if (freeze)
+      Object.freeze(key3);
+    if (!cached) {
+      cache.set(key3, { [alg]: cryptoKey });
+    } else {
+      cached[alg] = cryptoKey;
+    }
+    return cryptoKey;
+  };
+  var normalizePublicKey = (key3, alg) => {
+    if (isKeyObject(key3)) {
+      let jwk = key3.export({ format: "jwk" });
+      delete jwk.d;
+      delete jwk.dp;
+      delete jwk.dq;
+      delete jwk.p;
+      delete jwk.q;
+      delete jwk.qi;
+      if (jwk.k) {
+        return exportKeyValue(jwk.k);
+      }
+      pubCache || (pubCache = /* @__PURE__ */ new WeakMap());
+      return importAndCache(pubCache, key3, jwk, alg);
+    }
+    if (isJWK(key3)) {
+      if (key3.k)
+        return decode(key3.k);
+      pubCache || (pubCache = /* @__PURE__ */ new WeakMap());
+      const cryptoKey = importAndCache(pubCache, key3, key3, alg, true);
+      return cryptoKey;
+    }
+    return key3;
+  };
+  var normalizePrivateKey = (key3, alg) => {
+    if (isKeyObject(key3)) {
+      let jwk = key3.export({ format: "jwk" });
+      if (jwk.k) {
+        return exportKeyValue(jwk.k);
+      }
+      privCache || (privCache = /* @__PURE__ */ new WeakMap());
+      return importAndCache(privCache, key3, jwk, alg);
+    }
+    if (isJWK(key3)) {
+      if (key3.k)
+        return decode(key3.k);
+      privCache || (privCache = /* @__PURE__ */ new WeakMap());
+      const cryptoKey = importAndCache(privCache, key3, key3, alg, true);
+      return cryptoKey;
+    }
+    return key3;
+  };
+  var normalize_key_default = { normalizePublicKey, normalizePrivateKey };
+
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/key/import.js
+  async function importJWK(jwk, alg) {
     if (!isObject(jwk)) {
       throw new TypeError("JWK must be an object");
     }
@@ -46245,10 +46470,6 @@ var PodOS = (() => {
         if (typeof jwk.k !== "string" || !jwk.k) {
           throw new TypeError('missing "k" (Key Value) Parameter value');
         }
-        octAsKeyObject !== null && octAsKeyObject !== void 0 ? octAsKeyObject : octAsKeyObject = jwk.ext !== true;
-        if (octAsKeyObject) {
-          return jwk_to_key_default({ ...jwk, alg, ext: (_a = jwk.ext) !== null && _a !== void 0 ? _a : false });
-        }
         return decode(jwk.k);
       case "RSA":
         if (jwk.oth !== void 0) {
@@ -46262,50 +46483,81 @@ var PodOS = (() => {
     }
   }
 
-  // ../node_modules/jose/dist/browser/lib/check_key_type.js
-  var symmetricTypeCheck = (alg, key3) => {
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/check_key_type.js
+  var tag = (key3) => key3?.[Symbol.toStringTag];
+  var jwkMatchesOp = (alg, key3, usage2) => {
+    if (key3.use !== void 0 && key3.use !== "sig") {
+      throw new TypeError("Invalid key for this operation, when present its use must be sig");
+    }
+    if (key3.key_ops !== void 0 && key3.key_ops.includes?.(usage2) !== true) {
+      throw new TypeError(`Invalid key for this operation, when present its key_ops must include ${usage2}`);
+    }
+    if (key3.alg !== void 0 && key3.alg !== alg) {
+      throw new TypeError(`Invalid key for this operation, when present its alg must be ${alg}`);
+    }
+    return true;
+  };
+  var symmetricTypeCheck = (alg, key3, usage2, allowJwk) => {
     if (key3 instanceof Uint8Array)
       return;
+    if (allowJwk && isJWK(key3)) {
+      if (isSecretJWK(key3) && jwkMatchesOp(alg, key3, usage2))
+        return;
+      throw new TypeError(`JSON Web Key for symmetric algorithms must have JWK "kty" (Key Type) equal to "oct" and the JWK "k" (Key Value) present`);
+    }
     if (!is_key_like_default(key3)) {
-      throw new TypeError(withAlg(alg, key3, ...types, "Uint8Array"));
+      throw new TypeError(withAlg(alg, key3, ...types, "Uint8Array", allowJwk ? "JSON Web Key" : null));
     }
     if (key3.type !== "secret") {
-      throw new TypeError(`${types.join(" or ")} instances for symmetric algorithms must be of type "secret"`);
+      throw new TypeError(`${tag(key3)} instances for symmetric algorithms must be of type "secret"`);
     }
   };
-  var asymmetricTypeCheck = (alg, key3, usage2) => {
+  var asymmetricTypeCheck = (alg, key3, usage2, allowJwk) => {
+    if (allowJwk && isJWK(key3)) {
+      switch (usage2) {
+        case "sign":
+          if (isPrivateJWK(key3) && jwkMatchesOp(alg, key3, usage2))
+            return;
+          throw new TypeError(`JSON Web Key for this operation be a private JWK`);
+        case "verify":
+          if (isPublicJWK(key3) && jwkMatchesOp(alg, key3, usage2))
+            return;
+          throw new TypeError(`JSON Web Key for this operation be a public JWK`);
+      }
+    }
     if (!is_key_like_default(key3)) {
-      throw new TypeError(withAlg(alg, key3, ...types));
+      throw new TypeError(withAlg(alg, key3, ...types, allowJwk ? "JSON Web Key" : null));
     }
     if (key3.type === "secret") {
-      throw new TypeError(`${types.join(" or ")} instances for asymmetric algorithms must not be of type "secret"`);
+      throw new TypeError(`${tag(key3)} instances for asymmetric algorithms must not be of type "secret"`);
     }
     if (usage2 === "sign" && key3.type === "public") {
-      throw new TypeError(`${types.join(" or ")} instances for asymmetric algorithm signing must be of type "private"`);
+      throw new TypeError(`${tag(key3)} instances for asymmetric algorithm signing must be of type "private"`);
     }
     if (usage2 === "decrypt" && key3.type === "public") {
-      throw new TypeError(`${types.join(" or ")} instances for asymmetric algorithm decryption must be of type "private"`);
+      throw new TypeError(`${tag(key3)} instances for asymmetric algorithm decryption must be of type "private"`);
     }
     if (key3.algorithm && usage2 === "verify" && key3.type === "private") {
-      throw new TypeError(`${types.join(" or ")} instances for asymmetric algorithm verifying must be of type "public"`);
+      throw new TypeError(`${tag(key3)} instances for asymmetric algorithm verifying must be of type "public"`);
     }
     if (key3.algorithm && usage2 === "encrypt" && key3.type === "private") {
-      throw new TypeError(`${types.join(" or ")} instances for asymmetric algorithm encryption must be of type "public"`);
+      throw new TypeError(`${tag(key3)} instances for asymmetric algorithm encryption must be of type "public"`);
     }
   };
-  var checkKeyType = (alg, key3, usage2) => {
+  function checkKeyType(allowJwk, alg, key3, usage2) {
     const symmetric = alg.startsWith("HS") || alg === "dir" || alg.startsWith("PBES2") || /^A\d{3}(?:GCM)?KW$/.test(alg);
     if (symmetric) {
-      symmetricTypeCheck(alg, key3);
+      symmetricTypeCheck(alg, key3, usage2, allowJwk);
     } else {
-      asymmetricTypeCheck(alg, key3, usage2);
+      asymmetricTypeCheck(alg, key3, usage2, allowJwk);
     }
-  };
-  var check_key_type_default = checkKeyType;
+  }
+  var check_key_type_default = checkKeyType.bind(void 0, false);
+  var checkKeyTypeWithJwk = checkKeyType.bind(void 0, true);
 
-  // ../node_modules/jose/dist/browser/lib/validate_crit.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/validate_crit.js
   function validateCrit(Err, recognizedDefault, recognizedOption, protectedHeader, joseHeader) {
-    if (joseHeader.crit !== void 0 && protectedHeader.crit === void 0) {
+    if (joseHeader.crit !== void 0 && protectedHeader?.crit === void 0) {
       throw new Err('"crit" (Critical) Header Parameter MUST be integrity protected');
     }
     if (!protectedHeader || protectedHeader.crit === void 0) {
@@ -46326,7 +46578,8 @@ var PodOS = (() => {
       }
       if (joseHeader[parameter2] === void 0) {
         throw new Err(`Extension Header Parameter "${parameter2}" is missing`);
-      } else if (recognized.get(parameter2) && protectedHeader[parameter2] === void 0) {
+      }
+      if (recognized.get(parameter2) && protectedHeader[parameter2] === void 0) {
         throw new Err(`Extension Header Parameter "${parameter2}" MUST be integrity protected`);
       }
     }
@@ -46334,7 +46587,7 @@ var PodOS = (() => {
   }
   var validate_crit_default = validateCrit;
 
-  // ../node_modules/jose/dist/browser/lib/validate_algorithms.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/validate_algorithms.js
   var validateAlgorithms = (option5, algorithms) => {
     if (algorithms !== void 0 && (!Array.isArray(algorithms) || algorithms.some((s) => typeof s !== "string"))) {
       throw new TypeError(`"${option5}" option must be an array of strings`);
@@ -46346,7 +46599,7 @@ var PodOS = (() => {
   };
   var validate_algorithms_default = validateAlgorithms;
 
-  // ../node_modules/jose/dist/browser/runtime/key_to_jwk.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/key_to_jwk.js
   var keyToJWK = async (key3) => {
     if (key3 instanceof Uint8Array) {
       return {
@@ -46365,15 +46618,12 @@ var PodOS = (() => {
   };
   var key_to_jwk_default = keyToJWK;
 
-  // ../node_modules/jose/dist/browser/key/export.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/key/export.js
   async function exportJWK(key3) {
     return key_to_jwk_default(key3);
   }
 
-  // ../node_modules/jose/dist/browser/jwe/flattened/encrypt.js
-  var unprotected = Symbol();
-
-  // ../node_modules/jose/dist/browser/runtime/subtle_dsa.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/subtle_dsa.js
   function subtleDsa(alg, algorithm3) {
     const hash2 = `SHA-${alg.slice(-3)}`;
     switch (alg) {
@@ -46400,8 +46650,14 @@ var PodOS = (() => {
     }
   }
 
-  // ../node_modules/jose/dist/browser/runtime/get_sign_verify_key.js
-  function getCryptoKey(alg, key3, usage2) {
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/get_sign_verify_key.js
+  async function getCryptoKey(alg, key3, usage2) {
+    if (usage2 === "sign") {
+      key3 = await normalize_key_default.normalizePrivateKey(key3, alg);
+    }
+    if (usage2 === "verify") {
+      key3 = await normalize_key_default.normalizePublicKey(key3, alg);
+    }
     if (isCryptoKey(key3)) {
       checkSigCryptoKey(key3, alg, usage2);
       return key3;
@@ -46412,25 +46668,24 @@ var PodOS = (() => {
       }
       return webcrypto_default.subtle.importKey("raw", key3, { hash: `SHA-${alg.slice(-3)}`, name: "HMAC" }, false, [usage2]);
     }
-    throw new TypeError(invalid_key_input_default(key3, ...types, "Uint8Array"));
+    throw new TypeError(invalid_key_input_default(key3, ...types, "Uint8Array", "JSON Web Key"));
   }
 
-  // ../node_modules/jose/dist/browser/runtime/verify.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/verify.js
   var verify = async (alg, key3, signature2, data2) => {
     const cryptoKey = await getCryptoKey(alg, key3, "verify");
     check_key_length_default(alg, cryptoKey);
     const algorithm3 = subtleDsa(alg, cryptoKey.algorithm);
     try {
       return await webcrypto_default.subtle.verify(algorithm3, cryptoKey, signature2, data2);
-    } catch (_a) {
+    } catch {
       return false;
     }
   };
   var verify_default = verify;
 
-  // ../node_modules/jose/dist/browser/jws/flattened/verify.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jws/flattened/verify.js
   async function flattenedVerify(jws2, key3, options) {
-    var _a;
     if (!isObject(jws2)) {
       throw new JWSInvalid("Flattened JWS must be an object");
     }
@@ -46454,7 +46709,7 @@ var PodOS = (() => {
       try {
         const protectedHeader = decode(jws2.protected);
         parsedProt = JSON.parse(decoder.decode(protectedHeader));
-      } catch (_b) {
+      } catch {
         throw new JWSInvalid("JWS Protected Header is invalid");
       }
     }
@@ -46465,7 +46720,7 @@ var PodOS = (() => {
       ...parsedProt,
       ...jws2.header
     };
-    const extensions = validate_crit_default(JWSInvalid, /* @__PURE__ */ new Map([["b64", true]]), options === null || options === void 0 ? void 0 : options.crit, parsedProt, joseHeader);
+    const extensions = validate_crit_default(JWSInvalid, /* @__PURE__ */ new Map([["b64", true]]), options?.crit, parsedProt, joseHeader);
     let b64 = true;
     if (extensions.has("b64")) {
       b64 = parsedProt.b64;
@@ -46479,7 +46734,7 @@ var PodOS = (() => {
     }
     const algorithms = options && validate_algorithms_default("algorithms", options.algorithms);
     if (algorithms && !algorithms.has(alg)) {
-      throw new JOSEAlgNotAllowed('"alg" (Algorithm) Header Parameter not allowed');
+      throw new JOSEAlgNotAllowed('"alg" (Algorithm) Header Parameter value not allowed');
     }
     if (b64) {
       if (typeof jws2.payload !== "string") {
@@ -46492,13 +46747,18 @@ var PodOS = (() => {
     if (typeof key3 === "function") {
       key3 = await key3(parsedProt, jws2);
       resolvedKey = true;
+      checkKeyTypeWithJwk(alg, key3, "verify");
+      if (isJWK(key3)) {
+        key3 = await importJWK(key3, alg);
+      }
+    } else {
+      checkKeyTypeWithJwk(alg, key3, "verify");
     }
-    check_key_type_default(alg, key3, "verify");
-    const data2 = concat(encoder.encode((_a = jws2.protected) !== null && _a !== void 0 ? _a : ""), encoder.encode("."), typeof jws2.payload === "string" ? encoder.encode(jws2.payload) : jws2.payload);
+    const data2 = concat(encoder.encode(jws2.protected ?? ""), encoder.encode("."), typeof jws2.payload === "string" ? encoder.encode(jws2.payload) : jws2.payload);
     let signature2;
     try {
       signature2 = decode(jws2.signature);
-    } catch (_c) {
+    } catch {
       throw new JWSInvalid("Failed to base64url decode the signature");
     }
     const verified2 = await verify_default(alg, key3, signature2, data2);
@@ -46509,7 +46769,7 @@ var PodOS = (() => {
     if (b64) {
       try {
         payload4 = decode(jws2.payload);
-      } catch (_d) {
+      } catch {
         throw new JWSInvalid("Failed to base64url decode the payload");
       }
     } else if (typeof jws2.payload === "string") {
@@ -46530,7 +46790,7 @@ var PodOS = (() => {
     return result5;
   }
 
-  // ../node_modules/jose/dist/browser/jws/compact/verify.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jws/compact/verify.js
   async function compactVerify(jws2, key3, options) {
     if (jws2 instanceof Uint8Array) {
       jws2 = decoder.decode(jws2);
@@ -46550,56 +46810,67 @@ var PodOS = (() => {
     return result5;
   }
 
-  // ../node_modules/jose/dist/browser/lib/epoch.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/epoch.js
   var epoch_default = (date5) => Math.floor(date5.getTime() / 1e3);
 
-  // ../node_modules/jose/dist/browser/lib/secs.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/secs.js
   var minute = 60;
   var hour = minute * 60;
   var day = hour * 24;
   var week = day * 7;
   var year = day * 365.25;
-  var REGEX = /^(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)$/i;
+  var REGEX = /^(\+|\-)? ?(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)(?: (ago|from now))?$/i;
   var secs_default = (str) => {
     const matched = REGEX.exec(str);
-    if (!matched) {
+    if (!matched || matched[4] && matched[1]) {
       throw new TypeError("Invalid time period format");
     }
-    const value6 = parseFloat(matched[1]);
-    const unit2 = matched[2].toLowerCase();
+    const value6 = parseFloat(matched[2]);
+    const unit2 = matched[3].toLowerCase();
+    let numericDate;
     switch (unit2) {
       case "sec":
       case "secs":
       case "second":
       case "seconds":
       case "s":
-        return Math.round(value6);
+        numericDate = Math.round(value6);
+        break;
       case "minute":
       case "minutes":
       case "min":
       case "mins":
       case "m":
-        return Math.round(value6 * minute);
+        numericDate = Math.round(value6 * minute);
+        break;
       case "hour":
       case "hours":
       case "hr":
       case "hrs":
       case "h":
-        return Math.round(value6 * hour);
+        numericDate = Math.round(value6 * hour);
+        break;
       case "day":
       case "days":
       case "d":
-        return Math.round(value6 * day);
+        numericDate = Math.round(value6 * day);
+        break;
       case "week":
       case "weeks":
       case "w":
-        return Math.round(value6 * week);
+        numericDate = Math.round(value6 * week);
+        break;
       default:
-        return Math.round(value6 * year);
+        numericDate = Math.round(value6 * year);
+        break;
     }
+    if (matched[1] === "-" || matched[4] === "ago") {
+      return -numericDate;
+    }
+    return numericDate;
   };
 
-  // ../node_modules/jose/dist/browser/lib/jwt_claims_set.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/lib/jwt_claims_set.js
   var normalizeTyp = (value6) => value6.toLowerCase().replace(/^application\//, "");
   var checkAudiencePresence = (audPayload, audOption) => {
     if (typeof audPayload === "string") {
@@ -46611,40 +46882,41 @@ var PodOS = (() => {
     return false;
   };
   var jwt_claims_set_default = (protectedHeader, encodedPayload, options = {}) => {
-    const { typ } = options;
-    if (typ && (typeof protectedHeader.typ !== "string" || normalizeTyp(protectedHeader.typ) !== normalizeTyp(typ))) {
-      throw new JWTClaimValidationFailed('unexpected "typ" JWT header value', "typ", "check_failed");
-    }
     let payload4;
     try {
       payload4 = JSON.parse(decoder.decode(encodedPayload));
-    } catch (_a) {
+    } catch {
     }
     if (!isObject(payload4)) {
       throw new JWTInvalid("JWT Claims Set must be a top-level JSON object");
     }
+    const { typ } = options;
+    if (typ && (typeof protectedHeader.typ !== "string" || normalizeTyp(protectedHeader.typ) !== normalizeTyp(typ))) {
+      throw new JWTClaimValidationFailed('unexpected "typ" JWT header value', payload4, "typ", "check_failed");
+    }
     const { requiredClaims = [], issuer: issuer2, subject: subject5, audience: audience5, maxTokenAge } = options;
+    const presenceCheck = [...requiredClaims];
     if (maxTokenAge !== void 0)
-      requiredClaims.push("iat");
+      presenceCheck.push("iat");
     if (audience5 !== void 0)
-      requiredClaims.push("aud");
+      presenceCheck.push("aud");
     if (subject5 !== void 0)
-      requiredClaims.push("sub");
+      presenceCheck.push("sub");
     if (issuer2 !== void 0)
-      requiredClaims.push("iss");
-    for (const claim2 of new Set(requiredClaims.reverse())) {
+      presenceCheck.push("iss");
+    for (const claim2 of new Set(presenceCheck.reverse())) {
       if (!(claim2 in payload4)) {
-        throw new JWTClaimValidationFailed(`missing required "${claim2}" claim`, claim2, "missing");
+        throw new JWTClaimValidationFailed(`missing required "${claim2}" claim`, payload4, claim2, "missing");
       }
     }
     if (issuer2 && !(Array.isArray(issuer2) ? issuer2 : [issuer2]).includes(payload4.iss)) {
-      throw new JWTClaimValidationFailed('unexpected "iss" claim value', "iss", "check_failed");
+      throw new JWTClaimValidationFailed('unexpected "iss" claim value', payload4, "iss", "check_failed");
     }
     if (subject5 && payload4.sub !== subject5) {
-      throw new JWTClaimValidationFailed('unexpected "sub" claim value', "sub", "check_failed");
+      throw new JWTClaimValidationFailed('unexpected "sub" claim value', payload4, "sub", "check_failed");
     }
     if (audience5 && !checkAudiencePresence(payload4.aud, typeof audience5 === "string" ? [audience5] : audience5)) {
-      throw new JWTClaimValidationFailed('unexpected "aud" claim value', "aud", "check_failed");
+      throw new JWTClaimValidationFailed('unexpected "aud" claim value', payload4, "aud", "check_failed");
     }
     let tolerance;
     switch (typeof options.clockTolerance) {
@@ -46663,42 +46935,41 @@ var PodOS = (() => {
     const { currentDate } = options;
     const now = epoch_default(currentDate || /* @__PURE__ */ new Date());
     if ((payload4.iat !== void 0 || maxTokenAge) && typeof payload4.iat !== "number") {
-      throw new JWTClaimValidationFailed('"iat" claim must be a number', "iat", "invalid");
+      throw new JWTClaimValidationFailed('"iat" claim must be a number', payload4, "iat", "invalid");
     }
     if (payload4.nbf !== void 0) {
       if (typeof payload4.nbf !== "number") {
-        throw new JWTClaimValidationFailed('"nbf" claim must be a number', "nbf", "invalid");
+        throw new JWTClaimValidationFailed('"nbf" claim must be a number', payload4, "nbf", "invalid");
       }
       if (payload4.nbf > now + tolerance) {
-        throw new JWTClaimValidationFailed('"nbf" claim timestamp check failed', "nbf", "check_failed");
+        throw new JWTClaimValidationFailed('"nbf" claim timestamp check failed', payload4, "nbf", "check_failed");
       }
     }
     if (payload4.exp !== void 0) {
       if (typeof payload4.exp !== "number") {
-        throw new JWTClaimValidationFailed('"exp" claim must be a number', "exp", "invalid");
+        throw new JWTClaimValidationFailed('"exp" claim must be a number', payload4, "exp", "invalid");
       }
       if (payload4.exp <= now - tolerance) {
-        throw new JWTExpired('"exp" claim timestamp check failed', "exp", "check_failed");
+        throw new JWTExpired('"exp" claim timestamp check failed', payload4, "exp", "check_failed");
       }
     }
     if (maxTokenAge) {
       const age2 = now - payload4.iat;
       const max2 = typeof maxTokenAge === "number" ? maxTokenAge : secs_default(maxTokenAge);
       if (age2 - tolerance > max2) {
-        throw new JWTExpired('"iat" claim timestamp check failed (too far in the past)', "iat", "check_failed");
+        throw new JWTExpired('"iat" claim timestamp check failed (too far in the past)', payload4, "iat", "check_failed");
       }
       if (age2 < 0 - tolerance) {
-        throw new JWTClaimValidationFailed('"iat" claim timestamp check failed (it should be in the past)', "iat", "check_failed");
+        throw new JWTClaimValidationFailed('"iat" claim timestamp check failed (it should be in the past)', payload4, "iat", "check_failed");
       }
     }
     return payload4;
   };
 
-  // ../node_modules/jose/dist/browser/jwt/verify.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jwt/verify.js
   async function jwtVerify(jwt, key3, options) {
-    var _a;
     const verified2 = await compactVerify(jwt, key3, options);
-    if (((_a = verified2.protectedHeader.crit) === null || _a === void 0 ? void 0 : _a.includes("b64")) && verified2.protectedHeader.b64 === false) {
+    if (verified2.protectedHeader.crit?.includes("b64") && verified2.protectedHeader.b64 === false) {
       throw new JWTInvalid("JWTs MUST NOT use unencoded payload");
     }
     const payload4 = jwt_claims_set_default(verified2.protectedHeader, verified2.payload, options);
@@ -46709,7 +46980,7 @@ var PodOS = (() => {
     return result5;
   }
 
-  // ../node_modules/jose/dist/browser/runtime/sign.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/sign.js
   var sign = async (alg, key3, data2) => {
     const cryptoKey = await getCryptoKey(alg, key3, "sign");
     check_key_length_default(alg, cryptoKey);
@@ -46718,7 +46989,7 @@ var PodOS = (() => {
   };
   var sign_default = sign;
 
-  // ../node_modules/jose/dist/browser/jws/flattened/sign.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jws/flattened/sign.js
   var FlattenedSign = class {
     constructor(payload4) {
       if (!(payload4 instanceof Uint8Array)) {
@@ -46751,7 +47022,7 @@ var PodOS = (() => {
         ...this._protectedHeader,
         ...this._unprotectedHeader
       };
-      const extensions = validate_crit_default(JWSInvalid, /* @__PURE__ */ new Map([["b64", true]]), options === null || options === void 0 ? void 0 : options.crit, this._protectedHeader, joseHeader);
+      const extensions = validate_crit_default(JWSInvalid, /* @__PURE__ */ new Map([["b64", true]]), options?.crit, this._protectedHeader, joseHeader);
       let b64 = true;
       if (extensions.has("b64")) {
         b64 = this._protectedHeader.b64;
@@ -46763,7 +47034,7 @@ var PodOS = (() => {
       if (typeof alg !== "string" || !alg) {
         throw new JWSInvalid('JWS "alg" (Algorithm) Header Parameter missing or invalid');
       }
-      check_key_type_default(alg, key3, "sign");
+      checkKeyTypeWithJwk(alg, key3, "sign");
       let payload4 = this._payload;
       if (b64) {
         payload4 = encoder.encode(encode(payload4));
@@ -46793,7 +47064,7 @@ var PodOS = (() => {
     }
   };
 
-  // ../node_modules/jose/dist/browser/jws/compact/sign.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jws/compact/sign.js
   var CompactSign = class {
     constructor(payload4) {
       this._flattened = new FlattenedSign(payload4);
@@ -46811,9 +47082,15 @@ var PodOS = (() => {
     }
   };
 
-  // ../node_modules/jose/dist/browser/jwt/produce.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jwt/produce.js
+  function validateInput(label4, input2) {
+    if (!Number.isFinite(input2)) {
+      throw new TypeError(`Invalid ${label4} input`);
+    }
+    return input2;
+  }
   var ProduceJWT = class {
-    constructor(payload4) {
+    constructor(payload4 = {}) {
       if (!isObject(payload4)) {
         throw new TypeError("JWT Claims Set MUST be an object");
       }
@@ -46837,7 +47114,9 @@ var PodOS = (() => {
     }
     setNotBefore(input2) {
       if (typeof input2 === "number") {
-        this._payload = { ...this._payload, nbf: input2 };
+        this._payload = { ...this._payload, nbf: validateInput("setNotBefore", input2) };
+      } else if (input2 instanceof Date) {
+        this._payload = { ...this._payload, nbf: validateInput("setNotBefore", epoch_default(input2)) };
       } else {
         this._payload = { ...this._payload, nbf: epoch_default(/* @__PURE__ */ new Date()) + secs_default(input2) };
       }
@@ -46845,7 +47124,9 @@ var PodOS = (() => {
     }
     setExpirationTime(input2) {
       if (typeof input2 === "number") {
-        this._payload = { ...this._payload, exp: input2 };
+        this._payload = { ...this._payload, exp: validateInput("setExpirationTime", input2) };
+      } else if (input2 instanceof Date) {
+        this._payload = { ...this._payload, exp: validateInput("setExpirationTime", epoch_default(input2)) };
       } else {
         this._payload = { ...this._payload, exp: epoch_default(/* @__PURE__ */ new Date()) + secs_default(input2) };
       }
@@ -46854,41 +47135,318 @@ var PodOS = (() => {
     setIssuedAt(input2) {
       if (typeof input2 === "undefined") {
         this._payload = { ...this._payload, iat: epoch_default(/* @__PURE__ */ new Date()) };
+      } else if (input2 instanceof Date) {
+        this._payload = { ...this._payload, iat: validateInput("setIssuedAt", epoch_default(input2)) };
+      } else if (typeof input2 === "string") {
+        this._payload = {
+          ...this._payload,
+          iat: validateInput("setIssuedAt", epoch_default(/* @__PURE__ */ new Date()) + secs_default(input2))
+        };
       } else {
-        this._payload = { ...this._payload, iat: input2 };
+        this._payload = { ...this._payload, iat: validateInput("setIssuedAt", input2) };
       }
       return this;
     }
   };
 
-  // ../node_modules/jose/dist/browser/jwt/sign.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jwt/sign.js
   var SignJWT = class extends ProduceJWT {
     setProtectedHeader(protectedHeader) {
       this._protectedHeader = protectedHeader;
       return this;
     }
     async sign(key3, options) {
-      var _a;
       const sig = new CompactSign(encoder.encode(JSON.stringify(this._payload)));
       sig.setProtectedHeader(this._protectedHeader);
-      if (Array.isArray((_a = this._protectedHeader) === null || _a === void 0 ? void 0 : _a.crit) && this._protectedHeader.crit.includes("b64") && this._protectedHeader.b64 === false) {
+      if (Array.isArray(this._protectedHeader?.crit) && this._protectedHeader.crit.includes("b64") && this._protectedHeader.b64 === false) {
         throw new JWTInvalid("JWTs MUST NOT use unencoded payload");
       }
       return sig.sign(key3, options);
     }
   };
 
-  // ../node_modules/jose/dist/browser/runtime/generate.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jwks/local.js
+  function getKtyFromAlg(alg) {
+    switch (typeof alg === "string" && alg.slice(0, 2)) {
+      case "RS":
+      case "PS":
+        return "RSA";
+      case "ES":
+        return "EC";
+      case "Ed":
+        return "OKP";
+      default:
+        throw new JOSENotSupported('Unsupported "alg" value for a JSON Web Key Set');
+    }
+  }
+  function isJWKSLike(jwks) {
+    return jwks && typeof jwks === "object" && Array.isArray(jwks.keys) && jwks.keys.every(isJWKLike);
+  }
+  function isJWKLike(key3) {
+    return isObject(key3);
+  }
+  function clone(obj) {
+    if (typeof structuredClone === "function") {
+      return structuredClone(obj);
+    }
+    return JSON.parse(JSON.stringify(obj));
+  }
+  var LocalJWKSet = class {
+    constructor(jwks) {
+      this._cached = /* @__PURE__ */ new WeakMap();
+      if (!isJWKSLike(jwks)) {
+        throw new JWKSInvalid("JSON Web Key Set malformed");
+      }
+      this._jwks = clone(jwks);
+    }
+    async getKey(protectedHeader, token) {
+      const { alg, kid } = { ...protectedHeader, ...token?.header };
+      const kty = getKtyFromAlg(alg);
+      const candidates = this._jwks.keys.filter((jwk2) => {
+        let candidate4 = kty === jwk2.kty;
+        if (candidate4 && typeof kid === "string") {
+          candidate4 = kid === jwk2.kid;
+        }
+        if (candidate4 && typeof jwk2.alg === "string") {
+          candidate4 = alg === jwk2.alg;
+        }
+        if (candidate4 && typeof jwk2.use === "string") {
+          candidate4 = jwk2.use === "sig";
+        }
+        if (candidate4 && Array.isArray(jwk2.key_ops)) {
+          candidate4 = jwk2.key_ops.includes("verify");
+        }
+        if (candidate4 && alg === "EdDSA") {
+          candidate4 = jwk2.crv === "Ed25519" || jwk2.crv === "Ed448";
+        }
+        if (candidate4) {
+          switch (alg) {
+            case "ES256":
+              candidate4 = jwk2.crv === "P-256";
+              break;
+            case "ES256K":
+              candidate4 = jwk2.crv === "secp256k1";
+              break;
+            case "ES384":
+              candidate4 = jwk2.crv === "P-384";
+              break;
+            case "ES512":
+              candidate4 = jwk2.crv === "P-521";
+              break;
+          }
+        }
+        return candidate4;
+      });
+      const { 0: jwk, length: length2 } = candidates;
+      if (length2 === 0) {
+        throw new JWKSNoMatchingKey();
+      }
+      if (length2 !== 1) {
+        const error5 = new JWKSMultipleMatchingKeys();
+        const { _cached } = this;
+        error5[Symbol.asyncIterator] = async function* () {
+          for (const jwk2 of candidates) {
+            try {
+              yield await importWithAlgCache(_cached, jwk2, alg);
+            } catch {
+            }
+          }
+        };
+        throw error5;
+      }
+      return importWithAlgCache(this._cached, jwk, alg);
+    }
+  };
+  async function importWithAlgCache(cache, jwk, alg) {
+    const cached = cache.get(jwk) || cache.set(jwk, {}).get(jwk);
+    if (cached[alg] === void 0) {
+      const key3 = await importJWK({ ...jwk, ext: true }, alg);
+      if (key3 instanceof Uint8Array || key3.type !== "public") {
+        throw new JWKSInvalid("JSON Web Key Set members must be public keys");
+      }
+      cached[alg] = key3;
+    }
+    return cached[alg];
+  }
+  function createLocalJWKSet(jwks) {
+    const set = new LocalJWKSet(jwks);
+    const localJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(localJWKSet, {
+      jwks: {
+        value: () => clone(set._jwks),
+        enumerable: true,
+        configurable: false,
+        writable: false
+      }
+    });
+    return localJWKSet;
+  }
+
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/fetch_jwks.js
+  var fetchJwks = async (url7, timeout2, options) => {
+    let controller2;
+    let id6;
+    let timedOut = false;
+    if (typeof AbortController === "function") {
+      controller2 = new AbortController();
+      id6 = setTimeout(() => {
+        timedOut = true;
+        controller2.abort();
+      }, timeout2);
+    }
+    const response6 = await fetch(url7.href, {
+      signal: controller2 ? controller2.signal : void 0,
+      redirect: "manual",
+      headers: options.headers
+    }).catch((err) => {
+      if (timedOut)
+        throw new JWKSTimeout();
+      throw err;
+    });
+    if (id6 !== void 0)
+      clearTimeout(id6);
+    if (response6.status !== 200) {
+      throw new JOSEError("Expected 200 OK from the JSON Web Key Set HTTP response");
+    }
+    try {
+      return await response6.json();
+    } catch {
+      throw new JOSEError("Failed to parse the JSON Web Key Set HTTP response as JSON");
+    }
+  };
+  var fetch_jwks_default = fetchJwks;
+
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/jwks/remote.js
+  function isCloudflareWorkers() {
+    return typeof WebSocketPair !== "undefined" || typeof navigator !== "undefined" && navigator.userAgent === "Cloudflare-Workers" || typeof EdgeRuntime !== "undefined" && EdgeRuntime === "vercel";
+  }
+  var USER_AGENT;
+  if (typeof navigator === "undefined" || !navigator.userAgent?.startsWith?.("Mozilla/5.0 ")) {
+    const NAME = "jose";
+    const VERSION = "v5.9.3";
+    USER_AGENT = `${NAME}/${VERSION}`;
+  }
+  var jwksCache = Symbol();
+  function isFreshJwksCache(input2, cacheMaxAge) {
+    if (typeof input2 !== "object" || input2 === null) {
+      return false;
+    }
+    if (!("uat" in input2) || typeof input2.uat !== "number" || Date.now() - input2.uat >= cacheMaxAge) {
+      return false;
+    }
+    if (!("jwks" in input2) || !isObject(input2.jwks) || !Array.isArray(input2.jwks.keys) || !Array.prototype.every.call(input2.jwks.keys, isObject)) {
+      return false;
+    }
+    return true;
+  }
+  var RemoteJWKSet = class {
+    constructor(url7, options) {
+      if (!(url7 instanceof URL)) {
+        throw new TypeError("url must be an instance of URL");
+      }
+      this._url = new URL(url7.href);
+      this._options = { agent: options?.agent, headers: options?.headers };
+      this._timeoutDuration = typeof options?.timeoutDuration === "number" ? options?.timeoutDuration : 5e3;
+      this._cooldownDuration = typeof options?.cooldownDuration === "number" ? options?.cooldownDuration : 3e4;
+      this._cacheMaxAge = typeof options?.cacheMaxAge === "number" ? options?.cacheMaxAge : 6e5;
+      if (options?.[jwksCache] !== void 0) {
+        this._cache = options?.[jwksCache];
+        if (isFreshJwksCache(options?.[jwksCache], this._cacheMaxAge)) {
+          this._jwksTimestamp = this._cache.uat;
+          this._local = createLocalJWKSet(this._cache.jwks);
+        }
+      }
+    }
+    coolingDown() {
+      return typeof this._jwksTimestamp === "number" ? Date.now() < this._jwksTimestamp + this._cooldownDuration : false;
+    }
+    fresh() {
+      return typeof this._jwksTimestamp === "number" ? Date.now() < this._jwksTimestamp + this._cacheMaxAge : false;
+    }
+    async getKey(protectedHeader, token) {
+      if (!this._local || !this.fresh()) {
+        await this.reload();
+      }
+      try {
+        return await this._local(protectedHeader, token);
+      } catch (err) {
+        if (err instanceof JWKSNoMatchingKey) {
+          if (this.coolingDown() === false) {
+            await this.reload();
+            return this._local(protectedHeader, token);
+          }
+        }
+        throw err;
+      }
+    }
+    async reload() {
+      if (this._pendingFetch && isCloudflareWorkers()) {
+        this._pendingFetch = void 0;
+      }
+      const headers = new Headers(this._options.headers);
+      if (USER_AGENT && !headers.has("User-Agent")) {
+        headers.set("User-Agent", USER_AGENT);
+        this._options.headers = Object.fromEntries(headers.entries());
+      }
+      this._pendingFetch || (this._pendingFetch = fetch_jwks_default(this._url, this._timeoutDuration, this._options).then((json) => {
+        this._local = createLocalJWKSet(json);
+        if (this._cache) {
+          this._cache.uat = Date.now();
+          this._cache.jwks = json;
+        }
+        this._jwksTimestamp = Date.now();
+        this._pendingFetch = void 0;
+      }).catch((err) => {
+        this._pendingFetch = void 0;
+        throw err;
+      }));
+      await this._pendingFetch;
+    }
+  };
+  function createRemoteJWKSet(url7, options) {
+    const set = new RemoteJWKSet(url7, options);
+    const remoteJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(remoteJWKSet, {
+      coolingDown: {
+        get: () => set.coolingDown(),
+        enumerable: true,
+        configurable: false
+      },
+      fresh: {
+        get: () => set.fresh(),
+        enumerable: true,
+        configurable: false
+      },
+      reload: {
+        value: () => set.reload(),
+        enumerable: true,
+        configurable: false,
+        writable: false
+      },
+      reloading: {
+        get: () => !!set._pendingFetch,
+        enumerable: true,
+        configurable: false
+      },
+      jwks: {
+        value: () => set._local?.jwks(),
+        enumerable: true,
+        configurable: false,
+        writable: false
+      }
+    });
+    return remoteJWKSet;
+  }
+
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/runtime/generate.js
   function getModulusLengthOption(options) {
-    var _a;
-    const modulusLength = (_a = options === null || options === void 0 ? void 0 : options.modulusLength) !== null && _a !== void 0 ? _a : 2048;
+    const modulusLength = options?.modulusLength ?? 2048;
     if (typeof modulusLength !== "number" || modulusLength < 2048) {
       throw new JOSENotSupported("Invalid or unsupported modulusLength option provided, 2048 bits or larger keys must be used");
     }
     return modulusLength;
   }
   async function generateKeyPair(alg, options) {
-    var _a, _b, _c;
     let algorithm3;
     let keyUsages;
     switch (alg) {
@@ -46938,9 +47496,9 @@ var PodOS = (() => {
         algorithm3 = { name: "ECDSA", namedCurve: "P-521" };
         keyUsages = ["sign", "verify"];
         break;
-      case "EdDSA":
+      case "EdDSA": {
         keyUsages = ["sign", "verify"];
-        const crv = (_a = options === null || options === void 0 ? void 0 : options.crv) !== null && _a !== void 0 ? _a : "Ed25519";
+        const crv = options?.crv ?? "Ed25519";
         switch (crv) {
           case "Ed25519":
           case "Ed448":
@@ -46950,22 +47508,23 @@ var PodOS = (() => {
             throw new JOSENotSupported("Invalid or unsupported crv option provided");
         }
         break;
+      }
       case "ECDH-ES":
       case "ECDH-ES+A128KW":
       case "ECDH-ES+A192KW":
       case "ECDH-ES+A256KW": {
         keyUsages = ["deriveKey", "deriveBits"];
-        const crv2 = (_b = options === null || options === void 0 ? void 0 : options.crv) !== null && _b !== void 0 ? _b : "P-256";
-        switch (crv2) {
+        const crv = options?.crv ?? "P-256";
+        switch (crv) {
           case "P-256":
           case "P-384":
           case "P-521": {
-            algorithm3 = { name: "ECDH", namedCurve: crv2 };
+            algorithm3 = { name: "ECDH", namedCurve: crv };
             break;
           }
           case "X25519":
           case "X448":
-            algorithm3 = { name: crv2 };
+            algorithm3 = { name: crv };
             break;
           default:
             throw new JOSENotSupported("Invalid or unsupported crv option provided, supported values are P-256, P-384, P-521, X25519, and X448");
@@ -46975,15 +47534,25 @@ var PodOS = (() => {
       default:
         throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
     }
-    return webcrypto_default.subtle.generateKey(algorithm3, (_c = options === null || options === void 0 ? void 0 : options.extractable) !== null && _c !== void 0 ? _c : false, keyUsages);
+    return webcrypto_default.subtle.generateKey(algorithm3, options?.extractable ?? false, keyUsages);
   }
 
-  // ../node_modules/jose/dist/browser/key/generate_key_pair.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/jose/dist/browser/key/generate_key_pair.js
   async function generateKeyPair2(alg, options) {
     return generateKeyPair(alg, options);
   }
 
-  // ../node_modules/uuid/dist/esm-browser/rng.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/uuid/dist/esm-browser/stringify.js
+  var byteToHex = [];
+  for (i = 0; i < 256; ++i) {
+    byteToHex.push((i + 256).toString(16).slice(1));
+  }
+  var i;
+  function unsafeStringify(arr, offset3 = 0) {
+    return (byteToHex[arr[offset3 + 0]] + byteToHex[arr[offset3 + 1]] + byteToHex[arr[offset3 + 2]] + byteToHex[arr[offset3 + 3]] + "-" + byteToHex[arr[offset3 + 4]] + byteToHex[arr[offset3 + 5]] + "-" + byteToHex[arr[offset3 + 6]] + byteToHex[arr[offset3 + 7]] + "-" + byteToHex[arr[offset3 + 8]] + byteToHex[arr[offset3 + 9]] + "-" + byteToHex[arr[offset3 + 10]] + byteToHex[arr[offset3 + 11]] + byteToHex[arr[offset3 + 12]] + byteToHex[arr[offset3 + 13]] + byteToHex[arr[offset3 + 14]] + byteToHex[arr[offset3 + 15]]).toLowerCase();
+  }
+
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/uuid/dist/esm-browser/rng.js
   var getRandomValues;
   var rnds8 = new Uint8Array(16);
   function rng() {
@@ -46996,33 +47565,24 @@ var PodOS = (() => {
     return getRandomValues(rnds8);
   }
 
-  // ../node_modules/uuid/dist/esm-browser/stringify.js
-  var byteToHex = [];
-  for (let i = 0; i < 256; ++i) {
-    byteToHex.push((i + 256).toString(16).slice(1));
-  }
-  function unsafeStringify(arr, offset3 = 0) {
-    return byteToHex[arr[offset3 + 0]] + byteToHex[arr[offset3 + 1]] + byteToHex[arr[offset3 + 2]] + byteToHex[arr[offset3 + 3]] + "-" + byteToHex[arr[offset3 + 4]] + byteToHex[arr[offset3 + 5]] + "-" + byteToHex[arr[offset3 + 6]] + byteToHex[arr[offset3 + 7]] + "-" + byteToHex[arr[offset3 + 8]] + byteToHex[arr[offset3 + 9]] + "-" + byteToHex[arr[offset3 + 10]] + byteToHex[arr[offset3 + 11]] + byteToHex[arr[offset3 + 12]] + byteToHex[arr[offset3 + 13]] + byteToHex[arr[offset3 + 14]] + byteToHex[arr[offset3 + 15]];
-  }
-
-  // ../node_modules/uuid/dist/esm-browser/native.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/uuid/dist/esm-browser/native.js
   var randomUUID = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
   var native_default = {
     randomUUID
   };
 
-  // ../node_modules/uuid/dist/esm-browser/v4.js
+  // ../node_modules/@inrupt/solid-client-authn-core/node_modules/uuid/dist/esm-browser/v4.js
   function v4(options, buf, offset3) {
     if (native_default.randomUUID && !buf && !options) {
       return native_default.randomUUID();
     }
     options = options || {};
-    const rnds = options.random || (options.rng || rng)();
+    var rnds = options.random || (options.rng || rng)();
     rnds[6] = rnds[6] & 15 | 64;
     rnds[8] = rnds[8] & 63 | 128;
     if (buf) {
       offset3 = offset3 || 0;
-      for (let i = 0; i < 16; ++i) {
+      for (var i = 0; i < 16; ++i) {
         buf[offset3 + i] = rnds[i];
       }
       return buf;
@@ -47050,17 +47610,6 @@ var PodOS = (() => {
   var SCOPE_OFFLINE = "offline_access";
   var SCOPE_WEBID = "webid";
   var DEFAULT_SCOPES = [SCOPE_OPENID, SCOPE_OFFLINE, SCOPE_WEBID].join(" ");
-  var buildProxyHandler = (toExclude, errorMessage) => ({
-    // This proxy is only a temporary measure until Session no longer extends
-    // SessionEventEmitter, and the proxying is no longer necessary.
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    get(target5, prop, receiver2) {
-      if (!Object.getOwnPropertyNames(import_events.EventEmitter).includes(prop) && Object.getOwnPropertyNames(toExclude).includes(prop)) {
-        throw new Error(`${errorMessage}: [${prop}] is not supported`);
-      }
-      return Reflect.get(target5, prop, receiver2);
-    }
-  });
   var AggregateHandler = class {
     constructor(handleables) {
       this.handleables = handleables;
@@ -47097,24 +47646,11 @@ var PodOS = (() => {
       }).join(", ")}`);
     }
   };
-  async function fetchJwks(jwksIri, issuerIri) {
-    const jwksResponse = await fetch2.call(globalThis, jwksIri);
-    if (jwksResponse.status !== 200) {
-      throw new Error(`Could not fetch JWKS for [${issuerIri}] at [${jwksIri}]: ${jwksResponse.status} ${jwksResponse.statusText}`);
-    }
-    let jwk;
-    try {
-      jwk = (await jwksResponse.json()).keys[0];
-    } catch (e) {
-      throw new Error(`Malformed JWKS for [${issuerIri}] at [${jwksIri}]: ${e.message}`);
-    }
-    return jwk;
-  }
   async function getWebidFromTokenPayload(idToken, jwksIri, issuerIri, clientId) {
-    const jwk = await fetchJwks(jwksIri, issuerIri);
     let payload4;
+    let clientIdInPayload;
     try {
-      const { payload: verifiedPayload } = await jwtVerify(idToken, await importJWK(jwk), {
+      const { payload: verifiedPayload } = await jwtVerify(idToken, createRemoteJWKSet(new URL(jwksIri)), {
         issuer: issuerIri,
         audience: clientId
       });
@@ -47122,15 +47658,24 @@ var PodOS = (() => {
     } catch (e) {
       throw new Error(`Token verification failed: ${e.stack}`);
     }
+    if (typeof payload4.azp === "string") {
+      clientIdInPayload = payload4.azp;
+    }
     if (typeof payload4.webid === "string") {
-      return payload4.webid;
+      return {
+        webId: payload4.webid,
+        clientId: clientIdInPayload
+      };
     }
     if (typeof payload4.sub !== "string") {
       throw new Error(`The token ${JSON.stringify(payload4)} is invalid: it has no 'webid' claim and no 'sub' claim.`);
     }
     try {
       new URL(payload4.sub);
-      return payload4.sub;
+      return {
+        webId: payload4.sub,
+        clientId: clientIdInPayload
+      };
     } catch (e) {
       throw new Error(`The token has no 'webid' claim, and its 'sub' claim of [${payload4.sub}] is invalid as a URL - error [${e}].`);
     }
@@ -47154,17 +47699,29 @@ var PodOS = (() => {
     cleanedUpUrl.searchParams.delete("iss");
     return cleanedUpUrl;
   }
+  function booleanWithFallback(value6, fallback) {
+    if (typeof value6 === "boolean") {
+      return Boolean(value6);
+    }
+    return Boolean(fallback);
+  }
   var AuthorizationCodeWithPkceOidcHandlerBase = class {
     constructor(storageUtility, redirector) {
       this.storageUtility = storageUtility;
       this.redirector = redirector;
+      this.parametersGuard = (oidcLoginOptions) => {
+        return oidcLoginOptions.issuerConfiguration.grantTypesSupported !== void 0 && oidcLoginOptions.issuerConfiguration.grantTypesSupported.indexOf("authorization_code") > -1 && oidcLoginOptions.redirectUrl !== void 0;
+      };
       this.storageUtility = storageUtility;
       this.redirector = redirector;
     }
     async canHandle(oidcLoginOptions) {
-      return !!(oidcLoginOptions.issuerConfiguration.grantTypesSupported && oidcLoginOptions.issuerConfiguration.grantTypesSupported.indexOf("authorization_code") > -1);
+      return this.parametersGuard(oidcLoginOptions);
     }
     async handleRedirect({ oidcLoginOptions, state: state2, codeVerifier, targetUrl: targetUrl3 }) {
+      if (!this.parametersGuard(oidcLoginOptions)) {
+        throw new Error("The authorization code grant requires a redirectUrl.");
+      }
       await Promise.all([
         // We use the OAuth 'state' value (which should be crypto-random) as
         // the key in our storage to store our actual SessionID. We do this
@@ -47175,7 +47732,6 @@ var PodOS = (() => {
         // that session ID can be any developer-specified value, and therefore
         // may not be appropriate (since the OAuth 'state' value should really
         // be an unguessable crypto-random value).
-        // eslint-disable-next-line no-underscore-dangle
         this.storageUtility.setForUser(state2, {
           sessionId: oidcLoginOptions.sessionId
         }),
@@ -47184,12 +47740,12 @@ var PodOS = (() => {
         // our session ID is unnecessary, but it provides a slightly cleaner
         // separation of concerns.
         this.storageUtility.setForUser(oidcLoginOptions.sessionId, {
-          // eslint-disable-next-line no-underscore-dangle
           codeVerifier,
           issuer: oidcLoginOptions.issuer.toString(),
           // The redirect URL is read after redirect, so it must be stored now.
           redirectUrl: oidcLoginOptions.redirectUrl,
-          dpop: oidcLoginOptions.dpop ? "true" : "false"
+          dpop: Boolean(oidcLoginOptions.dpop).toString(),
+          keepAlive: booleanWithFallback(oidcLoginOptions.keepAlive, true).toString()
         })
       ]);
       this.redirector.redirect(targetUrl3, {
@@ -47251,7 +47807,7 @@ var PodOS = (() => {
     return {
       isLoggedIn: false,
       sessionId: v4_default(),
-      fetch: (...args) => fetch2.call(globalThis, ...args)
+      fetch: (...args) => fetch(...args)
     };
   }
   async function clear(sessionId, storage2) {
@@ -47345,48 +47901,51 @@ var PodOS = (() => {
       return supported.includes(signingAlg);
     })) !== null && _a !== void 0 ? _a : null;
   }
-  function determineClientType(options, issuerConfig) {
-    if (options.clientId !== void 0 && !isValidUrl(options.clientId)) {
-      return "static";
-    }
-    if (issuerConfig.scopesSupported.includes("webid") && options.clientId !== void 0 && isValidUrl(options.clientId)) {
-      return "solid-oidc";
-    }
-    return "dynamic";
+  function isStaticClient(options) {
+    return options.clientId !== void 0 && !isValidUrl(options.clientId);
+  }
+  function isSolidOidcClient(options, issuerConfig) {
+    return issuerConfig.scopesSupported.includes("webid") && options.clientId !== void 0 && isValidUrl(options.clientId);
+  }
+  function isKnownClientType(clientType) {
+    return typeof clientType === "string" && ["dynamic", "static", "solid-oidc"].includes(clientType);
   }
   async function handleRegistration(options, issuerConfig, storageUtility, clientRegistrar) {
-    const clientType = determineClientType(options, issuerConfig);
-    if (clientType === "dynamic") {
+    let clientInfo;
+    if (isSolidOidcClient(options, issuerConfig)) {
+      clientInfo = {
+        clientId: options.clientId,
+        clientName: options.clientName,
+        clientType: "solid-oidc"
+      };
+    } else if (isStaticClient(options)) {
+      clientInfo = {
+        clientId: options.clientId,
+        clientSecret: options.clientSecret,
+        clientName: options.clientName,
+        clientType: "static"
+      };
+    } else {
       return clientRegistrar.getClient({
         sessionId: options.sessionId,
         clientName: options.clientName,
         redirectUrl: options.redirectUrl
       }, issuerConfig);
     }
-    await storageUtility.setForUser(options.sessionId, {
-      // If the client is either static or solid-oidc compliant, its client ID cannot be undefined.
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      clientId: options.clientId
-    });
-    if (options.clientSecret) {
-      await storageUtility.setForUser(options.sessionId, {
-        clientSecret: options.clientSecret
-      });
+    const infoToSave = {
+      clientId: clientInfo.clientId,
+      clientType: clientInfo.clientType
+    };
+    if (clientInfo.clientType === "static") {
+      infoToSave.clientSecret = clientInfo.clientSecret;
     }
-    if (options.clientName) {
-      await storageUtility.setForUser(options.sessionId, {
-        clientName: options.clientName
-      });
+    if (clientInfo.clientName) {
+      infoToSave.clientName = clientInfo.clientName;
     }
-    return {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      clientId: options.clientId,
-      clientSecret: options.clientSecret,
-      clientName: options.clientName,
-      clientType
-    };
+    await storageUtility.setForUser(options.sessionId, infoToSave);
+    return clientInfo;
   }
-  var globalFetch = (request2, init) => fetch2.call(globalThis, request2, init);
+  var boundFetch = (request2, init) => fetch(request2, init);
   var ClientAuthentication = class {
     constructor(loginHandler, redirectHandler, logoutHandler, sessionInfoManager, issuerConfigFetcher) {
       this.loginHandler = loginHandler;
@@ -47394,13 +47953,13 @@ var PodOS = (() => {
       this.logoutHandler = logoutHandler;
       this.sessionInfoManager = sessionInfoManager;
       this.issuerConfigFetcher = issuerConfigFetcher;
-      this.fetch = globalFetch;
+      this.fetch = boundFetch;
       this.logout = async (sessionId, options) => {
         await this.logoutHandler.handle(sessionId, (options === null || options === void 0 ? void 0 : options.logoutType) === "idp" ? {
           ...options,
           toLogoutUrl: this.boundLogout
         } : options);
-        this.fetch = globalFetch;
+        this.fetch = boundFetch;
         delete this.boundLogout;
       };
       this.getSessionInfo = async (sessionId) => {
@@ -47418,13 +47977,14 @@ var PodOS = (() => {
   };
   async function loadOidcContextFromStorage(sessionId, storageUtility, configFetcher) {
     try {
-      const [issuerIri, codeVerifier, storedRedirectIri, dpop] = await Promise.all([
+      const [issuerIri, codeVerifier, storedRedirectIri, dpop, keepAlive] = await Promise.all([
         storageUtility.getForUser(sessionId, "issuer", {
           errorIfNull: true
         }),
         storageUtility.getForUser(sessionId, "codeVerifier"),
         storageUtility.getForUser(sessionId, "redirectUrl"),
-        storageUtility.getForUser(sessionId, "dpop", { errorIfNull: true })
+        storageUtility.getForUser(sessionId, "dpop", { errorIfNull: true }),
+        storageUtility.getForUser(sessionId, "keepAlive")
       ]);
       await storageUtility.deleteForUser(sessionId, "codeVerifier");
       const issuerConfig = await configFetcher.fetchConfig(issuerIri);
@@ -47432,12 +47992,34 @@ var PodOS = (() => {
         codeVerifier,
         redirectUrl: storedRedirectIri,
         issuerConfig,
-        dpop: dpop === "true"
+        dpop: dpop === "true",
+        // Default keepAlive to true if not found in storage.
+        keepAlive: typeof keepAlive === "string" ? keepAlive === "true" : true
       };
     } catch (e) {
       throw new Error(`Failed to retrieve OIDC context from storage associated with session [${sessionId}]: ${e}`);
     }
   }
+  async function saveSessionInfoToStorage(storageUtility, sessionId, webId, clientId, isLoggedIn2, refreshToken, secure, dpopKey) {
+    if (refreshToken !== void 0) {
+      await storageUtility.setForUser(sessionId, { refreshToken }, { secure });
+    }
+    if (webId !== void 0) {
+      await storageUtility.setForUser(sessionId, { webId }, { secure });
+    }
+    if (clientId !== void 0) {
+      await storageUtility.setForUser(sessionId, { clientId }, { secure });
+    }
+    if (isLoggedIn2 !== void 0) {
+      await storageUtility.setForUser(sessionId, { isLoggedIn: isLoggedIn2 }, { secure });
+    }
+    if (dpopKey !== void 0) {
+      await storageUtility.setForUser(sessionId, {
+        publicKey: JSON.stringify(dpopKey.publicKey),
+        privateKey: JSON.stringify(await exportJWK(dpopKey.privateKey))
+      }, { secure });
+    }
+  }
   var StorageUtility = class {
     constructor(secureStorage, insecureStorage) {
       this.secureStorage = secureStorage;
@@ -47589,8 +48171,8 @@ var PodOS = (() => {
       headers
     };
   }
-  async function makeAuthenticatedRequest(unauthFetch, accessToken, url7, defaultRequestInit, dpopKey) {
-    return unauthFetch(url7, await buildAuthenticatedHeaders(url7.toString(), accessToken, dpopKey, defaultRequestInit));
+  async function makeAuthenticatedRequest(accessToken, url7, defaultRequestInit, dpopKey) {
+    return fetch(url7, await buildAuthenticatedHeaders(url7.toString(), accessToken, dpopKey, defaultRequestInit));
   }
   async function refreshAccessToken(refreshOptions, dpopKey, eventEmitter) {
     var _a;
@@ -47614,7 +48196,7 @@ var PodOS = (() => {
     }
     return DEFAULT_EXPIRATION_TIME_SECONDS;
   };
-  async function buildAuthenticatedFetch(unauthFetch, accessToken, options) {
+  async function buildAuthenticatedFetch(accessToken, options) {
     var _a;
     let currentAccessToken = accessToken;
     let latestTimeout;
@@ -47662,7 +48244,7 @@ var PodOS = (() => {
       options.eventEmitter.emit(EVENTS.TIMEOUT_SET, expirationTimeout);
     }
     return async (url7, requestInit) => {
-      let response6 = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, url7, requestInit, options === null || options === void 0 ? void 0 : options.dpopKey);
+      let response6 = await makeAuthenticatedRequest(currentAccessToken, url7, requestInit, options === null || options === void 0 ? void 0 : options.dpopKey);
       const failedButNotExpectedAuthError = !response6.ok && !isExpectedAuthError(response6.status);
       if (response6.ok || failedButNotExpectedAuthError) {
         return response6;
@@ -47670,7 +48252,6 @@ var PodOS = (() => {
       const hasBeenRedirected = response6.url !== url7;
       if (hasBeenRedirected && (options === null || options === void 0 ? void 0 : options.dpopKey) !== void 0) {
         response6 = await makeAuthenticatedRequest(
-          unauthFetch,
           currentAccessToken,
           // Replace the original target IRI (`url`) by the redirection target
           response6.url,
@@ -47682,8 +48263,57 @@ var PodOS = (() => {
     };
   }
 
+  // ../node_modules/@inrupt/solid-client-authn-browser/node_modules/uuid/dist/esm-browser/stringify.js
+  var byteToHex2 = [];
+  for (i = 0; i < 256; ++i) {
+    byteToHex2.push((i + 256).toString(16).slice(1));
+  }
+  var i;
+  function unsafeStringify2(arr, offset3 = 0) {
+    return (byteToHex2[arr[offset3 + 0]] + byteToHex2[arr[offset3 + 1]] + byteToHex2[arr[offset3 + 2]] + byteToHex2[arr[offset3 + 3]] + "-" + byteToHex2[arr[offset3 + 4]] + byteToHex2[arr[offset3 + 5]] + "-" + byteToHex2[arr[offset3 + 6]] + byteToHex2[arr[offset3 + 7]] + "-" + byteToHex2[arr[offset3 + 8]] + byteToHex2[arr[offset3 + 9]] + "-" + byteToHex2[arr[offset3 + 10]] + byteToHex2[arr[offset3 + 11]] + byteToHex2[arr[offset3 + 12]] + byteToHex2[arr[offset3 + 13]] + byteToHex2[arr[offset3 + 14]] + byteToHex2[arr[offset3 + 15]]).toLowerCase();
+  }
+
+  // ../node_modules/@inrupt/solid-client-authn-browser/node_modules/uuid/dist/esm-browser/rng.js
+  var getRandomValues2;
+  var rnds82 = new Uint8Array(16);
+  function rng2() {
+    if (!getRandomValues2) {
+      getRandomValues2 = typeof crypto !== "undefined" && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
+      if (!getRandomValues2) {
+        throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
+      }
+    }
+    return getRandomValues2(rnds82);
+  }
+
+  // ../node_modules/@inrupt/solid-client-authn-browser/node_modules/uuid/dist/esm-browser/native.js
+  var randomUUID2 = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+  var native_default2 = {
+    randomUUID: randomUUID2
+  };
+
+  // ../node_modules/@inrupt/solid-client-authn-browser/node_modules/uuid/dist/esm-browser/v4.js
+  function v42(options, buf, offset3) {
+    if (native_default2.randomUUID && !buf && !options) {
+      return native_default2.randomUUID();
+    }
+    options = options || {};
+    var rnds = options.random || (options.rng || rng2)();
+    rnds[6] = rnds[6] & 15 | 64;
+    rnds[8] = rnds[8] & 63 | 128;
+    if (buf) {
+      offset3 = offset3 || 0;
+      for (var i = 0; i < 16; ++i) {
+        buf[offset3 + i] = rnds[i];
+      }
+      return buf;
+    }
+    return unsafeStringify2(rnds);
+  }
+  var v4_default2 = v42;
+
   // ../node_modules/@inrupt/solid-client-authn-browser/dist/index.mjs
-  var import_events2 = __toESM(require_events(), 1);
+  var import_events = __toESM(require_events(), 1);
 
   // ../node_modules/@inrupt/oidc-client-ext/dist/index.es.js
   var import_oidc_client = __toESM(require_oidc_client_min());
@@ -47831,79 +48461,20 @@ var PodOS = (() => {
       headers,
       body: new URLSearchParams(requestBody).toString()
     };
-    const rawTokenResponse = await fetch2(issuer2.tokenEndpoint, tokenRequestInit);
+    const rawTokenResponse = await fetch(issuer2.tokenEndpoint, tokenRequestInit);
     const jsonTokenResponse = await rawTokenResponse.json();
     const tokenResponse = validateTokenEndpointResponse(jsonTokenResponse, dpop);
-    const webId = await getWebidFromTokenPayload(tokenResponse.id_token, issuer2.jwksUri, issuer2.issuer, client.clientId);
+    const { webId, clientId } = await getWebidFromTokenPayload(tokenResponse.id_token, issuer2.jwksUri, issuer2.issuer, client.clientId);
     return {
       accessToken: tokenResponse.access_token,
       idToken: tokenResponse.id_token,
       refreshToken: hasRefreshToken(tokenResponse) ? tokenResponse.refresh_token : void 0,
       webId,
+      clientId,
       dpopKey,
       expiresIn: tokenResponse.expires_in
     };
   }
-  async function getBearerToken(redirectUrl) {
-    let signinResponse;
-    try {
-      const client = new import_oidc_client.OidcClient({
-        // TODO: We should look at the various interfaces being used for storage,
-        //  i.e. between oidc-client-js (WebStorageStoreState), localStorage
-        //  (which has an interface Storage), and our own proprietary interface
-        //  IStorage - i.e. we should really just be using the browser Web Storage
-        //  API, e.g. "stateStore: window.localStorage,".
-        // We are instantiating a new instance here, so the only value we need to
-        // explicitly provide is the response mode (default otherwise will look
-        // for a hash '#' fragment!).
-        // eslint-disable-next-line camelcase
-        response_mode: "query",
-        // The userinfo endpoint on NSS fails, so disable this for now
-        // Note that in Solid, information should be retrieved from the
-        // profile referenced by the WebId.
-        // TODO: Note that this is heavy-handed, and that this userinfo check
-        //  verifies that the `sub` claim in the id token you get along with the
-        //  access token matches the sub claim associated with the access token at
-        //  the userinfo endpoint.
-        // That is a useful check, and in the future it should be only disabled
-        // against NSS, and not in general.
-        // Issue tracker: https://github.com/solid/node-solid-server/issues/1490
-        loadUserInfo: false
-      });
-      signinResponse = await client.processSigninResponse(redirectUrl);
-      if (client.settings.metadata === void 0) {
-        throw new Error("Cannot retrieve issuer metadata from client information in storage.");
-      }
-      if (client.settings.metadata.jwks_uri === void 0) {
-        throw new Error("Missing some issuer metadata from client information in storage: 'jwks_uri' is undefined");
-      }
-      if (client.settings.metadata.issuer === void 0) {
-        throw new Error("Missing some issuer metadata from client information in storage: 'issuer' is undefined");
-      }
-      if (client.settings.client_id === void 0) {
-        throw new Error("Missing some client information in storage: 'client_id' is undefined");
-      }
-      const webId = await getWebidFromTokenPayload(signinResponse.id_token, client.settings.metadata.jwks_uri, client.settings.metadata.issuer, client.settings.client_id);
-      return {
-        accessToken: signinResponse.access_token,
-        idToken: signinResponse.id_token,
-        webId,
-        // Although not a field in the TypeScript response interface, the refresh
-        // token (which can optionally come back with the access token (if, as per
-        // the OAuth2 spec, we requested one using the scope of 'offline_access')
-        // will be included in the signin response object.
-        // eslint-disable-next-line camelcase
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        refreshToken: signinResponse.refresh_token
-      };
-    } catch (err) {
-      throw new Error(`Problem handling Auth Code Grant (Flow) redirect - URL [${redirectUrl}]: ${err}`);
-    }
-  }
-  async function getDpopToken(issuer2, client, data2) {
-    return getTokens(issuer2, client, data2, true);
-  }
   var isValidUrl2 = (url7) => {
     try {
       new URL(url7);
@@ -47937,7 +48508,7 @@ var PodOS = (() => {
     } else if (isValidUrl2(client.clientId)) {
       requestBody.client_id = client.clientId;
     }
-    const rawResponse = await fetch2(issuer2.tokenEndpoint, {
+    const rawResponse = await fetch(issuer2.tokenEndpoint, {
       method: "POST",
       body: new URLSearchParams(requestBody).toString(),
       headers: {
@@ -47953,7 +48524,7 @@ var PodOS = (() => {
       throw new Error(`The token endpoint of issuer ${issuer2.issuer} returned a malformed response.`);
     }
     const validatedResponse = validateTokenEndpointResponse(response6, dpopKey !== void 0);
-    const webId = await getWebidFromTokenPayload(validatedResponse.id_token, issuer2.jwksUri, issuer2.issuer, client.clientId);
+    const { webId } = await getWebidFromTokenPayload(validatedResponse.id_token, issuer2.jwksUri, issuer2.issuer, client.clientId);
     return {
       accessToken: validatedResponse.access_token,
       idToken: validatedResponse.id_token,
@@ -48035,7 +48606,7 @@ var PodOS = (() => {
       };
       this.handleIncomingRedirect = async (url7, eventEmitter) => {
         try {
-          const redirectInfo = await this.redirectHandler.handle(url7, eventEmitter);
+          const redirectInfo = await this.redirectHandler.handle(url7, eventEmitter, void 0);
           this.fetch = redirectInfo.fetch.bind(window);
           this.boundLogout = redirectInfo.getLogoutUrl;
           await this.cleanUrlAfterRedirect(url7);
@@ -48043,7 +48614,8 @@ var PodOS = (() => {
             isLoggedIn: redirectInfo.isLoggedIn,
             webId: redirectInfo.webId,
             sessionId: redirectInfo.sessionId,
-            expirationDate: redirectInfo.expirationDate
+            expirationDate: redirectInfo.expirationDate,
+            clientAppId: redirectInfo.clientAppId
           };
         } catch (err) {
           await this.cleanUrlAfterRedirect(url7);
@@ -48114,8 +48686,7 @@ var PodOS = (() => {
         authority: oidcLoginOptions.issuer.toString(),
         client_id: oidcLoginOptions.client.clientId,
         client_secret: oidcLoginOptions.client.clientSecret,
-        redirect_uri: oidcLoginOptions.redirectUrl.toString(),
-        post_logout_redirect_uri: oidcLoginOptions.redirectUrl.toString(),
+        redirect_uri: oidcLoginOptions.redirectUrl,
         response_type: "code",
         scope: DEFAULT_SCOPES,
         filterProtocolClaims: true,
@@ -48261,7 +48832,7 @@ var PodOS = (() => {
         // includes the full issuer path. See https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig.
         issuer2.endsWith("/") ? issuer2 : `${issuer2}/`
       ).href;
-      const issuerConfigRequestBody = await fetch2.call(globalThis, openIdConfigUrl);
+      const issuerConfigRequestBody = await fetch(openIdConfigUrl);
       try {
         issuerConfig = processConfig(await issuerConfigRequestBody.json());
       } catch (err) {
@@ -48352,7 +48923,6 @@ var PodOS = (() => {
       return getUnauthenticatedSession();
     }
   };
-  var globalFetch2 = (...args) => fetch2.call(globalThis, ...args);
   var AuthCodeRedirectHandler = class {
     constructor(storageUtility, sessionInfoManager, issuerConfigFetcher, clientRegistrar, tokerRefresher) {
       this.storageUtility = storageUtility;
@@ -48395,21 +48965,16 @@ var PodOS = (() => {
         throw new Error(`The redirect URL for session ${storedSessionId} is missing from storage.`);
       }
       const client = await this.clientRegistrar.getClient({ sessionId: storedSessionId }, issuerConfig);
-      let tokens;
       const tokenCreatedAt = Date.now();
-      if (isDpop) {
-        tokens = await getDpopToken(issuerConfig, client, {
-          grantType: "authorization_code",
-          // We rely on our 'canHandle' function checking that the OAuth 'code'
-          // parameter is present in our query string.
-          code: url7.searchParams.get("code"),
-          codeVerifier,
-          redirectUrl: storedRedirectIri
-        });
-        window.localStorage.removeItem(`oidc.${oauthState}`);
-      } else {
-        tokens = await getBearerToken(url7.toString());
-      }
+      const tokens = await getTokens(issuerConfig, client, {
+        grantType: "authorization_code",
+        // We rely on our 'canHandle' function checking that the OAuth 'code'
+        // parameter is present in our query string.
+        code: url7.searchParams.get("code"),
+        codeVerifier,
+        redirectUrl: storedRedirectIri
+      }, isDpop);
+      window.localStorage.removeItem(`oidc.${oauthState}`);
       let refreshOptions;
       if (tokens.refreshToken !== void 0) {
         refreshOptions = {
@@ -48418,16 +48983,13 @@ var PodOS = (() => {
           tokenRefresher: this.tokerRefresher
         };
       }
-      const authFetch = await buildAuthenticatedFetch(globalFetch2, tokens.accessToken, {
+      const authFetch = await buildAuthenticatedFetch(tokens.accessToken, {
         dpopKey: tokens.dpopKey,
         refreshOptions,
         eventEmitter,
         expiresIn: tokens.expiresIn
       });
-      await this.storageUtility.setForUser(storedSessionId, {
-        webId: tokens.webId,
-        isLoggedIn: "true"
-      }, { secure: true });
+      await saveSessionInfoToStorage(this.storageUtility, storedSessionId, tokens.webId, tokens.clientId, "true", void 0, true);
       const sessionInfo = await this.sessionInfoManager.get(storedSessionId);
       if (!sessionInfo) {
         throw new Error(`Could not retrieve session: [${storedSessionId}].`);
@@ -48478,33 +49040,34 @@ var PodOS = (() => {
       this.storageUtility = storageUtility;
     }
     async getClient(options, issuerConfig) {
-      const [
-        storedClientId,
-        storedClientSecret
-        // storedClientName,
-      ] = await Promise.all([
+      const [storedClientId, storedClientSecret, storedClientName, storedClientType] = await Promise.all([
         this.storageUtility.getForUser(options.sessionId, "clientId", {
           secure: false
         }),
         this.storageUtility.getForUser(options.sessionId, "clientSecret", {
           secure: false
+        }),
+        this.storageUtility.getForUser(options.sessionId, "clientName", {
+          secure: false
+        }),
+        this.storageUtility.getForUser(options.sessionId, "clientType", {
+          secure: false
         })
-        // this.storageUtility.getForUser(options.sessionId, "clientName", {
-        //   // FIXME: figure out how to persist secure storage at reload
-        //   secure: false,
-        // }),
       ]);
-      if (storedClientId) {
+      if (storedClientId && isKnownClientType(storedClientType)) {
         return {
           clientId: storedClientId,
           clientSecret: storedClientSecret,
-          clientType: "dynamic"
+          clientName: storedClientName,
+          // Note: static clients are not applicable in a browser context.
+          clientType: storedClientType
         };
       }
       try {
         const registeredClient = await registerClient(options, issuerConfig);
         const infoToSave = {
-          clientId: registeredClient.clientId
+          clientId: registeredClient.clientId,
+          clientType: "dynamic"
         };
         if (registeredClient.clientSecret) {
           infoToSave.clientSecret = registeredClient.clientSecret;
@@ -48563,9 +49126,6 @@ var PodOS = (() => {
       const tokenSet = await refresh(refreshToken, oidcContext.issuerConfig, clientInfo, dpopKey);
       if (tokenSet.refreshToken !== void 0) {
         eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.NEW_REFRESH_TOKEN, tokenSet.refreshToken);
-        await this.storageUtility.setForUser(sessionId, {
-          refreshToken: tokenSet.refreshToken
-        });
       }
       return tokenSet;
     }
@@ -48613,7 +49173,7 @@ var PodOS = (() => {
   function isLoggedIn(sessionInfo) {
     return !!(sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.isLoggedIn);
   }
-  var Session = class _Session extends import_events2.default {
+  var Session = class {
     /**
      * Session object constructor. Typically called as follows:
      *
@@ -48630,7 +49190,6 @@ var PodOS = (() => {
      *
      */
     constructor(sessionOptions = {}, sessionId = void 0) {
-      super();
       this.tokenRequestInProgress = false;
       this.login = async (options) => {
         var _a;
@@ -48687,7 +49246,7 @@ var PodOS = (() => {
         this.tokenRequestInProgress = false;
         return sessionInfo;
       };
-      this.events = new Proxy(this, buildProxyHandler(_Session.prototype, "events only implements ISessionEventListener"));
+      this.events = new import_events.default();
       if (sessionOptions.clientAuthentication) {
         this.clientAuthentication = sessionOptions.clientAuthentication;
       } else if (sessionOptions.secureStorage && sessionOptions.insecureStorage) {
@@ -48702,11 +49261,12 @@ var PodOS = (() => {
         this.info = {
           sessionId: sessionOptions.sessionInfo.sessionId,
           isLoggedIn: false,
-          webId: sessionOptions.sessionInfo.webId
+          webId: sessionOptions.sessionInfo.webId,
+          clientAppId: sessionOptions.sessionInfo.clientAppId
         };
       } else {
         this.info = {
-          sessionId: sessionId !== null && sessionId !== void 0 ? sessionId : v4_default(),
+          sessionId: sessionId !== null && sessionId !== void 0 ? sessionId : v4_default2(),
           isLoggedIn: false
         };
       }
@@ -48714,62 +49274,11 @@ var PodOS = (() => {
       this.events.on(EVENTS.SESSION_EXPIRED, () => this.internalLogout(false));
       this.events.on(EVENTS.ERROR, () => this.internalLogout(false));
     }
-    /**
-     * Register a callback function to be called when a user completes login.
-     *
-     * The callback is called when {@link handleIncomingRedirect} completes successfully.
-     *
-     * @param callback The function called when a user completes login.
-     * @deprecated Prefer session.events.on(EVENTS.LOGIN, callback)
-     */
-    onLogin(callback) {
-      this.events.on(EVENTS.LOGIN, callback);
-    }
-    /**
-     * Register a callback function to be called when a user logs out:
-     *
-     * @param callback The function called when a user completes logout.
-     * @deprecated Prefer session.events.on(EVENTS.LOGOUT, callback)
-     */
-    onLogout(callback) {
-      this.events.on(EVENTS.LOGOUT, callback);
-    }
-    /**
-     * Register a callback function to be called when a user logs out:
-     *
-     * @param callback The function called when an error occurs.
-     * @since 1.11.0
-     * @deprecated Prefer session.events.on(EVENTS.ERROR, callback)
-     */
-    onError(callback) {
-      this.events.on(EVENTS.ERROR, callback);
-    }
-    /**
-     * Register a callback function to be called when a session is restored.
-     *
-     * Note: the callback will be called with the saved value of the 'current URL'
-     * at the time the session was restored.
-     *
-     * @param callback The function called when a user's already logged-in session is restored, e.g., after a silent authentication is completed after a page refresh.
-     * @deprecated Prefer session.events.on(EVENTS.SESSION_RESTORED, callback)
-     */
-    onSessionRestore(callback) {
-      this.events.on(EVENTS.SESSION_RESTORED, callback);
-    }
-    /**
-     * Register a callback that runs when the session expires and can no longer
-     * make authenticated requests, but following a user logout.
-     * @param callback The function that runs on session expiration.
-     * @since 1.11.0
-     * @deprecated Prefer session.events.on(EVENTS.SESSION_EXPIRED, callback)
-     */
-    onSessionExpiration(callback) {
-      this.events.on(EVENTS.SESSION_EXPIRED, callback);
-    }
     setSessionInfo(sessionInfo) {
       this.info.isLoggedIn = sessionInfo.isLoggedIn;
       this.info.webId = sessionInfo.webId;
       this.info.sessionId = sessionInfo.sessionId;
+      this.info.clientAppId = sessionInfo.clientAppId;
       this.info.expirationDate = sessionInfo.expirationDate;
       this.events.on(EVENTS.SESSION_EXTENDED, (expiresIn) => {
         this.info.expirationDate = Date.now() + expiresIn * 1e3;
@@ -48816,16 +49325,19 @@ var PodOS = (() => {
      * @deprecated use observeSession instead
      */
     trackSession(callback) {
-      this.session.on(EVENTS.LOGIN, () => callback(this.session.info));
-      this.session.on(EVENTS.LOGOUT, () => callback(this.session.info));
-      this.session.on(EVENTS.SESSION_RESTORED, () => callback(this.session.info));
+      this.session.events.on(EVENTS.LOGIN, () => callback(this.session.info));
+      this.session.events.on(EVENTS.LOGOUT, () => callback(this.session.info));
+      this.session.events.on(
+        EVENTS.SESSION_RESTORED,
+        () => callback(this.session.info)
+      );
       callback(this.session.info);
     }
     observeSession() {
       return this.sessionInfo$;
     }
     onSessionRestore(callback) {
-      this.session.on(EVENTS.SESSION_RESTORED, callback);
+      this.session.events.on(EVENTS.SESSION_RESTORED, callback);
     }
   };
 
@@ -48886,7 +49398,7 @@ var PodOS = (() => {
 
   // src/modules/contacts.ts
   async function loadContactsModule(store) {
-    const module3 = await Promise.resolve().then(() => (init_dist(), dist_exports));
+    const module3 = await Promise.resolve().then(() => (init_dist2(), dist_exports));
     return new module3.default({
       store: store.graph,
       fetcher: store.fetcher,
@@ -49306,7 +49818,7 @@ var PodOS = (() => {
     foaf: () => foaf,
     http: () => http,
     hydra: () => hydra,
-    ldp: () => ldp,
+    ldp: () => ldp2,
     link: () => link3,
     log: () => log2,
     meeting: () => meeting,
@@ -49413,7 +49925,7 @@ var PodOS = (() => {
   var replies = "http://www.w3.org/ns/activitystreams#replies";
   var result = "http://www.w3.org/ns/activitystreams#result";
   var audience = "http://www.w3.org/ns/activitystreams#audience";
-  var tag = "http://www.w3.org/ns/activitystreams#tag";
+  var tag2 = "http://www.w3.org/ns/activitystreams#tag";
   var tags = "http://www.w3.org/ns/activitystreams#tags";
   var target = "http://www.w3.org/ns/activitystreams#target";
   var origin2 = "http://www.w3.org/ns/activitystreams#origin";
@@ -49531,7 +50043,7 @@ var PodOS = (() => {
     replies,
     result,
     audience,
-    tag,
+    tag: tag2,
     tags,
     target,
     origin: origin2,
@@ -53982,7 +54494,7 @@ var PodOS = (() => {
   var _identified = "http://hl7.org/fhir/_identified";
   var ExplanationOfBenefitAdjudication = "http://hl7.org/fhir/ExplanationOfBenefitAdjudication";
   var _Subscription = "http://hl7.org/fhir/_Subscription";
-  var tag2 = "http://hl7.org/fhir/tag";
+  var tag3 = "http://hl7.org/fhir/tag";
   var _performed = "http://hl7.org/fhir/_performed";
   var _formOf = "http://hl7.org/fhir/_formOf";
   var DeviceDefinitionPackagingComponentPackagingPackaging = "http://hl7.org/fhir/DeviceDefinitionPackagingComponentPackagingPackaging";
@@ -58215,7 +58727,7 @@ var PodOS = (() => {
     _identified,
     ExplanationOfBenefitAdjudication,
     _Subscription,
-    tag: tag2,
+    tag: tag3,
     _performed,
     _formOf,
     DeviceDefinitionPackagingComponentPackagingPackaging,
@@ -58819,7 +59331,7 @@ var PodOS = (() => {
   var Mailbox = "http://www.w3.org/2007/ont/link#Mailbox";
   var ProtocolEvent = "http://www.w3.org/2007/ont/link#ProtocolEvent";
   var RDFDocument = "http://www.w3.org/2007/ont/link#RDFDocument";
-  var Response2 = "http://www.w3.org/2007/ont/link#Response";
+  var Response = "http://www.w3.org/2007/ont/link#Response";
   var Session3 = "http://www.w3.org/2007/ont/link#Session";
   var isMentionedIn = "http://www.w3.org/2007/ont/link#isMentionedIn";
   var mentionsClass = "http://www.w3.org/2007/ont/link#mentionsClass";
@@ -58839,7 +59351,7 @@ var PodOS = (() => {
     Mailbox,
     ProtocolEvent,
     RDFDocument,
-    Response: Response2,
+    Response,
     Session: Session3,
     isMentionedIn,
     mentionsClass,
@@ -69105,7 +69617,7 @@ var PodOS = (() => {
   var Mailbox2 = "http://www.w3.org/2007/ont/link#Mailbox";
   var ProtocolEvent2 = "http://www.w3.org/2007/ont/link#ProtocolEvent";
   var RDFDocument2 = "http://www.w3.org/2007/ont/link#RDFDocument";
-  var Response3 = "http://www.w3.org/2007/ont/link#Response";
+  var Response2 = "http://www.w3.org/2007/ont/link#Response";
   var Session4 = "http://www.w3.org/2007/ont/link#Session";
   var isMentionedIn2 = "http://www.w3.org/2007/ont/link#isMentionedIn";
   var mentionsClass2 = "http://www.w3.org/2007/ont/link#mentionsClass";
@@ -69125,7 +69637,7 @@ var PodOS = (() => {
     Mailbox: Mailbox2,
     ProtocolEvent: ProtocolEvent2,
     RDFDocument: RDFDocument2,
-    Response: Response3,
+    Response: Response2,
     Session: Session4,
     isMentionedIn: isMentionedIn2,
     mentionsClass: mentionsClass2,
@@ -69147,7 +69659,7 @@ var PodOS = (() => {
   var Mailbox3 = "http://www.w3.org/2007/ont/link#Mailbox";
   var ProtocolEvent3 = "http://www.w3.org/2007/ont/link#ProtocolEvent";
   var RDFDocument3 = "http://www.w3.org/2007/ont/link#RDFDocument";
-  var Response4 = "http://www.w3.org/2007/ont/link#Response";
+  var Response3 = "http://www.w3.org/2007/ont/link#Response";
   var Session5 = "http://www.w3.org/2007/ont/link#Session";
   var isMentionedIn3 = "http://www.w3.org/2007/ont/link#isMentionedIn";
   var mentionsClass3 = "http://www.w3.org/2007/ont/link#mentionsClass";
@@ -69167,7 +69679,7 @@ var PodOS = (() => {
     Mailbox: Mailbox3,
     ProtocolEvent: ProtocolEvent3,
     RDFDocument: RDFDocument3,
-    Response: Response4,
+    Response: Response3,
     Session: Session5,
     isMentionedIn: isMentionedIn3,
     mentionsClass: mentionsClass3,
@@ -69555,7 +70067,7 @@ var PodOS = (() => {
   var foaf = foafImport;
   var http = httpImport;
   var hydra = hydraImport;
-  var ldp = ldpImport;
+  var ldp2 = ldpImport;
   var link3 = linkImport;
   var log2 = logImport;
   var meeting = meetingImport;