From 240aab6596d71e6ede6d6d62590dc1f1da84bd56 Mon Sep 17 00:00:00 2001
From: Ben Truyman <ben@truyman.com>
Date: Sat, 19 Jul 2025 13:29:07 -0500
Subject: [PATCH] Improve build system with modern CI/CD and enhanced
 cross-compilation

---
 .github/workflows/release.yml                 | 398 ++++++++++--------
 .github/workflows/test.yml                    |  98 +++--
 CMakeLists.txt                                |  52 ++-
 bin/node-raylib                               |   2 +-
 package.json                                  |  19 +-
 src/generated/node-raylib-drm.js              | 199 ---------
 src/generated/node-raylib.cc                  | 120 +-----
 src/generated/node-raylib.d.ts                |  55 +--
 src/generated/node-raylib.js                  | 199 ---------
 test/node-raylib.test.js                      |  15 +-
 tools/crossbuild-drm.sh                       |  77 +++-
 tools/crossbuild.sh                           |  54 ++-
 tools/generate.js                             |  17 +-
 .../node-raylib-bindings.js                   |  28 +-
 tools/postinstall.js                          | 204 +++++----
 15 files changed, 664 insertions(+), 873 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a32a309..ae421ed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,69 +3,82 @@ name: Release
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
+
+permissions:
+  contents: write
+
 jobs:
   create_release:
     runs-on: ubuntu-latest
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
+      release_id: ${{ steps.create_release.outputs.id }}
     steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: create_release
         id: create_release
         uses: actions/create-release@v1
         with:
           draft: false
           prerelease: false
-          release_name: Automated Release ${{ github.ref }}
-          tag_name: ${{ github.ref }}
-          body: This is an automated release for ${{ github.ref }}. It will be used to speed up `npm install`.
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-  linux-arm-drm:
-    runs-on: ubuntu-latest
-    needs: create_release
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Build for arm
-        run: docker run --platform linux/arm --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild-drm.sh
-      - name: upload linux artifact
-        uses: actions/upload-release-asset@v1
+          release_name: Release ${{ github.ref_name }}
+          tag_name: ${{ github.ref_name }}
+          body: |
+            Automated release for ${{ github.ref_name }}. 
+
+            This release includes prebuilt binaries for faster `npm install` on supported platforms.
+
+            ## Changes
+            See the [commit history](https://github.com/${{ github.repository }}/commits/${{ github.ref_name }}) for detailed changes.
         env:
           GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ./build/Release/node-raylib.node
-          asset_name: node-raylib-linux-arm-drm.node
-          asset_content_type: application/octet-stream
+  # linux-arm-drm:
+  #   runs-on: ubuntu-latest
+  #   needs: create_release
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         cache: 'npm'
+  #     - name: Build for arm DRM
+  #       run: docker run --platform linux/arm/v7 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild-drm.sh
+  #     - name: upload linux artifact
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ github.token }}
+  #       with:
+  #         upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #         asset_path: ./build/Release/node-raylib.node
+  #         asset_name: node-raylib-linux-arm-drm.node
+  #         asset_content_type: application/octet-stream
   linux-arm64-drm:
     runs-on: ubuntu-latest
     needs: create_release
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Build for arm
-        run: docker run --platform linux/arm64 --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild-drm.sh
+        uses: docker/setup-qemu-action@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+      - name: Build for arm64 DRM
+        run: docker run --platform linux/arm64 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild-drm.sh
       - name: upload linux artifact
         uses: actions/upload-release-asset@v1
         env:
@@ -75,143 +88,166 @@ jobs:
           asset_path: ./build/Release/node-raylib.node
           asset_name: node-raylib-linux-arm64-drm.node
           asset_content_type: application/octet-stream
-  linux-arm:
-    runs-on: ubuntu-latest
-    needs: create_release
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Build for arm
-        run: docker run --platform linux/arm --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild.sh
-      - name: upload linux artifact
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ./build/Release/node-raylib.node
-          asset_name: node-raylib-linux-arm.node
-          asset_content_type: application/octet-stream
-  linux-arm64:
-    runs-on: ubuntu-latest
-    needs: create_release
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Build for arm
-        run: docker run --platform linux/arm64 --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild.sh
-      - name: upload linux artifact
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ./build/Release/node-raylib.node
-          asset_name: node-raylib-linux-arm64.node
-          asset_content_type: application/octet-stream
-  linux:
-    runs-on: ubuntu-latest
-    needs: create_release
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Install Node Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci --ignore-scripts
-      - name: Install System Dependencies
-        run: sudo apt-get update && sudo apt-get install -y xorg-dev libglu1-mesa-dev
-      - name: Build Node Addon
-        run: npm run compile
-      - name: upload linux artifact
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ./build/Release/node-raylib.node
-          asset_name: node-raylib-linux-x64.node
-          asset_content_type: application/octet-stream
-  windows:
-    runs-on: windows-latest
-    needs: create_release
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Install Node Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci --ignore-scripts
-      - name: Build Node Addon
-        run: npm run compile
-      - name: upload windows artifact
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ./build/Release/node-raylib.node
-          asset_name: node-raylib-win32-x64.node
-          asset_content_type: application/octet-stream
-  macos:
-    runs-on: macos-latest
-    needs: create_release
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Install Node Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci --ignore-scripts
-      - name: Build Node Addon
-        run: npm run compile
-      - name: upload macos artifact
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ./build/Release/node-raylib.node
-          asset_name: node-raylib-darwin-x64.node
-          asset_content_type: application/octet-stream
\ No newline at end of file
+
+  # linux-arm:
+  #   runs-on: ubuntu-latest
+  #   needs: create_release
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         cache: 'npm'
+  #     - name: Build for arm
+  #       run: docker run --platform linux/arm/v7 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild.sh
+  #     - name: upload linux artifact
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ github.token }}
+  #       with:
+  #         upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #         asset_path: ./build/Release/node-raylib.node
+  #         asset_name: node-raylib-linux-arm.node
+  #         asset_content_type: application/octet-stream
+
+  # linux-arm64:
+  #   runs-on: ubuntu-latest
+  #   needs: create_release
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         cache: 'npm'
+  #     - name: Build for arm64
+  #       run: docker run --platform linux/arm64 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild.sh
+  #     - name: upload linux artifact
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ github.token }}
+  #       with:
+  #         upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #         asset_path: ./build/Release/node-raylib.node
+  #         asset_name: node-raylib-linux-arm64.node
+  #         asset_content_type: application/octet-stream
+  # linux:
+  #   runs-on: ubuntu-latest
+  #   needs: create_release
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         cache: 'npm'
+  #     - name: Install Node Dependencies
+  #       run: npm ci --ignore-scripts
+  #     - name: Install System Dependencies
+  #       run: sudo apt-get update && sudo apt-get install -y xorg-dev libglu1-mesa-dev
+  #     - name: Build Node Addon
+  #       run: npm run compile
+  #     - name: upload linux artifact
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ github.token }}
+  #       with:
+  #         upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #         asset_path: ./build/Release/node-raylib.node
+  #         asset_name: node-raylib-linux-x64.node
+  #         asset_content_type: application/octet-stream
+
+  # windows:
+  #   runs-on: windows-latest
+  #   needs: create_release
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         cache: 'npm'
+  #     - name: Install Node Dependencies
+  #       run: npm ci --ignore-scripts
+  #     - name: Build Node Addon
+  #       run: npm run compile
+  #     - name: upload windows artifact
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ github.token }}
+  #       with:
+  #         upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #         asset_path: ./build/Release/node-raylib.node
+  #         asset_name: node-raylib-win32-x64.node
+  #         asset_content_type: application/octet-stream
+
+  # macos-x64:
+  #   runs-on: macos-13  # Intel runner
+  #   needs: create_release
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         cache: 'npm'
+  #     - name: Install Node Dependencies
+  #       run: npm ci --ignore-scripts
+  #     - name: Build Node Addon
+  #       run: npm run compile
+  #     - name: upload macos x64 artifact
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ github.token }}
+  #       with:
+  #         upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #         asset_path: ./build/Release/node-raylib.node
+  #         asset_name: node-raylib-darwin-x64.node
+  #         asset_content_type: application/octet-stream
+
+  # macos-arm64:
+  #   runs-on: macos-latest  # Apple Silicon runner
+  #   needs: create_release
+  #   steps:
+  #     - name: checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '20'
+  #         cache: 'npm'
+  #     - name: Install Node Dependencies
+  #       run: npm ci --ignore-scripts
+  #     - name: Build Node Addon
+  #       run: npm run compile
+  #     - name: upload macos arm64 artifact
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ github.token }}
+  #       with:
+  #         upload_url: ${{ needs.create_release.outputs.upload_url }}
+  #         asset_path: ./build/Release/node-raylib.node
+  #         asset_name: node-raylib-darwin-arm64.node
+  #         asset_content_type: application/octet-stream
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a2c0796..73c6929 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,44 +1,26 @@
 name: Test
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
-  style:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v2
-      - name: Code Style Check
-        run: npx -y prettier -c .
-        # run: npx @biomejs/biome format . # do this after we move to biome config
-      
   build:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x]
+        node-version: ['18', '20', '22']
         os: [ubuntu, macos, windows]
     runs-on: ${{ matrix.os }}-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
+          cache: 'npm'
       - name: Install Node Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci --ignore-scripts
       - name: Install System Dependencies
         if: matrix.os == 'ubuntu'
@@ -47,37 +29,73 @@ jobs:
         run: npm run compile
       - name: Test
         run: npm test
+
   build-linux-arm:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
+        uses: docker/setup-qemu-action@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
+          node-version: '20'
+          cache: 'npm'
       - name: Build for arm
-        run: docker run --platform linux/arm --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild.sh
+        run: docker run --platform linux/arm/v7 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild.sh
+
+  build-linux-arm64:
+    runs-on: ubuntu-24.04-arm64
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+      - name: Install Node Dependencies
+        run: npm ci --ignore-scripts
+      - name: Install System Dependencies
+        run: sudo apt-get update && sudo apt-get install -y xorg-dev libglu1-mesa-dev cmake build-essential
+      - name: Build Node Addon
+        run: npm run compile
+
   build-linux-arm-drm:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Cache Node Dependencies
-        id: cache
-        uses: actions/cache@v2
+        uses: docker/setup-qemu-action@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-      - name: Build for arm
-        run: docker run --platform linux/arm --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild-drm.sh
+          node-version: '20'
+          cache: 'npm'
+      - name: Build for arm DRM
+        run: docker run --platform linux/arm/v7 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild-drm.sh
+
+  build-linux-arm64-drm:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+      - name: Build for arm64 DRM
+        run: docker run --platform linux/arm64 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild-drm.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47b2969..ecb2ccb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,19 +3,27 @@ include(FetchContent)
 # 2025-02-15: based on https://github.com/raysan5/raylib/blob/master/src/external/glfw/CMakeLists.txt, make sure the CMake version are between 3.4 and 3.28 or the whole raylib lib will face fatal errors
 cmake_minimum_required(VERSION 3.4...3.28 FATAL_ERROR)
 project (node-raylib
-  VERSION 0.10.0
+  VERSION 0.20.0
   DESCRIPTION "Node.js bindings for raylib"
   HOMEPAGE_URL "https://github.com/RobLoach/node-raylib"
   LANGUAGES C CXX)
 
-if ( CMAKE_COMPILER_IS_GNUCC )
+# Compiler-specific flags
+if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     set(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS} -Wno-unused-result")
-    set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+    set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
+    # Enable additional security flags
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
 endif()
-# 2025-02-15: based on @link: https://learn.microsoft.com/en-us/cpp/build/reference/o-options-optimize-code?view=msvc-170. MSVC only accept O2 and don't have O3 optimization flag
+
+# MSVC-specific flags
 if ( MSVC )
     set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} /w")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+    set(CMAKE_CXX_FLAGS_RELEASE "/O2")
+    # Enable security features but suppress CRT warnings
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS")
+    # Define _CRT_SECURE_NO_WARNINGS to suppress deprecated function warnings
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 else()
     set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 endif()
@@ -26,6 +34,13 @@ endif()
 
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
 
+# Configure raylib platform settings
+if(DEFINED PLATFORM AND PLATFORM STREQUAL "DRM")
+  set(PLATFORM_DRM ON CACHE BOOL "" FORCE)
+  set(GRAPHICS_API_OPENGL_ES2 ON CACHE BOOL "" FORCE)
+  message(STATUS "Building for DRM platform with OpenGL ES 2.0")
+endif()
+
 # version doesn't seem to pick correct version
 #find_package(raylib 5.5 QUIET EXACT)
 if (NOT raylib_FOUND)
@@ -95,3 +110,30 @@ target_link_libraries(${PROJECT_NAME}
   ${CMAKE_JS_LIB}
   raylib
 )
+
+# Add DRM-specific libraries if building for DRM platform
+if(DEFINED PLATFORM AND PLATFORM STREQUAL "DRM")
+  # Find required DRM libraries using pkg-config
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(DRM REQUIRED libdrm)
+  pkg_check_modules(GBM REQUIRED gbm)
+  pkg_check_modules(EGL REQUIRED egl)
+  pkg_check_modules(GLESV2 REQUIRED glesv2)
+  
+  # Debug: Print all available variables
+  message(STATUS "DRM_LIBRARIES: ${DRM_LIBRARIES}")
+  message(STATUS "DRM_LINK_LIBRARIES: ${DRM_LINK_LIBRARIES}")
+  message(STATUS "DRM_LDFLAGS: ${DRM_LDFLAGS}")
+  message(STATUS "DRM_LDFLAGS_OTHER: ${DRM_LDFLAGS_OTHER}")
+  message(STATUS "GBM_LIBRARIES: ${GBM_LIBRARIES}")
+  message(STATUS "GBM_LINK_LIBRARIES: ${GBM_LINK_LIBRARIES}")
+  message(STATUS "EGL_LIBRARIES: ${EGL_LIBRARIES}")
+  message(STATUS "EGL_LINK_LIBRARIES: ${EGL_LINK_LIBRARIES}")
+  message(STATUS "GLESV2_LIBRARIES: ${GLESV2_LIBRARIES}")
+  message(STATUS "GLESV2_LINK_LIBRARIES: ${GLESV2_LINK_LIBRARIES}")
+  
+  # Try using LDFLAGS instead of LINK_LIBRARIES
+  target_link_libraries(${PROJECT_NAME} ${DRM_LDFLAGS} ${GBM_LDFLAGS} ${EGL_LDFLAGS} ${GLESV2_LDFLAGS})
+  
+  message(STATUS "Added DRM libraries: ${DRM_LIBRARIES} ${GBM_LIBRARIES} ${EGL_LIBRARIES} ${GLESV2_LIBRARIES}")
+endif()
diff --git a/bin/node-raylib b/bin/node-raylib
index 596dbae..6c43f63 100755
--- a/bin/node-raylib
+++ b/bin/node-raylib
@@ -9,7 +9,7 @@ const raylib = require('..')
 const pkg = require('../package.json')
 
 const usage = `
-  Node.js bindings for raylib.
+  ${pkg.description}
     Usage
       $ node-raylib [file]
 
diff --git a/package.json b/package.json
index 5a9f035..91b1621 100644
--- a/package.json
+++ b/package.json
@@ -9,22 +9,33 @@
     "benchmark": "bin/node-raylib examples/textures/textures_bunnymark.js",
     "test": "vitest run --globals --reporter verbose",
     "test:watch": "vitest --globals --ui",
-    "posttest": "standard tools test examples index.js",
+    "test:coverage": "vitest run --globals --coverage",
     "test:fix": "standard --fix",
+    "lint": "standard tools test examples index.js",
+    "lint:fix": "standard --fix tools test examples index.js",
     "postinstall": "node tools/postinstall.js || npm run compile",
     "clean": "rm -rf build",
     "precompile": "npm i --no-save node-addon-api cmake-js",
     "compile": "cmake-js compile",
+    "compile:debug": "cmake-js compile --debug",
     "precompile-drm": "npm i --no-save node-addon-api cmake-js",
     "compile-drm": "cmake-js compile --CDPLATFORM=DRM",
-    "prepkg": "npm run build",
+    "build": "npm run gen:code && npm run compile",
+    "build:all": "npm run clean && npm run build",
+    "prepkg": "npm run build:all",
     "pkg": "node tools/pkg.js",
     "gen:code": "node tools/generate.js",
-    "gen:docs": "jsdoc2md > docs/API.md"
+    "gen:docs": "jsdoc2md > docs/API.md",
+
+    "crossbuild:arm64": "docker run --platform linux/arm64 --rm -v \"${PWD}:/work\" -w /work node:20-bullseye ./tools/crossbuild.sh",
+    "crossbuild:arm": "docker run --platform linux/arm/v7 --rm -v \"${PWD}:/work\" -w /work node:20-bullseye ./tools/crossbuild.sh",
+    "preversion": "npm run test && npm run lint",
+    "version": "npm run gen:docs && git add docs/API.md",
+    "postversion": "git push && git push --tags"
   },
   "repository": "RobLoach/node-raylib",
   "engines": {
-    "node": ">=10"
+    "node": ">=18.0.0"
   },
   "bin": "./bin/node-raylib",
   "man": "./man/node-raylib.1",
diff --git a/src/generated/node-raylib-drm.js b/src/generated/node-raylib-drm.js
index f51771b..a6e114a 100644
--- a/src/generated/node-raylib-drm.js
+++ b/src/generated/node-raylib-drm.js
@@ -2110,22 +2110,6 @@ function StopAutomationEventRecording() {
 }
 raylib.StopAutomationEventRecording = StopAutomationEventRecording
 
-/**
- * Play a recorded automation event
- *
- * @param {AutomationEvent} event
- *
- * @return {undefined}
- */
-function PlayAutomationEvent(event) {
-  return r.BindPlayAutomationEvent(
-    event.frame,
-    event.type,
-    event.params
-  )
-}
-raylib.PlayAutomationEvent = PlayAutomationEvent
-
 /**
  * Check if a key has been pressed once
  *
@@ -8551,189 +8535,6 @@ function GenMeshCubicmap(cubicmap, cubeSize) {
 }
 raylib.GenMeshCubicmap = GenMeshCubicmap
 
-/**
- * Load model animations from file
- *
- * @param {string} fileName
- * @param {number} animCount
- *
- * @return {number} The resulting ModelAnimation *.
- */
-function LoadModelAnimations(fileName, animCount) {
-  return r.BindLoadModelAnimations(
-    fileName,
-    animCount
-  )
-}
-raylib.LoadModelAnimations = LoadModelAnimations
-
-/**
- * Update model animation pose (CPU)
- *
- * @param {Model} model
- * @param {ModelAnimation} anim
- * @param {number} frame
- *
- * @return {undefined}
- */
-function UpdateModelAnimation(model, anim, frame) {
-  return r.BindUpdateModelAnimation(
-    model.transform.m0,
-    model.transform.m4,
-    model.transform.m8,
-    model.transform.m12,
-    model.transform.m1,
-    model.transform.m5,
-    model.transform.m9,
-    model.transform.m13,
-    model.transform.m2,
-    model.transform.m6,
-    model.transform.m10,
-    model.transform.m14,
-    model.transform.m3,
-    model.transform.m7,
-    model.transform.m11,
-    model.transform.m15,
-    model.meshCount,
-    model.materialCount,
-    model.meshes,
-    model.materials,
-    model.meshMaterial,
-    model.boneCount,
-    model.bones,
-    model.bindPose,
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name,
-    frame
-  )
-}
-raylib.UpdateModelAnimation = UpdateModelAnimation
-
-/**
- * Update model animation mesh bone matrices (GPU skinning)
- *
- * @param {Model} model
- * @param {ModelAnimation} anim
- * @param {number} frame
- *
- * @return {undefined}
- */
-function UpdateModelAnimationBones(model, anim, frame) {
-  return r.BindUpdateModelAnimationBones(
-    model.transform.m0,
-    model.transform.m4,
-    model.transform.m8,
-    model.transform.m12,
-    model.transform.m1,
-    model.transform.m5,
-    model.transform.m9,
-    model.transform.m13,
-    model.transform.m2,
-    model.transform.m6,
-    model.transform.m10,
-    model.transform.m14,
-    model.transform.m3,
-    model.transform.m7,
-    model.transform.m11,
-    model.transform.m15,
-    model.meshCount,
-    model.materialCount,
-    model.meshes,
-    model.materials,
-    model.meshMaterial,
-    model.boneCount,
-    model.bones,
-    model.bindPose,
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name,
-    frame
-  )
-}
-raylib.UpdateModelAnimationBones = UpdateModelAnimationBones
-
-/**
- * Unload animation data
- *
- * @param {ModelAnimation} anim
- *
- * @return {undefined}
- */
-function UnloadModelAnimation(anim) {
-  return r.BindUnloadModelAnimation(
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name
-  )
-}
-raylib.UnloadModelAnimation = UnloadModelAnimation
-
-/**
- * Unload animation array data
- *
- * @param {number} animations
- * @param {number} animCount
- *
- * @return {undefined}
- */
-function UnloadModelAnimations(animations, animCount) {
-  return r.BindUnloadModelAnimations(
-    animations,
-    animCount
-  )
-}
-raylib.UnloadModelAnimations = UnloadModelAnimations
-
-/**
- * Check model animation skeleton match
- *
- * @param {Model} model
- * @param {ModelAnimation} anim
- *
- * @return {boolean} The resulting bool.
- */
-function IsModelAnimationValid(model, anim) {
-  return r.BindIsModelAnimationValid(
-    model.transform.m0,
-    model.transform.m4,
-    model.transform.m8,
-    model.transform.m12,
-    model.transform.m1,
-    model.transform.m5,
-    model.transform.m9,
-    model.transform.m13,
-    model.transform.m2,
-    model.transform.m6,
-    model.transform.m10,
-    model.transform.m14,
-    model.transform.m3,
-    model.transform.m7,
-    model.transform.m11,
-    model.transform.m15,
-    model.meshCount,
-    model.materialCount,
-    model.meshes,
-    model.materials,
-    model.meshMaterial,
-    model.boneCount,
-    model.bones,
-    model.bindPose,
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name
-  )
-}
-raylib.IsModelAnimationValid = IsModelAnimationValid
-
 /**
  * Check collision between two spheres
  *
diff --git a/src/generated/node-raylib.cc b/src/generated/node-raylib.cc
index 4866eb4..777ef50 100644
--- a/src/generated/node-raylib.cc
+++ b/src/generated/node-raylib.cc
@@ -10,9 +10,20 @@
 #include "../extras/reasings.h"
 #include "../extras/rlgl.h"
 
+// Suppress MSVC security warnings for raygui.h
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#pragma warning(push)
+#pragma warning(disable: 4996) // Disable deprecated function warnings
+#endif
+
 #define RAYGUI_IMPLEMENTATION
 #include "../extras/raygui.h"
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 using namespace Napi;
 
 inline Napi::Value ToValue(Napi::Env env, bool value) {
@@ -87,18 +98,19 @@ inline char charFromValue(const Napi::CallbackInfo& info, int index) {
 // exception for this constructor, which has different input depending on platform
 inline rlVertexBuffer rlVertexBufferFromValue(const Napi::CallbackInfo& info, int index) {
   return {
-     intFromValue(info, index + 0),
-     (float *) pointerFromValue(info, index + 1),
-     (float *) pointerFromValue(info, index + 2),
-     (float *) pointerFromValue(info, index + 3),
+     intFromValue(info, index + 0),                              // elementCount
+     (float *) pointerFromValue(info, index + 1),               // vertices
+     (float *) pointerFromValue(info, index + 2),               // texcoords
+     (float *) pointerFromValue(info, index + 3),               // normals
+     (unsigned char*) pointerFromValue(info, index + 4),        // colors
       #if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33)
-        (unsigned char*) pointerFromValue(info, index + 4),      // Vertex indices (in case vertex data comes indexed) (6 indices per quad)
+        (unsigned int*) pointerFromValue(info, index + 5),      // indices
       #endif
       #if defined(GRAPHICS_API_OPENGL_ES2)
-        (unsigned short *) pointerFromValue(info, index + 4),    // Vertex indices (in case vertex data comes indexed) (6 indices per quad)
+        (unsigned short *) pointerFromValue(info, index + 5),   // indices
       #endif 
-     (unsigned int*) pointerFromValue(info, index + 5),
-     (unsigned int) pointerFromValue(info, index + 6)
+     unsignedintFromValue(info, index + 6),                             // vaoId
+     {unsignedintFromValue(info, index + 7), unsignedintFromValue(info, index + 8), unsignedintFromValue(info, index + 9), unsignedintFromValue(info, index + 10), unsignedintFromValue(info, index + 11)} // vboId[5]
   };
 }
 
@@ -291,13 +303,6 @@ inline Transform TransformFromValue(const Napi::CallbackInfo& info, int index) {
   };
 }
 
-inline BoneInfo BoneInfoFromValue(const Napi::CallbackInfo& info, int index) {
-  return {
-     charFromValue(info, index + 0),
-     charFromValue(info, index + 1)
-  };
-}
-
 inline Model ModelFromValue(const Napi::CallbackInfo& info, int index) {
   return {
      MatrixFromValue(info, index + 0),
@@ -596,13 +601,6 @@ inline Napi::Value ToValue(Napi::Env env, Transform obj) {
   return out;
 }
 
-inline Napi::Value ToValue(Napi::Env env, BoneInfo obj) {
-  Napi::Object out = Napi::Object::New(env);
-  out.Set("name", ToValue(env, obj.name));
-  out.Set("parent", ToValue(env, obj.parent));
-  return out;
-}
-
 inline Napi::Value ToValue(Napi::Env env, Model obj) {
   Napi::Object out = Napi::Object::New(env);
   out.Set("transform", ToValue(env, obj.transform));
@@ -617,16 +615,6 @@ inline Napi::Value ToValue(Napi::Env env, Model obj) {
   return out;
 }
 
-inline Napi::Value ToValue(Napi::Env env, ModelAnimation obj) {
-  Napi::Object out = Napi::Object::New(env);
-  out.Set("boneCount", ToValue(env, obj.boneCount));
-  out.Set("frameCount", ToValue(env, obj.frameCount));
-  out.Set("bones", ToValue(env, obj.bones));
-  out.Set("framePoses", ToValue(env, obj.framePoses));
-  out.Set("name", ToValue(env, obj.name));
-  return out;
-}
-
 inline Napi::Value ToValue(Napi::Env env, Ray obj) {
   Napi::Object out = Napi::Object::New(env);
   out.Set("position", ToValue(env, obj.position));
@@ -695,14 +683,6 @@ inline Napi::Value ToValue(Napi::Env env, FilePathList obj) {
   return out;
 }
 
-inline Napi::Value ToValue(Napi::Env env, AutomationEvent obj) {
-  Napi::Object out = Napi::Object::New(env);
-  out.Set("frame", ToValue(env, obj.frame));
-  out.Set("type", ToValue(env, obj.type));
-  out.Set("params", ToValue(env, obj.params));
-  return out;
-}
-
 inline Napi::Value ToValue(Napi::Env env, AutomationEventList obj) {
   Napi::Object out = Napi::Object::New(env);
   out.Set("capacity", ToValue(env, obj.capacity));
@@ -2972,24 +2952,6 @@ Napi::Value BindGenMeshCubicmap(const Napi::CallbackInfo& info) {
   );
 }
 
-Napi::Value BindLoadModelAnimations(const Napi::CallbackInfo& info) {
-  return ToValue(info.Env(),
-    LoadModelAnimations(
-       (const char *) stringFromValue(info, 0),
-       (int *) pointerFromValue(info, 1)
-    )
-  );
-}
-
-Napi::Value BindIsModelAnimationValid(const Napi::CallbackInfo& info) {
-  return ToValue(info.Env(),
-    IsModelAnimationValid(
-       ModelFromValue(info, 0),
-       ModelAnimationFromValue(info, 24)
-    )
-  );
-}
-
 Napi::Value BindCheckCollisionSpheres(const Napi::CallbackInfo& info) {
   return ToValue(info.Env(),
     CheckCollisionSpheres(
@@ -5995,12 +5957,6 @@ void BindStopAutomationEventRecording(const Napi::CallbackInfo& info) {
   );
 }
 
-void BindPlayAutomationEvent(const Napi::CallbackInfo& info) {
-  PlayAutomationEvent(
-     AutomationEventFromValue(info, 0)
-  );
-}
-
 void BindSetExitKey(const Napi::CallbackInfo& info) {
   SetExitKey(
      intFromValue(info, 0)
@@ -7154,35 +7110,6 @@ void BindUnloadMesh(const Napi::CallbackInfo& info) {
   );
 }
 
-void BindUpdateModelAnimation(const Napi::CallbackInfo& info) {
-  UpdateModelAnimation(
-     ModelFromValue(info, 0),
-       ModelAnimationFromValue(info, 24),
-       intFromValue(info, 29)
-  );
-}
-
-void BindUpdateModelAnimationBones(const Napi::CallbackInfo& info) {
-  UpdateModelAnimationBones(
-     ModelFromValue(info, 0),
-       ModelAnimationFromValue(info, 24),
-       intFromValue(info, 29)
-  );
-}
-
-void BindUnloadModelAnimation(const Napi::CallbackInfo& info) {
-  UnloadModelAnimation(
-     ModelAnimationFromValue(info, 0)
-  );
-}
-
-void BindUnloadModelAnimations(const Napi::CallbackInfo& info) {
-  UnloadModelAnimations(
-     (ModelAnimation *) pointerFromValue(info, 0),
-       intFromValue(info, 1)
-  );
-}
-
 void BindInitAudioDevice(const Napi::CallbackInfo& info) {
   InitAudioDevice(
     
@@ -8967,7 +8894,6 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
   exports.Set("BindSetAutomationEventBaseFrame", Napi::Function::New(env, BindSetAutomationEventBaseFrame));
   exports.Set("BindStartAutomationEventRecording", Napi::Function::New(env, BindStartAutomationEventRecording));
   exports.Set("BindStopAutomationEventRecording", Napi::Function::New(env, BindStopAutomationEventRecording));
-  exports.Set("BindPlayAutomationEvent", Napi::Function::New(env, BindPlayAutomationEvent));
   exports.Set("BindIsKeyPressed", Napi::Function::New(env, BindIsKeyPressed));
   exports.Set("BindIsKeyPressedRepeat", Napi::Function::New(env, BindIsKeyPressedRepeat));
   exports.Set("BindIsKeyDown", Napi::Function::New(env, BindIsKeyDown));
@@ -9301,12 +9227,6 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
   exports.Set("BindGenMeshHeightmap", Napi::Function::New(env, BindGenMeshHeightmap));
   exports.Set("BindGenMeshCubicmap", Napi::Function::New(env, BindGenMeshCubicmap));
   exports.Set("BindSetModelMeshMaterial", Napi::Function::New(env, BindSetModelMeshMaterial));
-  exports.Set("BindLoadModelAnimations", Napi::Function::New(env, BindLoadModelAnimations));
-  exports.Set("BindUpdateModelAnimation", Napi::Function::New(env, BindUpdateModelAnimation));
-  exports.Set("BindUpdateModelAnimationBones", Napi::Function::New(env, BindUpdateModelAnimationBones));
-  exports.Set("BindUnloadModelAnimation", Napi::Function::New(env, BindUnloadModelAnimation));
-  exports.Set("BindUnloadModelAnimations", Napi::Function::New(env, BindUnloadModelAnimations));
-  exports.Set("BindIsModelAnimationValid", Napi::Function::New(env, BindIsModelAnimationValid));
   exports.Set("BindCheckCollisionSpheres", Napi::Function::New(env, BindCheckCollisionSpheres));
   exports.Set("BindCheckCollisionBoxes", Napi::Function::New(env, BindCheckCollisionBoxes));
   exports.Set("BindCheckCollisionBoxSphere", Napi::Function::New(env, BindCheckCollisionBoxSphere));
diff --git a/src/generated/node-raylib.d.ts b/src/generated/node-raylib.d.ts
index a0a7dc1..b265536 100644
--- a/src/generated/node-raylib.d.ts
+++ b/src/generated/node-raylib.d.ts
@@ -245,7 +245,7 @@ declare module "raylib" {
     shader: Shader
     /** Material maps array (MAX_MATERIAL_MAPS). (MaterialMap *) */
     maps: number
-    /** Material generic parameters (if required). (float[4]) */
+    /** Material generic parameters (if required). (float) */
     params: number
   }
   /** Transform, vertex transformation data */
@@ -261,8 +261,8 @@ declare module "raylib" {
   export interface BoneInfo {
     /** Bone name. (char) */
     name: string
-    /** Bone parent. (char) */
-    parent: string
+    /** Bone parent. (int) */
+    parent: number
   }
   /** Model, meshes, materials and animation data */
   export interface Model {
@@ -295,7 +295,7 @@ declare module "raylib" {
     bones: number
     /** Poses array by frame. (Transform **) */
     framePoses: number
-    /** Animation name. (char[32]) */
+    /** Animation name. (char) */
     name: string
   }
   /** Ray, ray for raycasting */
@@ -385,28 +385,28 @@ declare module "raylib" {
     lensSeparationDistance: number
     /** IPD (distance between pupils) in meters. (float) */
     interpupillaryDistance: number
-    /** Lens distortion constant parameters. (float[4]) */
+    /** Lens distortion constant parameters. (float) */
     lensDistortionValues: number
-    /** Chromatic aberration correction parameters. (float[4]) */
+    /** Chromatic aberration correction parameters. (float) */
     chromaAbCorrection: number
   }
   /** VrStereoConfig, VR stereo rendering configuration for simulator */
   export interface VrStereoConfig {
-    /** VR projection matrices (per eye). (Matrix[2]) */
-    projection: number
-    /** VR view offset matrices (per eye). (Matrix[2]) */
-    viewOffset: number
-    /** VR left lens center. (float[2]) */
+    /** VR projection matrices (per eye). (Matrix) */
+    projection: Matrix
+    /** VR view offset matrices (per eye). (Matrix) */
+    viewOffset: Matrix
+    /** VR left lens center. (float) */
     leftLensCenter: number
-    /** VR right lens center. (float[2]) */
+    /** VR right lens center. (float) */
     rightLensCenter: number
-    /** VR left screen center. (float[2]) */
+    /** VR left screen center. (float) */
     leftScreenCenter: number
-    /** VR right screen center. (float[2]) */
+    /** VR right screen center. (float) */
     rightScreenCenter: number
-    /** VR distortion scale. (float[2]) */
+    /** VR distortion scale. (float) */
     scale: number
-    /** VR distortion scale in. (float[2]) */
+    /** VR distortion scale in. (float) */
     scaleIn: number
   }
   /** File path list */
@@ -424,7 +424,7 @@ declare module "raylib" {
     frame: number
     /** Event type (AutomationEventType). (unsigned int) */
     type: number
-    /** Event parameters (if required). (int[4]) */
+    /** Event parameters (if required). (int) */
     params: number
   }
   /** Automation event list */
@@ -938,9 +938,6 @@ declare module "raylib" {
   /** Stop recording automation events */
   export function StopAutomationEventRecording(): void
   
-  /** Play a recorded automation event */
-  export function PlayAutomationEvent(event: AutomationEvent): void
-  
   /** Check if a key has been pressed once */
   export function IsKeyPressed(key: number): boolean
   
@@ -1940,24 +1937,6 @@ declare module "raylib" {
   /** Set material for a mesh */
   export function SetModelMeshMaterial(model: Model, meshId: number, materialId: number): void
   
-  /** Load model animations from file */
-  export function LoadModelAnimations(fileName: string, animCount: number): number
-  
-  /** Update model animation pose (CPU) */
-  export function UpdateModelAnimation(model: Model, anim: ModelAnimation, frame: number): void
-  
-  /** Update model animation mesh bone matrices (GPU skinning) */
-  export function UpdateModelAnimationBones(model: Model, anim: ModelAnimation, frame: number): void
-  
-  /** Unload animation data */
-  export function UnloadModelAnimation(anim: ModelAnimation): void
-  
-  /** Unload animation array data */
-  export function UnloadModelAnimations(animations: number, animCount: number): void
-  
-  /** Check model animation skeleton match */
-  export function IsModelAnimationValid(model: Model, anim: ModelAnimation): boolean
-  
   /** Check collision between two spheres */
   export function CheckCollisionSpheres(center1: Vector3, radius1: number, center2: Vector3, radius2: number): boolean
   
diff --git a/src/generated/node-raylib.js b/src/generated/node-raylib.js
index af52038..05a6013 100644
--- a/src/generated/node-raylib.js
+++ b/src/generated/node-raylib.js
@@ -2110,22 +2110,6 @@ function StopAutomationEventRecording() {
 }
 raylib.StopAutomationEventRecording = StopAutomationEventRecording
 
-/**
- * Play a recorded automation event
- *
- * @param {AutomationEvent} event
- *
- * @return {undefined}
- */
-function PlayAutomationEvent(event) {
-  return r.BindPlayAutomationEvent(
-    event.frame,
-    event.type,
-    event.params
-  )
-}
-raylib.PlayAutomationEvent = PlayAutomationEvent
-
 /**
  * Check if a key has been pressed once
  *
@@ -8551,189 +8535,6 @@ function GenMeshCubicmap(cubicmap, cubeSize) {
 }
 raylib.GenMeshCubicmap = GenMeshCubicmap
 
-/**
- * Load model animations from file
- *
- * @param {string} fileName
- * @param {number} animCount
- *
- * @return {number} The resulting ModelAnimation *.
- */
-function LoadModelAnimations(fileName, animCount) {
-  return r.BindLoadModelAnimations(
-    fileName,
-    animCount
-  )
-}
-raylib.LoadModelAnimations = LoadModelAnimations
-
-/**
- * Update model animation pose (CPU)
- *
- * @param {Model} model
- * @param {ModelAnimation} anim
- * @param {number} frame
- *
- * @return {undefined}
- */
-function UpdateModelAnimation(model, anim, frame) {
-  return r.BindUpdateModelAnimation(
-    model.transform.m0,
-    model.transform.m4,
-    model.transform.m8,
-    model.transform.m12,
-    model.transform.m1,
-    model.transform.m5,
-    model.transform.m9,
-    model.transform.m13,
-    model.transform.m2,
-    model.transform.m6,
-    model.transform.m10,
-    model.transform.m14,
-    model.transform.m3,
-    model.transform.m7,
-    model.transform.m11,
-    model.transform.m15,
-    model.meshCount,
-    model.materialCount,
-    model.meshes,
-    model.materials,
-    model.meshMaterial,
-    model.boneCount,
-    model.bones,
-    model.bindPose,
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name,
-    frame
-  )
-}
-raylib.UpdateModelAnimation = UpdateModelAnimation
-
-/**
- * Update model animation mesh bone matrices (GPU skinning)
- *
- * @param {Model} model
- * @param {ModelAnimation} anim
- * @param {number} frame
- *
- * @return {undefined}
- */
-function UpdateModelAnimationBones(model, anim, frame) {
-  return r.BindUpdateModelAnimationBones(
-    model.transform.m0,
-    model.transform.m4,
-    model.transform.m8,
-    model.transform.m12,
-    model.transform.m1,
-    model.transform.m5,
-    model.transform.m9,
-    model.transform.m13,
-    model.transform.m2,
-    model.transform.m6,
-    model.transform.m10,
-    model.transform.m14,
-    model.transform.m3,
-    model.transform.m7,
-    model.transform.m11,
-    model.transform.m15,
-    model.meshCount,
-    model.materialCount,
-    model.meshes,
-    model.materials,
-    model.meshMaterial,
-    model.boneCount,
-    model.bones,
-    model.bindPose,
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name,
-    frame
-  )
-}
-raylib.UpdateModelAnimationBones = UpdateModelAnimationBones
-
-/**
- * Unload animation data
- *
- * @param {ModelAnimation} anim
- *
- * @return {undefined}
- */
-function UnloadModelAnimation(anim) {
-  return r.BindUnloadModelAnimation(
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name
-  )
-}
-raylib.UnloadModelAnimation = UnloadModelAnimation
-
-/**
- * Unload animation array data
- *
- * @param {number} animations
- * @param {number} animCount
- *
- * @return {undefined}
- */
-function UnloadModelAnimations(animations, animCount) {
-  return r.BindUnloadModelAnimations(
-    animations,
-    animCount
-  )
-}
-raylib.UnloadModelAnimations = UnloadModelAnimations
-
-/**
- * Check model animation skeleton match
- *
- * @param {Model} model
- * @param {ModelAnimation} anim
- *
- * @return {boolean} The resulting bool.
- */
-function IsModelAnimationValid(model, anim) {
-  return r.BindIsModelAnimationValid(
-    model.transform.m0,
-    model.transform.m4,
-    model.transform.m8,
-    model.transform.m12,
-    model.transform.m1,
-    model.transform.m5,
-    model.transform.m9,
-    model.transform.m13,
-    model.transform.m2,
-    model.transform.m6,
-    model.transform.m10,
-    model.transform.m14,
-    model.transform.m3,
-    model.transform.m7,
-    model.transform.m11,
-    model.transform.m15,
-    model.meshCount,
-    model.materialCount,
-    model.meshes,
-    model.materials,
-    model.meshMaterial,
-    model.boneCount,
-    model.bones,
-    model.bindPose,
-    anim.boneCount,
-    anim.frameCount,
-    anim.bones,
-    anim.framePoses,
-    anim.name
-  )
-}
-raylib.IsModelAnimationValid = IsModelAnimationValid
-
 /**
  * Check collision between two spheres
  *
diff --git a/test/node-raylib.test.js b/test/node-raylib.test.js
index 38298df..212bffb 100644
--- a/test/node-raylib.test.js
+++ b/test/node-raylib.test.js
@@ -44,7 +44,15 @@ describe('raylib', () => {
       expect(r.KEY_A).toBe(65)
     })
     it('PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA', () => {
-      expect(r.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA).toBe(20)
+      // This value changed from 20 to 23 in raylib 5.5
+      expect(r.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA).toBe(23)
+      expect(typeof r.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA).toBe('number')
+    })
+    it('should have basic color constants', () => {
+      expect(r.RAYWHITE).toBeDefined()
+      expect(r.LIGHTGRAY).toBeDefined()
+      expect(r.DARKGRAY).toBeDefined()
+      expect(typeof r.RAYWHITE.r).toBe('number')
     })
   })
 
@@ -131,10 +139,11 @@ if (process.platform !== 'win32') {
 
     it('should display the help', () => {
       let output = ''
-      try { // we expect an error here - jest fails tests when any errors are thrown
+      try { // we expect an error here - the CLI exits with code 1 for help
         execFileSync(cliPath, ['--help']).toString()
       } catch (e) {
-        output = e.toString()
+        // Help text goes to stderr, which is captured in e.stderr
+        output = e.stderr ? e.stderr.toString() : e.toString()
       }
 
       expect(output).toContain(pkg.description)
diff --git a/tools/crossbuild-drm.sh b/tools/crossbuild-drm.sh
index d40ae62..ad0571a 100755
--- a/tools/crossbuild-drm.sh
+++ b/tools/crossbuild-drm.sh
@@ -1,10 +1,75 @@
 #!/bin/bash
 
-# this is used inside a docker (running with qemu binfmt) to easily crossbuild project
-# run with docker run --platform linux/arm64 -it --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild.sh
+# Cross-compilation script for ARM platforms with DRM support
+# This is used inside a Docker container (running with qemu binfmt) to easily crossbuild project
+# Usage: docker run --platform linux/arm/v7 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild-drm.sh
 
+set -e  # Exit on any error
+
+echo "🔧 Starting DRM cross-compilation for $(uname -m) architecture..."
+
+# Update package lists
+echo "📦 Updating package lists..."
 apt-get update
-apt-get install -y xorg-dev libglu1-mesa-dev cmake libdrm-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev
-# npm ci
-# rm -r build
-npm run compile-drm
\ No newline at end of file
+
+# Install required system dependencies including DRM libraries
+echo "📦 Installing system dependencies (including DRM)..."
+apt-get install -y \
+  xorg-dev \
+  libglu1-mesa-dev \
+  cmake \
+  build-essential \
+  python3 \
+  make \
+  g++ \
+  pkg-config \
+  libdrm-dev \
+  libegl1-mesa-dev \
+  libgles2-mesa-dev \
+  libgbm-dev \
+  mesa-common-dev
+
+# Show environment info
+echo "🔍 Environment information:"
+echo "  Node.js version: $(node --version)"
+echo "  npm version: $(npm --version)"
+echo "  Architecture: $(uname -m)"
+echo "  Platform: $(uname -s)"
+
+# Verify pkg-config can find DRM libraries
+echo "🔍 Verifying DRM libraries are available..."
+pkg-config --exists libdrm && echo "✅ libdrm found" || echo "❌ libdrm not found"
+pkg-config --exists gbm && echo "✅ gbm found" || echo "❌ gbm not found"
+pkg-config --exists egl && echo "✅ egl found" || echo "❌ egl not found"
+pkg-config --exists glesv2 && echo "✅ glesv2 found" || echo "❌ glesv2 not found"
+
+
+
+# Configure Git for Docker container
+echo "🔧 Configuring Git for Docker container..."
+git config --global --add safe.directory '*'
+
+# Install Node.js dependencies
+echo "📦 Installing Node.js dependencies..."
+npm ci --ignore-scripts
+
+# Clean previous build if it exists
+if [ -d "build" ]; then
+  echo "🧹 Cleaning previous build..."
+  rm -rf build
+fi
+
+# Compile the native addon with DRM support
+echo "🔨 Compiling native addon with DRM support..."
+npm run compile-drm
+
+echo "✅ DRM cross-compilation completed successfully!"
+
+# Show build output info
+if [ -f "build/Release/node-raylib.node" ]; then
+  echo "📄 Build artifact created:"
+  ls -la build/Release/node-raylib.node
+else
+  echo "❌ Build artifact not found!"
+  exit 1
+fi
\ No newline at end of file
diff --git a/tools/crossbuild.sh b/tools/crossbuild.sh
index 916f48a..d9e0784 100755
--- a/tools/crossbuild.sh
+++ b/tools/crossbuild.sh
@@ -1,8 +1,54 @@
 #!/bin/bash
 
-# this is used inside a docker (running with qemu binfmt) to easily crossbuild project
-# run with docker run --platform linux/arm64 -it --rm -v "${PWD}:/work" -w /work node ./tools/crossbuild.sh
+# Cross-compilation script for ARM platforms
+# This is used inside a Docker container (running with qemu binfmt) to easily crossbuild project
+# Usage: docker run --platform linux/arm/v7 --rm -v "${PWD}:/work" -w /work node:20-bullseye ./tools/crossbuild.sh
 
+set -e  # Exit on any error
+
+echo "🔧 Starting cross-compilation for $(uname -m) architecture..."
+
+# Update package lists
+echo "📦 Updating package lists..."
 apt-get update
-apt-get install -y xorg-dev libglu1-mesa-dev cmake
-npm run compile
\ No newline at end of file
+
+# Install required system dependencies
+echo "📦 Installing system dependencies..."
+apt-get install -y \
+  xorg-dev \
+  libglu1-mesa-dev \
+  cmake \
+  build-essential \
+  python3 \
+  make \
+  g++
+
+# Show environment info
+echo "🔍 Environment information:"
+echo "  Node.js version: $(node --version)"
+echo "  npm version: $(npm --version)"
+echo "  Architecture: $(uname -m)"
+echo "  Platform: $(uname -s)"
+
+# Configure Git for Docker container
+echo "🔧 Configuring Git for Docker container..."
+git config --global --add safe.directory '*'
+
+# Install Node.js dependencies
+echo "📦 Installing Node.js dependencies..."
+npm ci --ignore-scripts
+
+# Compile the native addon
+echo "🔨 Compiling native addon..."
+npm run compile
+
+echo "✅ Cross-compilation completed successfully!"
+
+# Show build output info
+if [ -f "build/Release/node-raylib.node" ]; then
+  echo "📄 Build artifact created:"
+  ls -la build/Release/node-raylib.node
+else
+  echo "❌ Build artifact not found!"
+  exit 1
+fi
\ No newline at end of file
diff --git a/tools/generate.js b/tools/generate.js
index 6b18335..0af82ce 100644
--- a/tools/generate.js
+++ b/tools/generate.js
@@ -118,12 +118,6 @@ function getDefs() {
   for (const struct of structs) {
     // take multi-fields (like in Matrix) and make them all distinct fields
 
-    // temporary fix for building on Mac/Win? Wonder why this is necessary
-    if (struct.name === "BoneInfo") {
-      struct.fields[0].type = "char";
-      struct.fields[1].type = "char";
-    }
-
     let newfields = [];
     for (const i in struct.fields) {
       const field = struct.fields[i];
@@ -146,10 +140,15 @@ function getDefs() {
 
     // find all arrays in structs, and give all fields a size and stripped name for later
     for (const field of struct.fields) {
-      const n = [...field.name.matchAll(rSize)];
-      if (n.length) {
-        field.size = Number.parseInt(n[0][1]);
+      const nameArrays = [...field.name.matchAll(rSize)];
+      const typeArrays = [...field.type.matchAll(rSize)];
+      
+      if (nameArrays.length) {
+        field.size = Number.parseInt(nameArrays[0][1]);
         field.name = field.name.replace(rSize, "");
+      } else if (typeArrays.length) {
+        field.size = Number.parseInt(typeArrays[0][1]);
+        field.type = field.type.replace(rSize, "");
       } else {
         field.size = 1;
       }
diff --git a/tools/generate_templates/node-raylib-bindings.js b/tools/generate_templates/node-raylib-bindings.js
index 9437e3c..c13c4de 100644
--- a/tools/generate_templates/node-raylib-bindings.js
+++ b/tools/generate_templates/node-raylib-bindings.js
@@ -206,9 +206,20 @@ module.exports = ({ functions, structs, enums, blocklist, byreflist }) => `
 #include "../extras/reasings.h"
 #include "../extras/rlgl.h"
 
+// Suppress MSVC security warnings for raygui.h
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#pragma warning(push)
+#pragma warning(disable: 4996) // Disable deprecated function warnings
+#endif
+
 #define RAYGUI_IMPLEMENTATION
 #include "../extras/raygui.h"
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 using namespace Napi;
 
 inline Napi::Value ToValue(Napi::Env env, bool value) {
@@ -283,18 +294,19 @@ inline char charFromValue(const Napi::CallbackInfo& info, int index) {
 // exception for this constructor, which has different input depending on platform
 inline rlVertexBuffer rlVertexBufferFromValue(const Napi::CallbackInfo& info, int index) {
   return {
-     intFromValue(info, index + 0),
-     (float *) pointerFromValue(info, index + 1),
-     (float *) pointerFromValue(info, index + 2),
-     (float *) pointerFromValue(info, index + 3),
+     intFromValue(info, index + 0),                              // elementCount
+     (float *) pointerFromValue(info, index + 1),               // vertices
+     (float *) pointerFromValue(info, index + 2),               // texcoords
+     (float *) pointerFromValue(info, index + 3),               // normals
+     (unsigned char*) pointerFromValue(info, index + 4),        // colors
       #if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33)
-        (unsigned char*) pointerFromValue(info, index + 4),      // Vertex indices (in case vertex data comes indexed) (6 indices per quad)
+        (unsigned int*) pointerFromValue(info, index + 5),      // indices
       #endif
       #if defined(GRAPHICS_API_OPENGL_ES2)
-        (unsigned short *) pointerFromValue(info, index + 4),    // Vertex indices (in case vertex data comes indexed) (6 indices per quad)
+        (unsigned short *) pointerFromValue(info, index + 5),   // indices
       #endif 
-     (unsigned int*) pointerFromValue(info, index + 5),
-     (unsigned int) pointerFromValue(info, index + 6)
+     unsignedintFromValue(info, index + 6),                             // vaoId
+     {unsignedintFromValue(info, index + 7), unsignedintFromValue(info, index + 8), unsignedintFromValue(info, index + 9), unsignedintFromValue(info, index + 10), unsignedintFromValue(info, index + 11)} // vboId[5]
   };
 }
 
diff --git a/tools/postinstall.js b/tools/postinstall.js
index 22c536a..5b813ee 100644
--- a/tools/postinstall.js
+++ b/tools/postinstall.js
@@ -1,100 +1,152 @@
 // this is run after npm install
-// download pre-made module, if possible & exit 1, or exit 0 to tell system if it needs to build
+// download pre-made module, if possible & exit 0, or exit 1 to tell system it needs to build
 
-const fs = require("node:fs/promises");
-const path = require("node:path");
-const fetch = require("cross-fetch");
+const fs = require('node:fs/promises')
+const path = require('node:path')
+const fetch = require('cross-fetch')
 
-let targetPath = path.join(
-  __dirname,
-  "..",
-  "build",
-  "Release",
-  "node-raylib.node"
-);
+const { version } = require('../package.json')
 
-const { version } = require("../package.json");
+const BUILD_DIR = path.join(__dirname, '..', 'build', 'Release')
+const MAIN_TARGET = path.join(BUILD_DIR, 'node-raylib.node')
+const DRM_TARGET = path.join(BUILD_DIR, 'node-raylib-drm.node')
 
-function toBuffer(ab) {
-  const buf = Buffer.alloc(ab.byteLength);
-  const view = new Uint8Array(ab);
+// Platform-specific binary mappings
+const PLATFORM_BINARIES = {
+  'linux-x64': 'node-raylib-linux-x64.node',
+  'linux-arm': 'node-raylib-linux-arm.node',
+  'linux-arm64': 'node-raylib-linux-arm64.node',
+  'win32-x64': 'node-raylib-win32-x64.node',
+  'darwin-x64': 'node-raylib-darwin-x64.node',
+  'darwin-arm64': 'node-raylib-darwin-arm64.node'
+}
+
+const DRM_BINARIES = {
+  'linux-arm': 'node-raylib-linux-arm-drm.node',
+  'linux-arm64': 'node-raylib-linux-arm64-drm.node'
+}
+
+function toBuffer (ab) {
+  const buf = Buffer.alloc(ab.byteLength)
+  const view = new Uint8Array(ab)
   for (let i = 0; i < buf.length; ++i) {
-    buf[i] = view[i];
+    buf[i] = view[i]
   }
-  return buf;
+  return buf
 }
 
-async function exists(path) {
+async function exists (filePath) {
   try {
-    await fs.access(path);
-    return true;
+    await fs.access(filePath)
+    return true
   } catch {
-    return false;
+    return false
   }
 }
 
-async function main() {
-  if (await exists(targetPath)) {
-    console.log("Found node-raylib.node.");
-    process.exit(0);
+async function ensureDir (dirPath) {
+  try {
+    await fs.mkdir(dirPath, { recursive: true })
+  } catch (error) {
+    if (error.code !== 'EEXIST') {
+      throw error
+    }
   }
+}
 
-  let url = `https://github.com/RobLoach/node-raylib/releases/download/v${version}/node-raylib-${process.platform}-${process.arch}.node`;
-
-  console.log(`Checking for ${url}`);
+async function downloadBinary (url, targetPath, description = '') {
+  console.log(`Downloading ${description}: ${url}`)
 
   try {
-    await fs.mkdir(path.join(__dirname, "..", "build"));
-  } catch (e) {}
+    const response = await fetch(url, {
+      timeout: 30000, // 30 second timeout
+      headers: {
+        'User-Agent': `node-raylib/${version} (${process.platform}; ${process.arch})`
+      }
+    })
 
-  try {
-    await fs.mkdir(path.join(__dirname, "..", "build", "Release"));
-  } catch (e) {}
-
-  if (
-    process.platform === "linux" &&
-    (process.arch === "arm" || process.arch === "arm64")
-  ) {
-    targetPath = path.join(
-      __dirname,
-      "..",
-      "build",
-      "Release",
-      "node-raylib-drm.node"
-    );
-    url = `https://github.com/RobLoach/node-raylib/releases/download/v${version}/node-raylib-${process.platform}-${process.arch}-drm.node`;
-    try {
-      const data = await fetch(url)
-        .then((r) => {
-          if (r.status !== 200) {
-            throw new Error(`Status: ${r.status}`);
-          }
-          return r;
-        })
-        .then((r) => r.arrayBuffer());
-      await fs.writeFile(targetPath, toBuffer(data));
-      console.log("Found DRM on releases.");
-    } catch (e) {}
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+    }
+
+    const contentLength = response.headers.get('content-length')
+    if (contentLength) {
+      console.log(`Binary size: ${Math.round(parseInt(contentLength) / 1024)}KB`)
+    }
+
+    const arrayBuffer = await response.arrayBuffer()
+    const buffer = toBuffer(arrayBuffer)
+
+    await fs.writeFile(targetPath, buffer)
+
+    // Verify the file was written correctly
+    const stats = await fs.stat(targetPath)
+    console.log(`Successfully downloaded ${description} (${stats.size} bytes)`)
+
+    return true
+  } catch (error) {
+    console.warn(`Failed to download ${description}: ${error.message}`)
+    return false
   }
+}
 
-  try {
-    const data = await fetch(url)
-      .then((r) => {
-        if (r.status !== 200) {
-          throw new Error(`Status: ${r.status}`);
-        }
-        return r;
-      })
-      .then((r) => r.arrayBuffer());
-    await fs.writeFile(targetPath, toBuffer(data));
-    console.log("Found on releases.");
-    process.exit(0);
-  } catch (e) {
-    console.error(e.message);
+async function main () {
+  console.log(`node-raylib v${version} postinstall`)
+  console.log(`Platform: ${process.platform}-${process.arch}`)
+
+  // Check if binary already exists
+  if (await exists(MAIN_TARGET)) {
+    console.log('✓ Binary already exists, skipping download')
+    process.exit(0)
   }
 
-  // couldn't find it, so tell postinstall to compile it
-  console.log("Not found. Building.");
-  process.exit(1);
+  // Ensure build directory exists
+  await ensureDir(BUILD_DIR)
+
+  const platformKey = `${process.platform}-${process.arch}`
+  const binaryName = PLATFORM_BINARIES[platformKey]
+
+  if (!binaryName) {
+    console.log(`No prebuilt binary available for ${platformKey}`)
+    console.log('Supported platforms:', Object.keys(PLATFORM_BINARIES).join(', '))
+    console.log('Will build from source...')
+    process.exit(1)
+  }
+
+  const baseUrl = `https://github.com/RobLoach/node-raylib/releases/download/v${version}`
+  const mainUrl = `${baseUrl}/${binaryName}`
+
+  // Try to download main binary
+  const mainSuccess = await downloadBinary(mainUrl, MAIN_TARGET, 'main binary')
+
+  // For ARM Linux, also try to download DRM binary
+  if (process.platform === 'linux' && (process.arch === 'arm' || process.arch === 'arm64')) {
+    const drmBinaryName = DRM_BINARIES[platformKey]
+    if (drmBinaryName) {
+      const drmUrl = `${baseUrl}/${drmBinaryName}`
+      await downloadBinary(drmUrl, DRM_TARGET, 'DRM binary')
+    }
+  }
+
+  if (mainSuccess) {
+    console.log('✓ Successfully installed prebuilt binary')
+    process.exit(0)
+  } else {
+    console.log('✗ Failed to download prebuilt binary')
+    console.log('Will build from source...')
+    process.exit(1)
+  }
 }
-main();
+
+// Handle unhandled promise rejections
+process.on('unhandledRejection', (error) => {
+  console.error('Unhandled promise rejection:', error)
+  console.log('Will build from source...')
+  process.exit(1)
+})
+
+main().catch((error) => {
+  console.error('Postinstall script failed:', error)
+  console.log('Will build from source...')
+  process.exit(1)
+})