Only load glkaudio if it's actually needed

Author: curiousdannii

src/glkaudio/build.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
 
 npx wasm-pack build --target web
-rm pkg/.gitignore
+rm pkg/.gitignore
+
+# Inject an export so that we can synchronously check if we've already initiated the module
+echo "export {wasm}" >> pkg/glkaudio.js
+echo "export let wasm: InitOutput | undefined" >> pkg/glkaudio.d.ts

src/glkaudio/pkg/glkaudio.d.ts

@@ -32,3 +32,4 @@ export function initSync(module: { module: SyncInitInput } | SyncInitInput): Ini
 * @returns {Promise<InitOutput>}
 */
 export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise<InitInput> } | InitInput | Promise<InitInput>): Promise<InitOutput>;
+export let wasm: InitOutput | undefined

src/glkaudio/pkg/glkaudio.js

@@ -159,3 +159,4 @@ async function __wbg_init(module_or_path) {
 
 export { initSync };
 export default __wbg_init;
+export {wasm}

src/glkote/web/schannels.ts

@@ -13,12 +13,11 @@ import {fetch_resource} from '../../common/file/browser.js'
 import * as protocol from '../../common/protocol.js'
 import WebGlkOte from './web.js'
 
-import GlkAudio_init, {decode as GlkAudio_decode} from 'glkaudio'
+import GlkAudio_init, {decode as GlkAudio_decode, wasm as GlkAudio_is_ready} from 'glkaudio'
 
 export class SoundChannelManager extends Map<number, SoundChannel> {
     private context: AudioContext
     private glkote: WebGlkOte
-    private loaded = false
 
     constructor(glkote: WebGlkOte) {
         super()
@@ -39,12 +38,6 @@ export class SoundChannelManager extends Map<number, SoundChannel> {
 
             // Do operations
             if (ops) {
-                // Load the glkaudio library only when we actually have something to do
-                // We still might be loading it unnecessarily, but it's not very big
-                if (!this.loaded) {
-                    await GlkAudio_init({module_or_path: fetch_resource(this.glkote.options, 'glkaudio_bg.wasm')})
-                    this.loaded = true
-                }
                 this.get(id)!.do_ops(ops)
             }
         }
@@ -120,6 +113,10 @@ export class SoundChannel {
                         this.buffer = await context.decodeAudioData(chunk.content!.slice().buffer)
                     }
                     catch {
+                        // Load the glkaudio library if it hasn't been yet
+                        if (!GlkAudio_is_ready) {
+                            await GlkAudio_init({module_or_path: fetch_resource(this.glkote.options, 'glkaudio_bg.wasm')})
+                        }
                         const decoded = GlkAudio_decode(chunk.content!)
                         this.buffer = await context.decodeAudioData(decoded.buffer)
                     }