Use one request for compose wasm resource versions

Author: ilgonmic

src/config.js

@@ -65,18 +65,15 @@ export const API_URLS = {
   get VERSIONS() {
     return `${this.server}/versions`;
   },
-  SKIKO_VERSION() {
-    return `${this.composeServer}/api/resource/skiko`;
+  RESOURCE_VERSIONS() {
+    return `${this.composeServer}/api/resource/compose-wasm-versions`;
   },
   SKIKO_MJS(version) {
     return `${this.composeResources}/api/resource/skiko-${version}.mjs`;
   },
   SKIKO_WASM(version) {
     return `${this.composeResources}/api/resource/skiko-${version}.wasm`;
   },
-  STDLIB_HASH() {
-    return `${this.composeServer}/api/resource/stdlib`;
-  },
   STDLIB_MJS(hash) {
     return `${this.composeResources}/api/resource/stdlib-${hash}.mjs`;
   },

src/js-executor/index.js

@@ -183,32 +183,32 @@ export default class JsExecutor {
     }
     if (targetPlatform === TargetPlatforms.COMPOSE_WASM) {
 
-      const skikoExports = fetch(API_URLS.SKIKO_VERSION(), {
+      const skikoStdlib = fetch(API_URLS.RESOURCE_VERSIONS(),{
         method: 'GET'
-      }).then(response => response.text())
-        .then(version =>
-          fetch(API_URLS.SKIKO_MJS(version), {
+      }).then(response => response.json())
+        .then(versions => {
+          const skikoVersion = versions["skiko"];
+
+          const skikoExports = fetch(API_URLS.SKIKO_MJS(skikoVersion), {
             method: 'GET',
             headers: {
               'Content-Type': 'text/javascript',
             }
           }).then(script => script.text())
             .then(script => script.replace(
               "new URL(\"skiko.wasm\",import.meta.url).href",
-              `'${API_URLS.SKIKO_WASM(version)}'`
+              `'${API_URLS.SKIKO_WASM(skikoVersion)}'`
             ))
             .then(skikoCode =>
               executeJs(
                 this.iframe.contentWindow,
                 skikoCode,
               ))
-            .then(skikoExports => fixedSkikoExports(skikoExports)))
+            .then(skikoExports => fixedSkikoExports(skikoExports))
 
-      const stdlibExports = fetch(API_URLS.STDLIB_HASH(), {
-        method: 'GET'
-      }).then(response => response.text())
-        .then(hash =>
-          fetch(API_URLS.STDLIB_MJS(hash), {
+          const stdlibVersion = versions["stdlib"];
+
+          const stdlibExports = fetch(API_URLS.STDLIB_MJS(stdlibVersion), {
             method: 'GET',
             headers: {
               'Content-Type': 'text/javascript',
@@ -217,7 +217,7 @@ export default class JsExecutor {
             .then(script =>
               // necessary to load stdlib.wasm before its initialization to parallelize
               // language=JavaScript
-              (`const stdlibWasm = fetch('${API_URLS.STDLIB_WASM(hash)}');\n` + script).replace(
+              (`const stdlibWasm = fetch('${API_URLS.STDLIB_WASM(stdlibVersion)}');\n` + script).replace(
                 "fetch(new URL('./stdlib_master.wasm',import.meta.url).href)",
                 "stdlibWasm"
               ).replace(
@@ -230,9 +230,11 @@ export default class JsExecutor {
                 stdlibCode,
               )
             )
-        )
 
-      this.stdlibExports = Promise.all([skikoExports, stdlibExports])
+          return Promise.all([skikoExports, stdlibExports])
+        })
+
+      this.stdlibExports = skikoStdlib
         .then(async ([skikoExportsResult, stdlibExportsResult]) => {
             return [
               await stdlibExportsResult.instantiate({