@rel-packages/osu-beatmap-parser 1.0.3 → 1.0.4

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { OsuKey, OsuInput } from "./types";
+import { init_wasm } from "./lib/bindings";
 export declare const get_property: (data: Uint8Array, key: OsuKey) => any;
 export declare const get_properties: (input: Uint8Array | OsuInput, keys: OsuKey[]) => any;
-export { OsuKey, OsuInput };
+export { OsuKey, OsuInput, init_wasm };

package/dist/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.get_properties = exports.get_property = void 0;
+exports.init_wasm = exports.get_properties = exports.get_property = void 0;
 const bindings_1 = require("./lib/bindings");
+Object.defineProperty(exports, "init_wasm", { enumerable: true, get: function () { return bindings_1.init_wasm; } });
 const get_property = (data, key) => {
     return bindings_1.native.get_property(data, key);
 };

package/dist/lib/bindings.d.ts

@@ -1 +1,2 @@
+export declare const init_wasm: () => Promise<void>;
 export declare let native: any;

package/dist/lib/bindings.js

@@ -1,92 +1,119 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.native = void 0;
+exports.native = exports.init_wasm = void 0;
 const IS_BROWSER = globalThis.window != undefined;
+const wasm_proxy = {
+    instance: null,
+    init_promise: null,
+    get_property: (data, key) => {
+        if (wasm_proxy.instance == null)
+            throw Error("WASM not loaded yet...");
+        const wasm_inst = wasm_proxy.instance;
+        const buffer_ptr = wasm_inst._malloc(data.length);
+        wasm_inst.HEAPU8.set(data, buffer_ptr);
+        const result = wasm_inst.get_property(buffer_ptr, data.length, key);
+        wasm_inst._free(buffer_ptr);
+        return result;
+    },
+    get_properties: (data, keys) => {
+        if (wasm_proxy.instance == null)
+            throw Error("WASM not loaded yet...");
+        const wasm_inst = wasm_proxy.instance;
+        const buffer_ptr = wasm_inst._malloc(data.length);
+        wasm_inst.HEAPU8.set(data, buffer_ptr);
+        const result = wasm_inst.get_properties(buffer_ptr, data.length, keys);
+        wasm_inst._free(buffer_ptr);
+        return result;
+    },
+};
+const init_wasm = async () => {
+    if (!IS_BROWSER)
+        return;
+    if (wasm_proxy.instance)
+        return;
+    if (wasm_proxy.init_promise)
+        return wasm_proxy.init_promise;
+    wasm_proxy.init_promise = (async () => {
+        // try dynamic import first, fallback to globalThis
+        let create_func;
+        try {
+            // @ts-ignore
+            const mod = await Promise.resolve().then(() => __importStar(require("../../build/osu-beatmap-parser.js")));
+            create_func = mod.default || mod.create_osu_parser;
+        }
+        catch (e) {
+            create_func = globalThis.create_osu_parser;
+        }
+        if (!create_func) {
+            throw Error("create_osu_parser not found");
+        }
+        wasm_proxy.instance = await create_func();
+    })();
+    return wasm_proxy.init_promise;
+};
+exports.init_wasm = init_wasm;
 const load_native_module = () => {
     if (IS_BROWSER) {
-        const wasm_proxy = {
-            instance: null,
-            get_property: (data, key) => {
-                if (wasm_proxy.instance == null) {
-                    throw Error("WASM not loaded yet");
-                }
-                const wasm_inst = wasm_proxy.instance;
-                const buffer_ptr = wasm_inst._malloc(data.length);
-                wasm_inst.HEAPU8.set(data, buffer_ptr);
-                const result_val = wasm_inst.get_property(buffer_ptr, data.length, key);
-                wasm_inst._free(buffer_ptr);
-                return result_val;
-            },
-            get_properties: (data, keys) => {
-                if (wasm_proxy.instance == null) {
-                    throw Error("WASM not loaded yet");
-                }
-                const wasm_inst = wasm_proxy.instance;
-                const buffer_ptr = wasm_inst._malloc(data.length);
-                wasm_inst.HEAPU8.set(data, buffer_ptr);
-                const results_obj = wasm_inst.get_properties(buffer_ptr, data.length, keys);
-                wasm_inst._free(buffer_ptr);
-                return results_obj;
-            },
-        };
-        const create_func = globalThis.create_osu_parser;
-        if (create_func != undefined) {
-            create_func().then((instance) => {
-                wasm_proxy.instance = instance;
-            });
-        }
         return wasm_proxy;
     }
     try {
-        const fs_mod = require("fs");
-        const path_mod = require("path");
-        const load_prebuilt = () => {
-            const OS_PLATFORM = process.platform;
-            const CPU_ARCH = process.arch;
-            const SCAN_PATHS = [
-                path_mod.join(__dirname, "..", "..", "prebuilds", `${OS_PLATFORM}-${CPU_ARCH}`, "osu-beatmap-parser.node"),
-                path_mod.join(__dirname, "prebuilds", `${OS_PLATFORM}-${CPU_ARCH}`, "osu-beatmap-parser.node"),
-            ];
-            for (const path_str of SCAN_PATHS) {
-                if (fs_mod.existsSync(path_str)) {
-                    return require(path_str);
-                }
+        const fs = require("fs");
+        const path = require("path");
+        const platform = process.platform;
+        const arch = process.arch;
+        const paths = [
+            // prebuilt binaries
+            path.join(__dirname, "..", "..", "prebuilds", `${platform}-${arch}`, "osu-beatmap-parser.node"),
+            path.join(__dirname, "..", "prebuilds", `${platform}-${arch}`, "osu-beatmap-parser.node"),
+            // local builds
+            path.join(__dirname, "..", "..", "build", "osu-beatmap-parser.node"),
+            path.join(__dirname, "..", "..", "build", "Release", "osu-beatmap-parser.node"),
+            path.join(__dirname, "..", "build", "osu-beatmap-parser.node"),
+            path.join(__dirname, "build", "osu-beatmap-parser.node"),
+        ];
+        for (const p of paths) {
+            if (fs.existsSync(p)) {
+                return require(p);
             }
-            return false;
-        };
-        const load_local = () => {
-            const SCAN_PATHS = [
-                path_mod.join(__dirname, "..", "..", "build", "osu-beatmap-parser.node"),
-                path_mod.join(__dirname, "..", "..", "build", "Release", "osu-beatmap-parser.node"),
-                path_mod.join(__dirname, "..", "build", "osu-beatmap-parser.node"),
-                path_mod.join(__dirname, "build", "osu-beatmap-parser.node"),
-            ];
-            for (const path_str of SCAN_PATHS) {
-                if (fs_mod.existsSync(path_str)) {
-                    return require(path_str);
-                }
-            }
-            return false;
-        };
-        const bin_module = load_prebuilt() || load_local();
-        if (bin_module) {
-            return bin_module;
         }
     }
     catch (e) { }
     return false;
 };
 exports.native = load_native_module();
-try {
-    if (exports.native == false && IS_BROWSER == false) {
-        throw Error("failed to find native module...");
-    }
-}
-catch (err) {
-    if (IS_BROWSER) {
-        exports.native = {};
-    }
-    else {
-        throw new Error("failed to load native module...\n" + err);
-    }
+if (exports.native == false && !IS_BROWSER) {
+    throw new Error("failed to load native module...");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rel-packages/osu-beatmap-parser",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": ".osu parser for nodejs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",