Final go at improving the way we dynamically import external dependencies.

Well... this was disappointing since we are pretty much back to what we originally had. Indeed, to load and even cache libOpenCOR's WASM is not worth it. To actually import and instantiate is really what takes time.

Author: agarny

src/renderer/index.html

@@ -7,7 +7,7 @@
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; connect-src *; script-src 'unsafe-eval'; script-src-elem 'self' blob: https://apis.google.com https://cdn.jsdelivr.net https://cors-proxy.opencor.workers.dev; style-src 'self' 'unsafe-inline'; frame-src 'self' https://opencorapp.firebaseapp.com; img-src 'self' blob: data:" />
+      content="default-src 'self'; connect-src *; script-src 'unsafe-eval'; script-src-elem 'self' https://apis.google.com https://cdn.jsdelivr.net https://cors-proxy.opencor.workers.dev; style-src 'self' 'unsafe-inline'; frame-src 'self' https://opencorapp.firebaseapp.com; img-src 'self' blob: data:" />
     <style scoped>
     body {
       background-color: #ffffff; /* Light version of --p-content-background. */

src/renderer/src/common/cache.ts

@@ -1,4 +1,3 @@
-import * as cache from './cache.ts';
 import * as dependencies from './dependencies.ts';
 import { electronApi } from './electronApi.ts';
 
@@ -213,170 +212,3 @@ export const fileName = (filePath: string): string => {
 export const sleep = (ms: number): Promise<void> => {
   return new Promise((resolve) => setTimeout(resolve, ms));
 };
-
-// A method to retrieve the size of a remote file, if possible.
-
-export const remoteFileSize = async (url: string): Promise<number> => {
-  // Check the cache first.
-
-  try {
-    const size = await cache.remoteFileSize(url);
-
-    if (size !== undefined) {
-      return size;
-    }
-  } catch {}
-
-  // Try a HEAD request first to get the content-length header.
-
-  try {
-    const head = await fetch(url, { method: 'HEAD' });
-    const contentLength = head.headers.get('content-length');
-
-    if (head.ok && contentLength && /^\d+$/.test(contentLength)) {
-      const size = Number(contentLength);
-
-      await cache.setRemoteFileSize(url, size);
-
-      return size;
-    }
-  } catch {}
-
-  // If that doesn't work, try a GET request with a Range header to get the content-range header.
-
-  try {
-    const res = await fetch(url, { headers: { Range: 'bytes=0-0' } });
-    const contentRange = res.headers.get('content-range');
-    const match = contentRange?.match(/\/(\d+)$/);
-
-    if (res.ok && match) {
-      const size = Number(match[1]);
-
-      await cache.setRemoteFileSize(url, size);
-
-      return size;
-    }
-  } catch {}
-
-  const size = 0; // Unknown size.
-
-  await cache.setRemoteFileSize(url, size);
-
-  return size;
-};
-
-// A method to download a remote file and track the progress of the download.
-
-export const downloadRemoteFile = async (url: string, onProgress: (percent: number) => void): Promise<Uint8Array> => {
-  // Check the cache first.
-
-  try {
-    const data = await cache.remoteFile(url);
-
-    if (data) {
-      for (let percent = 0; percent <= 100; percent += 2) {
-        await sleep(1);
-
-        onProgress(percent);
-      }
-
-      return data;
-    }
-  } catch {}
-
-  // Download the file in chunks and track the progress.
-
-  const res = await fetch(url);
-
-  if (!res.ok) {
-    throw new Error(`HTTP ${res.status} was returned while trying to download ${url}.`);
-  }
-
-  if (!res.body) {
-    throw new Error('ReadableStream is not supported in this browser.');
-  }
-
-  // Start with 0% progress.
-
-  onProgress(0);
-
-  // Try to get the total size of the file from the content-length header or the cache, if possible, to be able to
-  // compute the progress. If not, we'll just show 0% until the download is complete and then show 100%.
-
-  let totalNbOfBytes = 0;
-  const contentLength = res.headers.get('content-length');
-
-  if (contentLength && /^\d+$/.test(contentLength)) {
-    totalNbOfBytes = Number(contentLength);
-
-    await cache.setRemoteFileSize(url, totalNbOfBytes);
-  } else {
-    totalNbOfBytes = await remoteFileSize(url);
-  }
-
-  // Read the response body in chunks and track the progress.
-
-  const reader = res.body.getReader();
-  let oldPercent = 0;
-  let crtNbOfBytes = 0;
-  const buffer = totalNbOfBytes ? new Uint8Array(totalNbOfBytes) : undefined;
-  const chunks: Uint8Array[] = buffer ? [] : [];
-
-  while (true) {
-    const { done, value } = await reader.read();
-
-    if (done) {
-      break;
-    }
-
-    if (!value) {
-      continue;
-    }
-
-    if (buffer) {
-      buffer.set(value, crtNbOfBytes);
-    } else {
-      chunks.push(value);
-    }
-
-    crtNbOfBytes += value.length;
-
-    if (totalNbOfBytes) {
-      const percent = Math.floor((100 * crtNbOfBytes) / totalNbOfBytes);
-
-      if (percent > oldPercent) {
-        oldPercent = percent;
-
-        onProgress(percent);
-      }
-    }
-  }
-
-  if (!totalNbOfBytes) {
-    onProgress(100);
-  }
-
-  let data: Uint8Array;
-
-  if (buffer) {
-    data = crtNbOfBytes === totalNbOfBytes ? buffer : buffer.subarray(0, crtNbOfBytes);
-  } else {
-    let offset = 0;
-
-    data = new Uint8Array(crtNbOfBytes);
-
-    for (const chunk of chunks) {
-      data.set(chunk, offset);
-
-      offset += chunk.length;
-    }
-  }
-
-  // Try to cache the remote file.
-
-  try {
-    await cache.setRemoteFile(url, data);
-  } catch {}
-
-  return data;
-};