WIP: WASM compatibility updates/CORS override for GitHub Pages

espresso3389 · Feb 13, 2025 · 6db7f94 · 6db7f94
1 parent 39042d9
commit 6db7f94
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 5 deletions.
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -28,8 +28,8 @@ jobs:
       - name: Build Flutter Web App (WASM)
         run: |
           cd example/viewer/
+          cp -f extras/github-pages/* web/
           flutter build web --wasm --release
-          sed -i 's|<base href="/">|<base href="/pdfrx/">|' build/web/index.html
       - name: Configure Git for deployment
         run: |
           git config user.email "[email protected]"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-# 1.1.2
+## 1.1.2
 
 - FIXED: if running with WASM enabled on Flutter Web, certain PDF file could not be loaded correctly
 - Debug log to know WASM/SharedArrayBuffer status on Flutter Web

diff --git a/example/viewer/extras/github-pages/coi-serviceworker.min.js b/example/viewer/extras/github-pages/coi-serviceworker.min.js
diff --git a/example/viewer/extras/github-pages/index.html b/example/viewer/extras/github-pages/index.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <base href="/pdfrx/">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="pdfrx demo page">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="example">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png"/>
+
+  <title>pdfrx demo page</title>
+  <link rel="manifest" href="manifest.json">
+
+  <!-- Workaround for GitHub Pages CORS policy
+       https://github.com/gzuidhof/coi-serviceworker -->
+  <script>
+    window.coi = {coepCredentialless: () => true,}
+  </script>
+  <script src="coi-serviceworker.min.js"></script>
+</head>
+<body>
+  <script src="flutter_bootstrap.js" async></script>
+</body>
+</html>
diff --git a/lib/src/web/pdf.js.dart b/lib/src/web/pdf.js.dart
@@ -102,7 +102,7 @@ extension type PdfjsDocument._(JSObject _) implements JSObject {
   external void destroy();
 
   external JSPromise<JSNumber> getPageIndex(PdfjsRef ref);
-  external JSPromise<JSObject> getDestination(String id);
+  external JSPromise<JSObject?> getDestination(String id);
   external JSPromise<JSArray<PdfjsOutlineNode>?> getOutline();
 }
 

diff --git a/lib/src/web/pdfrx_web.dart b/lib/src/web/pdfrx_web.dart
@@ -197,8 +197,7 @@ class PdfDocumentWeb extends PdfDocument {
   Future<JSObject?> _getDestObject(JSAny? dest) async {
     if (dest == null) return null;
     if (dest.isA<JSString>()) {
-      final destObj = await _document.getDestination((dest as JSString).toDart).toDart;
-      return destObj;
+      return await _document.getDestination((dest as JSString).toDart).toDart;
     } else {
       return dest as JSObject;
     }