work around promising main stuff in 3.1.74

Author: pmp-p

README.md

@@ -134,7 +134,7 @@ ____
 NOTES:
  - pygbag only provides support for pygame-ce ( pygame community edition )
 
- - safari/chrome mobile will not run until version ios 15.x
+ - safari/chrome mobile will not run until version ios 15.x. Regarding iOS: This project is tested with BrowserStack when possible.
 
  - first load will be slower, because setting up local cache from cdn to avoid
 useless network transfer for getting pygame and cpython prebuilts.

src/pygbag/__init__.py

@@ -9,7 +9,7 @@
 
 from pathlib import Path
 
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 
 __version__ = VERSION
 

src/pygbag/support/cpythonrc.py

@@ -699,28 +699,15 @@ async def preload_code(cls, code, callback=None, loaderhome=".", hint=""):
             sconf = __import__("sysconfig").get_paths()
             env = Path(sconf["purelib"])
 
-            if not len(Config.repos):
-                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()))
-
-                DBG("650: FIXME (this is pyodide maintened stuff, use (auto)PEP723 asap)")
-                print("651: referenced packages :", len(Config.repos[0]["packages"]))
-
-            DBG(f"654: aio.pep0723.check_list {aio.pep0723.env=}")
+            DBG(f"702: aio.pep0723.check_list {aio.pep0723.env=}")
             deps = await aio.pep0723.check_list(code)
 
-            DBG(f"656: aio.pep0723.pip_install {deps=}")
+            DBG(f"705: aio.pep0723.pip_install {deps=}")
 
             # auto import plumbing to avoid rely too much on import error
             maybe_wanted = list(TopLevel_async_handler.list_imports(code, file=None, hint=hint))
 
-            DBG(f"723: {maybe_wanted=} known failed {aio.pep0723.hint_failed=} {aio.pep0723.HISTORY=}")
+            DBG(f"710: {maybe_wanted=} known failed {aio.pep0723.hint_failed=} {aio.pep0723.HISTORY=}")
 
             # FIXME use an hybrid wheel
             if "pyodide" in aio.pep0723.hint_failed:
@@ -1534,19 +1521,17 @@ async def import_site(__file__, run=True):
         # or the user script (script mode).
 
         if Path(__file__).is_file():
-            DBG(f"1755: shell.source({__file__=})")
             await shell.source(__file__)
 
             # allow to set user site customization network, or embedded js to be processed
             await asyncio.sleep(0)
 
             if PyConfig.user_site_directory:
-                DBG(f"1768: {__file__=} done, giving hand to user_site")
                 return __file__
             else:
-                DBG(f"1764: {__file__=} done : now trying user sources")
+                DBG(f"1545: {__file__=} done : now trying user sources")
         else:
-            DBG(f"1767: {__file__=} NOT FOUND : now trying user sources")
+            DBG(f"1547: {__file__=} NOT FOUND : now trying user sources")
 
         # NOW CHECK OTHER SOURCES
 
@@ -1607,8 +1592,6 @@ async def main():
             else:
                 source = sys.argv[0]
 
-        DBG(f"1830: {local=} {source=} {is_py=} {hint=}")
-
         if local is None:
 
             ext = str(source).rsplit(".")[-1].lower()
@@ -1646,9 +1629,7 @@ async def main():
                 await shell.exec(shell.wget(f"-O{local}", source))
             else:
                 # maybe base64 or frozen code in html.
-                ...
-
-        DBG(f"1867: {local=} {source=} {is_py=} {hint=}")
+                pass
 
         if local and local.is_file():
             pdir = str(local.parent)

src/pygbag/support/cross/aio/pep0723.py

@@ -61,7 +61,6 @@ class Config:
     PKG_BASE_DEFAULT = "https://pygame-web.github.io/archives/repo/"
     PKG_INDEXES = []
     REPO_INDEX = "index.json"
-    REPO_DATA = "repodata.json"
     repos = []
     pkg_repolist = []
     dev_mode = ".-X.dev." in ".".join([""] + sys.orig_argv + [""])
@@ -71,9 +70,8 @@ class Config:
     Requires_Failures = []
 
     mapping = {
-        "pygame": "pygame.base",
-        "pygame_ce": "pygame.base",
-        "pygame_static": "pygame.base",
+        "pygame": "pygame_ce",
+        "pygame.base": "pygame_ce",
         "python_i18n": "i18n",
         "pillow": "PIL",
         "pyglm": "glm",
@@ -89,7 +87,8 @@ def read_dependency_block_723(code):
     content = []
     for line in code.split("\n"):
         if not has_block:
-            if line.strip() in ["# /// pyproject", "# /// script"]:
+            # compat with draft PEP for pyproject
+            if line.rstrip() in ["# /// pyproject", "# /// script"]:
                 has_block = True
             continue
 
@@ -103,6 +102,7 @@ def read_dependency_block_723(code):
     struct = tomllib.loads("\n".join(content))
 
     print(json.dumps(struct, sort_keys=True, indent=4))
+    # compat with draft PEP
     if struct.get("project", None):
         struct = struct.get("project", {"dependencies": []})
     deps = struct.get("dependencies", [])
@@ -147,15 +147,6 @@ def install(pkg_file, sconf=None):
         sys.print_exception(ex)
 
 
-#    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")
@@ -171,28 +162,31 @@ async def async_repos():
 
     print("200: async_repos", Config.PKG_INDEXES)
 
+
     for repo in Config.PKG_INDEXES:
-        idx = f"{repo}index-0.9.2-{abitag}.json"
-        try:
-            async with fopen(idx, "r", encoding="UTF-8") as index:
-                try:
-                    data = index.read()
-                    if isinstance(data, bytes):
-                        data = data.decode()
-                    data = data.replace("<abi>", abitag)
-                    data = data.replace("<api>", apitag)
-                    repo = json.loads(data)
-                except:
-                    pdb(f"213: {idx=}: malformed json index {data}")
-                    continue
-                if repo not in Config.pkg_repolist:
-                    Config.pkg_repolist.append(repo)
-        except FileNotFoundError:
-            print("\n" * 4)
-            print("!" * 75)
-            print("Sorry, there is no pygbag package repository for your python version")
-            print("!" * 75, "\n" * 4)
-            #raise SystemExit
+        merged = {}
+        for pygver in ('0.9.2', '0.9.3'):
+            idx = f"{repo}index-{pygver}-{abitag}.json"
+            try:
+                async with fopen(idx, "r", encoding="UTF-8") as index:
+                    try:
+                        data = index.read()
+                        if isinstance(data, bytes):
+                            data = data.decode()
+                        data = data.replace("<abi>", abitag)
+                        data = data.replace("<api>", apitag)
+                        merged.update( json.loads(data) )
+                    except Exception as e:
+                        pdb(f"213: {idx=}: malformed json index {data}", e)
+                        continue
+            except FileNotFoundError:
+                print("\n" * 4)
+                print("!" * 75)
+                print("Sorry, there is no pygbag package repository for your python version")
+                print("!" * 75, "\n" * 4)
+                #raise SystemExit
+        if merged:
+            Config.pkg_repolist.append(merged)
 
     if not aio.cross.simulator:
         rewritecdn = ""
@@ -462,20 +456,20 @@ async def check_list(code=None, filename=None):
         import platform
         import asyncio
 
-        print(f'# 439: Scanning {sconf["platlib"]} for WebAssembly library')
+        print(f'# 455: Scanning {sconf["platlib"]} for WebAssembly libraries')
         platform.explore(sconf["platlib"], verbose=True)
         for compilation in range(1 + embed.preloading()):
 
             await asyncio.sleep(0)
             if embed.preloading() <= 0:
                 break
         else:
-            print("# 442: ERROR: remaining wasm {embed.preloading()}")
+            print("# 463: ERROR: remaining wasm {embed.preloading()}")
         await asyncio.sleep(0)
 
     do_patches()
 
-    print("-" * 40)
+    print("-" * 79)
     print()
 
     return still_missing

static/pythons.js

@@ -1,5 +1,7 @@
 "use strict";
 
+WebAssembly.promising = null
+
 /*  BF2 is still broken see  https://github.com/jvilk/BrowserFS/issues/325
 import { configure, BFSRequire, EmscriptenFS } from './browserfs.mjs';
 //import { Buffer } from 'buffer';
@@ -87,7 +89,7 @@ window.addEventListener("error", function (e) {
 })
 
 window.addEventListener('unhandledrejection', function (e) {
-  alert("Error occurred: " + e.reason.message);
+  alert("Rejection occurred: " + e.reason.message);
 })
 
 function reverse(s){
@@ -413,7 +415,7 @@ async function postrun(vm) {
     window.VM = vm
 
     var pyrc_url = vm.config.cdn + VM.script.interpreter + "rc.py"
-
+    console.log("Maybe RC", pyrc_url)
     await fetch(pyrc_url, {})
         .then( response => checkStatus(response) && response.arrayBuffer() )
         .then( buffer => run_pyrc(new Uint8Array(buffer)) )
@@ -2306,12 +2308,7 @@ async function onload() {
     if (window.custom_onload)
         window.custom_onload(debug_hidden)
 
-
     window.busy--;
-    if (!config.quiet)
-        vm.vt.xterm.write('OK\r\nPlease \x1B[1;3;31mwait\x1B[0m ...\r\n')
-
-
 
     if (window.window_resize)
         window_resize(vm.config.gui_divider)