omniql 0.5.4 → 0.5.8

package/dist/omniql.d.ts

@@ -2,17 +2,8 @@
  * OmniQL TypeScript / Node.js Binding
  * =====================================
  *
- * A modern, low-friction Node.js binding built with Koffi that wraps the
- * OmniQL shared library.
- *
- * Example usage:
- *   import { OmniEngine } from 'omniql';
- *
- *   const engine = new OmniEngine();
- *   const driver = engine.registerSQLiteDriver(':memory:');
- *   engine.route('data', driver);
- *   const result = await engine.execute({ target: 'data', action: 'FIND' });
- *   engine.close();
+ * A robust Node.js binding built with a native C++ addon to handle signal
+ * masking and FFI stability.
  */
 export type Action = 'FIND' | 'INSERT' | 'UPDATE' | 'DELETE' | 'COUNT';
 export interface Filter {
@@ -56,37 +47,11 @@ export interface CollectionSchema {
 export declare class OmniEngine {
     private readonly handle;
     constructor();
-    /**
-     * Internal helper to call native functions that return a JSON string
-     * and need to be freed.
-     */
-    private callNative;
-    /**
-     * Executes an OQL query and returns the OmniJSON result.
-     */
     execute<T = Record<string, unknown>>(query: Query): Promise<OmniResult<T>>;
-    /**
-     * Registers a collection schema with the engine.
-     */
     registerSchema(schema: CollectionSchema): void;
-    /**
-     * Binds a collection/table target name to a driver name.
-     */
     route(target: string, driverName: string): void;
-    /**
-     * Registers a SQLite driver.
-     */
     registerSQLiteDriver(dsn: string): string;
-    /**
-     * Registers a PostgreSQL driver.
-     */
     registerPostgresDriver(connStr: string): string;
-    /**
-     * Registers a MongoDB driver.
-     */
     registerMongoDriver(uri: string, dbName: string): string;
-    /**
-     * Releases the native engine handle.
-     */
     close(): void;
 }

package/dist/omniql.js

@@ -3,17 +3,8 @@
  * OmniQL TypeScript / Node.js Binding
  * =====================================
  *
- * A modern, low-friction Node.js binding built with Koffi that wraps the
- * OmniQL shared library.
- *
- * Example usage:
- *   import { OmniEngine } from 'omniql';
- *
- *   const engine = new OmniEngine();
- *   const driver = engine.registerSQLiteDriver(':memory:');
- *   engine.route('data', driver);
- *   const result = await engine.execute({ target: 'data', action: 'FIND' });
- *   engine.close();
+ * A robust Node.js binding built with a native C++ addon to handle signal
+ * masking and FFI stability.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -50,12 +41,13 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OmniEngine = void 0;
-const koffi = __importStar(require("koffi"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 // ---------------------------------------------------------------------------
 // Native library loader
 // ---------------------------------------------------------------------------
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const bridge = require('bindings')('omniql_bridge');
 const LIB_SEARCH_PATHS = [
     path.join(__dirname, 'libomniql.so'),
     path.join(__dirname, 'libomniql.dylib'),
@@ -63,103 +55,53 @@ const LIB_SEARCH_PATHS = [
     path.join(process.cwd(), 'libomniql.so'),
     path.join(process.cwd(), 'libomniql.dylib'),
     path.join(process.cwd(), 'omniql.dll'),
+    './libomniql.so',
+    'libomniql.so',
 ];
 function findLibPath() {
     for (const p of LIB_SEARCH_PATHS) {
         if (fs.existsSync(p))
             return p;
     }
-    throw new Error('OmniQL native library not found. ' +
-        'Please ensure libomniql.so/dylib/dll is present in the package or CWD.');
+    throw new Error('OmniQL native library not found. Please ensure libomniql.so/dylib/dll is present.');
 }
-const lib = koffi.load(findLibPath());
-// Function definitions
-const OmniQL_NewEngine = lib.func('int OmniQL_NewEngine()');
-const OmniQL_FreeEngine = lib.func('void OmniQL_FreeEngine(int)');
-const OmniQL_Execute = lib.func('void *OmniQL_Execute(int, const char *)');
-const OmniQL_RegisterSchema = lib.func('void *OmniQL_RegisterSchema(int, const char *)');
-const OmniQL_Route = lib.func('void *OmniQL_Route(int, const char *, const char *)');
-const OmniQL_RegisterSQLiteDriver = lib.func('void *OmniQL_RegisterSQLiteDriver(int, const char *)');
-const OmniQL_RegisterPostgresDriver = lib.func('void *OmniQL_RegisterPostgresDriver(int, const char *)');
-const OmniQL_RegisterMongoDriver = lib.func('void *OmniQL_RegisterMongoDriver(int, const char *, const char *)');
-const OmniQL_Free = lib.func('void OmniQL_Free(void *)');
+// Initialize the bridge by loading the shared library.
+// The C++ bridge handles SIGURG masking internally.
+bridge.loadLib(findLibPath());
 // ---------------------------------------------------------------------------
 // OmniEngine class
 // ---------------------------------------------------------------------------
 class OmniEngine {
     handle;
     constructor() {
-        this.handle = OmniQL_NewEngine();
-    }
-    /**
-     * Internal helper to call native functions that return a JSON string
-     * and need to be freed.
-     */
-    callNative(fn, ...args) {
-        const raw = fn(this.handle, ...args);
-        if (!raw || koffi.address(raw) === 0n)
-            return '{}';
-        try {
-            return koffi.decode(raw, 'char *');
-        }
-        finally {
-            OmniQL_Free(raw);
-        }
+        this.handle = bridge.newEngine();
     }
-    /**
-     * Executes an OQL query and returns the OmniJSON result.
-     */
     async execute(query) {
         const queryWithDefaults = { action: 'FIND', ...query };
         const json = JSON.stringify(queryWithDefaults);
-        return new Promise((resolve, reject) => {
-            try {
-                const rawResponse = this.callNative(OmniQL_Execute, json);
-                resolve(JSON.parse(rawResponse));
-            }
-            catch (err) {
-                reject(err);
-            }
-        });
+        const rawResponse = bridge.execute(this.handle, json);
+        return JSON.parse(rawResponse);
     }
-    /**
-     * Registers a collection schema with the engine.
-     */
     registerSchema(schema) {
-        this.callNative(OmniQL_RegisterSchema, JSON.stringify(schema));
+        bridge.registerSchema(this.handle, JSON.stringify(schema));
     }
-    /**
-     * Binds a collection/table target name to a driver name.
-     */
     route(target, driverName) {
-        this.callNative(OmniQL_Route, target, driverName);
+        bridge.route(this.handle, target, driverName);
     }
-    /**
-     * Registers a SQLite driver.
-     */
     registerSQLiteDriver(dsn) {
-        const raw = this.callNative(OmniQL_RegisterSQLiteDriver, dsn);
+        const raw = bridge.registerSQLiteDriver(this.handle, dsn);
         return JSON.parse(raw).driver ?? 'sqlite';
     }
-    /**
-     * Registers a PostgreSQL driver.
-     */
     registerPostgresDriver(connStr) {
-        const raw = this.callNative(OmniQL_RegisterPostgresDriver, connStr);
+        const raw = bridge.registerPostgresDriver(this.handle, connStr);
         return JSON.parse(raw).driver ?? 'postgres';
     }
-    /**
-     * Registers a MongoDB driver.
-     */
     registerMongoDriver(uri, dbName) {
-        const raw = this.callNative(OmniQL_RegisterMongoDriver, uri, dbName);
+        const raw = bridge.registerMongoDriver(this.handle, uri, dbName);
         return JSON.parse(raw).driver ?? 'mongo';
     }
-    /**
-     * Releases the native engine handle.
-     */
     close() {
-        OmniQL_FreeEngine(this.handle);
+        bridge.freeEngine(this.handle);
     }
 }
 exports.OmniEngine = OmniEngine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omniql",
-  "version": "0.5.4",
+  "version": "0.5.8",
   "description": "A standardized, multi-database query language (OQL) for TypeScript/Node.js.",
   "main": "dist/omniql.js",
   "types": "dist/omniql.d.ts",
@@ -13,10 +13,12 @@
   "author": "Uttam Mahata <uttam-mahata-cs@outlook.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "koffi": "^2.9.0"
+    "bindings": "^1.5.0",
+    "node-addon-api": "^7.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
+    "node-gyp": "^10.0.0",
     "typescript": "^5.0.0"
   },
   "scripts": {