@d-i-t-a/reader 2.1.0-beta.2 → 2.1.0-beta.3

package/dist/esm/index.js

@@ -34139,10 +34139,8 @@ function TaJsonDeserialize(json, type) {
 
 // src/model/Publication.ts
 var Publication = class extends import_publication.Publication {
-  static async fromUrl(url) {
-    const response = await fetch(url.href, {
-      credentials: "same-origin"
-    });
+  static async fromUrl(url, requestInit) {
+    const response = await fetch(url.href, requestInit);
     const manifestJSON = await response.json();
     let publication = TaJsonDeserialize(manifestJSON, Publication);
     publication.manifestUrl = url;
@@ -34318,7 +34316,7 @@ var Publication = class extends import_publication.Publication {
     const decodedHref = decodeURI(href) ?? "";
     return this.positions?.filter((p) => decodedHref.includes(p.href));
   }
-  async autoGeneratePositions(getContentBytesLength = fetchContentBytesLength) {
+  async autoGeneratePositions(requestInit, getContentBytesLength = fetchContentBytesLength) {
     let startPosition = 0;
     let totalContentLength = 0;
     const positions = [];
@@ -34337,7 +34335,7 @@ var Publication = class extends import_publication.Publication {
           startPosition = startPosition + 1;
         } else {
           let href = this.getAbsoluteHref(link.Href);
-          let length = await getContentBytesLength(href);
+          let length = await getContentBytesLength(href, requestInit);
           link.contentLength = length;
           totalContentLength += length;
           let positionLength = 1024;
@@ -34381,17 +34379,17 @@ var Publication = class extends import_publication.Publication {
     }
     this.positions = positions;
   }
-  async fetchPositionsFromService(href) {
-    const result = await fetch(href);
+  async fetchPositionsFromService(href, requestInit) {
+    const result = await fetch(href, requestInit);
     const content = await result.json();
     this.positions = content.positions;
   }
-  async fetchWeightsFromService(href) {
+  async fetchWeightsFromService(href, requestInit) {
     if (this.isFixedLayout) {
       console.warn("Not fetching weights from service for fixed layout publication.");
       return;
     }
-    const result = await fetch(href);
+    const result = await fetch(href, requestInit);
     const weights = await result.json();
     if (this.readingOrder !== void 0) {
       this.readingOrder.forEach((link) => {
@@ -34403,8 +34401,8 @@ var Publication = class extends import_publication.Publication {
 Publication = __decorateClass([
   (0, import_ta_json_x2.JsonObject)()
 ], Publication);
-var fetchContentBytesLength = async (href) => {
-  const r = await fetch(href);
+var fetchContentBytesLength = async (href, requestInit) => {
+  const r = await fetch(href, requestInit);
   const b = await r.blob();
   return b.size;
 };
@@ -34637,7 +34635,7 @@ var Popup = class {
         absolute = absolute.substring(0, absolute.indexOf("#"));
         event.preventDefault();
         event.stopPropagation();
-        await fetch(absolute).then((r) => r.text()).then(async (data) => {
+        await fetch(absolute, this.navigator.requestInit).then((r) => r.text()).then(async (data) => {
           const parser = new DOMParser();
           const doc = parser.parseFromString(data, "text/html");
           const element = doc.querySelector("#" + id2);
@@ -34687,7 +34685,7 @@ var Popup = class {
         const d2content = document.createElement("div");
         d2content.className = "d2-popover-content";
         d2wrapper.appendChild(d2content);
-        await fetch(absolute).then((r) => r.text()).then(async (data) => {
+        await fetch(absolute, this.navigator.requestInit).then((r) => r.text()).then(async (data) => {
           d2content.innerHTML = data;
           let doc = this.navigator.iframes[0].contentDocument;
           if (doc) {
@@ -40977,7 +40975,7 @@ var MediaOverlayModule = class {
       const moUrlFull = moUrlObjFull.toString();
       let response;
       try {
-        response = await fetch(moUrlFull);
+        response = await fetch(moUrlFull, this.delegate.requestInit);
       } catch (e) {
         console.error(e, moUrlFull);
         return;
@@ -42737,7 +42735,7 @@ var SearchModule = class {
       }
       if (tocItem) {
         let href = this.publication.getAbsoluteHref(tocItem.Href);
-        await fetch(href).then((r) => r.text()).then(async (data) => {
+        await fetch(href, this.delegate.requestInit).then((r) => r.text()).then(async (data) => {
           let parser = new DOMParser();
           let doc = parser.parseFromString(data, "application/xhtml+xml");
           if (tocItem) {
@@ -43431,7 +43429,7 @@ var SampleReadEventHandler = class {
 // src/navigator/IFrameNavigator.ts
 var import_eventemitter3 = __toModule(require_eventemitter3());
 var IFrameNavigator = class extends import_eventemitter3.default {
-  constructor(settings, annotator = void 0, upLinkConfig = void 0, initialLastReadingPosition = void 0, publication, material, api, rights, tts, injectables, attributes, services, sample) {
+  constructor(settings, annotator = void 0, upLinkConfig = void 0, initialLastReadingPosition = void 0, publication, material, api, rights, tts, injectables, attributes, services, sample, requestInit) {
     super();
     this.iframes = [];
     this.sideNavExpanded = false;
@@ -43529,6 +43527,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
     this.attributes = attributes || { margin: 0 };
     this.services = services;
     this.sample = sample;
+    this.requestInit = requestInit;
     this.sampleReadEventHandler = new SampleReadEventHandler(this);
   }
   static async create(config2) {
@@ -44385,7 +44384,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                 if (isSameOrigin) {
                   this.iframes[0].src = this.currentChapterLink.href;
                 } else {
-                  fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content2) => {
+                  fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
                     writeIframeDoc.call(this, content2, this.currentChapterLink.href);
                   });
                 }
@@ -44406,7 +44405,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                       if (isSameOrigin) {
                         this.iframes[1].src = href;
                       } else {
-                        fetch(href).then((r) => r.text()).then(async (content2) => {
+                        fetch(href, this.requestInit).then((r) => r.text()).then(async (content2) => {
                           writeIframe2Doc.call(this, content2, href);
                           this.currentSpreadLinks.right = {
                             href
@@ -44435,7 +44434,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                     if (isSameOrigin) {
                       this.iframes[0].src = href;
                     } else {
-                      fetch(href).then((r) => r.text()).then(async (content2) => {
+                      fetch(href, this.requestInit).then((r) => r.text()).then(async (content2) => {
                         writeIframeDoc.call(this, content2, href);
                       });
                     }
@@ -44456,7 +44455,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                   if (isSameOrigin) {
                     this.iframes[1].src = this.currentChapterLink.href;
                   } else {
-                    fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content2) => {
+                    fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
                       writeIframe2Doc.call(this, content2, this.currentChapterLink.href);
                     });
                   }
@@ -44475,7 +44474,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
               if (isSameOrigin) {
                 this.iframes[0].src = this.currentChapterLink.href;
               } else {
-                fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content2) => {
+                fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
                   writeIframeDoc.call(this, content2, this.currentChapterLink.href);
                 });
               }
@@ -44493,7 +44492,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
             if (isSameOrigin) {
               this.iframes[0].src = this.currentChapterLink.href;
             } else {
-              fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content2) => {
+              fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
                 writeIframeDoc.call(this, content2, this.currentChapterLink.href);
               });
             }
@@ -44526,7 +44525,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                 }
               }
             } else {
-              fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content) => {
+              fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
                 writeIframeDoc.call(this, content, this.currentChapterLink.href);
               });
               if (this.iframes.length === 2) {
@@ -44537,7 +44536,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                     this.currentSpreadLinks.right = {
                       href
                     };
-                    fetch(href).then((r) => r.text()).then(async (content) => {
+                    fetch(href, this.requestInit).then((r) => r.text()).then(async (content) => {
                       writeIframe2Doc.call(this, content, href);
                     });
                   }
@@ -44560,14 +44559,14 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                     this.iframes[1].src = this.currentChapterLink.href;
                   }
                 } else {
-                  fetch(href).then((r) => r.text()).then(async (content) => {
+                  fetch(href, this.requestInit).then((r) => r.text()).then(async (content) => {
                     writeIframeDoc.call(this, content, href);
                   });
                   if (this.iframes.length === 2) {
                     this.currentSpreadLinks.right = {
                       href: this.currentChapterLink.href
                     };
-                    fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content) => {
+                    fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
                       writeIframe2Doc.call(this, content, this.currentChapterLink.href);
                     });
                   }
@@ -44583,7 +44582,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
               if (isSameOrigin) {
                 this.iframes[1].src = this.currentChapterLink.href;
               } else {
-                fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content) => {
+                fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
                   writeIframe2Doc.call(this, content, this.currentChapterLink.href);
                 });
               }
@@ -44596,7 +44595,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
           if (isSameOrigin) {
             this.iframes[0].src = this.currentChapterLink.href;
           } else {
-            fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content) => {
+            fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
               writeIframeDoc.call(this, content, this.currentChapterLink.href);
             });
           }
@@ -44608,7 +44607,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
         if (isSameOrigin) {
           this.iframes[0].src = this.currentChapterLink.href;
         } else {
-          fetch(this.currentChapterLink.href).then((r) => r.text()).then(async (content) => {
+          fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
             writeIframeDoc.call(this, content, this.currentChapterLink.href);
           });
         }
@@ -48317,9 +48316,16 @@ var D2Reader = class {
     const mainElement = findRequiredElement(document, "#D2Reader-Container");
     const headerMenu = findElement(document, "#headerMenu");
     const footerMenu = findElement(document, "#footerMenu");
-    const webPubManifestUrl = initialConfig.url;
+    let webPubManifestUrl = initialConfig.url;
+    let publication;
+    if (initialConfig.publication) {
+      publication = TaJsonDeserialize(initialConfig.publication, Publication);
+      publication.manifestUrl = new URL(webPubManifestUrl);
+    } else {
+      publication = await Publication.fromUrl(webPubManifestUrl, initialConfig.requestInit);
+    }
     const store = new LocalStorageStore({
-      prefix: webPubManifestUrl.href,
+      prefix: publication.manifestUrl,
       useLocalStorage: initialConfig.useLocalStorage ?? false
     });
     const settingsStore = new LocalStorageStore({
@@ -48332,17 +48338,16 @@ var D2Reader = class {
     });
     const annotator = new LocalAnnotator({ store });
     const upLink = initialConfig.upLinkUrl ?? void 0;
-    const publication = await Publication.fromUrl(webPubManifestUrl);
     publication.sample = initialConfig.sample;
     rights = updateConfig(rights, publication);
     if (rights.autoGeneratePositions) {
-      await publication.autoGeneratePositions();
+      await publication.autoGeneratePositions(initialConfig.requestInit);
     } else {
       if (initialConfig.services?.positions) {
-        await publication.fetchPositionsFromService(initialConfig.services?.positions.href);
+        await publication.fetchPositionsFromService(initialConfig.services?.positions.href, initialConfig.requestInit);
       }
       if (initialConfig.services?.weight) {
-        await publication.fetchWeightsFromService(initialConfig.services?.weight.href);
+        await publication.fetchWeightsFromService(initialConfig.services?.weight.href, initialConfig.requestInit);
       }
     }
     const layers = await LayerSettings.create({ store: layerStore });
@@ -48369,6 +48374,7 @@ var D2Reader = class {
       rights,
       tts: initialConfig.tts,
       sample: initialConfig.sample,
+      requestInit: initialConfig.requestInit,
       injectables: (publication.Metadata.Rendition?.Layout ?? "unknown") === "fixed" ? initialConfig.injectablesFixed : initialConfig.injectables,
       attributes: initialConfig.attributes,
       services: initialConfig.services