reorganize a bit

+ make the packaging script work

Author: sz3

web/main.js

@@ -78,19 +78,28 @@ var Main = function () {
       }
     },
 
-    check_GL_enabled: function () {
-      var testCanvas = document.createElement('canvas');
-      if (!testCanvas.getContext("webgl2") && !testCanvas.getContext("webgl")) {
-        var elem = document.getElementById('dragdrop');
-        elem.classList.add("error");
+    init_ww: function (canvas) {
+      let noww = (window.location.hash == "#noww");
+      if (noww || typeof OffscreenCanvas === 'undefined' || typeof Worker === 'undefined') {
+        return false;
       }
+      console.log("ww impl");
+      var offscreen = canvas.transferControlToOffscreen();
+      _ww = new Worker('send-worker.js');
+      _ww.onmessage = Report.handleWorkerMessage;
+      _ww.onerror = function (err) {
+        console.error('[send] Worker error: ', err);
+      };
+      _ww.postMessage({ fun: 'init_window', args: [offscreen] }, [offscreen]);
+      return true;
     },
 
     on_ww_init: function (force_local) {
       console.log('on ww init ' + force_local);
 
       if (force_local) {
         _ww = undefined;
+        // force refresh in main thread mode
         window.location.hash = "#noww";
         window.location.reload();
         return;
@@ -100,21 +109,13 @@ var Main = function () {
       _ww.postMessage({ fun: 'nextFrame', args: [] });
     },
 
-    init_ww: function (canvas) {
-      let noww = (window.location.hash == "#noww");
-      if (noww || typeof OffscreenCanvas === 'undefined' || typeof Worker === 'undefined') {
-        return false;
+
+    check_GL_enabled: function () {
+      var testCanvas = document.createElement('canvas');
+      if (!testCanvas.getContext("webgl2") && !testCanvas.getContext("webgl")) {
+        var elem = document.getElementById('dragdrop');
+        elem.classList.add("error");
       }
-      console.log("ww impl");
-      // TODO: clone canvas maybe?
-      var offscreen = canvas.transferControlToOffscreen();
-      _ww = new Worker('send-worker.js');
-      _ww.onmessage = Report.handleWorkerMessage;
-      _ww.onerror = function (err) {
-        console.error('[send] Worker error: ', err);
-      };
-      _ww.postMessage({ fun: 'init_window', args: [offscreen] }, [offscreen]);
-      return true;
     },
 
     resize: function () {

web/wasmgz.sh

@@ -2,7 +2,7 @@
 # run from within web dir
 # does various renames for cache busting
 
-RENAME_FILES=$(ls cimbar_js.js cimbar_js.wasm main.js recv.js recv-worker.js zstd.js pwa*.json)
+RENAME_FILES=$(ls cimbar_js.js cimbar_js.wasm main.js send.js send-worker.js recv.js recv-worker.js zstd.js pwa*.json)
 GSUB_FILES="index.html recv.html sw.js recv-sw.js $(echo $RENAME_FILES | sed 's/cimbar_js\.wasm//g')"
 
 VERSION=${VERSION:-$(date --utc '+%Y-%m-%dT%H%M')}