@bun-win32/psapi 2.0.1 → 2.0.3

package/README.md

@@ -4,7 +4,9 @@ Zero-dependency, zero-overhead Win32 PSAPI bindings for [Bun](https://bun.sh) on
 
 ## Overview
 
-`@bun-win32/psapi` exposes the `psapi.dll` exports using Bun's FFI. It provides a single class, `Psapi`, which lazily binds native symbols on first use. You can optionally preload a subset or all symbols up-front via `Preload()`.
+`@bun-win32/psapi` exposes the `psapi.dll` exports using [Bun](https://bun.sh)'s FFI. It provides a single class, `Psapi`, which lazily binds native symbols on first use. You can optionally preload a subset or all symbols up-front via `Preload()`.
+
+The bindings are strongly typed for a smooth DX in TypeScript.
 
 ## Features
 
@@ -46,7 +48,7 @@ console.log('Processes: %d', count);
 
 ## Examples
 
-Run the included example to see the library in action:
+Run the included examples:
 
 ```sh
 bun run example              # Process enumeration + performance info

package/index.ts

@@ -1,5 +1,3 @@
-import './runtime/extensions';
-
 import Psapi from './structs/Psapi';
 
 export * from './types/Psapi';

package/package.json

@@ -1,7 +1,10 @@
 {
   "author": "Stev Peifer <stev@bell.net>",
   "bugs": {
-    "url": "https://github.com/bun-win32/psapi/issues"
+    "url": "https://github.com/ObscuritySRL/bun-win32/issues"
+  },
+  "dependencies": {
+    "@bun-win32/core": "workspace:*"
   },
   "description": "Zero-dependency, zero-overhead Win32 PSAPI bindings for Bun (FFI) on Windows.",
   "devDependencies": {
@@ -17,13 +20,14 @@
     "typescript": "^5"
   },
   "private": false,
-  "homepage": "https://github.com/bun-win32/psapi#readme",
+  "homepage": "https://github.com/ObscuritySRL/bun-win32#readme",
   "repository": {
     "type": "git",
-    "url": "git://github.com/bun-win32/psapi.git"
+    "url": "git://github.com/ObscuritySRL/bun-win32.git",
+    "directory": "packages/psapi"
   },
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "./index.ts",
   "keywords": [
     "bun",
@@ -37,7 +41,6 @@
   ],
   "files": [
     "index.ts",
-    "runtime/*.ts",
     "structs/*.ts",
     "types/*.ts",
     "README.md"

package/structs/Psapi.ts

@@ -1,4 +1,5 @@
-import { type FFIFunction, FFIType, dlopen } from 'bun:ffi';
+import { type FFIFunction, FFIType } from 'bun:ffi';
+import { Win32 } from '@bun-win32/core';
 
 import type {
   BOOL,
@@ -43,71 +44,11 @@ import type {
  * Psapi.Preload(['EnumProcesses', 'GetModuleBaseNameW']);
  * ```
  */
-class Psapi {
-  /**
-   * Lazily binds a single `psapi.dll` export and memoizes it on the class.
-   *
-   * If the symbol has already been bound (property is non-configurable), this is a no-op.
-   * Subsequent calls go directly through the memoized native function.
-   *
-   * @param method Exact export name from `Symbols`.
-   * @returns The bound native function, typed to the corresponding static method.
-   * @example
-   * ```ts
-   * // Internal usage: public wrappers call Load on first invocation
-   * // return Psapi.Load('EnumProcesses')();
-   * ```
-   */
-  private static Load<T extends keyof typeof Psapi.Symbols>(method: T): (typeof Psapi)[T] {
-    const skip = Object.getOwnPropertyDescriptor(Psapi, method)?.configurable === false;
+class Psapi extends Win32 {
+  protected static override name = 'psapi.dll';
 
-    if (skip) {
-      return Psapi[method];
-    }
-
-    const library = dlopen('psapi.dll', { [method]: Psapi.Symbols[method] });
-
-    const propertyDescriptor = { configurable: false, value: library.symbols[method] };
-    Object.defineProperty(Psapi, method, propertyDescriptor);
-
-    return Psapi[method];
-  }
-
-  /**
-   * Eagerly binds one or more `psapi.dll` exports in a single `dlopen` call.
-   *
-   * When called with no arguments, every symbol in `Symbols` is bound.
-   * Already-bound symbols are skipped.
-   *
-   * @param methods Optional list of export names to preload. Defaults to all symbols.
-   * @example
-   * ```ts
-   * // Preload specific hot-path symbols
-   * Psapi.Preload(['EnumProcessModules', 'GetModuleBaseNameW', 'GetModuleFileNameExW']);
-   *
-   * // Or preload everything
-   * Psapi.Preload();
-   * ```
-   */
-  public static Preload(methods?: (keyof typeof Psapi.Symbols)[]): void {
-    methods ??= Object.keys(Psapi.Symbols) as (keyof typeof Psapi.Symbols)[];
-
-    const symbols = Object.fromEntries(
-      methods
-        .filter((method) => Object.getOwnPropertyDescriptor(Psapi, method)?.configurable !== false)
-        .map((method) => [method, Psapi.Symbols[method]])
-    );
-
-    const library = dlopen('psapi.dll', symbols);
-
-    const propertyDescriptorMap = Object.fromEntries(
-      Object.entries(library.symbols).map(([key, value]) => [key, { configurable: false, value }])
-    );
-
-    Object.defineProperties(Psapi, propertyDescriptorMap);
-  }
-
-  private static readonly Symbols = {
+  /** @inheritdoc */
+  protected static override readonly Symbols = {
     EmptyWorkingSet: { args: [FFIType.u64], returns: FFIType.i32 },
     EnumDeviceDrivers: { args: [FFIType.ptr, FFIType.u32, FFIType.ptr], returns: FFIType.i32 },
     EnumPageFilesA: { args: [FFIType.ptr, FFIType.ptr], returns: FFIType.i32 },

package/types/Psapi.ts

@@ -1,4 +1,5 @@
 import type { Pointer } from 'bun:ffi';
+export type { BOOL, DWORD, HANDLE, HMODULE, LPCSTR, LPCWSTR, LPDWORD, LPSTR, LPVOID, LPWSTR, PDWORD, PVOID } from '@bun-win32/core';
 
 export enum ListModulesFilterFlag {
   LIST_MODULES_32BIT = 0x01,
@@ -7,23 +8,11 @@ export enum ListModulesFilterFlag {
   LIST_MODULES_DEFAULT = 0x00,
 }
 
-export type BOOL = number;
-export type DWORD = number;
-export type HANDLE = bigint;
-export type HMODULE = bigint;
-export type LPCSTR = Pointer;
-export type LPCWSTR = Pointer;
-export type LPDWORD = Pointer;
 export type LPHMODULE = Pointer;
 export type LPMODULEINFO = Pointer;
-export type LPSTR = Pointer;
-export type LPVOID = Pointer;
-export type LPWSTR = Pointer;
-export type PDWORD = Pointer;
 export type PENUM_PAGE_FILE_CALLBACKA = Pointer;
 export type PENUM_PAGE_FILE_CALLBACKW = Pointer;
 export type PPERFORMANCE_INFORMATION = Pointer;
 export type PPROCESS_MEMORY_COUNTERS = Pointer;
 export type PPSAPI_WS_WATCH_INFORMATION = Pointer;
 export type PPSAPI_WS_WATCH_INFORMATION_EX = Pointer;
-export type PVOID = Pointer;

package/runtime/extensions.ts

@@ -1,210 +0,0 @@
-import { type Pointer, ptr } from 'bun:ffi';
-
-declare global {
-  /**
-   * Adds a native pointer property to all ArrayBuffer, Buffer, DataView, and TypedArray types.
-   *
-   * The `ptr` property returns a native pointer usable with Bun FFI.
-   *
-   * @example
-   * ```ts
-   * const arr = new Uint8Array([1, 2, 3]);
-   * nativeFunction(arr.ptr, arr.length);
-   * ```
-   */
-  interface ArrayBuffer {
-    /**
-     * Native pointer to ArrayBuffer memory for Bun FFI.
-     * @example
-     * ```ts
-     * const buf = new ArrayBuffer(8);
-     * nativeFunction(buf.ptr, buf.byteLength);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface BigInt64Array {
-    /**
-     * Native pointer to BigInt64Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new BigInt64Array([1n, 2n]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface BigUint64Array {
-    /**
-     * Native pointer to BigUint64Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new BigUint64Array([1n, 2n]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Buffer {
-    /**
-     * Native pointer to Buffer memory for Bun FFI.
-     * @example
-     * ```ts
-     * const buf = Buffer.from([1, 2, 3]);
-     * nativeFunction(buf.ptr, buf.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface DataView {
-    /**
-     * Native pointer to DataView memory for Bun FFI.
-     * @example
-     * ```ts
-     * const view = new DataView(new ArrayBuffer(4));
-     * nativeFunction(view.ptr, view.byteLength);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Float32Array {
-    /**
-     * Native pointer to Float32Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Float32Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Float64Array {
-    /**
-     * Native pointer to Float64Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Float64Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Int16Array {
-    /**
-     * Native pointer to Int16Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Int16Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Int32Array {
-    /**
-     * Native pointer to Int32Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Int32Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Int8Array {
-    /**
-     * Native pointer to Int8Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Int8Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface SharedArrayBuffer {
-    /**
-     * Native pointer to SharedArrayBuffer memory for Bun FFI.
-     * @example
-     * ```ts
-     * const buf = new SharedArrayBuffer(8);
-     * nativeFunction(buf.ptr, buf.byteLength);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Uint16Array {
-    /**
-     * Native pointer to Uint16Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Uint16Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Uint32Array {
-    /**
-     * Native pointer to Uint32Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Uint32Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Uint8Array {
-    /**
-     * Native pointer to Uint8Array memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Uint8Array([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-  interface Uint8ClampedArray {
-    /**
-     * Native pointer to Uint8ClampedArray memory for Bun FFI.
-     * @example
-     * ```ts
-     * const arr = new Uint8ClampedArray([1, 2, 3]);
-     * nativeFunction(arr.ptr, arr.length);
-     * ```
-     */
-    readonly ptr: Pointer;
-  }
-}
-
-/**
- * Installs the `ptr` property on all supported binary view prototypes.
- *
- * The property is non-enumerable and non-configurable. The getter calls `ptr(this)`.
- */
-const constructors = [ArrayBuffer, BigInt64Array, BigUint64Array, Buffer, DataView, Float32Array, Float64Array, Int16Array, Int32Array, Int8Array, SharedArrayBuffer, Uint16Array, Uint32Array, Uint8Array, Uint8ClampedArray] as const;
-
-constructors.forEach(
-  ({ prototype }) =>
-    !Object.getOwnPropertyDescriptor(prototype, 'ptr') &&
-    Object.defineProperty(prototype, 'ptr', {
-      configurable: false,
-      enumerable: false,
-      /**
-       * Returns a native pointer to the underlying memory.
-       * @returns Native pointer for Bun FFI.
-       * @example
-       * ```ts
-       * const arr = new Uint8Array([1, 2, 3]);
-       * nativeFunction(arr.ptr, arr.length);
-       * ```
-       */
-      get(this): Pointer {
-        return ptr(this);
-      },
-    })
-);
-
-export {};