@startinblox/core 2.0.6-beta.7 → 2.0.6-beta.9

package/dist/{store-pxHgUL4R.js → store-DsK-vxfo.js}

@@ -1,15 +1,15 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { l as isUrlOrRelativePath, m as jsonldContextParserExports, o as getRawContext, n as normalizeContext, q as mergeContexts, c as doesResourceContainList, r as requireJsonldContextParser, v as requireErrorCoded, w as requireLink } from "./helpers-vZrb1UDN.js";
-let StoreService, formatAttributesToServerSearchOptions, base_context, StoreType, StoreFactory, hasQueryIndex, formatAttributesToServerPaginationOptions, getDefaultExportFromCjs, hasSetLocalData, sibStore, mergeServerSearchOptions, semantizer;
+import { l as isUrlOrRelativePath, m as jsonldContextParserExports, o as getRawContext, n as normalizeContext, q as mergeContexts, c as doesResourceContainList, r as requireJsonldContextParser, v as requireErrorCoded, w as requireLink } from "./helpers-DtCY-jxq.js";
+let AuthFetchResolver, DEFAULT_AUTH_SELECTORS, StoreService, formatAttributesToServerSearchOptions, base_context, StoreType, StoreFactory, hasQueryIndex, formatAttributesToServerPaginationOptions, getDefaultExportFromCjs, hasSetLocalData, sibStore, mergeServerSearchOptions, semantizer;
 let __tla = (async () => {
   var _a;
   getDefaultExportFromCjs = function(x) {
     return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
   };
   function getAugmentedNamespace(n) {
-    if (n.__esModule) return n;
+    if (Object.prototype.hasOwnProperty.call(n, "__esModule")) return n;
     var f = n.default;
     if (typeof f == "function") {
       var a = function a2() {
@@ -268,6 +268,17 @@ let __tla = (async () => {
     }
     async negotiateContract(counterPartyAddress, _offerId, policy, counterPartyId) {
       await this.ensureAuthenticated();
+      console.log("[DataspaceConnectorStore] Received policy for negotiation:", policy);
+      console.log("[DataspaceConnectorStore] Policy keys:", Object.keys(policy));
+      const cleanPolicy = {};
+      for (const key in policy) {
+        if (!/^\d+$/.test(key)) {
+          cleanPolicy[key] = policy[key];
+        } else {
+          console.warn(`[DataspaceConnectorStore] Removing numeric key "${key}" from policy`);
+        }
+      }
+      console.log("[DataspaceConnectorStore] Cleaned policy keys:", Object.keys(cleanPolicy));
       const negotiationRequest = {
         "@context": {
           "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
@@ -278,13 +289,15 @@ let __tla = (async () => {
         protocol: "dataspace-protocol-http",
         policy: {
           "@context": "http://www.w3.org/ns/odrl.jsonld",
-          ...policy,
-          "@type": policy["@type"] || "Offer",
-          assigner: policy.assigner || counterPartyId || "provider",
-          target: policy.target
+          ...cleanPolicy,
+          "@type": cleanPolicy["@type"] || policy["@type"] || "Offer",
+          assigner: cleanPolicy.assigner || policy.assigner || counterPartyId || "provider",
+          target: cleanPolicy.target || cleanPolicy["odrl:target"] || policy.target || policy["odrl:target"],
+          "odrl:target": cleanPolicy["odrl:target"] || cleanPolicy.target || policy["odrl:target"] || policy.target
         }
       };
       console.log("[DataspaceConnectorStore] Contract negotiation request:", JSON.stringify(negotiationRequest, null, 2));
+      console.log("[DataspaceConnectorStore] \u{1F50D} POSTing negotiation to consumer connector:", this.config.contractNegotiationEndpoint);
       const response = await this.fetchAuthn(this.config.contractNegotiationEndpoint, {
         method: "POST",
         headers: this.headers,
@@ -705,11 +718,11 @@ let __tla = (async () => {
     async ensureAuthenticated() {
       if (this.authToken && this.headers) return;
       switch (this.config.authMethod) {
-        case "edc-api-key":
-          if (!this.config.edcApiKey) {
-            throw new Error("EDC API key required but not provided. Set edcApiKey in configuration.");
+        case "dsp-api-key":
+          if (!this.config.dspApiKey) {
+            throw new Error("DSP API key required but not provided. Set dspApiKey in configuration.");
           }
-          this.authToken = this.config.edcApiKey;
+          this.authToken = this.config.dspApiKey;
           this.headers = {
             ...this.headers,
             "X-Api-Key": this.authToken
@@ -1339,21 +1352,100 @@ let __tla = (async () => {
       return property;
     }
   }
-  const _DataspaceConnectorStoreAdapter = class _DataspaceConnectorStoreAdapter {
+  class DataspaceConnectorStoreAdapter {
     constructor() {
     }
     static getStoreInstance(cfg) {
-      if (!_DataspaceConnectorStoreAdapter.store) {
-        if (!cfg) {
-          throw new Error("DataspaceConnectorStore configuration is required");
+      var _a2;
+      if (!cfg) {
+        throw new Error("DataspaceConnectorStore configuration is required");
+      }
+      const dspConfig = cfg;
+      console.log("\u{1F3ED} [DataspaceConnectorStoreAdapter.getStoreInstance] Creating new store with config:", {
+        endpoint: dspConfig.endpoint,
+        catalogEndpoint: dspConfig.catalogEndpoint,
+        negotiationEndpoint: dspConfig.contractNegotiationEndpoint
+      });
+      const newStore = new DataspaceConnectorStore(dspConfig);
+      console.log("\u2705 [DataspaceConnectorStoreAdapter.getStoreInstance] Created store:", {
+        storeType: typeof newStore,
+        configEndpoint: (_a2 = newStore.config) == null ? void 0 : _a2.endpoint
+      });
+      return newStore;
+    }
+  }
+  DEFAULT_AUTH_SELECTORS = [
+    "sib-auth-oidc",
+    "sib-auth"
+  ];
+  function findAuthElement(selectors = [
+    ...DEFAULT_AUTH_SELECTORS
+  ]) {
+    for (const selector of selectors) {
+      const element = document.querySelector(selector);
+      if (element && typeof element.getFetch === "function") {
+        return element;
+      }
+    }
+    return null;
+  }
+  function getAuthFetch(selectors) {
+    const authElement = findAuthElement(selectors);
+    if (authElement) {
+      try {
+        const authFetch = authElement.getFetch();
+        if (typeof authFetch === "function") {
+          return authFetch;
         }
-        _DataspaceConnectorStoreAdapter.store = new DataspaceConnectorStore(cfg);
+      } catch (error2) {
+        console.warn("[AuthFetchResolver] Error getting auth fetch:", error2);
+      }
+    }
+    return fetch.bind(globalThis);
+  }
+  function onAuthActivated(callback, eventName = "sib-auth:activated") {
+    const handler2 = (event) => {
+      var _a2;
+      if (((_a2 = event.detail) == null ? void 0 : _a2.fetch) && typeof event.detail.fetch === "function") {
+        callback(event);
       }
-      return _DataspaceConnectorStoreAdapter.store;
+    };
+    document.addEventListener(eventName, handler2);
+    return () => {
+      document.removeEventListener(eventName, handler2);
+    };
+  }
+  async function waitForAuthElement(selectors = [
+    ...DEFAULT_AUTH_SELECTORS
+  ], timeout = 5e3) {
+    const existing = findAuthElement(selectors);
+    if (existing) {
+      return existing;
     }
+    return new Promise((resolve, reject) => {
+      const observer = new MutationObserver(() => {
+        const element = findAuthElement(selectors);
+        if (element) {
+          observer.disconnect();
+          resolve(element);
+        }
+      });
+      observer.observe(document.body, {
+        childList: true,
+        subtree: true
+      });
+      setTimeout(() => {
+        observer.disconnect();
+        reject(new Error(`No auth element found with selectors: ${selectors.join(", ")}`));
+      }, timeout);
+    });
+  }
+  AuthFetchResolver = {
+    findAuthElement,
+    getAuthFetch,
+    onAuthActivated,
+    waitForAuthElement
   };
-  __publicField(_DataspaceConnectorStoreAdapter, "store");
-  let DataspaceConnectorStoreAdapter = _DataspaceConnectorStoreAdapter;
   const _LocalStorageCacheMetadataManager = class _LocalStorageCacheMetadataManager {
     constructor(endpoint, ttlMs = _LocalStorageCacheMetadataManager.DEFAULT_TTL_MS) {
       this.endpoint = endpoint;
@@ -1539,16 +1631,69 @@ let __tla = (async () => {
   __publicField(_LocalStorageCacheMetadataManager, "DEFAULT_TTL_MS", 2 * 60 * 60 * 1e3);
   let LocalStorageCacheMetadataManager = _LocalStorageCacheMetadataManager;
   class FederatedCatalogueAPIWrapper {
-    constructor(options, fcBaseUrl) {
+    constructor(options, fcBaseUrl, fetchAuth) {
       __publicField(this, "fcBaseUrl");
-      __publicField(this, "connect");
+      __publicField(this, "loginOptions");
+      __publicField(this, "tokenState", null);
+      __publicField(this, "tokenRefreshBuffer", 5 * 60 * 1e3);
+      __publicField(this, "isRefreshing", false);
+      __publicField(this, "refreshPromise", null);
+      __publicField(this, "STORAGE_KEY", "fc_token_state");
+      __publicField(this, "_fetch");
+      __publicField(this, "useKeycloakAuth");
       this.fcBaseUrl = fcBaseUrl;
+      this.loginOptions = options;
+      if (fetchAuth && (!options.kc_url || options.kc_url === "")) {
+        this._fetch = fetchAuth;
+        this.useKeycloakAuth = false;
+      } else {
+        this._fetch = fetch.bind(globalThis);
+        this.useKeycloakAuth = true;
+        this.loadTokenState();
+      }
+      if (this.useKeycloakAuth) {
+        try {
+          this.firstConnect(options);
+        } catch (e) {
+          console.log("Error while establishing the first connection", e);
+        }
+      }
+    }
+    saveTokenState() {
+      if (this.tokenState) {
+        try {
+          localStorage.setItem(this.STORAGE_KEY, JSON.stringify(this.tokenState));
+          console.log("\u{1F4BE} [FederatedCatalogueAPIWrapper] Token state saved to localStorage");
+        } catch (error2) {
+          console.error("Failed to save token state to localStorage:", error2);
+        }
+      }
+    }
+    loadTokenState() {
+      var _a2, _b, _c;
       try {
-        const connection = this.firstConnect(options);
-        this.connect = () => connection;
-      } catch (e) {
-        console.log("Error while establishing the first connection", e);
-        this.connect = null;
+        const stored = localStorage.getItem(this.STORAGE_KEY);
+        if (stored) {
+          this.tokenState = JSON.parse(stored);
+          console.log("\u{1F4C2} [FederatedCatalogueAPIWrapper] Token state loaded from localStorage:", {
+            hasAccessToken: !!((_a2 = this.tokenState) == null ? void 0 : _a2.access_token),
+            hasRefreshToken: !!((_b = this.tokenState) == null ? void 0 : _b.refresh_token),
+            expiresAt: (_c = this.tokenState) == null ? void 0 : _c.expires_at,
+            isExpired: this.tokenState ? Date.now() >= this.tokenState.expires_at : "N/A"
+          });
+        }
+      } catch (error2) {
+        console.error("Failed to load token state from localStorage:", error2);
+        this.clearTokenState();
+      }
+    }
+    clearTokenState() {
+      this.tokenState = null;
+      try {
+        localStorage.removeItem(this.STORAGE_KEY);
+        console.log("\u{1F5D1}\uFE0F [FederatedCatalogueAPIWrapper] Token state cleared");
+      } catch (error2) {
+        console.error("Failed to clear token state from localStorage:", error2);
       }
     }
     async firstConnect(options) {
@@ -1563,7 +1708,7 @@ let __tla = (async () => {
       const headers = new Headers({
         "Content-Type": "application/x-www-form-urlencoded"
       });
-      const response = await fetch(options.kc_url, {
+      const response = await this._fetch(options.kc_url, {
         method: "POST",
         headers,
         body
@@ -1575,30 +1720,130 @@ let __tla = (async () => {
           cause: data
         });
       }
+      this.tokenState = {
+        access_token: token,
+        refresh_token: data.refresh_token || null,
+        expires_at: Date.now() + (data.expires_in || 3600) * 1e3
+      };
+      this.saveTokenState();
       return token;
     }
-    async getAllSelfDescriptions() {
-      if (!this.connect) return null;
-      const token = await this.connect();
-      const url2 = `${this.fcBaseUrl}/self-descriptions`;
-      const headers = new Headers({
-        Authorization: `Bearer ${token}`
-      });
-      const response = await fetch(url2, {
+    async refreshToken() {
+      if (this.isRefreshing && this.refreshPromise) {
+        return this.refreshPromise;
+      }
+      this.isRefreshing = true;
+      this.refreshPromise = this._performRefresh();
+      try {
+        const token = await this.refreshPromise;
+        return token;
+      } finally {
+        this.isRefreshing = false;
+        this.refreshPromise = null;
+      }
+    }
+    async _performRefresh() {
+      var _a2;
+      if (!((_a2 = this.tokenState) == null ? void 0 : _a2.refresh_token)) {
+        console.log("No refresh token available, re-authenticating with credentials");
+        return this.firstConnect(this.loginOptions);
+      }
+      try {
+        const body = new URLSearchParams({
+          grant_type: "refresh_token",
+          client_id: this.loginOptions.kc_client_id,
+          client_secret: this.loginOptions.kc_client_secret,
+          refresh_token: this.tokenState.refresh_token
+        });
+        const headers = new Headers({
+          "Content-Type": "application/x-www-form-urlencoded"
+        });
+        const response = await this._fetch(this.loginOptions.kc_url, {
+          method: "POST",
+          headers,
+          body
+        });
+        if (!response.ok) {
+          console.warn("Token refresh failed, re-authenticating with credentials");
+          return this.firstConnect(this.loginOptions);
+        }
+        const data = await response.json();
+        const token = data.access_token;
+        if (token == null) {
+          throw new Error("Token refresh failed: no access_token in response", {
+            cause: data
+          });
+        }
+        this.tokenState = {
+          access_token: token,
+          refresh_token: data.refresh_token || this.tokenState.refresh_token,
+          expires_at: Date.now() + (data.expires_in || 3600) * 1e3
+        };
+        this.saveTokenState();
+        return token;
+      } catch (error2) {
+        console.error("Error refreshing token:", error2);
+        this.clearTokenState();
+        return this.firstConnect(this.loginOptions);
+      }
+    }
+    async getValidToken() {
+      if (!this.tokenState) {
+        return await this.firstConnect(this.loginOptions);
+      }
+      const now = Date.now();
+      const isExpiringSoon = now >= this.tokenState.expires_at - this.tokenRefreshBuffer;
+      if (isExpiringSoon) {
+        return await this.refreshToken();
+      }
+      return this.tokenState.access_token;
+    }
+    async fetchWithAuth(url2, options = {}) {
+      var _a2;
+      if (!this.useKeycloakAuth) {
+        return this._fetch(url2, options);
+      }
+      const token = await this.getValidToken();
+      const headers = new Headers(options.headers);
+      headers.set("Authorization", `Bearer ${token}`);
+      let response = await this._fetch(url2, {
+        ...options,
         headers
       });
+      if (response.status === 401 || response.status === 403) {
+        console.log(`\u{1F510} [FederatedCatalogueAPIWrapper] Authentication failed (${response.status}) for ${url2}`);
+        console.log("\u{1F504} [FederatedCatalogueAPIWrapper] Attempting token refresh...", {
+          hasRefreshToken: !!((_a2 = this.tokenState) == null ? void 0 : _a2.refresh_token),
+          tokenExpired: this.tokenState ? Date.now() >= this.tokenState.expires_at : "N/A"
+        });
+        try {
+          const newToken = await this.refreshToken();
+          console.log("\u2705 [FederatedCatalogueAPIWrapper] Token refreshed successfully, retrying request...");
+          headers.set("Authorization", `Bearer ${newToken}`);
+          response = await this._fetch(url2, {
+            ...options,
+            headers
+          });
+          if (response.status === 401 || response.status === 403) {
+            console.error(`\u274C [FederatedCatalogueAPIWrapper] Authentication still failed after token refresh (${response.status}). Please check credentials.`);
+          } else {
+            console.log(`\u2705 [FederatedCatalogueAPIWrapper] Retry succeeded with status ${response.status}`);
+          }
+        } catch (error2) {
+          console.error("\u274C [FederatedCatalogueAPIWrapper] Failed to refresh token:", error2);
+        }
+      }
+      return response;
+    }
+    async getAllSelfDescriptions() {
+      const url2 = `${this.fcBaseUrl}/self-descriptions`;
+      const response = await this.fetchWithAuth(url2);
       return await response.json();
     }
     async getSelfDescriptionByHash(sdHash) {
-      if (!this.connect) return null;
-      const token = await this.connect();
       const url2 = `${this.fcBaseUrl}/self-descriptions/${sdHash}`;
-      const headers = new Headers({
-        Authorization: `Bearer ${token}`
-      });
-      const response = await fetch(url2, {
-        method: "GET",
-        headers
+      const response = await this.fetchWithAuth(url2, {
+        method: "GET"
       });
       if (!response.ok) throw new Error(`GET /self-descriptions/${sdHash} failed: ${response.status} ${response.statusText}`, {
         cause: response
@@ -1606,20 +1851,16 @@ let __tla = (async () => {
       return await response.json();
     }
     async postQuery(statement, parameters = {}) {
-      if (!this.connect) return null;
-      const token = await this.connect();
       const url2 = `${this.fcBaseUrl}/query`;
-      const headers = new Headers({
-        Authorization: `Bearer ${token}`,
-        "Content-Type": "application/json"
-      });
       const body = JSON.stringify({
         statement,
         parameters
       });
-      const response = await fetch(url2, {
+      const response = await this.fetchWithAuth(url2, {
         method: "POST",
-        headers,
+        headers: {
+          "Content-Type": "application/json"
+        },
         body
       });
       if (!response.ok) {
@@ -1630,13 +1871,7 @@ let __tla = (async () => {
       return await response.json();
     }
     async postQuerySearch(statement, parameters = {}, queryLanguage = "OPENCYPHER", annotations) {
-      if (!this.connect) return null;
-      const token = await this.connect();
       const url2 = `${this.fcBaseUrl}/query/search`;
-      const headers = new Headers({
-        Authorization: `Bearer ${token}`,
-        "Content-Type": "application/json"
-      });
       const body = JSON.stringify({
         statement,
         parameters,
@@ -1644,9 +1879,11 @@ let __tla = (async () => {
           queryLanguage
         }
       });
-      const response = await fetch(url2, {
+      const response = await this.fetchWithAuth(url2, {
         method: "POST",
-        headers,
+        headers: {
+          "Content-Type": "application/json"
+        },
         body
       });
       if (!response.ok) {
@@ -1657,28 +1894,36 @@ let __tla = (async () => {
       return await response.json();
     }
   }
-  function getFederatedCatalogueAPIWrapper(baseUrl, loginOptions) {
-    return new FederatedCatalogueAPIWrapper(loginOptions, baseUrl);
+  function getFederatedCatalogueAPIWrapper(baseUrl, loginOptions, fetch2) {
+    return new FederatedCatalogueAPIWrapper(loginOptions, baseUrl, fetch2);
   }
   class FederatedCatalogueStore {
     constructor(cfg) {
       __publicField(this, "cache");
-      __publicField(this, "session");
       __publicField(this, "fcApi");
       __publicField(this, "metadataManager");
       __publicField(this, "enableCaching");
+      __publicField(this, "cleanupAuth");
+      __publicField(this, "isFetching", false);
+      __publicField(this, "pendingGetData", null);
+      __publicField(this, "resolveFetch", (event) => {
+        if (!this.cfg.endpoint) {
+          throw new Error("Missing required `endpoint` in StoreConfig for FederatedCatalogueStore");
+        }
+        if (event.detail.fetch) {
+          this.fcApi = getFederatedCatalogueAPIWrapper(this.cfg.endpoint, event.detail.fetch);
+        }
+      });
       this.cfg = cfg;
-      if (!this.cfg.login) {
-        throw new Error("Login must be provided for FederatedCatalogueStore");
-      }
       if (!this.cfg.endpoint) {
         throw new Error("Missing required `endpoint` in StoreConfig for FederatedCatalogueStore");
       }
-      try {
-        this.fcApi = getFederatedCatalogueAPIWrapper(this.cfg.endpoint, this.cfg.login);
-      } catch (e) {
-        console.error("[FederatedCatalogueStore] Failed to initialize API wrapper:", e);
-        this.fcApi = null;
+      const fetchAuth = AuthFetchResolver.getAuthFetch();
+      this.cleanupAuth = AuthFetchResolver.onAuthActivated(this.resolveFetch.bind(this));
+      if (fetchAuth && !this.cfg.login) {
+        this.fcApi = getFederatedCatalogueAPIWrapper(this.cfg.endpoint, {}, fetchAuth);
+      } else {
+        this.fcApi = getFederatedCatalogueAPIWrapper(this.cfg.endpoint, this.cfg.login, fetchAuth);
       }
       this.cache = new InMemoryCacheManager();
       this.enableCaching = this.cfg.enableLocalStorageMetadata === true;
@@ -1690,6 +1935,10 @@ let __tla = (async () => {
         this.metadataManager = null;
       }
     }
+    disconnectedCallback() {
+      var _a2;
+      (_a2 = this.cleanupAuth) == null ? void 0 : _a2.call(this);
+    }
     handlePageReload() {
       var _a2, _b;
       try {
@@ -1714,21 +1963,40 @@ let __tla = (async () => {
       }
       return "";
     }
-    async getData(args) {
+    buildContainerId(containerType = "default") {
       var _a2;
-      const targetType = this.resolveTargetType(args);
-      if (!this.fcApi) {
-        throw new Error("Federated API not initialized, returning empty data.");
-      }
-      const cacheIsValid = this.enableCaching && ((_a2 = this.metadataManager) == null ? void 0 : _a2.isCacheValid());
-      const hasCached = this.hasCachedData();
-      if (cacheIsValid && hasCached) {
-        return await this.getDeltaUpdatedData(targetType);
-      }
-      if (cacheIsValid && !hasCached && this.metadataManager) {
-        this.metadataManager.clear();
+      const endpointHash = ((_a2 = this.cfg.endpoint) == null ? void 0 : _a2.replace(/[^a-zA-Z0-9]/g, "")) || "unknown";
+      return `store://local.fc-${endpointHash}-${containerType}/`;
+    }
+    async getData(args) {
+      if (this.isFetching) {
+        if (this.pendingGetData) {
+          return this.pendingGetData;
+        }
+        return null;
       }
-      return await this.getFullData(targetType);
+      this.isFetching = true;
+      const executeGetData = async () => {
+        var _a2;
+        const targetType = this.resolveTargetType(args);
+        if (!this.fcApi) {
+          throw new Error("Federated API not initialized, returning empty data.");
+        }
+        const cacheIsValid = this.enableCaching && ((_a2 = this.metadataManager) == null ? void 0 : _a2.isCacheValid());
+        const hasCached = this.hasCachedData();
+        if (cacheIsValid && hasCached) {
+          return await this.getDeltaUpdatedData(targetType);
+        }
+        if (cacheIsValid && !hasCached && this.metadataManager) {
+          this.metadataManager.clear();
+        }
+        return await this.getFullData(targetType);
+      };
+      this.pendingGetData = executeGetData().finally(() => {
+        this.isFetching = false;
+        this.pendingGetData = null;
+      });
+      return this.pendingGetData;
     }
     hasCachedData() {
       try {
@@ -1759,7 +2027,7 @@ let __tla = (async () => {
           return await this.getFullData(targetType);
         }
         if (!resource["@id"]) {
-          resource["@id"] = targetType;
+          resource["@id"] = this.buildContainerId();
         }
         if (!resource["ldp:contains"]) {
           resource["ldp:contains"] = [];
@@ -1851,11 +2119,11 @@ let __tla = (async () => {
         return await this.getFullData(targetType);
       }
     }
-    async getFullData(targetType) {
+    async getFullData(_targetType) {
       if (!this.fcApi) {
         throw new Error("Federated API not initialized");
       }
-      const resource = await this.initLocalDataSourceContainer(targetType);
+      const resource = await this.initLocalDataSourceContainer();
       const dataset2 = await this.fcApi.getAllSelfDescriptions();
       const newMetadata = [];
       if ((dataset2 == null ? void 0 : dataset2.items) && Array.isArray(dataset2.items)) {
@@ -1899,11 +2167,8 @@ let __tla = (async () => {
       return resource;
     }
     async initLocalDataSourceContainer(dataSrc = "", containerType = "default") {
-      var _a2;
-      const endpointHash = ((_a2 = this.cfg.endpoint) == null ? void 0 : _a2.replace(/[^a-zA-Z0-9]/g, "")) || "unknown";
-      const idField = `fc-${endpointHash}-${containerType}`;
       if (!dataSrc) {
-        dataSrc = `store://local.${idField}/`;
+        dataSrc = this.buildContainerId(containerType);
       }
       const localContainer = {
         "@context": "https://cdn.startinblox.com/owl/context.jsonld",
@@ -1964,8 +2229,8 @@ let __tla = (async () => {
     }
     subscribeResourceTo(_resourceId, _nestedResourceId) {
     }
-    fetchAuthn(_iri, _options) {
-      return Promise.resolve({});
+    async fetchAuthn(_iri, _options) {
+      return await Promise.resolve({});
     }
     async setLocalData(resource, id) {
       try {
@@ -2124,18 +2389,44 @@ let __tla = (async () => {
       const assetId = this.stripUrnPrefix(cs["@id"], "urn:uuid:");
       let datasetId;
       let policy;
+      let policies = [];
       if (cs["dcat:dataset"] && cs["dcat:dataset"].length > 0) {
         const dataset2 = cs["dcat:dataset"][0];
         if (dataset2["@id"]) {
           datasetId = this.stripUrnPrefix(dataset2["@id"], "urn:uuid:");
         }
         if (dataset2["odrl:hasPolicy"]) {
-          policy = this.stripTemsUrnFromPolicy(JSON.parse(JSON.stringify(dataset2["odrl:hasPolicy"])));
-          if (datasetId) {
-            policy.target = datasetId;
+          const rawPolicy = dataset2["odrl:hasPolicy"];
+          const processSinglePolicy = (policyObj) => {
+            const processedPolicy = this.stripTemsUrnFromPolicy(JSON.parse(JSON.stringify(policyObj)));
+            if (datasetId) {
+              processedPolicy.target = datasetId;
+            }
+            return processedPolicy;
+          };
+          if (Array.isArray(rawPolicy)) {
+            policies = rawPolicy.map(processSinglePolicy);
+            policy = policies[0];
+          } else {
+            policy = processSinglePolicy(rawPolicy);
+            policies = [
+              policy
+            ];
           }
         }
       }
+      console.log("[FederatedCatalogueStore] \u{1F50D} Policy processing for", name, ":", {
+        hasPolicy: !!policy,
+        policiesCount: policies.length,
+        policy: policy ? {
+          "@id": policy["@id"],
+          hasTarget: !!policy.target
+        } : null,
+        policies: policies.map((p) => ({
+          "@id": p["@id"],
+          hasTarget: !!p.target
+        }))
+      });
       const dest = {
         "@id": serviceId,
         creation_date,
@@ -2174,12 +2465,20 @@ let __tla = (async () => {
         },
         ...policy && {
           policy
+        },
+        ...policies.length > 0 && {
+          policies
         }
       };
+      console.log("[FederatedCatalogueStore] \u{1F50D} Destination object contract fields:", {
+        hasPolicy: "policy" in dest,
+        hasPolicies: "policies" in dest,
+        policiesValue: dest.policies
+      });
       return dest;
     }
   }
-  const _FederatedCatalogueStoreAdapter = class _FederatedCatalogueStoreAdapter {
+  class FederatedCatalogueStoreAdapter {
     constructor() {
     }
     static validateConfiguration(cfg) {
@@ -2195,18 +2494,13 @@ let __tla = (async () => {
       }
     }
     static getStoreInstance(cfg) {
-      if (!_FederatedCatalogueStoreAdapter.store) {
-        if (!cfg) {
-          throw new Error("[FederatedCatalogueStoreAdapter] configuration is required");
-        }
-        _FederatedCatalogueStoreAdapter.validateConfiguration(cfg);
-        _FederatedCatalogueStoreAdapter.store = new FederatedCatalogueStore(cfg);
+      if (!cfg) {
+        throw new Error("[FederatedCatalogueStoreAdapter] configuration is required");
       }
-      return _FederatedCatalogueStoreAdapter.store;
+      FederatedCatalogueStoreAdapter.validateConfiguration(cfg);
+      return new FederatedCatalogueStore(cfg);
     }
-  };
-  __publicField(_FederatedCatalogueStoreAdapter, "store");
-  let FederatedCatalogueStoreAdapter = _FederatedCatalogueStoreAdapter;
+  }
   var lib = {};
   var IdentifierIssuer_1;
   var hasRequiredIdentifierIssuer;
@@ -3523,7 +3817,7 @@ let __tla = (async () => {
   function requireLib() {
     if (hasRequiredLib) return lib;
     hasRequiredLib = 1;
-    (function(exports) {
+    (function(exports$1) {
       const URDNA2015 = requireURDNA2015();
       const URGNA20122 = requireURGNA2012();
       const URDNA2015Sync = requireURDNA2015Sync();
@@ -3535,19 +3829,19 @@ let __tla = (async () => {
       }
       function _inputToDataset(input) {
         if (!Array.isArray(input)) {
-          return exports.NQuads.legacyDatasetToQuads(input);
+          return exports$1.NQuads.legacyDatasetToQuads(input);
         }
         return input;
       }
-      exports.NQuads = requireNQuads$1();
-      exports.IdentifierIssuer = requireIdentifierIssuer();
-      exports._rdfCanonizeNative = function(api) {
+      exports$1.NQuads = requireNQuads$1();
+      exports$1.IdentifierIssuer = requireIdentifierIssuer();
+      exports$1._rdfCanonizeNative = function(api) {
         if (api) {
           rdfCanonizeNative = api;
         }
         return rdfCanonizeNative;
       };
-      exports.canonize = async function(input, options) {
+      exports$1.canonize = async function(input, options) {
         const dataset2 = _inputToDataset(input);
         if (options.useNative) {
           if (!rdfCanonizeNative) {
@@ -3572,7 +3866,7 @@ let __tla = (async () => {
         }
         throw new Error("Invalid RDF Dataset Canonicalization algorithm: " + options.algorithm);
       };
-      exports._canonizeSync = function(input, options) {
+      exports$1._canonizeSync = function(input, options) {
         const dataset2 = _inputToDataset(input);
         if (options.useNative) {
           if (!rdfCanonizeNative) {
@@ -10398,7 +10692,7 @@ let __tla = (async () => {
   function requirePubsub() {
     if (hasRequiredPubsub) return pubsub$1.exports;
     hasRequiredPubsub = 1;
-    (function(module, exports) {
+    (function(module, exports$1) {
       (function(root, factory2) {
         var PubSub2 = {};
         if (root.PubSub) {
@@ -10410,10 +10704,10 @@ let __tla = (async () => {
         }
         {
           if (module !== void 0 && module.exports) {
-            exports = module.exports = PubSub2;
+            exports$1 = module.exports = PubSub2;
           }
-          exports.PubSub = PubSub2;
-          module.exports = exports = PubSub2;
+          exports$1.PubSub = PubSub2;
+          module.exports = exports$1 = PubSub2;
         }
       })(typeof window === "object" && window || pubsub || globalThis, function(PubSub2) {
         var messages = {}, lastUid = -1, ALL_SUBSCRIBING_MSG = "*";
@@ -11186,15 +11480,15 @@ let __tla = (async () => {
   function requireBuffer() {
     if (hasRequiredBuffer) return buffer;
     hasRequiredBuffer = 1;
-    (function(exports) {
+    (function(exports$1) {
       const base64 = requireBase64Js();
       const ieee7542 = requireIeee754();
       const customInspectSymbol = typeof Symbol === "function" && typeof Symbol["for"] === "function" ? Symbol["for"]("nodejs.util.inspect.custom") : null;
-      exports.Buffer = Buffer2;
-      exports.SlowBuffer = SlowBuffer;
-      exports.INSPECT_MAX_BYTES = 50;
+      exports$1.Buffer = Buffer2;
+      exports$1.SlowBuffer = SlowBuffer;
+      exports$1.INSPECT_MAX_BYTES = 50;
       const K_MAX_LENGTH = 2147483647;
-      exports.kMaxLength = K_MAX_LENGTH;
+      exports$1.kMaxLength = K_MAX_LENGTH;
       Buffer2.TYPED_ARRAY_SUPPORT = typedArraySupport();
       if (!Buffer2.TYPED_ARRAY_SUPPORT && typeof console !== "undefined" && typeof console.error === "function") {
         console.error("This browser lacks typed array (Uint8Array) support which is required by `buffer` v5.x. Use `buffer` v4.x if you require old browser support.");
@@ -11608,7 +11902,7 @@ let __tla = (async () => {
       };
       Buffer2.prototype.inspect = function inspect2() {
         let str = "";
-        const max = exports.INSPECT_MAX_BYTES;
+        const max = exports$1.INSPECT_MAX_BYTES;
         str = this.toString("hex", 0, max).replace(/(.{2})/g, "$1 ").trim();
         if (this.length > max) str += " ... ";
         return "<Buffer " + str + ">";
@@ -12699,7 +12993,7 @@ let __tla = (async () => {
       function numberIsNaN(obj) {
         return obj !== obj;
       }
-      const hexSliceLookupTable = function() {
+      const hexSliceLookupTable = (function() {
         const alphabet = "0123456789abcdef";
         const table = new Array(256);
         for (let i = 0; i < 16; ++i) {
@@ -12709,7 +13003,7 @@ let __tla = (async () => {
           }
         }
         return table;
-      }();
+      })();
       function defineBigIntMethod(fn) {
         return typeof BigInt === "undefined" ? BufferBigIntNotDefined : fn;
       }
@@ -12800,7 +13094,7 @@ let __tla = (async () => {
     function copyBuffer(src, target, offset) {
       Buffer2.prototype.copy.call(src, target, offset);
     }
-    buffer_list$1 = function() {
+    buffer_list$1 = (function() {
       function BufferList() {
         _classCallCheck(this, BufferList);
         this.head = null;
@@ -12968,7 +13262,7 @@ let __tla = (async () => {
         }
       ]);
       return BufferList;
-    }();
+    })();
     return buffer_list$1;
   }
   var destroy_1$1;
@@ -13082,13 +13376,13 @@ let __tla = (async () => {
           return message(arg1, arg2, arg3);
         }
       }
-      var NodeError = function(_Base) {
+      var NodeError = (function(_Base) {
         _inheritsLoose(NodeError2, _Base);
         function NodeError2(arg1, arg2, arg3) {
           return _Base.call(this, getMessage(arg1, arg2, arg3)) || this;
         }
         return NodeError2;
-      }(Base);
+      })(Base);
       NodeError.prototype.name = Base.name;
       NodeError.prototype.code = code;
       codes[code] = NodeError;
@@ -13783,7 +14077,7 @@ let __tla = (async () => {
   function requireSafeBuffer() {
     if (hasRequiredSafeBuffer) return safeBuffer.exports;
     hasRequiredSafeBuffer = 1;
-    (function(module, exports) {
+    (function(module, exports$1) {
       var buffer2 = requireBuffer();
       var Buffer2 = buffer2.Buffer;
       function copyProps(src, dst) {
@@ -13794,8 +14088,8 @@ let __tla = (async () => {
       if (Buffer2.from && Buffer2.alloc && Buffer2.allocUnsafe && Buffer2.allocUnsafeSlow) {
         module.exports = buffer2;
       } else {
-        copyProps(buffer2, exports);
-        exports.Buffer = SafeBuffer;
+        copyProps(buffer2, exports$1);
+        exports$1.Buffer = SafeBuffer;
       }
       function SafeBuffer(arg, encodingOrOffset, length) {
         return Buffer2(arg, encodingOrOffset, length);
@@ -14982,11 +15276,11 @@ let __tla = (async () => {
       });
       for (var i in stream2) {
         if (this[i] === void 0 && typeof stream2[i] === "function") {
-          this[i] = /* @__PURE__ */ function methodWrap(method) {
+          this[i] = /* @__PURE__ */ (function methodWrap(method) {
             return function methodWrapReturnFunction() {
               return stream2[method].apply(stream2, arguments);
             };
-          }(i);
+          })(i);
         }
       }
       for (var n = 0; n < kProxyEvents.length; n++) {
@@ -19752,50 +20046,64 @@ let __tla = (async () => {
         createDebug.namespaces = namespaces2;
         createDebug.names = [];
         createDebug.skips = [];
-        let i;
-        const split = (typeof namespaces2 === "string" ? namespaces2 : "").split(/[\s,]+/);
-        const len = split.length;
-        for (i = 0; i < len; i++) {
-          if (!split[i]) {
-            continue;
+        const split = (typeof namespaces2 === "string" ? namespaces2 : "").trim().replace(/\s+/g, ",").split(",").filter(Boolean);
+        for (const ns2 of split) {
+          if (ns2[0] === "-") {
+            createDebug.skips.push(ns2.slice(1));
+          } else {
+            createDebug.names.push(ns2);
           }
-          namespaces2 = split[i].replace(/\*/g, ".*?");
-          if (namespaces2[0] === "-") {
-            createDebug.skips.push(new RegExp("^" + namespaces2.slice(1) + "$"));
+        }
+      }
+      function matchesTemplate(search, template) {
+        let searchIndex = 0;
+        let templateIndex = 0;
+        let starIndex = -1;
+        let matchIndex = 0;
+        while (searchIndex < search.length) {
+          if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
+            if (template[templateIndex] === "*") {
+              starIndex = templateIndex;
+              matchIndex = searchIndex;
+              templateIndex++;
+            } else {
+              searchIndex++;
+              templateIndex++;
+            }
+          } else if (starIndex !== -1) {
+            templateIndex = starIndex + 1;
+            matchIndex++;
+            searchIndex = matchIndex;
           } else {
-            createDebug.names.push(new RegExp("^" + namespaces2 + "$"));
+            return false;
           }
         }
+        while (templateIndex < template.length && template[templateIndex] === "*") {
+          templateIndex++;
+        }
+        return templateIndex === template.length;
       }
       function disable() {
         const namespaces2 = [
-          ...createDebug.names.map(toNamespace),
-          ...createDebug.skips.map(toNamespace).map((namespace2) => "-" + namespace2)
+          ...createDebug.names,
+          ...createDebug.skips.map((namespace2) => "-" + namespace2)
         ].join(",");
         createDebug.enable("");
         return namespaces2;
       }
       function enabled(name) {
-        if (name[name.length - 1] === "*") {
-          return true;
-        }
-        let i;
-        let len;
-        for (i = 0, len = createDebug.skips.length; i < len; i++) {
-          if (createDebug.skips[i].test(name)) {
+        for (const skip of createDebug.skips) {
+          if (matchesTemplate(name, skip)) {
             return false;
           }
         }
-        for (i = 0, len = createDebug.names.length; i < len; i++) {
-          if (createDebug.names[i].test(name)) {
+        for (const ns2 of createDebug.names) {
+          if (matchesTemplate(name, ns2)) {
             return true;
           }
         }
         return false;
       }
-      function toNamespace(regexp) {
-        return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-      }
       function coerce(val) {
         if (val instanceof Error) {
           return val.stack || val.message;
@@ -19815,13 +20123,13 @@ let __tla = (async () => {
   function requireBrowser$3() {
     if (hasRequiredBrowser$3) return browser$3.exports;
     hasRequiredBrowser$3 = 1;
-    (function(module, exports) {
-      exports.formatArgs = formatArgs;
-      exports.save = save;
-      exports.load = load;
-      exports.useColors = useColors;
-      exports.storage = localstorage();
-      exports.destroy = /* @__PURE__ */ (() => {
+    (function(module, exports$1) {
+      exports$1.formatArgs = formatArgs;
+      exports$1.save = save;
+      exports$1.load = load;
+      exports$1.useColors = useColors;
+      exports$1.storage = localstorage();
+      exports$1.destroy = /* @__PURE__ */ (() => {
         let warned = false;
         return () => {
           if (!warned) {
@@ -19830,7 +20138,7 @@ let __tla = (async () => {
           }
         };
       })();
-      exports.colors = [
+      exports$1.colors = [
         "#0000CC",
         "#0000FF",
         "#0033CC",
@@ -19915,7 +20223,8 @@ let __tla = (async () => {
         if (typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
           return false;
         }
-        return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31 || typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
+        let m;
+        return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || typeof navigator !== "undefined" && navigator.userAgent && (m = navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)) && parseInt(m[1], 10) >= 31 || typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
       }
       function formatArgs(args) {
         args[0] = (this.useColors ? "%c" : "") + this.namespace + (this.useColors ? " %c" : " ") + args[0] + (this.useColors ? "%c " : " ") + "+" + module.exports.humanize(this.diff);
@@ -19937,14 +20246,14 @@ let __tla = (async () => {
         });
         args.splice(lastC, 0, c);
       }
-      exports.log = console.debug || console.log || (() => {
+      exports$1.log = console.debug || console.log || (() => {
       });
       function save(namespaces2) {
         try {
           if (namespaces2) {
-            exports.storage.setItem("debug", namespaces2);
+            exports$1.storage.setItem("debug", namespaces2);
           } else {
-            exports.storage.removeItem("debug");
+            exports$1.storage.removeItem("debug");
           }
         } catch (error2) {
         }
@@ -19952,7 +20261,7 @@ let __tla = (async () => {
       function load() {
         let r;
         try {
-          r = exports.storage.getItem("debug");
+          r = exports$1.storage.getItem("debug") || exports$1.storage.getItem("DEBUG");
         } catch (error2) {
         }
         if (!r && typeof process !== "undefined" && "env" in process) {
@@ -19966,7 +20275,7 @@ let __tla = (async () => {
         } catch (error2) {
         }
       }
-      module.exports = requireCommon()(exports);
+      module.exports = requireCommon()(exports$1);
       const { formatters } = module.exports;
       formatters.j = function(v) {
         try {
@@ -20811,8 +21120,8 @@ let __tla = (async () => {
   function requireRdfDataFactory() {
     if (hasRequiredRdfDataFactory) return rdfDataFactory;
     hasRequiredRdfDataFactory = 1;
-    (function(exports) {
-      var __createBinding = rdfDataFactory && rdfDataFactory.__createBinding || (Object.create ? function(o, m, k, k2) {
+    (function(exports$1) {
+      var __createBinding = rdfDataFactory && rdfDataFactory.__createBinding || (Object.create ? (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         var desc = Object.getOwnPropertyDescriptor(m, k);
         if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
@@ -20824,23 +21133,23 @@ let __tla = (async () => {
           };
         }
         Object.defineProperty(o, k2, desc);
-      } : function(o, m, k, k2) {
+      }) : (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         o[k2] = m[k];
-      });
-      var __exportStar = rdfDataFactory && rdfDataFactory.__exportStar || function(m, exports2) {
-        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
+      }));
+      var __exportStar = rdfDataFactory && rdfDataFactory.__exportStar || function(m, exports$12) {
+        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$12, p)) __createBinding(exports$12, m, p);
       };
-      Object.defineProperty(exports, "__esModule", {
+      Object.defineProperty(exports$1, "__esModule", {
         value: true
       });
-      __exportStar(requireBlankNode(), exports);
-      __exportStar(requireDataFactory(), exports);
-      __exportStar(requireDefaultGraph(), exports);
-      __exportStar(requireLiteral(), exports);
-      __exportStar(requireNamedNode(), exports);
-      __exportStar(requireQuad(), exports);
-      __exportStar(requireVariable(), exports);
+      __exportStar(requireBlankNode(), exports$1);
+      __exportStar(requireDataFactory(), exports$1);
+      __exportStar(requireDefaultGraph(), exports$1);
+      __exportStar(requireLiteral(), exports$1);
+      __exportStar(requireNamedNode(), exports$1);
+      __exportStar(requireQuad(), exports$1);
+      __exportStar(requireVariable(), exports$1);
     })(rdfDataFactory);
     return rdfDataFactory;
   }
@@ -21144,8 +21453,8 @@ let __tla = (async () => {
   function requireHandler() {
     if (hasRequiredHandler) return handler;
     hasRequiredHandler = 1;
-    (function(exports) {
-      var __createBinding = handler && handler.__createBinding || (Object.create ? function(o, m, k, k2) {
+    (function(exports$1) {
+      var __createBinding = handler && handler.__createBinding || (Object.create ? (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         var desc = Object.getOwnPropertyDescriptor(m, k);
         if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
@@ -21157,21 +21466,21 @@ let __tla = (async () => {
           };
         }
         Object.defineProperty(o, k2, desc);
-      } : function(o, m, k, k2) {
+      }) : (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         o[k2] = m[k];
-      });
-      var __exportStar = handler && handler.__exportStar || function(m, exports2) {
-        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
+      }));
+      var __exportStar = handler && handler.__exportStar || function(m, exports$12) {
+        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$12, p)) __createBinding(exports$12, m, p);
       };
-      Object.defineProperty(exports, "__esModule", {
+      Object.defineProperty(exports$1, "__esModule", {
         value: true
       });
-      __exportStar(requireTypeHandlerBoolean(), exports);
-      __exportStar(requireTypeHandlerDate(), exports);
-      __exportStar(requireTypeHandlerNumberDouble(), exports);
-      __exportStar(requireTypeHandlerNumberInteger(), exports);
-      __exportStar(requireTypeHandlerString(), exports);
+      __exportStar(requireTypeHandlerBoolean(), exports$1);
+      __exportStar(requireTypeHandlerDate(), exports$1);
+      __exportStar(requireTypeHandlerNumberDouble(), exports$1);
+      __exportStar(requireTypeHandlerNumberInteger(), exports$1);
+      __exportStar(requireTypeHandlerString(), exports$1);
     })(handler);
     return handler;
   }
@@ -21189,8 +21498,8 @@ let __tla = (async () => {
   function requireRdfLiteral() {
     if (hasRequiredRdfLiteral) return rdfLiteral;
     hasRequiredRdfLiteral = 1;
-    (function(exports) {
-      var __createBinding = rdfLiteral && rdfLiteral.__createBinding || (Object.create ? function(o, m, k, k2) {
+    (function(exports$1) {
+      var __createBinding = rdfLiteral && rdfLiteral.__createBinding || (Object.create ? (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         var desc = Object.getOwnPropertyDescriptor(m, k);
         if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
@@ -21202,27 +21511,27 @@ let __tla = (async () => {
           };
         }
         Object.defineProperty(o, k2, desc);
-      } : function(o, m, k, k2) {
+      }) : (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         o[k2] = m[k];
-      });
-      var __exportStar = rdfLiteral && rdfLiteral.__exportStar || function(m, exports2) {
-        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
+      }));
+      var __exportStar = rdfLiteral && rdfLiteral.__exportStar || function(m, exports$12) {
+        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$12, p)) __createBinding(exports$12, m, p);
       };
-      Object.defineProperty(exports, "__esModule", {
+      Object.defineProperty(exports$1, "__esModule", {
         value: true
       });
-      exports.fromRdf = fromRdf2;
-      exports.toRdf = toRdf2;
-      exports.getTermRaw = getTermRaw;
-      exports.getSupportedRdfDatatypes = getSupportedRdfDatatypes;
-      exports.getSupportedJavaScriptPrimitives = getSupportedJavaScriptPrimitives;
+      exports$1.fromRdf = fromRdf2;
+      exports$1.toRdf = toRdf2;
+      exports$1.getTermRaw = getTermRaw;
+      exports$1.getSupportedRdfDatatypes = getSupportedRdfDatatypes;
+      exports$1.getSupportedJavaScriptPrimitives = getSupportedJavaScriptPrimitives;
       const rdf_data_factory_1 = requireRdfDataFactory();
       const handler_1 = requireHandler();
       const Translator_1 = requireTranslator();
-      __exportStar(requireHandler(), exports);
-      __exportStar(requireITypeHandler(), exports);
-      __exportStar(requireTranslator(), exports);
+      __exportStar(requireHandler(), exports$1);
+      __exportStar(requireITypeHandler(), exports$1);
+      __exportStar(requireTranslator(), exports$1);
       const DF = new rdf_data_factory_1.DataFactory();
       const translator = new Translator_1.Translator();
       translator.registerHandler(new handler_1.TypeHandlerString(), handler_1.TypeHandlerString.TYPES.map((t) => DF.namedNode(t)), [
@@ -25560,8 +25869,8 @@ let __tla = (async () => {
       this.pipes = [];
       this.flowing = null;
       this[kPaused] = null;
-      if (options && options.emitClose === false) this.state &= -2049;
-      if (options && options.autoDestroy === false) this.state &= -4097;
+      if (options && options.emitClose === false) this.state &= ~kEmitClose;
+      if (options && options.autoDestroy === false) this.state &= ~kAutoDestroy;
       this.errored = null;
       this.defaultEncoding = options && options.defaultEncoding || "utf8";
       this.awaitDrainWriters = null;
@@ -25642,7 +25951,7 @@ let __tla = (async () => {
       if (err) {
         errorOrDestroy(stream2, err);
       } else if (chunk === null) {
-        state2.state &= -9;
+        state2.state &= ~kReading;
         onEofChunk(stream2, state2);
       } else if ((state2.state & kObjectMode) !== 0 || chunk && chunk.length > 0) {
         if (addToFront) {
@@ -25654,7 +25963,7 @@ let __tla = (async () => {
         } else if (state2.destroyed || state2.errored) {
           return false;
         } else {
-          state2.state &= -9;
+          state2.state &= ~kReading;
           if (state2.decoder && !encoding) {
             chunk = state2.decoder.write(chunk);
             if (state2.objectMode || chunk.length !== 0) addChunk(stream2, state2, chunk, false);
@@ -25664,7 +25973,7 @@ let __tla = (async () => {
           }
         }
       } else if (!addToFront) {
-        state2.state &= -9;
+        state2.state &= ~kReading;
         maybeReadMore(stream2, state2);
       }
       return !state2.ended && (state2.length < state2.highWaterMark || state2.length === 0);
@@ -25739,7 +26048,7 @@ let __tla = (async () => {
       const state2 = this._readableState;
       const nOrig = n;
       if (n > state2.highWaterMark) state2.highWaterMark = computeNewHighWaterMark(n);
-      if (n !== 0) state2.state &= -129;
+      if (n !== 0) state2.state &= ~kEmittedReadable;
       if (n === 0 && state2.needReadable && ((state2.highWaterMark !== 0 ? state2.length >= state2.highWaterMark : state2.length > 0) || state2.ended)) {
         debug2("read: emitReadable", state2.length, state2.ended);
         if (state2.length === 0 && state2.ended) endReadable(this);
@@ -25769,7 +26078,7 @@ let __tla = (async () => {
         } catch (err) {
           errorOrDestroy(this, err);
         }
-        state2.state &= -33;
+        state2.state &= ~kSync;
         if (!state2.reading) n = howMuchToRead(nOrig, state2);
       }
       let ret;
@@ -27145,7 +27454,7 @@ let __tla = (async () => {
       let { promise, resolve } = createDeferredPromise();
       const ac = new AbortController();
       const signal = ac.signal;
-      const value = fn(async function* () {
+      const value = fn((async function* () {
         while (true) {
           const _promise = promise;
           promise = null;
@@ -27158,7 +27467,7 @@ let __tla = (async () => {
           ({ promise, resolve } = createDeferredPromise());
           yield chunk;
         }
-      }(), {
+      })(), {
         signal
       });
       return {
@@ -29056,9 +29365,9 @@ sh:property [
       __publicField(this, "loadingList");
       __publicField(this, "headers");
       __publicField(this, "fetch");
-      __publicField(this, "session");
       __publicField(this, "contextParser");
       __publicField(this, "searchProvider");
+      __publicField(this, "cleanupAuth");
       __publicField(this, "resolveResource", (id, resolve) => {
         const handler2 = (event) => {
           if (event.detail.id === id) {
@@ -29072,6 +29381,11 @@ sh:property [
         };
         return handler2;
       });
+      __publicField(this, "resolveFetch", (event) => {
+        if (event.detail.fetch) {
+          this.fetch = event.detail.fetch.bind ? event.detail.fetch.bind(globalThis) : event.detail.fetch;
+        }
+      });
       this.storeOptions = storeOptions;
       this.cache = this.storeOptions.cacheManager ?? new InMemoryCacheManager();
       this.subscriptionIndex = /* @__PURE__ */ new Map();
@@ -29082,15 +29396,35 @@ sh:property [
         "Content-Type": "application/ld+json",
         "Cache-Control": "must-revalidate"
       };
-      this.fetch = this.storeOptions.fetchMethod;
-      this.session = this.storeOptions.session;
       this.contextParser = new jsonldContextParserExports.ContextParser();
       this.searchProvider = new SolidIndexingSearchProvider(this.getData.bind(this));
+      if (this.storeOptions.fetchMethod) {
+        this.fetch = this.storeOptions.fetchMethod.bind(globalThis);
+      } else {
+        const authFetch = AuthFetchResolver.getAuthFetch();
+        this.fetch = authFetch.bind ? authFetch.bind(globalThis) : authFetch;
+        this.cleanupAuth = AuthFetchResolver.onAuthActivated(this.resolveFetch.bind(this));
+      }
+      if (!this.fetch) {
+        this.fetch = fetch;
+      }
+      const event = new CustomEvent("sib-core:loaded", {
+        bubbles: true,
+        composed: true,
+        detail: {
+          store: this
+        }
+      });
+      window.dispatchEvent(event);
     }
     async initGetter() {
-      const { CustomGetter } = await import("./custom-getter-DFIdqwHu.js");
+      const { CustomGetter } = await import("./custom-getter-4u-Xg-ue.js");
       return CustomGetter;
     }
+    disconnectedCallback() {
+      var _a2;
+      (_a2 = this.cleanupAuth) == null ? void 0 : _a2.call(this);
+    }
     async getData(id, context2, parentId, localData, forceFetch, serverPagination, serverSearch, headers, bypassLoadingList) {
       var _a2;
       let key = id;
@@ -29156,17 +29490,7 @@ sh:property [
       if (!this.fetch) {
         console.warn("No fetch method available");
       }
-      let authenticated = false;
-      if (this.session) authenticated = await this.session;
-      if (this.fetch && authenticated) {
-        return this.fetch.then((fn) => {
-          return fn(iri, options);
-        });
-      }
-      if (options.headers) {
-        options.headers = this._convertHeaders(options.headers);
-      }
-      return fetch(iri, options).then((response) => response);
+      return await this.fetch(iri, options);
     }
     async fetchData(id, context2 = null, parentId = "", serverPagination, serverSearch, headers) {
       let iri = this._getAbsoluteIri(id, context2, parentId);
@@ -29409,19 +29733,19 @@ sh:property [
       ]);
     }
     _getAbsoluteIri(id, context2, parentId) {
+      var _a2;
       let iri = normalizeContext(context2, base_context).expandTerm(id);
       if (!iri) return "";
-      if (parentId && !parentId.startsWith("store://local")) {
-        const parentIri = new URL(parentId, document.location.href).href;
-        iri = new URL(iri, parentIri).href;
-      } else {
-        iri = new URL(iri, document.location.href).href;
+      try {
+        const baseHref = ((_a2 = document == null ? void 0 : document.location) == null ? void 0 : _a2.href) || "";
+        const canUseParent = parentId && !parentId.startsWith("store://local");
+        const base = canUseParent ? new URL(parentId, baseHref).href : baseHref;
+        iri = new URL(iri, base).href;
+      } catch (err) {
+        console.log("[LDPStore _getAbsoluteIri()]", err);
       }
       return iri;
     }
-    async getSession() {
-      return await this.session;
-    }
     _getLanguage() {
       return localStorage.getItem("language") || window.navigator.language.slice(0, 2);
     }
@@ -29439,16 +29763,8 @@ sh:property [
     if (window.sibStore) {
       return window.sibStore;
     }
-    const storeOptions = {};
-    const sibAuth = document.querySelector("sib-auth");
-    if (sibAuth) {
-      const sibAuthDefined = customElements.whenDefined(sibAuth.localName);
-      storeOptions.session = sibAuthDefined.then(() => sibAuth.session);
-      storeOptions.fetchMethod = sibAuthDefined.then(() => sibAuth.getFetch());
-    }
     const store2 = new LdpStore({
-      ..._cfg == null ? void 0 : _cfg.options,
-      ...storeOptions
+      ..._cfg == null ? void 0 : _cfg.options
     });
     window.sibStore = store2;
     return store2;
@@ -29495,6 +29811,7 @@ sh:property [
   StoreFactory.register(StoreType.DataspaceConnector, DataspaceConnectorStoreAdapter);
   StoreService = (_a = class {
     static addStore(name, config) {
+      var _a2;
       const trimmedName = name.trim();
       if (!trimmedName) {
         throw new Error("[StoreService] Store name cannot be empty.");
@@ -29502,10 +29819,20 @@ sh:property [
       if (!config) {
         throw new Error("[StoreService] Store configuration is required.");
       }
+      console.log(`\u{1F527} [StoreService.addStore] Adding store "${trimmedName}":`, {
+        storeType: config.type,
+        endpoint: config.endpoint,
+        alreadyExists: StoreService.stores.has(trimmedName)
+      });
       if (StoreService.stores.has(trimmedName)) {
         StoreService.logWarning(`Store with name "${trimmedName}" already exists. Overwriting.`);
       }
       const store2 = StoreFactory.create(config);
+      console.log(`\u2705 [StoreService.addStore] Created store for "${trimmedName}":`, {
+        storeType: typeof store2,
+        storeConfig: store2.config,
+        storeEndpoint: (_a2 = store2.config) == null ? void 0 : _a2.endpoint
+      });
       StoreService.stores.set(trimmedName, {
         store: store2,
         config
@@ -29513,6 +29840,7 @@ sh:property [
       return store2;
     }
     static getStore(name) {
+      var _a2;
       const storeName = StoreService.resolveStoreName(name);
       if (!storeName) {
         return null;
@@ -29525,6 +29853,11 @@ sh:property [
         StoreService.logWarning(`Store with name "${storeName}" not found.`);
         return null;
       }
+      console.log(`\u{1F4E6} [StoreService.getStore] Retrieving store "${storeName}":`, {
+        found: !!instance,
+        storeEndpoint: (_a2 = instance.store.config) == null ? void 0 : _a2.endpoint,
+        configEndpoint: instance.config.endpoint
+      });
       return instance.store;
     }
     static setDefaultStore(name) {
@@ -33393,8 +33726,8 @@ sh:property [
   function requireJsonldStreamingParser() {
     if (hasRequiredJsonldStreamingParser) return jsonldStreamingParser;
     hasRequiredJsonldStreamingParser = 1;
-    (function(exports) {
-      var __createBinding = jsonldStreamingParser && jsonldStreamingParser.__createBinding || (Object.create ? function(o, m, k, k2) {
+    (function(exports$1) {
+      var __createBinding = jsonldStreamingParser && jsonldStreamingParser.__createBinding || (Object.create ? (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         var desc = Object.getOwnPropertyDescriptor(m, k);
         if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
@@ -33406,17 +33739,17 @@ sh:property [
           };
         }
         Object.defineProperty(o, k2, desc);
-      } : function(o, m, k, k2) {
+      }) : (function(o, m, k, k2) {
         if (k2 === void 0) k2 = k;
         o[k2] = m[k];
-      });
-      var __exportStar = jsonldStreamingParser && jsonldStreamingParser.__exportStar || function(m, exports2) {
-        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
+      }));
+      var __exportStar = jsonldStreamingParser && jsonldStreamingParser.__exportStar || function(m, exports$12) {
+        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$12, p)) __createBinding(exports$12, m, p);
       };
-      Object.defineProperty(exports, "__esModule", {
+      Object.defineProperty(exports$1, "__esModule", {
         value: true
       });
-      __exportStar(requireJsonLdParser(), exports);
+      __exportStar(requireJsonLdParser(), exports$1);
     })(jsonldStreamingParser);
     return jsonldStreamingParser;
   }
@@ -33622,6 +33955,8 @@ sh:property [
   semantizer = globalThis.SEMANTIZER;
 })();
 export {
+  AuthFetchResolver as A,
+  DEFAULT_AUTH_SELECTORS as D,
   StoreService as S,
   __tla,
   formatAttributesToServerSearchOptions as a,