quickwin 2.3.1 → 3.0.0

package/test/test_mupdf_render.js

@@ -1,31 +1,13 @@
 import * as std from 'std';
 import '../lib/polyfill.js';
-function loadWasmBytes(path) {
-    const fp = std.open(path, 'rb');
-    if (!fp)
-        throw new Error('Cannot open: ' + path);
-    fp.seek(0, 2);
-    const size = fp.tell();
-    fp.seek(0, 0);
-    const buffer = new ArrayBuffer(size);
-    fp.read(buffer, 0, size);
-    fp.close();
-    return buffer;
-}
-function setupMupdfModule(wasmPath) {
-    const wasmBinary = loadWasmBytes(wasmPath);
-    globalThis["$libmupdf_wasm_Module"] = {
-        wasmBinary,
-        locateFile: (p) => p
-    };
-}
+import { MUPDF_JS_URL, preloadMupdfWasm } from './mupdf-cdn.js';
 export const suite = {
     name: 'mupdf-render',
     run: async (t) => {
         try {
-            setupMupdfModule('./vendor/mupdf-wasm/mupdf-wasm.wasm');
-            const mupdf = await import('../vendor/mupdf-wasm/mupdf.js');
-            const fp = std.open('./example.pdf', 'rb');
+            await preloadMupdfWasm();
+            const mupdf = await import(MUPDF_JS_URL);
+            const fp = std.open('./test/example.pdf', 'rb');
             if (!fp) {
                 console.log('SKIP: no example.pdf');
                 return;

package/test/test_mupdf_render.ts

@@ -1,36 +1,17 @@
 import * as std from 'std'
 import { Tester } from './test_helper.js'
 import '../lib/polyfill.js'
-
-function loadWasmBytes(path: string): ArrayBuffer {
-    const fp = std.open(path, 'rb')
-    if (!fp) throw new Error('Cannot open: ' + path)
-    fp.seek(0, 2)
-    const size = fp.tell()
-    fp.seek(0, 0)
-    const buffer = new ArrayBuffer(size)
-    fp.read(buffer, 0, size)
-    fp.close()
-    return buffer
-}
-
-function setupMupdfModule(wasmPath: string) {
-    const wasmBinary = loadWasmBytes(wasmPath)
-    ;(globalThis as any)["$libmupdf_wasm_Module"] = {
-        wasmBinary,
-        locateFile: (p: string) => p
-    }
-}
+import { MUPDF_JS_URL, preloadMupdfWasm } from './mupdf-cdn.js'
 
 export const suite = {
     name: 'mupdf-render',
     run: async (t: Tester): Promise<void> => {
         try {
-            setupMupdfModule('./vendor/mupdf-wasm/mupdf-wasm.wasm')
+            await preloadMupdfWasm()
 
-            const mupdf: typeof import('../vendor/mupdf-wasm/mupdf.js') = await import('../vendor/mupdf-wasm/mupdf.js')
+            const mupdf: typeof import('@quickwinlabs/mupdf-wasm') = await import(MUPDF_JS_URL)
 
-            const fp = std.open('./example.pdf', 'rb')
+            const fp = std.open('./test/example.pdf', 'rb')
             if (!fp) { console.log('SKIP: no example.pdf'); return }
             fp.seek(0, 2)
             const size = fp.tell()

package/test/test_mupdf_twice.js

@@ -1,32 +1,17 @@
 import '../lib/polyfill.js';
 import * as std from 'std';
-function loadWasmBytes(path) {
-    const fp = std.open(path, 'rb');
-    if (!fp)
-        throw new Error('Cannot open: ' + path);
-    fp.seek(0, 2);
-    const size = fp.tell();
-    fp.seek(0, 0);
-    const buffer = new ArrayBuffer(size);
-    fp.read(buffer, 0, size);
-    fp.close();
-    return buffer;
-}
+import { MUPDF_JS_URL, preloadMupdfWasm } from './mupdf-cdn.js';
 export const suite = {
     name: 'mupdf-twice',
     run: async (t) => {
         try {
             console.log('  Loading WASM binary...');
-            const wasmBinary = loadWasmBytes('./vendor/mupdf-wasm/mupdf-wasm.wasm');
+            const wasmBinary = await preloadMupdfWasm();
             console.log('  WASM binary loaded, size:', wasmBinary.byteLength);
-            globalThis["$libmupdf_wasm_Module"] = {
-                wasmBinary,
-                locateFile: (p) => p
-            };
             console.log('  Importing mupdf module...');
-            const mupdf = await import('../vendor/mupdf-wasm/mupdf.js');
+            const mupdf = await import(MUPDF_JS_URL);
             console.log('  mupdf module imported ok');
-            const fp = std.open('./example.pdf', 'rb');
+            const fp = std.open('./test/example.pdf', 'rb');
             if (!fp) {
                 console.log('SKIP: no example.pdf');
                 return;

package/test/test_mupdf_twice.ts

@@ -1,37 +1,21 @@
 import '../lib/polyfill.js'
 import * as std from 'std'
 import { Tester } from './test_helper.js'
-
-function loadWasmBytes(path: string): ArrayBuffer {
-    const fp = std.open(path, 'rb')
-    if (!fp) throw new Error('Cannot open: ' + path)
-    fp.seek(0, 2)
-    const size = fp.tell()
-    fp.seek(0, 0)
-    const buffer = new ArrayBuffer(size)
-    fp.read(buffer, 0, size)
-    fp.close()
-    return buffer
-}
+import { MUPDF_JS_URL, preloadMupdfWasm } from './mupdf-cdn.js'
 
 export const suite = {
     name: 'mupdf-twice',
     run: async (t: Tester): Promise<void> => {
         try {
             console.log('  Loading WASM binary...')
-            const wasmBinary = loadWasmBytes('./vendor/mupdf-wasm/mupdf-wasm.wasm')
+            const wasmBinary = await preloadMupdfWasm()
             console.log('  WASM binary loaded, size:', wasmBinary.byteLength)
 
-            ;(globalThis as any)["$libmupdf_wasm_Module"] = {
-                wasmBinary,
-                locateFile: (p: string) => p
-            }
-
             console.log('  Importing mupdf module...')
-            const mupdf: typeof import('../vendor/mupdf-wasm/mupdf.js') = await import('../vendor/mupdf-wasm/mupdf.js')
+            const mupdf: typeof import('@quickwinlabs/mupdf-wasm') = await import(MUPDF_JS_URL)
             console.log('  mupdf module imported ok')
 
-            const fp = std.open('./example.pdf', 'rb')
+            const fp = std.open('./test/example.pdf', 'rb')
             if (!fp) { console.log('SKIP: no example.pdf'); return }
             fp.seek(0, 2)
             const size = fp.tell()

package/test/test_mupdf_wasm.js

@@ -1,9 +1,15 @@
-import { readWasmFile } from './test_helper.js';
+import { fetchMupdfWasm } from './mupdf-cdn.js';
 export const suite = {
-    name: 'vendor/mupdf-wasm',
-    run: (t) => {
+    name: 'mupdf-wasm',
+    run: async (t) => {
         t.section('validate binary');
-        const buf = readWasmFile('../vendor/mupdf-wasm/mupdf-wasm.wasm');
+        let buf = null;
+        try {
+            buf = await fetchMupdfWasm();
+        }
+        catch (e) {
+            console.log('mupdf wasm fetch failed: ' + String(e));
+        }
         if (!buf) {
             t.fail++;
             return;

package/test/test_mupdf_wasm.ts

@@ -1,10 +1,12 @@
-import { Tester, readWasmFile } from './test_helper.js'
+import { Tester } from './test_helper.js'
+import { fetchMupdfWasm } from './mupdf-cdn.js'
 
 export const suite = {
-    name: 'vendor/mupdf-wasm',
-    run: (t: Tester) => {
+    name: 'mupdf-wasm',
+    run: async (t: Tester) => {
         t.section('validate binary')
-        const buf = readWasmFile('../vendor/mupdf-wasm/mupdf-wasm.wasm')
+        let buf: ArrayBuffer | null = null
+        try { buf = await fetchMupdfWasm() } catch (e) { console.log('mupdf wasm fetch failed: ' + String(e)) }
         if (!buf) { t.fail++; return }
         t.check('file size > 0', true, buf.byteLength > 0)
         const header = new Uint8Array(buf)