From 93a0eacd47f89db2c414a3e3688365f41865dac6 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Wed, 21 Feb 2024 18:14:05 +0100
Subject: [PATCH 01/17] fix cache deletion logic on osx

---
 src/pygbag/app.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pygbag/app.py b/src/pygbag/app.py
index 48e5c95..0defc8b 100644
--- a/src/pygbag/app.py
+++ b/src/pygbag/app.py
@@ -161,17 +161,21 @@ def make_cache_dirs():
 
     if clear_cache:
         win32 = sys.platform == "win32"
-        if shutil.rmtree.avoids_symlink_attacks or win32:
-            if cache_dir.is_dir():
+        if cache_dir.is_dir():
+            if shutil.rmtree.avoids_symlink_attacks or win32:
                 if win32:
                     warnings.warn("clear cache : rmtree is not safe on that system (win32)")
                 shutil.rmtree(cache_dir.as_posix())
-        else:
-            print(
-                "115: cannot clear cache : rmtree is not safe on that system",
-                file=sys.stderr,
-            )
-            raise SystemExit(115)
+            else:
+                print(
+                    "171: cannot clear cache : rmtree is not safe on that system",
+                    file=sys.stderr,
+                )
+                print(
+                    "175: Please remove build folder manually",
+                    file=sys.stderr,
+                )
+                raise SystemExit(115)
 
         # rebuild
         make_cache_dirs()

From cc62dfc4251e78bd2ab2f9c733896d2da8638d30 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Sat, 24 Feb 2024 11:25:37 +0100
Subject: [PATCH 02/17] fix pypad_git

---
 src/pygbag/support/cpythonrc.py         |  3 ++-
 src/pygbag/support/cross/aio/pep0723.py |  2 +-
 static/pythons.js                       | 13 ++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/pygbag/support/cpythonrc.py b/src/pygbag/support/cpythonrc.py
index 97c7114..90f7b80 100644
--- a/src/pygbag/support/cpythonrc.py
+++ b/src/pygbag/support/cpythonrc.py
@@ -1475,6 +1475,7 @@ def log(*argv, **kw):
 
 async def import_site(__file__, run=True):
     import builtins
+
     if builtins.LOCK:
         platform.window.console.error("1473: import_site IS NOT RE ENTRANT")
         return
@@ -1643,4 +1644,4 @@ async def main():
             shell.interactive(prompt=True)
             return None
     finally:
-        LOCK = False
+        builtins.LOCK = False
diff --git a/src/pygbag/support/cross/aio/pep0723.py b/src/pygbag/support/cross/aio/pep0723.py
index 7b740a2..f4d113d 100644
--- a/src/pygbag/support/cross/aio/pep0723.py
+++ b/src/pygbag/support/cross/aio/pep0723.py
@@ -238,7 +238,7 @@ async def async_repos():
         print(
             f"""
 
-===============  REDIRECTION TO DEV HOST {repo['-CDN-']}  ================
+======  REDIRECT TO DEV HOST {repo['-CDN-']}  ========
 {abitag=}
 {apitag=}
 
diff --git a/static/pythons.js b/static/pythons.js
index dae8af1..cd9c551 100644
--- a/static/pythons.js
+++ b/static/pythons.js
@@ -1036,15 +1036,22 @@ async function feat_vtx(debug_hidden) {
         document.body.appendChild(terminal)
     }
 
+    var console_divider = 1
     const cols = get_terminal_cols()
-    const cons = get_terminal_console()
+    var cons = get_terminal_console()
+    if (cons<0) {
+        console_divider = -cons
+        cons = 0
+    }
+
     const { WasmTerminal } = await import("./vtx.js")
     const lines = get_terminal_lines() + cons  // including virtual get_terminal_console()
     const py = window.document.body.clientHeight
     var fntsize = Math.floor(py/lines) - 1
 
-    if (lines<=33)
-        fntsize = fntsize - 5
+    if (lines<=33) {
+        fntsize = ( fntsize - 5 ) / console_divider
+    }
 
     console.warn("fnt:",window.document.body.clientHeight ,"/", lines,"=", fntsize, " Cols:", cols, "Cons:", cons)
     vm.vt = new WasmTerminal(

From a373d8b96ee3c4c90b53ac33742d630427092412 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Mon, 26 Feb 2024 08:17:19 +0100
Subject: [PATCH 03/17] drop 3.11 bump sdk

---
 .github/workflows/ci.yml | 26 +++++++++++++-------------
 src/pygbag/app.py        |  5 +++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6eb3f92..c92dd03 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,12 +6,12 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        SDK_VERSION: 3.1.54.1bi
+        SDK_VERSION: 3.1.55.0bi
         SYS_PYTHON: /usr/bin/python3
         PACKAGES: emsdk hpy pygame
         BUILD_STATIC: emsdk hpy
         STATIC: false
-        BUILDS: 3.11 3.12 3.13
+        BUILDS: 3.12 3.13
         CYTHON: Cython-3.0.8-py2.py3-none-any.whl
         LD_VENDOR: -sUSE_GLFW=3
 
@@ -36,17 +36,17 @@ jobs:
             sudo apt-get update 2>&1 >/dev/null
             sudo apt-get install -y bash git curl wget lz4 pv 2>&1 >/dev/null
 
-
-    - name: build 3.11 packages
-      run: |
-            cd $GITHUB_WORKSPACE
-            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy"  bash ./scripts/build-pkg.sh
-
-    - name: build 3.11 loader
-      run: |
-            cd $GITHUB_WORKSPACE
-            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy" bash ./scripts/build-loader.sh
-
+#
+#    - name: build 3.11 packages
+#      run: |
+#            cd $GITHUB_WORKSPACE
+#            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy"  bash ./scripts/build-pkg.sh
+#
+#    - name: build 3.11 loader
+#      run: |
+#            cd $GITHUB_WORKSPACE
+#            PYBUILD=3.11 PACKAGES="emsdk hpy _ctypes pygame" BUILD_STATIC="emsdk _ctypes hpy" bash ./scripts/build-loader.sh
+#
 
     - name: build 3.12 packages
       run: |
diff --git a/src/pygbag/app.py b/src/pygbag/app.py
index 0defc8b..06e7120 100644
--- a/src/pygbag/app.py
+++ b/src/pygbag/app.py
@@ -36,6 +36,7 @@
 DEFAULT_CONSOLE = 25
 DEFAULT_LINES = 57
 DEFAULT_COLUMNS = 132
+DEFAULT_PYBUILD = "3.12"
 
 CACHE_ROOT = Path("build")
 CACHE_PATH = CACHE_ROOT / "web-cache"
@@ -214,8 +215,8 @@ async def main_run(app_folder, mainscript, cdn=DEFAULT_CDN):
 
     parser.add_argument(
         "--PYBUILD",
-        default="3.11",
-        help="Specify python version [default:%s]" % "3.11",
+        default=DEFAULT_PYBUILD,
+        help="Specify python version [default:%s]" % DEFAULT_PYBUILD,
     )
 
     parser.add_argument(

From 9f124f85e4d02a5b068bdbb2af8170d0d131d7c7 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Mon, 26 Feb 2024 08:57:53 +0100
Subject: [PATCH 04/17] update hpy build script for 3.12

---
 packages.d/hpy/hpy.sh | 85 +++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/packages.d/hpy/hpy.sh b/packages.d/hpy/hpy.sh
index e30cdb8..af37029 100755
--- a/packages.d/hpy/hpy.sh
+++ b/packages.d/hpy/hpy.sh
@@ -57,52 +57,57 @@ popd
 
 pushd external/hpy
 
-# build for host simulator
+# build and install for host simulator
 ${HPY} setup.py install
 
-# build for wasm
-${SDKROOT}/python3-wasm setup.py install
-
+# ${SDKROOT}/python3-wasm setup.py install
 
 # link static
 . ${SDKROOT}/emsdk/emsdk_env.sh
-
     $SDKROOT/emsdk/upstream/emscripten/emar rcs /opt/python-wasm-sdk/prebuilt/emsdk/libhpy${PYMAJOR}.${PYMINOR}.a \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/_debugmod.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/autogen_debug_wrappers.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/debug_ctx.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/debug_ctx_cpython.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/debug_handles.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/dhqueue.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/memprotect.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/debug/src/stacktrace.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/argparse.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/buildvalue.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_bytes.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_call.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_capsule.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_contextvar.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_err.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_eval.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_listbuilder.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_long.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_module.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_object.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_tracker.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_tuple.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_tuplebuilder.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/ctx_type.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/format.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/helpers.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/devel/src/runtime/structseq.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/_tracemod.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/autogen_trace_func_table.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/autogen_trace_wrappers.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/trace/src/trace_ctx.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/ctx.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/ctx_meth.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/ctx_misc.o \
- build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-311/hpy/universal/src/hpymodule.o
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/_debugmod.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/autogen_debug_wrappers.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/debug_ctx.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/debug_ctx_cpython.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/debug_handles.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/dhqueue.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/memprotect.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/stacktrace.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/argparse.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/buildvalue.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_bytes.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_call.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_capsule.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_contextvar.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_err.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_eval.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_listbuilder.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_long.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_module.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_object.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_tracker.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_tuple.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_tuplebuilder.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/ctx_type.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/format.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/helpers.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/devel/src/runtime/structseq.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/_tracemod.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/autogen_trace_func_table.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/autogen_trace_wrappers.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/trace/src/trace_ctx.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/ctx.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/ctx_meth.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/ctx_misc.o \
+ build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/universal/src/hpymodule.o
+
+if [ -f /pp ]
+then
+    # build wheel for wasm
+    ${SDKROOT}/python3-wasm -m build --no-isolation .
+
+    mv dist/*wasm*whl /data/git/archives/repo/pkg/
+fi
 
 popd
 

From 3e60e1c9208ace0966160c83f68f7c9cd9b7f533 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Mon, 26 Feb 2024 09:04:46 +0100
Subject: [PATCH 05/17] missing build cmd

---
 packages.d/hpy/hpy.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages.d/hpy/hpy.sh b/packages.d/hpy/hpy.sh
index af37029..3e65780 100755
--- a/packages.d/hpy/hpy.sh
+++ b/packages.d/hpy/hpy.sh
@@ -61,9 +61,11 @@ pushd external/hpy
 ${HPY} setup.py install
 
 # ${SDKROOT}/python3-wasm setup.py install
+${SDKROOT}/python3-wasm setup.py build
 
 # link static
 . ${SDKROOT}/emsdk/emsdk_env.sh
+
     $SDKROOT/emsdk/upstream/emscripten/emar rcs /opt/python-wasm-sdk/prebuilt/emsdk/libhpy${PYMAJOR}.${PYMINOR}.a \
  build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/_debugmod.o \
  build/temp.wasm32-${WASM_FLAVOUR}-emscripten-cpython-${PYMAJOR}${PYMINOR}/hpy/debug/src/autogen_debug_wrappers.o \

From c9eb5b77ff8a5369e4dc34a17c1629aedfea16a6 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Sat, 2 Mar 2024 10:31:32 +0100
Subject: [PATCH 06/17] 0.9pre

---
 src/pygbag/optimizing.py                | 14 ++++++++++----
 src/pygbag/support/cpythonrc.py         |  9 +++------
 src/pygbag/support/cross/aio/pep0723.py |  2 +-
 static/default.tmpl                     |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/pygbag/optimizing.py b/src/pygbag/optimizing.py
index ba8a7ad..a13012c 100644
--- a/src/pygbag/optimizing.py
+++ b/src/pygbag/optimizing.py
@@ -44,7 +44,10 @@ def optimize(folder, filenames, **kw):
 
     def optimize(folder, filenames, **kw):
         global BAD
-        print("optimizing", folder)
+        if "--no_opt" in sys.argv:
+            print("NOT optimizing", folder)
+        else:
+            print("optimizing", folder)
         png_quality = 50
 
         done_list = []
@@ -57,10 +60,13 @@ def optimize(folder, filenames, **kw):
         except ImportError:
             warnings.warn(f"Black not found for processing {folder=}")
 
-        if os.popen("pngquant 2>&1").read().count("pngfile"):
-            print(f"    -> with pngquant --quality {png_quality}", folder)
+        if "--no_opt" in sys.argv:
+            pass
         else:
-            png_quality = -1
+            if os.popen("pngquant 2>&1").read().count("pngfile"):
+                print(f"    -> with pngquant --quality {png_quality}", folder)
+            else:
+                png_quality = -1
 
         has_ffmpeg = os.popen("ffmpeg -version").read().count("version")
 
diff --git a/src/pygbag/support/cpythonrc.py b/src/pygbag/support/cpythonrc.py
index 90f7b80..eb701ff 100644
--- a/src/pygbag/support/cpythonrc.py
+++ b/src/pygbag/support/cpythonrc.py
@@ -960,7 +960,6 @@ def __eq__(self, other):
 platform.fopen = aio.filelike.fopen
 platform.sopen = aio.filelike.sopen
 
-
 if not aio.cross.simulator:
 
     def fix_url(maybe_url):
@@ -1130,8 +1129,6 @@ class TopLevel_async_handler(aio.toplevel.AsyncInteractiveConsole):
 
         from pathlib import Path
 
-        # repodata = "repodata.json"
-
         def eval(self, source):
             for count, line in enumerate(source.split("\n")):
                 if not count:
@@ -1143,7 +1140,7 @@ def eval(self, source):
             if count:
                 self.line = None
                 self.buffer.insert(0, "#")
-            # self.buffer.append("")
+
             DBG(f"1039: {count} lines queued for async eval")
 
         @classmethod
@@ -1208,13 +1205,13 @@ def list_imports(cls, code=None, file=None, hint=""):
             if not len(aio.pep0723.Config.pkg_repolist):
                 print(
                     """
-1170: pep0723 REPOSITORY MISSING
+1208: pep0723 REPOSITORY MISSING
 """
                 )
             else:
                 DBG(
                     f"""
-1175: list_imports {len(code)=} {file=} {hint=}")
+1214: list_imports {len(code)=} {file=} {hint=}")
 {aio.pep0723.Config.pkg_repolist[0]['-CDN-']=}
 
 """
diff --git a/src/pygbag/support/cross/aio/pep0723.py b/src/pygbag/support/cross/aio/pep0723.py
index f4d113d..d5732c2 100644
--- a/src/pygbag/support/cross/aio/pep0723.py
+++ b/src/pygbag/support/cross/aio/pep0723.py
@@ -198,7 +198,7 @@ async def async_repos():
         if apitag.find("mvp") > 0:
             idx = f"{repo}index.json"
         else:
-            idx = f"{repo}index-bi.json"
+            idx = f"{repo}index-090bi.json"
         async with fopen(idx, "r", encoding="UTF-8") as index:
             try:
                 data = index.read()
diff --git a/static/default.tmpl b/static/default.tmpl
index 2205ea5..bb67319 100644
--- a/static/default.tmpl
+++ b/static/default.tmpl
@@ -1,4 +1,4 @@
-<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-python="python{{cookiecutter.PYBUILD}}" data-os="vtx,fs,snd,gui" async defer>#<!--
+<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id=site data-LINES={{cookiecutter.LINES}} data-CONSOLE={{cookiecutter.CONSOLE}} data-python=python{{cookiecutter.PYBUILD}} data-os=vtx,fs,snd,gui async defer>#<!--
 
 print("""
 Loading {{cookiecutter.title}} from {{cookiecutter.archive}}.apk

From 96543b864887cc45abe08833d9915d5eddd4a66f Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Sat, 2 Mar 2024 11:22:04 +0100
Subject: [PATCH 07/17] 0.9pre bump sdk

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c92dd03..216ecb6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        SDK_VERSION: 3.1.55.0bi
+        SDK_VERSION: 3.1.55.1bi
         SYS_PYTHON: /usr/bin/python3
         PACKAGES: emsdk hpy pygame
         BUILD_STATIC: emsdk hpy

From 41702674eee9cc0696ada327e57f9543c25458b2 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Sun, 3 Mar 2024 15:29:29 +0100
Subject: [PATCH 08/17] fix a vendoring issues with hpy wip

---
 src/pygbag/support/pygbag_fsm.py |  2 +-
 support/__EMSCRIPTEN__.c         | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pygbag/support/pygbag_fsm.py b/src/pygbag/support/pygbag_fsm.py
index 9e81e6c..2c573d2 100644
--- a/src/pygbag/support/pygbag_fsm.py
+++ b/src/pygbag/support/pygbag_fsm.py
@@ -13,7 +13,7 @@ class Draft(object):
     ...
 
 
-@dataclass()
+@dataclass
 class FSM(Machine):
     states: tuple
     initial: str
diff --git a/support/__EMSCRIPTEN__.c b/support/__EMSCRIPTEN__.c
index 7b5887f..7847681 100644
--- a/support/__EMSCRIPTEN__.c
+++ b/support/__EMSCRIPTEN__.c
@@ -136,7 +136,7 @@ char buf[FD_BUFFER_MAX];
 #   pragma message  "  @@@@@@@@@@@ NOT YET ../build/gen_inittab.h @@@@@@@@@@@@"
 #endif
 
-
+#if PYDK_static_hpy
 // ===== HPY =======
 
 #define HPY_ABI_UNIVERSAL
@@ -172,9 +172,9 @@ PyInit__platform(void)
 {
     return (PyObject *)_HPyModuleDef_AsPyInit(&hpy_platform_def);
 }
+#endif // hpy
 
-
-#endif // PKPY
+#endif // !PKPY
 
 
 
@@ -997,7 +997,11 @@ main(int argc, char **argv)
 
     PyImport_AppendInittab("embed", PyInit_embed);
 
+// wip hpy
+#if PYDK_static_hpy
     PyImport_AppendInittab("_platform", PyInit__platform);
+#endif
+
 
 #   include "../build/gen_inittab.c"
 

From 14428a493218400e2a8dec6e13c3619bca19bdf5 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Sun, 3 Mar 2024 16:02:09 +0100
Subject: [PATCH 09/17] fix directive

---
 support/__EMSCRIPTEN__.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/__EMSCRIPTEN__.c b/support/__EMSCRIPTEN__.c
index 7847681..7224038 100644
--- a/support/__EMSCRIPTEN__.c
+++ b/support/__EMSCRIPTEN__.c
@@ -136,7 +136,7 @@ char buf[FD_BUFFER_MAX];
 #   pragma message  "  @@@@@@@@@@@ NOT YET ../build/gen_inittab.h @@@@@@@@@@@@"
 #endif
 
-#if PYDK_static_hpy
+#if defined(PYDK_static_hpy)
 // ===== HPY =======
 
 #define HPY_ABI_UNIVERSAL
@@ -998,7 +998,7 @@ main(int argc, char **argv)
     PyImport_AppendInittab("embed", PyInit_embed);
 
 // wip hpy
-#if PYDK_static_hpy
+#if defined(PYDK_static_hpy)
     PyImport_AppendInittab("_platform", PyInit__platform);
 #endif
 

From 8c6de56adaa1faa0863ca8a2200e4f62cc6782f5 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Sun, 3 Mar 2024 17:19:03 +0100
Subject: [PATCH 10/17] handle abi3 builds

---
 scripts/build-pkpy.sh |  7 +++++++
 wasm-build-all.sh     | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/scripts/build-pkpy.sh b/scripts/build-pkpy.sh
index 202352e..4ff9600 100755
--- a/scripts/build-pkpy.sh
+++ b/scripts/build-pkpy.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
+
+if [ -f vendor/vendor.sh ]
+then
+    echo "vendor build, skipping"
+    exit 0
+fi
+
 reset
 
 PW=$(realpath patchwork/pykpocket)
diff --git a/wasm-build-all.sh b/wasm-build-all.sh
index d8301dc..567bd8c 100755
--- a/wasm-build-all.sh
+++ b/wasm-build-all.sh
@@ -10,13 +10,26 @@ export STATIC=${STATIC:-true}
 
 . scripts/vendoring.sh
 
-
-
 chmod +x *sh scripts/*.sh packages.d/*/*sh
 
 for PYBUILD in $BUILDS
 do
     export PYBUILD
+
+    if [ -f vendor/vendor.sh ]
+    then
+        echo "  vendor build"
+        if ${ABI3:-false}
+        then
+        echo "  vendor build (abi3) $PYBUILD"
+            if echo $PYBUILD|grep -v -q 3.12$
+            then
+                echo "abi3 vendor build only, skipping $PYBUILD"
+                exit 0
+            fi
+        fi
+    fi
+
     if ./scripts/build-pkg.sh
     then
         echo done

From a9555b3b3e4f52e0da25b37bb81f83659a206509 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Sun, 3 Mar 2024 17:28:51 +0100
Subject: [PATCH 11/17] handle abi3 in CI

---
 scripts/build-loader.sh | 14 +++++++++++++-
 scripts/build-pkg.sh    | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh
index dc645e8..33ee582 100755
--- a/scripts/build-loader.sh
+++ b/scripts/build-loader.sh
@@ -4,7 +4,19 @@
 
 . ${CONFIG:-$SDKROOT/config}
 
-#
+if [ -f vendor/vendor.sh ]
+then
+    echo "  vendor build"
+    if ${ABI3:-false}
+    then
+    echo "  vendor build (abi3) $PYBUILD"
+        if echo $PYBUILD|grep -v -q 3.12$
+        then
+            echo "abi3 vendor build only, skipping $PYBUILD"
+            exit 0
+        fi
+    fi
+fi
 
 ln -s $(pwd)/src/pygbag $(pwd)/pygbag
 
diff --git a/scripts/build-pkg.sh b/scripts/build-pkg.sh
index 52ab361..79dfd1f 100755
--- a/scripts/build-pkg.sh
+++ b/scripts/build-pkg.sh
@@ -2,6 +2,20 @@
 
 . scripts/vendoring.sh
 
+if [ -f vendor/vendor.sh ]
+then
+    echo "  vendor build"
+    if ${ABI3:-false}
+    then
+    echo "  vendor build (abi3) $PYBUILD"
+        if echo $PYBUILD|grep -v -q 3.12$
+        then
+            echo "abi3 vendor build only, skipping $PYBUILD"
+            exit 0
+        fi
+    fi
+fi
+
 export PYMAJOR=$(echo -n $PYBUILD|cut -d. -f1)
 export PYMINOR=$(echo -n $PYBUILD|cut -d. -f2)
 

From 8e6ee17e3659188a49ad985c4b2c6ccffe0276fb Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Tue, 5 Mar 2024 13:55:24 +0100
Subject: [PATCH 12/17] fix canvas selector in pyo emu, ignore .DS_Store

---
 scripts/build-loader.sh       | 4 +++-
 src/pygbag/filtering.py       | 3 ++-
 src/pygbag/support/pyodide.py | 2 +-
 static/pythons.js             | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh
index 33ee582..7426dc2 100755
--- a/scripts/build-loader.sh
+++ b/scripts/build-loader.sh
@@ -248,7 +248,9 @@ then
 
 # TODO: test -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION
 
-    LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
+# -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2
+
+    LDFLAGS="-sUSE_GLFW=3 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
 
     LDFLAGS="$LDFLAGS -lsqlite3"
 
diff --git a/src/pygbag/filtering.py b/src/pygbag/filtering.py
index 9576f35..064f6d3 100644
--- a/src/pygbag/filtering.py
+++ b/src/pygbag/filtering.py
@@ -16,6 +16,7 @@
 /.github
 /.vscode
 /.idea
+/.DS_Store
 /dist
 /build
 /venv
@@ -26,7 +27,7 @@
     "\n"
 )
 
-SKIP_EXT = ["pyc", "pyx", "pyd", "pyi", "exe", "log", "blend", "DS_Store"]
+SKIP_EXT = ["pyc", "pyx", "pyd", "pyi", "exe", "bak", "log", "blend", "DS_Store"]
 
 
 def filter(walked):
diff --git a/src/pygbag/support/pyodide.py b/src/pygbag/support/pyodide.py
index 182b4ed..6834a5a 100644
--- a/src/pygbag/support/pyodide.py
+++ b/src/pygbag/support/pyodide.py
@@ -24,7 +24,7 @@ class m_pyodide:
 
 class m_canvas:
     def getCanvas3D(self, name='canvas',width=1024,height=1024):
-        canvas = platform.document.getElementById("canvas")
+        canvas = platform.document.getElementById(name)
         canvas.width = width
         canvas.height = height
         return canvas
diff --git a/static/pythons.js b/static/pythons.js
index cd9c551..16084cc 100644
--- a/static/pythons.js
+++ b/static/pythons.js
@@ -1576,10 +1576,12 @@ MM.unpause = function unpause(trackid) {
 }
 
 MM.set_volume = function set_volume(trackid, vol) {
+    console.log(`MM.set_volume track=${trackid} vol=${vol}`)
     MM[trackid].media.volume = 1 * vol
 }
 
-MM.set_volume = function get_volume(trackid, vol) {
+MM.get_volume = function get_volume(trackid, vol) {
+    console.log(`MM.get_volume track=${trackid} vol=${vol}`)
     return MM[trackid].media.volume
 }
 

From 471f6652ba098f8515f6aa61227f52a5731c2f5f Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Wed, 6 Mar 2024 08:45:47 +0100
Subject: [PATCH 13/17] bump sdk

---
 .github/workflows/ci.yml | 2 +-
 support/__EMSCRIPTEN__.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 216ecb6..d3c24ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        SDK_VERSION: 3.1.55.1bi
+        SDK_VERSION: 3.1.55.2bi
         SYS_PYTHON: /usr/bin/python3
         PACKAGES: emsdk hpy pygame
         BUILD_STATIC: emsdk hpy
diff --git a/support/__EMSCRIPTEN__.c b/support/__EMSCRIPTEN__.c
index 7224038..66bfaec 100644
--- a/support/__EMSCRIPTEN__.c
+++ b/support/__EMSCRIPTEN__.c
@@ -384,7 +384,7 @@ embed_set_ps2(PyObject *self, PyObject *_null) {
 static PyObject *
 embed_prompt(PyObject *self, PyObject *_null) {
     if (sys_ps==1)
-        fprintf( stderr, ">=> ");
+        fprintf( stderr, ">>> ");
     else
         fprintf( stderr, "... ");
     embed_flush(self,_null);

From 2ff50d1a9637a1f3a34d02277161754b8b652b9f Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Wed, 6 Mar 2024 09:17:57 +0100
Subject: [PATCH 14/17] fix gl level

---
 scripts/build-loader.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh
index 7426dc2..e05c03e 100755
--- a/scripts/build-loader.sh
+++ b/scripts/build-loader.sh
@@ -248,9 +248,9 @@ then
 
 # TODO: test -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION
 
-# -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2
+# -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2
 
-    LDFLAGS="-sUSE_GLFW=3 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
+    LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2  -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
 
     LDFLAGS="$LDFLAGS -lsqlite3"
 

From bcccabca0a1264e9d07af63f21fa2616fd24eb18 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Wed, 6 Mar 2024 09:26:47 +0100
Subject: [PATCH 15/17] hotfix for zengl sometimes cannot select webgl2

---
 scripts/build-loader.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build-loader.sh b/scripts/build-loader.sh
index e05c03e..a3c03ed 100755
--- a/scripts/build-loader.sh
+++ b/scripts/build-loader.sh
@@ -248,9 +248,9 @@ then
 
 # TODO: test -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION
 
-# -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2
+#
 
-    LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2  -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
+    LDFLAGS="-sUSE_GLFW=3 -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sOFFSCREENCANVAS_SUPPORT=1 -sFULL_ES2 -sFULL_ES3"
 
     LDFLAGS="$LDFLAGS -lsqlite3"
 

From c7b5298bdcf8da129328df1fff628bd03a6d3752 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Thu, 7 Mar 2024 07:37:11 +0100
Subject: [PATCH 16/17] PYGPI + bumpd sdk

---
 .github/workflows/ci.yml                |  2 +-
 src/pygbag/aio.py                       |  4 ++-
 src/pygbag/support/cpythonrc.py         | 22 +++++++++----
 src/pygbag/support/cross/aio/pep0723.py | 44 +++++++++++++------------
 src/pygbag/support/pyodide.py           | 12 +++++--
 5 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d3c24ed..e624906 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        SDK_VERSION: 3.1.55.2bi
+        SDK_VERSION: 3.1.56.0bi
         SYS_PYTHON: /usr/bin/python3
         PACKAGES: emsdk hpy pygame
         BUILD_STATIC: emsdk hpy
diff --git a/src/pygbag/aio.py b/src/pygbag/aio.py
index 6e7f2bd..2451744 100644
--- a/src/pygbag/aio.py
+++ b/src/pygbag/aio.py
@@ -34,7 +34,9 @@
     if aio.pep0723.Config.dev_mode:
         aio.pep0723.Config.PKG_INDEXES.extend(["http://localhost:8000/archives/repo/"])
     else:
-        aio.pep0723.Config.PKG_INDEXES.extend(["https://pygame-web.github.io/archives/repo/"])
+        aio.pep0723.Config.PKG_INDEXES.extend([
+            os.environ.get('PYGPY', "https://pygame-web.github.io/archives/repo/"),
+        ])
 
     import pygbag.__main__
 
diff --git a/src/pygbag/support/cpythonrc.py b/src/pygbag/support/cpythonrc.py
index eb701ff..1a272b8 100644
--- a/src/pygbag/support/cpythonrc.py
+++ b/src/pygbag/support/cpythonrc.py
@@ -17,9 +17,9 @@
 
 
 PYCONFIG_PKG_INDEXES_DEV = ["http://localhost:<port>/archives/repo/"]
-PYCONFIG_PKG_INDEXES = ["https://pygame-web.github.io/archives/repo/"]
+# normal index or PYGPY env is handled after env conversion around line 255
 
-# the sim does not preload assets and cannot access currentline
+# the sim does not ospreload assets and cannot access currentline
 # unless using https://github.com/pmp-p/aioprompt/blob/master/aioprompt/__init__.py
 # or a thread
 
@@ -252,6 +252,10 @@ def dump_code():
     os.environ["APPDATA"] = home
     del home
 
+# now in pep0723
+#PYCONFIG_PKG_INDEXES = [
+#    os.environ.get('PYGPY', "https://pygame-web.github.io/archives/repo/"),
+#]
 
 PyConfig["imports_ready"] = False
 PyConfig["pygbag"] = 0
@@ -682,8 +686,11 @@ async def preload_code(cls, code, callback=None, loaderhome=".", hint=""):
             env = Path(sconf["purelib"])
 
             if not len(Config.repos):
-                if not len(Config.PKG_INDEXES):
-                    Config.PKG_INDEXES = PyConfig.pkg_indexes
+                await aio.pep0723.async_repos()
+
+    # TODO switch to METADATA:Requires-Dist
+    #   see https://github.com/pygame-web/pygbag/issues/156
+
                 for cdn in Config.PKG_INDEXES:
                     async with platform.fopen(Path(cdn) / Config.REPO_DATA) as source:
                         Config.repos.append(json.loads(source.read()))
@@ -1066,9 +1073,10 @@ def urlretrieve(maybe_url, filename=None, reporthook=None, data=None):
                 PyConfig.pkg_indexes.append(redirect)
 
             print("807: DEV MODE ON", PyConfig.pkg_indexes)
-        else:
-            # address cdn
-            PyConfig.pkg_indexes = PYCONFIG_PKG_INDEXES
+# now in pep0723
+#        else:
+#            # address cdn
+#            PyConfig.pkg_indexes = PYCONFIG_PKG_INDEXES
 
         from platform import window, document, ffi
 
diff --git a/src/pygbag/support/cross/aio/pep0723.py b/src/pygbag/support/cross/aio/pep0723.py
index d5732c2..76e39bb 100644
--- a/src/pygbag/support/cross/aio/pep0723.py
+++ b/src/pygbag/support/cross/aio/pep0723.py
@@ -59,6 +59,7 @@ class Config:
     READ_723 = True
     BLOCK_RE_722 = r"(?i)^#\s+script\s+dependencies:\s*$"
     BLOCK_RE_723 = r"(?m)^# /// (?P<type>[a-zA-Z0-9-]+)$\s(?P<content>(^#(| .*)$\s)+)^# ///$"
+    PKG_BASE_DEFAULT = "https://pygame-web.github.io/archives/repo/"
     PKG_INDEXES = []
     REPO_INDEX = "index.json"
     REPO_DATA = "repodata.json"
@@ -174,26 +175,30 @@ def install(pkg_file, sconf=None):
         sys.print_exception(ex)
 
 
-async def async_imports_init():
-    ...
-
-
-#    see pythonrc
+#    see cpythonrc
 #            if not len(Config.repos):
 #                for cdn in (Config.PKG_INDEXES or PyConfig.pkg_indexes):
 #                    async with platform.fopen(Path(cdn) / Config.REPO_DATA) as source:
 #                        Config.repos.append(json.loads(source.read()))
 #
 #                DBG("1203: FIXME (this is pyodide maintened stuff, use PEP723 asap) referenced packages :", len(cls.repos[0]["packages"]))
-#
 
 
 async def async_repos():
     abitag = f"cp{sys.version_info.major}{sys.version_info.minor}"
-
     apitag = __import__("sysconfig").get_config_var("HOST_GNU_TYPE")
     apitag = apitag.replace("-", "_")
-    print("163: async_repos", Config.PKG_INDEXES)
+
+    # user can override "PYPI" index
+    if os.environ.get('PYGPI',""):
+        Config.PKG_INDEXES= [os.environ.get('PYGPI')]
+
+    # default to "official" cdn
+    if not len(Config.PKG_INDEXES):
+        Config.PKG_INDEXES = [ Config.PKG_BASE_DEFAULT ]
+
+    print("200: async_repos", Config.PKG_INDEXES)
+
     for repo in Config.PKG_INDEXES:
         if apitag.find("mvp") > 0:
             idx = f"{repo}index.json"
@@ -208,7 +213,7 @@ async def async_repos():
                 data = data.replace("<api>", apitag)
                 repo = json.loads(data)
             except:
-                pdb(f"110: {repo=}: malformed json index {data}")
+                pdb(f"216: {repo=}: malformed json index {data}")
                 continue
             if repo not in Config.pkg_repolist:
                 Config.pkg_repolist.append(repo)
@@ -224,7 +229,7 @@ async def async_repos():
     if not aio.cross.simulator:
         import platform
 
-        print("193:", platform.window.location.href)
+        print("232:", platform.window.location.href)
         if platform.window.location.href.startswith("http://localhost:8"):
             for idx, repo in enumerate(Config.pkg_repolist):
                 repo["-CDN-"] = "http://localhost:8000/archives/repo/"
@@ -274,7 +279,7 @@ async def pip_install(pkg, sysconf={}):
     if pkg in HISTORY:
         return
 
-    print("253: searching", pkg)
+    print("282: searching", pkg)
 
     if not sysconf:
         sysconf = sconf
@@ -286,7 +291,7 @@ async def pip_install(pkg, sysconf={}):
         pkg = Config.mapping[pkg.lower()]
         if pkg in HISTORY:
             return
-        print("279: package renamed to", pkg)
+        print("294: package renamed to", pkg)
 
     if pkg in platform.patches:
         if not pkg in PATCHLIST:
@@ -306,13 +311,13 @@ async def pip_install(pkg, sysconf={}):
                             if line.find("py3-none-any.whl") > 0:
                                 wheel_url = line.split('"', 2)[1]
                 else:
-                    print("283: ERROR: cannot find package :", pkg)
+                    print("308: ERROR: cannot find package :", pkg)
         except FileNotFoundError:
             print("285: ERROR: cannot find package :", pkg)
             return
 
         except:
-            print("289: ERROR: cannot find package :", pkg)
+            print("320: ERROR: cannot find package :", pkg)
             return
 
     if wheel_url:
@@ -322,12 +327,10 @@ async def pip_install(pkg, sysconf={}):
             if pkg not in HISTORY:
                 HISTORY.append(pkg)
         except:
-            print("299: INVALID", pkg, "from", wheel_url)
-
+            print("324: INVALID", pkg, "from", wheel_url)
 
 PYGAME = 0
 
-
 async def parse_code(code, env):
     global PATCHLIST, PYGAME
 
@@ -378,7 +381,7 @@ async def parse_code(code, env):
 # parse_code does the patching
 # this is not called by pythonrc
 async def check_list(code=None, filename=None):
-    global PATCHLIST, async_imports_init, async_repos, env, sconf
+    global PATCHLIST, async_repos, env, sconf
     print()
     print("-" * 11, "computing required packages", "-" * 10)
 
@@ -386,12 +389,11 @@ async def check_list(code=None, filename=None):
     # so do patching here
     patchlevel = platform_wasm.todo.patch()
     if patchlevel:
-        print("264:parse_code() patches loaded :", list(patchlevel.keys()))
+        print("392: parse_code() patches loaded :", list(patchlevel.keys()))
         platform_wasm.todo.patch = lambda: None
         # and only do that once and for all.
-        await async_imports_init()
         await async_repos()
-        del async_imports_init, async_repos
+        del async_repos
 
     # mandatory
     importlib.invalidate_caches()
diff --git a/src/pygbag/support/pyodide.py b/src/pygbag/support/pyodide.py
index 6834a5a..d66fbc3 100644
--- a/src/pygbag/support/pyodide.py
+++ b/src/pygbag/support/pyodide.py
@@ -23,10 +23,16 @@ class m_pyodide:
 import pyodide
 
 class m_canvas:
-    def getCanvas3D(self, name='canvas',width=1024,height=1024):
+    def getCanvas3D(self, name='canvas',width=0,height=0):
         canvas = platform.document.getElementById(name)
-        canvas.width = width
-        canvas.height = height
+        try:
+            width = width or canvas.width
+            height = height or canvas.height
+            #print(f"canvas size was previously set to : {width=} x {height=}")
+        except:
+            pass
+        canvas.width = width or 1024
+        canvas.height = height or 1024
         return canvas
 
 class m_pyodide_js:

From c99518bb2d8a96fb47930850db36232649088f74 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Thu, 7 Mar 2024 12:47:11 +0100
Subject: [PATCH 17/17] test fix
 https://github.com/pygame-web/pygame-web.github.io/issues/14

---
 static/default.tmpl | 3 ++-
 static/mobile.tmpl  | 3 ++-
 static/noctx.tmpl   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/static/default.tmpl b/static/default.tmpl
index bb67319..0965875 100644
--- a/static/default.tmpl
+++ b/static/default.tmpl
@@ -393,7 +393,8 @@ height="1px"
             <iframe id="iframe" class="framed" name="iframe"
 width="470px" height="90%"
 allowtransparency="true"
-style="z-index: 10; style="background: #FFFFFF;"
+style="z-index: 10;"
+style="background: #FFFFFF;"
 frameborder="1"
                 allowfullscreen="true"
                 webkitallowfullscreen="true"
diff --git a/static/mobile.tmpl b/static/mobile.tmpl
index 4aa506d..38ca0a1 100644
--- a/static/mobile.tmpl
+++ b/static/mobile.tmpl
@@ -510,7 +510,8 @@ height="512px"
 width="470px" height="95%"
 loading="lazy"
 allowtransparency="true"
-style="z-index: 10; style="background: #FFFFFF;"
+style="z-index: 10;"
+style="background: #FFFFFF;"
 frameborder="1"
                 allowfullscreen="true"
                 webkitallowfullscreen="true"
diff --git a/static/noctx.tmpl b/static/noctx.tmpl
index 372185b..8888d52 100644
--- a/static/noctx.tmpl
+++ b/static/noctx.tmpl
@@ -347,7 +347,8 @@ height="1px"
             <iframe id="iframe" class="framed" name="iframe"
 width="470px" height="90%"
 allowtransparency="true"
-style="z-index: 10; style="background: #FFFFFF;"
+style="z-index: 10;"
+style="background: #FFFFFF;"
 frameborder="1"
                 allowfullscreen="true"
                 webkitallowfullscreen="true"