@oxmc/node-smbios 1.0.0 → 1.0.2

package/README.md

@@ -1,6 +1,6 @@
 # node-smbios
 
-[![npm version](https://badge.fury.io/js/node-smbios.svg)](https://www.npmjs.com/package/node-smbios)
+[![npm version](https://badge.fury.io/js/%40oxmc%2Fnode-smbios.svg)](https://www.npmjs.com/package/%40oxmc%2Fnode-smbios)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Cross-platform Node.js native addon for reading SMBIOS (System Management BIOS) / DMI (Desktop Management Interface) hardware information.
@@ -17,7 +17,7 @@ Cross-platform Node.js native addon for reading SMBIOS (System Management BIOS)
 ## Installation
 
 ```bash
-npm install node-smbios
+npm install @oxmc/node-smbios
 ```
 
 ### How Installation Works
@@ -26,7 +26,7 @@ The package uses **prebuilt native binaries** for most users:
 
 1. **First**: Attempts to download a prebuilt binary from [GitHub Releases](https://github.com/oxmc/node-smbios/releases)
    - Binaries are available for common platforms: Windows, macOS, Linux
-   - Supports Node.js versions: 16, 18, 20, 22
+   - Supports N-API Versions: 3, 4, 5, 6, 7, 8, 9
    - Covers architectures: x64, arm64
 
 2. **Fallback**: If no prebuilt binary is available, it compiles from source
@@ -125,7 +125,7 @@ sudo pacman -S base-devel python
 After installation, verify it works:
 
 ```bash
-node -e "const smbios = require('node-smbios'); console.log(smbios.getSystemInfo());"
+node -e "const smbios = require('@oxmc/node-smbios'); console.log(smbios.getSystemInfo());"
 ```
 
 ### Forcing Source Build
@@ -133,13 +133,13 @@ node -e "const smbios = require('node-smbios'); console.log(smbios.getSystemInfo
 If you want to compile from source instead of using prebuilt binaries:
 
 ```bash
-npm install node-smbios --build-from-source
+npm install @oxmc/node-smbios --build-from-source
 ```
 
 ## Usage
 
 ```javascript
-const smbios = require('node-smbios');
+const smbios = require('@oxmc/node-smbios');
 
 // Get BIOS information
 const biosInfo = smbios.getBiosInfo();
@@ -305,7 +305,7 @@ This runs `node-gyp rebuild` which:
    - `src/smbios_common.cpp` - Common utilities
    - Platform-specific file: `src/windows/smbios_windows.cpp`, `src/mac/smbios_macos.cpp`, or `src/linux/smbios_linux.cpp`
 3. Links with platform-specific libraries
-4. Outputs `build/Release/smbios.node` (the compiled addon)
+4. Outputs the compiled addon for all napi versions supported (/lib/{platform}-{arch}-napi-v{napi_version}/smbios.node) ex: /lib/win32-x64-napi-v9/smbios.node
 
 ### 4. Run Tests
 
@@ -418,8 +418,6 @@ This project uses automated releases via GitHub Actions. To create a new release
    - Upload binaries to GitHub Releases
    - Publish the package to npm
 
-See [.github/RELEASE.md](.github/RELEASE.md) for more details on the release process.
-
 ## Troubleshooting
 
 ### Build Errors

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@oxmc/node-smbios",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "A Node.js module designed to retrieve detailed system and hardware information from SMBIOS.",
   "main": "index.js",
   "scripts": {
     "install": "node-pre-gyp install --fallback-to-build",
-    "build": "node-gyp rebuild",
+    "build": "node-pre-gyp rebuild",
     "clean": "node-gyp clean",
     "test": "node example.js",
     "package": "node-pre-gyp package",
@@ -13,11 +13,17 @@
   },
   "binary": {
     "module_name": "smbios",
-    "module_path": "./build/Release/",
-    "package_name": "{module_name}-v{version}-{node_abi}-{platform}-{arch}.tar.gz",
+    "module_path": "./lib/{platform}-{arch}-napi-v{napi_build_version}",
+    "package_name": "{module_name}-v{version}-napi-v{napi_build_version}-{platform}-{arch}.tar.gz",
     "host": "https://github.com/oxmc/node-smbios/releases/download/",
-    "remote_path": "v{version}"
+    "remote_path": "v{version}",
+    "napi_versions": [3, 4, 5, 6, 7, 8, 9]
   },
+  "files": [
+    "index.js",
+    "lib/**/*",
+    "src/**/*"
+  ],
   "keywords": [
     "smbios",
     "dmi",
@@ -67,4 +73,4 @@
     "linux",
     "win32"
   ]
-}
+}

package/src/windows/smbios_windows.cpp

@@ -7,14 +7,22 @@
 #include <comdef.h>
 #include <Wbemidl.h>
 #include <string>
-#include <vector>
 
 #pragma comment(lib, "wbemuuid.lib")
 
 namespace smbios {
 
+static std::string WideToUtf8(const wchar_t* wstr) {
+    if (!wstr) return "";
+    int len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);
+    if (len <= 0) return "";
+    std::string result(len - 1, '\0');
+    WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &result[0], len, NULL, NULL);
+    return result;
+}
+
 /**
- * Helper class for WMI queries
+ * Lightweight WMI query class - no COM init/uninit, connection reuse
  */
 class WMIQuery {
 private:
@@ -24,38 +32,19 @@ private:
 
 public:
     WMIQuery() : pLoc(nullptr), pSvc(nullptr), initialized(false) {
-        // Initialize COM
-        HRESULT hres = CoInitializeEx(0, COINIT_MULTITHREADED);
-        if (FAILED(hres) && hres != RPC_E_CHANGED_MODE) {
-            return;
-        }
-
-        // Set general COM security levels
-        hres = CoInitializeSecurity(
-            NULL, -1, NULL, NULL,
-            RPC_C_AUTHN_LEVEL_DEFAULT,
-            RPC_C_IMP_LEVEL_IMPERSONATE,
-            NULL, EOAC_NONE, NULL
-        );
-
-        if (FAILED(hres) && hres != RPC_E_TOO_LATE) {
-            CoUninitialize();
-            return;
-        }
-
-        // Obtain the initial locator to WMI
-        hres = CoCreateInstance(
+        // Don't call CoInitialize - Node.js already initialized COM
+        // Don't call CoInitializeSecurity - it's already set or will fail with RPC_E_TOO_LATE
+        
+        HRESULT hres = CoCreateInstance(
             CLSID_WbemLocator, 0,
             CLSCTX_INPROC_SERVER,
             IID_IWbemLocator, (LPVOID*)&pLoc
         );
 
         if (FAILED(hres)) {
-            CoUninitialize();
             return;
         }
 
-        // Connect to WMI
         hres = pLoc->ConnectServer(
             _bstr_t(L"ROOT\\CIMV2"), NULL, NULL, 0,
             NULL, 0, 0, &pSvc
@@ -63,11 +52,10 @@ public:
 
         if (FAILED(hres)) {
             pLoc->Release();
-            CoUninitialize();
+            pLoc = nullptr;
             return;
         }
 
-        // Set security levels on the proxy
         hres = CoSetProxyBlanket(
             pSvc, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL,
             RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE,
@@ -77,7 +65,8 @@ public:
         if (FAILED(hres)) {
             pSvc->Release();
             pLoc->Release();
-            CoUninitialize();
+            pSvc = nullptr;
+            pLoc = nullptr;
             return;
         }
 
@@ -85,9 +74,15 @@ public:
     }
 
     ~WMIQuery() {
-        if (pSvc) pSvc->Release();
-        if (pLoc) pLoc->Release();
-        CoUninitialize();
+        if (pSvc) {
+            pSvc->Release();
+            pSvc = nullptr;
+        }
+        if (pLoc) {
+            pLoc->Release();
+            pLoc = nullptr;
+        }
+        // Don't call CoUninitialize - we didn't initialize COM
     }
 
     std::string QueryProperty(const wchar_t* wmiClass, const wchar_t* property) {
@@ -98,7 +93,7 @@ public:
         query += L" FROM ";
         query += wmiClass;
 
-        IEnumWbemClassObject* pEnumerator = NULL;
+        IEnumWbemClassObject* pEnumerator = nullptr;
         HRESULT hres = pSvc->ExecQuery(
             bstr_t("WQL"),
             bstr_t(query.c_str()),
@@ -106,40 +101,44 @@ public:
             NULL, &pEnumerator
         );
 
-        if (FAILED(hres)) {
+        if (FAILED(hres) || !pEnumerator) {
             return "";
         }
 
-        IWbemClassObject* pclsObj = NULL;
+        IWbemClassObject* pclsObj = nullptr;
         ULONG uReturn = 0;
         std::string result;
 
-        while (pEnumerator) {
-            HRESULT hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn);
-            if (0 == uReturn) {
-                break;
-            }
-
+        hres = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn);
+        
+        if (SUCCEEDED(hres) && uReturn == 1 && pclsObj) {
             VARIANT vtProp;
             VariantInit(&vtProp);
-            hr = pclsObj->Get(property, 0, &vtProp, 0, 0);
             
-            if (SUCCEEDED(hr)) {
-                if (vtProp.vt == VT_BSTR) {
-                    _bstr_t bstr(vtProp.bstrVal);
-                    result = (char*)bstr;
-                } else if (vtProp.vt == VT_I4 || vtProp.vt == VT_UI4) {
+            hres = pclsObj->Get(property, 0, &vtProp, 0, 0);
+            
+            if (SUCCEEDED(hres)) {
+                if (vtProp.vt == VT_BSTR && vtProp.bstrVal) {
+                    result = WideToUtf8(vtProp.bstrVal);
+                } else if (vtProp.vt == VT_I4) {
                     result = std::to_string(vtProp.lVal);
-                } else if (vtProp.vt == VT_I2 || vtProp.vt == VT_UI2) {
+                } else if (vtProp.vt == VT_UI4) {
+                    result = std::to_string(vtProp.ulVal);
+                } else if (vtProp.vt == VT_I2) {
                     result = std::to_string(vtProp.iVal);
+                } else if (vtProp.vt == VT_UI2) {
+                    result = std::to_string(vtProp.uiVal);
                 } else if (vtProp.vt == VT_UI1) {
                     result = std::to_string(vtProp.bVal);
+                } else if (vtProp.vt == VT_I8) {
+                    result = std::to_string(vtProp.llVal);
+                } else if (vtProp.vt == VT_UI8) {
+                    result = std::to_string(vtProp.ullVal);
                 }
             }
             
             VariantClear(&vtProp);
             pclsObj->Release();
-            break; // Get only first result
         }
 
         pEnumerator->Release();
@@ -168,7 +167,6 @@ SystemInfo GetSystemInfo() {
     info.uuid = wmi.QueryProperty(L"Win32_ComputerSystemProduct", L"UUID");
     info.wakeUpType = wmi.QueryProperty(L"Win32_ComputerSystem", L"WakeUpType");
     
-    // Try to get serial number from ComputerSystemProduct
     std::string serial = wmi.QueryProperty(L"Win32_ComputerSystemProduct", L"IdentifyingNumber");
     if (serial.empty() || serial == "To Be Filled By O.E.M.") {
         serial = wmi.QueryProperty(L"Win32_BIOS", L"SerialNumber");
@@ -222,7 +220,6 @@ MemoryInfo GetMemoryInfo() {
     info.maxCapacity = wmi.QueryProperty(L"Win32_PhysicalMemoryArray", L"MaxCapacity");
     info.memoryDevices = wmi.QueryProperty(L"Win32_PhysicalMemoryArray", L"MemoryDevices");
     
-    // Get available memory from OS
     MEMORYSTATUSEX memStatus;
     memStatus.dwLength = sizeof(memStatus);
     if (GlobalMemoryStatusEx(&memStatus)) {
@@ -252,4 +249,4 @@ ChassisInfo GetChassisInfo() {
 
 } // namespace smbios
 
-#endif // _WIN32
+#endif // _WIN32

package/binding.gyp

@@ -1,49 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "smbios",
-      "cflags!": [ "-fno-exceptions" ],
-      "cflags_cc!": [ "-fno-exceptions" ],
-      "cflags_cc": [ "-std=c++17" ],
-      "sources": [
-        "src/binding.cpp",
-        "src/smbios_common.cpp"
-      ],
-      "include_dirs": [
-        "<!@(node -p \"require('node-addon-api').include\")",
-        "<!@(node -p \"require('@mapbox/node-pre-gyp').include\")"
-      ],
-      "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
-      "conditions": [
-        ["OS=='win'", {
-          "sources": [ "src/windows/smbios_windows.cpp" ],
-          "libraries": [],
-          "msvs_settings": {
-            "VCCLCompilerTool": {
-              "ExceptionHandling": 1,
-              "AdditionalOptions": [ "/std:c++17" ]
-            }
-          }
-        }],
-        ["OS=='mac'", {
-          "sources": [ "src/mac/smbios_macos.cpp" ],
-          "xcode_settings": {
-            "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-            "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
-            "CLANG_CXX_LIBRARY": "libc++",
-            "MACOSX_DEPLOYMENT_TARGET": "10.13"
-          },
-          "link_settings": {
-            "libraries": [
-              "-framework IOKit",
-              "-framework CoreFoundation"
-            ]
-          }
-        }],
-        ["OS=='linux'", {
-          "sources": [ "src/linux/smbios_linux.cpp" ]
-        }]
-      ]
-    }
-  ]
-}

package/example.js

@@ -1,94 +0,0 @@
-/**
- * Example usage of node-smbios
- * 
- * This demonstrates how to retrieve SMBIOS information from the system.
- * Run with: node example.js
- */
-
-const smbios = require('./index');
-
-console.log('=== node-smbios Example ===\n');
-
-try {
-    // Get BIOS information
-    console.log('--- BIOS Information ---');
-    const biosInfo = smbios.getBiosInfo();
-    console.log('Vendor:', biosInfo.vendor || 'N/A');
-    console.log('Version:', biosInfo.version || 'N/A');
-    console.log('Release Date:', biosInfo.releaseDate || 'N/A');
-    console.log('BIOS Characteristics:', biosInfo.biosCharacteristics || 'N/A');
-    console.log();
-
-    // Get System information
-    console.log('--- System Information ---');
-    const systemInfo = smbios.getSystemInfo();
-    console.log('Manufacturer:', systemInfo.manufacturer || 'N/A');
-    console.log('Product Name:', systemInfo.productName || 'N/A');
-    console.log('Serial Number:', systemInfo.serialNumber || 'N/A');
-    console.log('UUID:', systemInfo.uuid || 'N/A');
-    console.log('SKU Number:', systemInfo.skuNumber || 'N/A');
-    console.log('Family:', systemInfo.family || 'N/A');
-    console.log('Wake Up Type:', systemInfo.wakeUpType || 'N/A');
-    console.log();
-
-    // Get Board information
-    console.log('--- Board Information ---');
-    const boardInfo = smbios.getBoardInfo();
-    console.log('Manufacturer:', boardInfo.manufacturer || 'N/A');
-    console.log('Product:', boardInfo.product || 'N/A');
-    console.log('Version:', boardInfo.version || 'N/A');
-    console.log('Serial Number:', boardInfo.serialNumber || 'N/A');
-    console.log('Asset Tag:', boardInfo.assetTag || 'N/A');
-    console.log('Location in Chassis:', boardInfo.locationInChassis || 'N/A');
-    console.log();
-
-    // Get Processor information
-    console.log('--- Processor Information ---');
-    const procInfo = smbios.getProcessorInfo();
-    console.log('Manufacturer:', procInfo.manufacturer || 'N/A');
-    console.log('Name:', procInfo.version || 'N/A');
-    console.log('Socket:', procInfo.socketDesignation || 'N/A');
-    console.log('Type:', procInfo.processorType || 'N/A');
-    console.log('Family:', procInfo.processorFamily || 'N/A');
-    console.log('Max Speed:', procInfo.maxSpeed || 'N/A');
-    console.log('Current Speed:', procInfo.currentSpeed || 'N/A');
-    console.log('Core Count:', procInfo.coreCount || 'N/A');
-    console.log('Thread Count:', procInfo.threadCount || 'N/A');
-    console.log('L2 Cache:', procInfo.l2CacheSize || 'N/A');
-    console.log('L3 Cache:', procInfo.l3CacheSize || 'N/A');
-    console.log();
-
-    // Get Memory information
-    console.log('--- Memory Information ---');
-    const memInfo = smbios.getMemoryInfo();
-    console.log('Total Physical Memory:', memInfo.totalPhysicalMemory || 'N/A');
-    console.log('Available Physical Memory:', memInfo.availablePhysicalMemory || 'N/A');
-    console.log('Total Virtual Memory:', memInfo.totalVirtualMemory || 'N/A');
-    console.log('Available Virtual Memory:', memInfo.availableVirtualMemory || 'N/A');
-    console.log('Memory Devices:', memInfo.memoryDevices || 'N/A');
-    console.log('Max Capacity:', memInfo.maxCapacity || 'N/A');
-    console.log();
-
-    // Get Chassis information
-    console.log('--- Chassis Information ---');
-    const chassisInfo = smbios.getChassisInfo();
-    console.log('Manufacturer:', chassisInfo.manufacturer || 'N/A');
-    console.log('Type:', chassisInfo.type || 'N/A');
-    console.log('Version:', chassisInfo.version || 'N/A');
-    console.log('Serial Number:', chassisInfo.serialNumber || 'N/A');
-    console.log('Asset Tag:', chassisInfo.assetTag || 'N/A');
-    console.log('Boot Up State:', chassisInfo.bootUpState || 'N/A');
-    console.log('Power Supply State:', chassisInfo.powerSupplyState || 'N/A');
-    console.log('Thermal State:', chassisInfo.thermalState || 'N/A');
-    console.log();
-
-    // Get all information at once
-    console.log('--- All Information (Single Call) ---');
-    const allInfo = smbios.getAllInfo();
-    console.log(JSON.stringify(allInfo, null, 2));
-
-} catch (error) {
-    console.error('Error:', error.message);
-    console.error('\nNote: Some information may require elevated privileges (administrator/root).');
-    process.exit(1);
-}