revert wasm loading

maxence-charriere · Oct 18, 2021 · ee17e24 · ee17e24
1 parent 40f8cca
commit ee17e24
Show file tree

Hide file tree

Showing 22 changed files with 1,700 additions and 1,756 deletions.
diff --git a/docs/actions.html b/docs/actions.html
diff --git a/docs/app-worker.js b/docs/app-worker.js
@@ -1,7 +1,7 @@
-const cacheName = "app-" + "8e0f1317d923632879808cfe869d42560fd3eecd";
+const cacheName = "app-" + "49470db4017dfd3f09c7c0157e3ce83fc1201361";
 
 self.addEventListener("install", event => {
-  console.log("installing app worker 8e0f1317d923632879808cfe869d42560fd3eecd");
+  console.log("installing app worker 49470db4017dfd3f09c7c0157e3ce83fc1201361");
 
   event.waitUntil(
     caches.open(cacheName).
@@ -44,7 +44,7 @@ self.addEventListener("activate", event => {
       );
     })
   );
-  console.log("app worker 8e0f1317d923632879808cfe869d42560fd3eecd is activated");
+  console.log("app worker 49470db4017dfd3f09c7c0157e3ce83fc1201361 is activated");
 });
 
 self.addEventListener("fetch", event => {

diff --git a/docs/app.js b/docs/app.js
@@ -28,7 +28,7 @@ if ("serviceWorker" in navigator) {
 // -----------------------------------------------------------------------------
 // Env
 // -----------------------------------------------------------------------------
-const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"","GOAPP_STATIC_RESOURCES_URL":"","GOAPP_VERSION":"8e0f1317d923632879808cfe869d42560fd3eecd"};
+const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"","GOAPP_STATIC_RESOURCES_URL":"","GOAPP_VERSION":"49470db4017dfd3f09c7c0157e3ce83fc1201361"};
 
 function goappGetenv(k) {
   return goappEnv[k];
@@ -95,60 +95,32 @@ function goappKeepBodyClean() {
 // -----------------------------------------------------------------------------
 // Init Web Assembly
 // -----------------------------------------------------------------------------
-async function initWebAssembly() {
-  if (!/bot|googlebot|crawler|spider|robot|crawling/i.test(navigator.userAgent)) {
-    const go = new Go();
+if (!/bot|googlebot|crawler|spider|robot|crawling/i.test(navigator.userAgent)) {
+  if (!WebAssembly.instantiateStreaming) {
+    WebAssembly.instantiateStreaming = async (resp, importObject) => {
+      const source = await (await resp).arrayBuffer();
+      return await WebAssembly.instantiate(source, importObject);
+    };
+  }
 
-    const loaderLabel = document.getElementById("app-wasm-loader-label");
+  const go = new Go();
 
-    let response = await fetch("/web/app.wasm");
-    const reader = response.body.getReader();
-    const contentLength = response.headers.get('Content-Length');
+  WebAssembly.instantiateStreaming(fetch("/web/app.wasm"), go.importObject)
+    .then(result => {
+      const loaderIcon = document.getElementById("app-wasm-loader-icon");
+      loaderIcon.className = "goapp-logo";
 
-    let chunks = [];
-    let len = 0;
+      go.run(result.instance);
+    })
+    .catch(err => {
+      const loaderIcon = document.getElementById("app-wasm-loader-icon");
+      loaderIcon.className = "goapp-logo";
 
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) {
-        break;
-      }
+      const loaderLabel = document.getElementById("app-wasm-loader-label");
+      loaderLabel.innerText = err;
 
-      chunks.push(value);
-      len += value.length;
-      let progress = (len * 100 / contentLength).toFixed(2)
-      if (progress > 100) {
-        progress = (100).toFixed(2);
-      }
-      loaderLabel.innerText = progress + "%";
-    }
-
-    let wasmFile = new Uint8Array(len);
-    let idx = 0;
-    for (let c of chunks) {
-      wasmFile.set(c, idx);
-      idx += c.length;
-    }
-
-    WebAssembly.instantiate(wasmFile.buffer, go.importObject)
-      .then(result => {
-        const loaderIcon = document.getElementById("app-wasm-loader-icon");
-        loaderIcon.className = "goapp-logo";
-
-        go.run(result.instance);
-      })
-      .catch(err => {
-        const loaderIcon = document.getElementById("app-wasm-loader-icon");
-        loaderIcon.className = "goapp-logo";
-
-        const loaderLabel = document.getElementById("app-wasm-loader-label");
-        loaderLabel.innerText = err;
-
-        console.error("loading wasm failed: " + err);
-      });
-  } else {
-    document.getElementById('app-wasm-loader').style.display = "none";
-  }
+      console.error("loading wasm failed: " + err);
+    });
+} else {
+  document.getElementById('app-wasm-loader').style.display = "none";
 }
-
-initWebAssembly();
diff --git a/docs/architecture.html b/docs/architecture.html
diff --git a/docs/components.html b/docs/components.html
diff --git a/docs/concurrency.html b/docs/concurrency.html
diff --git a/docs/declarative-syntax.html b/docs/declarative-syntax.html
diff --git a/docs/getting-started.html b/docs/getting-started.html
diff --git a/docs/github-deploy.html b/docs/github-deploy.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/install.html b/docs/install.html
diff --git a/docs/js.html b/docs/js.html
diff --git a/docs/lifecycle.html b/docs/lifecycle.html
diff --git a/docs/migrate.html b/docs/migrate.html
diff --git a/docs/privacy-policy.html b/docs/privacy-policy.html
diff --git a/docs/routing.html b/docs/routing.html
diff --git a/docs/seo.html b/docs/seo.html
diff --git a/docs/states.html b/docs/states.html
diff --git a/docs/static-resources.html b/docs/static-resources.html
diff --git a/docs/testing.html b/docs/testing.html
diff --git a/pkg/app/gen/app.js b/pkg/app/gen/app.js
@@ -95,60 +95,32 @@ function goappKeepBodyClean() {
 // -----------------------------------------------------------------------------
 // Init Web Assembly
 // -----------------------------------------------------------------------------
-async function initWebAssembly() {
-  if (!/bot|googlebot|crawler|spider|robot|crawling/i.test(navigator.userAgent)) {
-    const go = new Go();
+if (!/bot|googlebot|crawler|spider|robot|crawling/i.test(navigator.userAgent)) {
+  if (!WebAssembly.instantiateStreaming) {
+    WebAssembly.instantiateStreaming = async (resp, importObject) => {
+      const source = await (await resp).arrayBuffer();
+      return await WebAssembly.instantiate(source, importObject);
+    };
+  }
 
-    const loaderLabel = document.getElementById("app-wasm-loader-label");
+  const go = new Go();
 
-    let response = await fetch("{{.Wasm}}");
-    const reader = response.body.getReader();
-    const contentLength = response.headers.get('Content-Length');
+  WebAssembly.instantiateStreaming(fetch("{{.Wasm}}"), go.importObject)
+    .then(result => {
+      const loaderIcon = document.getElementById("app-wasm-loader-icon");
+      loaderIcon.className = "goapp-logo";
 
-    let chunks = [];
-    let len = 0;
+      go.run(result.instance);
+    })
+    .catch(err => {
+      const loaderIcon = document.getElementById("app-wasm-loader-icon");
+      loaderIcon.className = "goapp-logo";
 
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) {
-        break;
-      }
+      const loaderLabel = document.getElementById("app-wasm-loader-label");
+      loaderLabel.innerText = err;
 
-      chunks.push(value);
-      len += value.length;
-      let progress = (len * 100 / contentLength).toFixed(2)
-      if (progress > 100) {
-        progress = (100).toFixed(2);
-      }
-      loaderLabel.innerText = progress + "%";
-    }
-
-    let wasmFile = new Uint8Array(len);
-    let idx = 0;
-    for (let c of chunks) {
-      wasmFile.set(c, idx);
-      idx += c.length;
-    }
-
-    WebAssembly.instantiate(wasmFile.buffer, go.importObject)
-      .then(result => {
-        const loaderIcon = document.getElementById("app-wasm-loader-icon");
-        loaderIcon.className = "goapp-logo";
-
-        go.run(result.instance);
-      })
-      .catch(err => {
-        const loaderIcon = document.getElementById("app-wasm-loader-icon");
-        loaderIcon.className = "goapp-logo";
-
-        const loaderLabel = document.getElementById("app-wasm-loader-label");
-        loaderLabel.innerText = err;
-
-        console.error("loading wasm failed: " + err);
-      });
-  } else {
-    document.getElementById('app-wasm-loader').style.display = "none";
-  }
+      console.error("loading wasm failed: " + err);
+    });
+} else {
+  document.getElementById('app-wasm-loader').style.display = "none";
 }
-
-initWebAssembly();
diff --git a/pkg/app/scripts.go b/pkg/app/scripts.go