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

package/dist/esm/index.js

@@ -10118,9 +10118,9 @@ var require_source_map = __commonJS({
   }
 });
 
-// (disabled):path
+// (disabled):node_modules/path/path.js
 var require_path = __commonJS({
-  "(disabled):path"() {
+  "(disabled):node_modules/path/path.js"() {
     init_polyfills();
   }
 });
@@ -34139,8 +34139,8 @@ function TaJsonDeserialize(json, type) {
 
 // src/model/Publication.ts
 var Publication = class extends import_publication.Publication {
-  static async fromUrl(url, requestInit) {
-    const response = await fetch(url.href, requestInit);
+  static async fromUrl(url, requestConfig) {
+    const response = await fetch(url.href, requestConfig);
     const manifestJSON = await response.json();
     let publication = TaJsonDeserialize(manifestJSON, Publication);
     publication.manifestUrl = url;
@@ -34316,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(requestInit, getContentBytesLength = fetchContentBytesLength) {
+  async autoGeneratePositions(requestConfig, getContentBytesLength = fetchContentBytesLength) {
     let startPosition = 0;
     let totalContentLength = 0;
     const positions = [];
@@ -34335,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, requestInit);
+          let length = await getContentBytesLength(href, requestConfig);
           link.contentLength = length;
           totalContentLength += length;
           let positionLength = 1024;
@@ -34379,17 +34379,17 @@ var Publication = class extends import_publication.Publication {
     }
     this.positions = positions;
   }
-  async fetchPositionsFromService(href, requestInit) {
-    const result = await fetch(href, requestInit);
+  async fetchPositionsFromService(href, requestConfig) {
+    const result = await fetch(href, requestConfig);
     const content = await result.json();
     this.positions = content.positions;
   }
-  async fetchWeightsFromService(href, requestInit) {
+  async fetchWeightsFromService(href, requestConfig) {
     if (this.isFixedLayout) {
       console.warn("Not fetching weights from service for fixed layout publication.");
       return;
     }
-    const result = await fetch(href, requestInit);
+    const result = await fetch(href, requestConfig);
     const weights = await result.json();
     if (this.readingOrder !== void 0) {
       this.readingOrder.forEach((link) => {
@@ -34401,8 +34401,8 @@ var Publication = class extends import_publication.Publication {
 Publication = __decorateClass([
   (0, import_ta_json_x2.JsonObject)()
 ], Publication);
-var fetchContentBytesLength = async (href, requestInit) => {
-  const r = await fetch(href, requestInit);
+var fetchContentBytesLength = async (href, requestConfig) => {
+  const r = await fetch(href, requestConfig);
   const b = await r.blob();
   return b.size;
 };
@@ -34635,7 +34635,7 @@ var Popup = class {
         absolute = absolute.substring(0, absolute.indexOf("#"));
         event.preventDefault();
         event.stopPropagation();
-        await fetch(absolute, this.navigator.requestInit).then((r) => r.text()).then(async (data) => {
+        await fetch(absolute, this.navigator.requestConfig).then((r) => r.text()).then(async (data) => {
           const parser = new DOMParser();
           const doc = parser.parseFromString(data, "text/html");
           const element = doc.querySelector("#" + id2);
@@ -34685,7 +34685,7 @@ var Popup = class {
         const d2content = document.createElement("div");
         d2content.className = "d2-popover-content";
         d2wrapper.appendChild(d2content);
-        await fetch(absolute, this.navigator.requestInit).then((r) => r.text()).then(async (data) => {
+        await fetch(absolute, this.navigator.requestConfig).then((r) => r.text()).then(async (data) => {
           d2content.innerHTML = data;
           let doc = this.navigator.iframes[0].contentDocument;
           if (doc) {
@@ -40975,7 +40975,7 @@ var MediaOverlayModule = class {
       const moUrlFull = moUrlObjFull.toString();
       let response;
       try {
-        response = await fetch(moUrlFull, this.delegate.requestInit);
+        response = await fetch(moUrlFull, this.delegate.requestConfig);
       } catch (e) {
         console.error(e, moUrlFull);
         return;
@@ -42297,7 +42297,7 @@ async function searchDocDomSeek(searchInput, doc, href, title, fullWordSearch =
 
 // src/modules/search/SearchModule.ts
 var SearchModule = class {
-  constructor(delegate, publication, properties, highlighter, api, headerMenu) {
+  constructor(delegate, publication, properties, highlighter, requestConfig, api, headerMenu) {
     this.currentChapterSearchResult = [];
     this.bookSearchResult = [];
     this.currentSearchHighlights = [];
@@ -42307,9 +42307,10 @@ var SearchModule = class {
     this.properties = properties;
     this.api = api;
     this.highlighter = highlighter;
+    this.requestConfig = requestConfig;
   }
   static async create(config2) {
-    const search = new this(config2.delegate, config2.publication, config2, config2.highlighter, config2.api, config2.headerMenu);
+    const search = new this(config2.delegate, config2.publication, config2, config2.highlighter, config2.requestConfig, config2.api, config2.headerMenu);
     await search.start();
     return search;
   }
@@ -42735,9 +42736,9 @@ var SearchModule = class {
       }
       if (tocItem) {
         let href = this.publication.getAbsoluteHref(tocItem.Href);
-        await fetch(href, this.delegate.requestInit).then((r) => r.text()).then(async (data) => {
+        await fetch(href, this.requestConfig).then((r) => r.text()).then(async (data) => {
           let parser = new DOMParser();
-          let doc = parser.parseFromString(data, "application/xhtml+xml");
+          let doc = parser.parseFromString(this.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
           if (tocItem) {
             searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
               result.forEach((searchItem) => {
@@ -42753,6 +42754,16 @@ var SearchModule = class {
       }
     }
   }
+  decodeBase64(base64) {
+    const text = atob(base64);
+    const length = text.length;
+    const bytes = new Uint8Array(length);
+    for (let i = 0; i < length; i++) {
+      bytes[i] = text.charCodeAt(i);
+    }
+    const decoder = new TextDecoder();
+    return decoder.decode(bytes);
+  }
   async searchChapter(term) {
     let localSearchResultBook = [];
     const linkHref = this.publication.getAbsoluteHref(this.publication.readingOrder[this.delegate.currentResource() ?? 0].Href);
@@ -42762,9 +42773,9 @@ 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.requestConfig).then((r) => r.text()).then(async (data) => {
         let parser = new DOMParser();
-        let doc = parser.parseFromString(data, "application/xhtml+xml");
+        let doc = parser.parseFromString(this.requestConfig?.encoded ? this.decodeBase64(data) : data, "application/xhtml+xml");
         if (tocItem) {
           searchDocDomSeek(term, doc, tocItem.Href, tocItem.Title).then((result) => {
             result.forEach((searchItem) => {
@@ -43429,11 +43440,10 @@ 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, requestInit) {
+  constructor(settings, annotator = void 0, upLinkConfig = void 0, initialLastReadingPosition = void 0, publication, api, rights, tts, injectables, attributes, services, sample, requestConfig) {
     super();
     this.iframes = [];
     this.sideNavExpanded = false;
-    this.material = false;
     this.currentChapterLink = { href: "" };
     this.currentSpreadLinks = {};
     this.upLink = void 0;
@@ -43504,7 +43514,6 @@ var IFrameNavigator = class extends import_eventemitter3.default {
     this.upLinkConfig = upLinkConfig;
     this.initialLastReadingPosition = initialLastReadingPosition;
     this.publication = publication;
-    this.material = material;
     this.api = api;
     this.rights = rights ?? {
       autoGeneratePositions: false,
@@ -43527,11 +43536,11 @@ var IFrameNavigator = class extends import_eventemitter3.default {
     this.attributes = attributes || { margin: 0 };
     this.services = services;
     this.sample = sample;
-    this.requestInit = requestInit;
+    this.requestConfig = requestConfig;
     this.sampleReadEventHandler = new SampleReadEventHandler(this);
   }
   static async create(config2) {
-    const navigator2 = new this(config2.settings, config2.annotator || void 0, config2.upLink || void 0, config2.initialLastReadingPosition || void 0, config2.publication, config2.material, config2.api, config2.rights, config2.tts, config2.injectables, config2.attributes || { margin: 0 }, config2.services, config2.sample);
+    const navigator2 = new this(config2.settings, config2.annotator || void 0, config2.upLink || void 0, config2.initialLastReadingPosition || void 0, config2.publication, config2.api, config2.rights, config2.tts, config2.injectables, config2.attributes || { margin: 0 }, config2.services, config2.sample);
     await navigator2.start(config2.mainElement, config2.headerMenu, config2.footerMenu);
     return new Promise((resolve) => resolve(navigator2));
   }
@@ -44384,7 +44393,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                 if (isSameOrigin) {
                   this.iframes[0].src = this.currentChapterLink.href;
                 } else {
-                  fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
+                  fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content2) => {
                     writeIframeDoc.call(this, content2, this.currentChapterLink.href);
                   });
                 }
@@ -44405,7 +44414,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                       if (isSameOrigin) {
                         this.iframes[1].src = href;
                       } else {
-                        fetch(href, this.requestInit).then((r) => r.text()).then(async (content2) => {
+                        fetch(href, this.requestConfig).then((r) => r.text()).then(async (content2) => {
                           writeIframe2Doc.call(this, content2, href);
                           this.currentSpreadLinks.right = {
                             href
@@ -44434,7 +44443,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                     if (isSameOrigin) {
                       this.iframes[0].src = href;
                     } else {
-                      fetch(href, this.requestInit).then((r) => r.text()).then(async (content2) => {
+                      fetch(href, this.requestConfig).then((r) => r.text()).then(async (content2) => {
                         writeIframeDoc.call(this, content2, href);
                       });
                     }
@@ -44455,7 +44464,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                   if (isSameOrigin) {
                     this.iframes[1].src = this.currentChapterLink.href;
                   } else {
-                    fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
+                    fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content2) => {
                       writeIframe2Doc.call(this, content2, this.currentChapterLink.href);
                     });
                   }
@@ -44474,7 +44483,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
               if (isSameOrigin) {
                 this.iframes[0].src = this.currentChapterLink.href;
               } else {
-                fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
+                fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content2) => {
                   writeIframeDoc.call(this, content2, this.currentChapterLink.href);
                 });
               }
@@ -44492,7 +44501,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
             if (isSameOrigin) {
               this.iframes[0].src = this.currentChapterLink.href;
             } else {
-              fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content2) => {
+              fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content2) => {
                 writeIframeDoc.call(this, content2, this.currentChapterLink.href);
               });
             }
@@ -44525,7 +44534,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                 }
               }
             } else {
-              fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
+              fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content) => {
                 writeIframeDoc.call(this, content, this.currentChapterLink.href);
               });
               if (this.iframes.length === 2) {
@@ -44536,7 +44545,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                     this.currentSpreadLinks.right = {
                       href
                     };
-                    fetch(href, this.requestInit).then((r) => r.text()).then(async (content) => {
+                    fetch(href, this.requestConfig).then((r) => r.text()).then(async (content) => {
                       writeIframe2Doc.call(this, content, href);
                     });
                   }
@@ -44559,14 +44568,14 @@ var IFrameNavigator = class extends import_eventemitter3.default {
                     this.iframes[1].src = this.currentChapterLink.href;
                   }
                 } else {
-                  fetch(href, this.requestInit).then((r) => r.text()).then(async (content) => {
+                  fetch(href, this.requestConfig).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, this.requestInit).then((r) => r.text()).then(async (content) => {
+                    fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content) => {
                       writeIframe2Doc.call(this, content, this.currentChapterLink.href);
                     });
                   }
@@ -44582,7 +44591,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
               if (isSameOrigin) {
                 this.iframes[1].src = this.currentChapterLink.href;
               } else {
-                fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
+                fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content) => {
                   writeIframe2Doc.call(this, content, this.currentChapterLink.href);
                 });
               }
@@ -44595,7 +44604,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
           if (isSameOrigin) {
             this.iframes[0].src = this.currentChapterLink.href;
           } else {
-            fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
+            fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content) => {
               writeIframeDoc.call(this, content, this.currentChapterLink.href);
             });
           }
@@ -44607,7 +44616,7 @@ var IFrameNavigator = class extends import_eventemitter3.default {
         if (isSameOrigin) {
           this.iframes[0].src = this.currentChapterLink.href;
         } else {
-          fetch(this.currentChapterLink.href, this.requestInit).then((r) => r.text()).then(async (content) => {
+          fetch(this.currentChapterLink.href, this.requestConfig).then((r) => r.text()).then(async (content) => {
             writeIframeDoc.call(this, content, this.currentChapterLink.href);
           });
         }
@@ -48322,7 +48331,7 @@ var D2Reader = class {
       publication = TaJsonDeserialize(initialConfig.publication, Publication);
       publication.manifestUrl = new URL(webPubManifestUrl);
     } else {
-      publication = await Publication.fromUrl(webPubManifestUrl, initialConfig.requestInit);
+      publication = await Publication.fromUrl(webPubManifestUrl, initialConfig.requestConfig);
     }
     const store = new LocalStorageStore({
       prefix: publication.manifestUrl,
@@ -48341,13 +48350,13 @@ var D2Reader = class {
     publication.sample = initialConfig.sample;
     rights = updateConfig(rights, publication);
     if (rights.autoGeneratePositions) {
-      await publication.autoGeneratePositions(initialConfig.requestInit);
+      await publication.autoGeneratePositions(initialConfig.requestConfig);
     } else {
       if (initialConfig.services?.positions) {
-        await publication.fetchPositionsFromService(initialConfig.services?.positions.href, initialConfig.requestInit);
+        await publication.fetchPositionsFromService(initialConfig.services?.positions.href, initialConfig.requestConfig);
       }
       if (initialConfig.services?.weight) {
-        await publication.fetchWeightsFromService(initialConfig.services?.weight.href, initialConfig.requestInit);
+        await publication.fetchWeightsFromService(initialConfig.services?.weight.href, initialConfig.requestConfig);
       }
     }
     const layers = await LayerSettings.create({ store: layerStore });
@@ -48355,7 +48364,6 @@ var D2Reader = class {
       store: settingsStore,
       initialUserSettings: initialConfig.userSettings,
       headerMenu,
-      material: initialConfig.material,
       api: initialConfig.api,
       injectables: (publication.Metadata.Rendition?.Layout ?? "unknown") === "fixed" ? initialConfig.injectablesFixed : initialConfig.injectables,
       layout: (publication.Metadata.Rendition?.Layout ?? "unknown") === "fixed" ? "fixed" : "reflowable"
@@ -48369,13 +48377,12 @@ var D2Reader = class {
       annotator,
       upLink,
       initialLastReadingPosition: initialConfig.lastReadingPosition,
-      material: initialConfig.material,
       api: initialConfig.api,
       rights,
       tts: initialConfig.tts,
       sample: initialConfig.sample,
-      requestInit: initialConfig.requestInit,
-      injectables: (publication.Metadata.Rendition?.Layout ?? "unknown") === "fixed" ? initialConfig.injectablesFixed : initialConfig.injectables,
+      requestConfig: initialConfig.requestConfig,
+      injectables: (publication.Metadata.Rendition?.Layout ?? "unknown") === "fixed" ? initialConfig.injectablesFixed ?? [] : initialConfig.injectables,
       attributes: initialConfig.attributes,
       services: initialConfig.services
     });
@@ -48420,7 +48427,8 @@ var D2Reader = class {
       headerMenu,
       delegate: navigator2,
       publication,
-      highlighter
+      highlighter,
+      requestConfig: initialConfig.requestConfig
     }, initialConfig.search)) : void 0;
     const definitionsModule = rights.enableDefinitions ? await DefinitionsModule.create(__spreadValues({
       delegate: navigator2,