From c6a7f2ec80b507bd5af3da809b6bb14d02a24947 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 27 Jun 2025 10:31:02 +0200 Subject: [PATCH 1/6] Update to new empack mount points --- include/pyjs/pre_js/load_pkg.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/pyjs/pre_js/load_pkg.js b/include/pyjs/pre_js/load_pkg.js index 69a83de..0368741 100644 --- a/include/pyjs/pre_js/load_pkg.js +++ b/include/pyjs/pre_js/load_pkg.js @@ -260,6 +260,7 @@ Module["bootstrap_from_empack_packed_environment"] = async function // fetch json with list of all packages let empack_env_meta = await fetchJson(packages_json_url); let all_packages = empack_env_meta.packages; + let all_mount_points = empack_env_meta.mounts; let prefix = empack_env_meta.prefix; if(verbose){ @@ -285,6 +286,7 @@ Module["bootstrap_from_empack_packed_environment"] = async function if(verbose){ console.log("fetchAndUntarAll"); } + await Promise.all(all_mount_points.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose))); let shared_libs = await Promise.all(packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose))); if(verbose){ From a1bb2962df47c0a9f38799fd07c23a51be7a894b Mon Sep 17 00:00:00 2001 From: martinRenou Date: Mon, 30 Jun 2025 09:58:37 +0200 Subject: [PATCH 2/6] Promise.ALL --- include/pyjs/pre_js/load_pkg.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/pyjs/pre_js/load_pkg.js b/include/pyjs/pre_js/load_pkg.js index 0368741..bb1f737 100644 --- a/include/pyjs/pre_js/load_pkg.js +++ b/include/pyjs/pre_js/load_pkg.js @@ -286,8 +286,10 @@ Module["bootstrap_from_empack_packed_environment"] = async function if(verbose){ console.log("fetchAndUntarAll"); } - await Promise.all(all_mount_points.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose))); - let shared_libs = await Promise.all(packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose))); + let shared_libs = await Promise.all( + ...packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)), + ...all_mount_points.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)) + ); if(verbose){ console.log("init_phase_2"); From 2fbf45b39ce5249922be364e0fdc2c0f9a6eea52 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Thu, 3 Jul 2025 10:25:17 +0200 Subject: [PATCH 3/6] fix --- include/pyjs/pre_js/load_pkg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pyjs/pre_js/load_pkg.js b/include/pyjs/pre_js/load_pkg.js index bb1f737..5a51c6c 100644 --- a/include/pyjs/pre_js/load_pkg.js +++ b/include/pyjs/pre_js/load_pkg.js @@ -287,7 +287,7 @@ Module["bootstrap_from_empack_packed_environment"] = async function console.log("fetchAndUntarAll"); } let shared_libs = await Promise.all( - ...packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)), + ...all_packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)), ...all_mount_points.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)) ); From b645dba5c5dd34a0839c3c971a68e42ed8a7b3ec Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Thu, 3 Jul 2025 10:50:46 +0200 Subject: [PATCH 4/6] undo wrong "fix" --- include/pyjs/pre_js/load_pkg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pyjs/pre_js/load_pkg.js b/include/pyjs/pre_js/load_pkg.js index 5a51c6c..bb1f737 100644 --- a/include/pyjs/pre_js/load_pkg.js +++ b/include/pyjs/pre_js/load_pkg.js @@ -287,7 +287,7 @@ Module["bootstrap_from_empack_packed_environment"] = async function console.log("fetchAndUntarAll"); } let shared_libs = await Promise.all( - ...all_packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)), + ...packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)), ...all_mount_points.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)) ); From ff1526b475f9d04070875fba4334865574623134 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 3 Jul 2025 10:53:11 +0200 Subject: [PATCH 5/6] Fix possible undefined mounts --- include/pyjs/pre_js/load_pkg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pyjs/pre_js/load_pkg.js b/include/pyjs/pre_js/load_pkg.js index bb1f737..489366d 100644 --- a/include/pyjs/pre_js/load_pkg.js +++ b/include/pyjs/pre_js/load_pkg.js @@ -260,7 +260,7 @@ Module["bootstrap_from_empack_packed_environment"] = async function // fetch json with list of all packages let empack_env_meta = await fetchJson(packages_json_url); let all_packages = empack_env_meta.packages; - let all_mount_points = empack_env_meta.mounts; + let all_mount_points = empack_env_meta.mounts || []; let prefix = empack_env_meta.prefix; if(verbose){ From dea0bcf83ff196d5e2512b3a1b064bdb33262911 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 3 Jul 2025 11:01:29 +0200 Subject: [PATCH 6/6] Stupide hobbit joufflu --- include/pyjs/pre_js/load_pkg.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/pyjs/pre_js/load_pkg.js b/include/pyjs/pre_js/load_pkg.js index 489366d..9b89651 100644 --- a/include/pyjs/pre_js/load_pkg.js +++ b/include/pyjs/pre_js/load_pkg.js @@ -286,10 +286,10 @@ Module["bootstrap_from_empack_packed_environment"] = async function if(verbose){ console.log("fetchAndUntarAll"); } - let shared_libs = await Promise.all( + let shared_libs = await Promise.all([ ...packages.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)), ...all_mount_points.map(pkg => fetchAndUntar(package_tarballs_root_url, python_is_ready_promise, pkg, verbose)) - ); + ]); if(verbose){ console.log("init_phase_2");