@internetarchive/bookreader 5.0.0-83 → 5.0.0-85

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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
+
 # 5.0.0-83
 - Fix: Fix typo in search-results.js @sahalbelam
 - Dev: Bump cache action to v4 @williamtheaker

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/bookreader",
-  "version": "5.0.0-83",
+  "version": "5.0.0-85",
   "description": "The Internet Archive BookReader.",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "@iiif/presentation-2": "^1.0.4",
     "@iiif/presentation-3": "^2.1.3",
     "@open-wc/testing-helpers": "3.0.1",
-    "@types/jest": "29.5.13",
+    "@types/jest": "29.5.14",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "babel-loader": "9.2.1",
     "concurrently": "9.0.1",

package/src/BookNavigator/downloads/downloads.js

@@ -62,21 +62,9 @@ export class IABookDownloads extends LitElement {
     `;
   }
 
-  get accessProtectedBook() {
+  get installLCPSoftwareMsg() {
     return html`
-      <p>To access downloaded books, you need Adobe-compliant software on your device. The Internet Archive will administer this loan, but Adobe may also collect some information.</p>
-      <a class="ia-button external primary" href="https://www.adobe.com/solutions/ebook/digital-editions/download.html" rel="noopener noreferrer" target="_blank">Install Adobe Digital Editions</a>
-    `;
-  }
-
-  get installSimplyEAldikoThoriumMsg() {
-    return html`
-    <p>For LCP downloads, make sure you have SimplyE or Aldiko Next installed on mobile or Thorium on desktop.</p>
-    <ul>
-      <li><a href="https://librarysimplified.org/simplye/" rel="noopener noreferrer nofollow" target="_blank">Install SimplyE</a></li>
-      <li><a href="https://www.demarque.com/en-aldiko" rel="noopener noreferrer nofollow" target="_blank">Install Aldiko</a></li>
-      <li><a href="https://thorium.edrlab.org/" rel="noopener noreferrer nofollow" target="_blank">Install Thorium</a></li>
-    </ul>
+    <p>For LCP downloads, make sure you have LCP software such as <a href="https://thorium.edrlab.org/" rel="noopener noreferrer nofollow" target="_blank">Thorium (desktop)</a>, <a href="https://apps.apple.com/us/app/cantook-by-aldiko/id1476410111" rel="noopener noreferrer nofollow" target="_blank">Cantook (iOS)</a> or <a href="https://play.google.com/store/apps/details?id=com.aldiko.android" rel="noopener noreferrer nofollow" target="_blank">Cantook (Android)</a> installed on your device.</p>
   `;
   }
 
@@ -86,8 +74,8 @@ export class IABookDownloads extends LitElement {
       ${this.loanExpiryMessage}
       <ul>${this.renderDownloadOptions()}</ul>
       ${this.hasLCPOption
-      ? this.installSimplyEAldikoThoriumMsg
-      : (this.isBookProtected ? this.accessProtectedBook : nothing)
+      ? this.installLCPSoftwareMsg
+      : nothing
       }
     `;
   }

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/search/plugin.search.js

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

package/src/plugins/tts/PageChunk.js

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