@internetarchive/bookreader 5.0.0-84 → 5.0.0-86

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 5.0.0-86
+- Fix: Make JSON requests with cookies for protected books @cdrini
+
+# 5.0.0-85
+- Dev: Disable JSONP requests to archive.org to make BR CSP-compatible @cdrini
+
 # 5.0.0-84
 - Fix: Improve/update wording for downloads @rebecca-shoptaw
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/bookreader",
-  "version": "5.0.0-84",
+  "version": "5.0.0-86",
   "description": "The Internet Archive BookReader.",
   "repository": {
     "type": "git",

package/src/plugins/plugin.chapters.js

@@ -163,11 +163,11 @@ BookReader.prototype.getOpenLibraryRecord = async function (olHost, ocaid) {
   const baseURL = `${olHost}/query.json?type=/type/edition&*=`;
   const fetchUrlByBookId = `${baseURL}&ocaid=${ocaid}`;
 
-  let data = await $.ajax({ url: fetchUrlByBookId, dataType: 'jsonp' });
+  let data = await $.ajax({ url: fetchUrlByBookId });
 
   if (!data || !data.length) {
     // try sourceid
-    data = await $.ajax({ url: `${baseURL}&source_records=ia:${ocaid}`, dataType: 'jsonp' });
+    data = await $.ajax({ url: `${baseURL}&source_records=ia:${ocaid}` });
   }
 
   return data?.[0];

package/src/plugins/plugin.text_selection.js

@@ -89,6 +89,9 @@ export class TextSelectionPlugin {
       url: applyVariables(this.options.fullDjvuXmlUrl, this.optionVariables),
       dataType: this.options.jsonp ? "jsonp" : "html",
       cache: true,
+      xhrFields: {
+        withCredentials: window.br.protected,
+      },
       error: (e) => undefined,
     }).then((res) => {
       try {
@@ -115,6 +118,9 @@ export class TextSelectionPlugin {
         url: applyVariables(this.options.singlePageDjvuXmlUrl, this.optionVariables, { pageIndex: index }),
         dataType: this.options.jsonp ? "jsonp" : "html",
         cache: true,
+        xhrFields: {
+          withCredentials: window.br.protected,
+        },
         error: (e) => undefined,
       });
       try {

package/src/plugins/search/plugin.search.js

@@ -222,8 +222,10 @@ BookReader.prototype.search = async function(term = '', overrides = {}) {
   this.trigger('SearchStarted', { term: this.searchTerm, instance: this });
   callSearchResultsCallback(await $.ajax({
     url: url,
-    dataType: 'jsonp',
     cache: true,
+    xhrFields: {
+      withCredentials: this.protected,
+    },
     beforeSend: xhr => { this.searchXHR = xhr; },
   }));
 };

package/src/plugins/tts/PageChunk.js

@@ -25,11 +25,14 @@ export default class PageChunk {
     const chunks = await $.ajax({
       type: 'GET',
       url: `https://${server}/BookReader/BookReaderGetTextWrapper.php`,
-      dataType:'jsonp',
       cache: true,
+      xhrFields: {
+        withCredentials: window.br.protected,
+      },
       data: {
         path: `${bookPath}_djvu.xml`,
         page: leafIndex,
+        callback: 'false',
       },
     });
     return PageChunk._fromTextWrapperResponse(leafIndex, chunks);

package/tests/jest/plugins/plugin.text_selection.test.js

@@ -87,7 +87,7 @@ const FAKE_XML_EMPTY = '';
 
 describe("Generic tests", () => {
   document.body.innerHTML = '<div id="BookReader">';
-  const br = new BookreaderWithTextSelection({
+  const br = window.br = new BookreaderWithTextSelection({
     data: [
       [
         { width: 800, height: 1200,