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

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 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, init_wasm };
+export declare const get_property: (data: Uint8Array, key: OsuKey) => string;
+export declare const get_properties: (input: Uint8Array | OsuInput, keys: OsuKey[]) => Record<string, string>;
+export { OsuKey, OsuInput };

package/dist/index.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init_wasm = exports.get_properties = exports.get_property = void 0;
+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,2 +1 @@
-export declare const init_wasm: () => Promise<void>;
-export declare let native: any;
+export declare const native: any;

package/dist/lib/bindings.js

@@ -1,119 +1,45 @@
 "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 = 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.native = void 0;
+const DEBUG = typeof process != "undefined" && process.env?.OSU_PARSER_DEBUG == "1";
+const log_debug = (...args) => {
+    if (DEBUG) {
+        console.log("[osu-beatmap-parser]", ...args);
+    }
 };
-exports.init_wasm = init_wasm;
 const load_native_module = () => {
-    if (IS_BROWSER) {
-        return wasm_proxy;
-    }
-    try {
-        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);
-            }
+    const fs = require("fs");
+    const path = require("path");
+    const platform = process.platform;
+    const arch = process.arch;
+    log_debug(`loading native module for ${platform}-${arch}`);
+    log_debug(`__dirname: ${__dirname}`);
+    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 dev 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) {
+        const resolved = path.resolve(p);
+        const exists = fs.existsSync(resolved);
+        log_debug(`checking: ${resolved} -> ${exists ? "found" : "not found"}`);
+        if (exists) {
+            log_debug(`loading native module from: ${resolved}`);
+            return require(resolved);
         }
     }
-    catch (e) { }
-    return false;
+    log_debug("no native module found in any path");
+    return null;
 };
 exports.native = load_native_module();
-if (exports.native == false && !IS_BROWSER) {
-    throw new Error("failed to load native module...");
+if (exports.native == null) {
+    const platform = process.platform;
+    const arch = process.arch;
+    throw new Error(`failed to load native module for ${platform}-${arch}. ` +
+        `Set OSU_PARSER_DEBUG=1 for more info.`);
 }

package/dist/lib/wasm-wrapper.d.ts

@@ -0,0 +1,3 @@
+export declare const init_wasm: () => Promise<void>;
+export declare const get_property: (data: Uint8Array, key: string) => string;
+export declare const get_properties: (data: Uint8Array, keys: string[]) => Record<string, string>;

package/dist/lib/wasm-wrapper.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_properties = exports.get_property = exports.init_wasm = void 0;
+console.log("[parser] wrapper loaded");
+let wasm_instance = null;
+let init_promise = null;
+const get_factory = () => {
+    return globalThis.create_osu_parser;
+};
+const init_wasm = async () => {
+    if (wasm_instance)
+        return;
+    if (init_promise)
+        return init_promise;
+    init_promise = (async () => {
+        const factory = get_factory();
+        if (typeof factory !== "function") {
+            throw new Error("create_osu_parser not found in global scope");
+        }
+        try {
+            wasm_instance = await factory();
+        }
+        catch (e) {
+            console.error(e);
+            throw e;
+        }
+    })();
+    return init_promise;
+};
+exports.init_wasm = init_wasm;
+const get_property = (data, key) => {
+    if (wasm_instance == null)
+        throw new Error("wasm not initialized");
+    const buffer_ptr = wasm_instance._malloc(data.length);
+    wasm_instance.HEAPU8.set(data, buffer_ptr);
+    try {
+        return wasm_instance.get_property(buffer_ptr, data.length, key);
+    }
+    finally {
+        wasm_instance._free(buffer_ptr);
+    }
+};
+exports.get_property = get_property;
+const get_properties = (data, keys) => {
+    if (wasm_instance == null)
+        throw new Error("wasm not initialized");
+    const buffer_ptr = wasm_instance._malloc(data.length);
+    wasm_instance.HEAPU8.set(data, buffer_ptr);
+    try {
+        return wasm_instance.get_properties(buffer_ptr, data.length, keys);
+    }
+    finally {
+        wasm_instance._free(buffer_ptr);
+    }
+};
+exports.get_properties = get_properties;
+if (typeof window != "undefined") {
+    window.beatmap_parser = {
+        init_wasm: exports.init_wasm,
+        get_property: exports.get_property,
+        get_properties: exports.get_properties,
+    };
+    console.log(window.beatmap_parser);
+    console.log("[parser] attached to window");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rel-packages/osu-beatmap-parser",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": ".osu parser for nodejs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,8 +14,8 @@
     "compile:wasm": "tsx scripts/build.ts wasm",
     "compile:tsc": "tsc",
     "build": "tsx scripts/build.ts all && npm run compile:tsc",
-    "example:wasm": "bun run compile:wasm && bun run examples/wasm/server.ts",
-    "example:node": "bun run compile:native && tsx examples/node/index.ts"
+    "example:wasm": "bun run compile:wasm && bun x http-server . -p 8080 -c-1 -o /examples/wasm/",
+    "example:node": "bun run compile:node && bun run examples/node/index.ts"
   },
   "keywords": [
     "osu",
@@ -32,10 +32,6 @@
   "files": [
     "dist/",
     "prebuilds/",
-    "build/*.node",
-    "build/*.wasm",
-    "build/*.js",
-    "lib/bindings.ts",
     "README.md"
   ],
   "devDependencies": {