maxence-charriere
diff --git a/‎.github/workflows/build.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/build.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/actions.html‎
Lines changed: 108 additions & 109 deletions b/‎docs/actions.html‎
Lines changed: 108 additions & 109 deletions
diff --git a/‎docs/app-worker.js‎
Lines changed: 4 additions & 4 deletions b/‎docs/app-worker.js‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎docs/app.js‎
Lines changed: 65 additions & 6 deletions b/‎docs/app.js‎
Lines changed: 65 additions & 6 deletions
@@ -10,7 +10,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Vet
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Run Unit Tests
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Install WASM Browser Test
 
@@ -29,7 +29,7 @@ An app created with go-app can out of the box **run in its own window**, **suppo
 
 **go-app** requirements:
 
-- [Go 1.17](https://golang.org/doc/go1.17) or newer
+- [Go 1.18](https://golang.org/doc/go1.17) or newer
 - [Go module](https://github.com/golang/go/wiki/Modules)
 
 ```sh
 
@@ -1,8 +1,8 @@
-const cacheName = "app-" + "5b5659f9412858d9a889d51820887845d1eff4de";
-const resourcesToCache = ["/app.css","/app.js","/manifest.webmanifest","https://storage.googleapis.com/murlok-github/icon-192.png","/wasm_exec.js","/","/web/css/prism.css","/web/css/docs.css","https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500\u0026display=swap","/web/documents/updates.md","/web/app.wasm","https://storage.googleapis.com/murlok-github/icon-512.png","/web/js/prism.js","/web/documents/what-is-go-app.md","/web/documents/home.md","/web/documents/home-next.md"];
+const cacheName = "app-" + "99744976a78f1c0e6202f9856d65e47589cb83ca";
+const resourcesToCache = ["/","/app.css","/app.js","/manifest.webmanifest","/wasm_exec.js","/web/app.wasm","/web/css/docs.css","/web/css/prism.css","/web/documents/home-next.md","/web/documents/home.md","/web/documents/updates.md","/web/documents/what-is-go-app.md","/web/js/prism.js","https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500\u0026display=swap","https://storage.googleapis.com/murlok-github/icon-192.png","https://storage.googleapis.com/murlok-github/icon-512.png"];
 
 self.addEventListener("install", (event) => {
-  console.log("installing app worker 5b5659f9412858d9a889d51820887845d1eff4de");
+  console.log("installing app worker 99744976a78f1c0e6202f9856d65e47589cb83ca");
 
   event.waitUntil(
     caches
@@ -28,7 +28,7 @@ self.addEventListener("activate", (event) => {
       );
     })
   );
-  console.log("app worker 5b5659f9412858d9a889d51820887845d1eff4de is activated");
+  console.log("app worker 99744976a78f1c0e6202f9856d65e47589cb83ca is activated");
 });
 
 self.addEventListener("fetch", (event) => {
 
@@ -5,7 +5,8 @@ var goappNav = function () {};
 var goappOnUpdate = function () {};
 var goappOnAppInstallChange = function () {};
 
-const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"","GOAPP_STATIC_RESOURCES_URL":"","GOAPP_VERSION":"5b5659f9412858d9a889d51820887845d1eff4de"};
+const goappEnv = {"GOAPP_INTERNAL_URLS":"null","GOAPP_ROOT_PREFIX":"","GOAPP_STATIC_RESOURCES_URL":"","GOAPP_VERSION":"99744976a78f1c0e6202f9856d65e47589cb83ca"};
+const goappWasmContentLengthHeader = "";
 
 let goappServiceWorkerRegistration;
 let deferredPrompt = null;
@@ -202,16 +203,22 @@ async function goappInitWebAssembly() {
   }
 
   try {
-    const go = new Go();
+    const loaderIcon = document.getElementById("app-wasm-loader-icon");
+    loaderIcon.className = "goapp-logo";
+
+    const loaderLabel = document.getElementById("app-wasm-loader-label");
+    const loadingLabel = loaderLabel.innerText;
+    const showProgress = (progress) => {
+      loaderLabel.innerText = loadingLabel.replace("{progress}", progress);
+    };
+    showProgress(0);
 
+    const go = new Go();
     const wasm = await instantiateStreaming(
-      fetch("/web/app.wasm"),
+      fetchWithProgress("/web/app.wasm", showProgress),
       go.importObject
     );
 
-    const loaderIcon = document.getElementById("app-wasm-loader-icon");
-    loaderIcon.className = "goapp-logo";
-
     go.run(wasm.instance);
   } catch (err) {
     const loaderIcon = document.getElementById("app-wasm-loader-icon");
@@ -229,3 +236,55 @@ function goappCanLoadWebAssembly() {
     navigator.userAgent
   );
 }
+
+async function fetchWithProgress(url, progess) {
+  const response = await fetch(url);
+
+  let contentLength;
+  try {
+    contentLength = response.headers.get(goappWasmContentLengthHeader);
+  } catch {}
+  if (!goappWasmContentLengthHeader || !contentLength) {
+    contentLength = response.headers.get("Content-Length");
+  }
+  
+  const total = parseInt(contentLength, 10);
+  let loaded = 0;
+
+  const progressHandler = function (loaded, total) {
+    progess(Math.round((loaded * 100) / total));
+  };
+
+  var res = new Response(
+    new ReadableStream(
+      {
+        async start(controller) {
+          var reader = response.body.getReader();
+          for (;;) {
+            var { done, value } = await reader.read();
+
+            if (done) {
+              progressHandler(total, total);
+              break;
+            }
+
+            loaded += value.byteLength;
+            progressHandler(loaded, total);
+            controller.enqueue(value);
+          }
+          controller.close();
+        },
+      },
+      {
+        status: response.status,
+        statusText: response.statusText,
+      }
+    )
+  );
+
+  for (var pair of response.headers.entries()) {
+    res.headers.set(pair[0], pair[1]);
+  }
+
+  return res;
+}