mdbxmou 0.2.2 → 0.2.4

package/README.md

@@ -19,6 +19,8 @@ npm install mdbxmou
 
 ## Quick Start
 
+CommonJS:
+
 ```javascript
 const { MDBX_Env, MDBX_Param } = require('mdbxmou');
 
@@ -47,6 +49,12 @@ readTxn.commit();
 await env.close();
 ```
 
+ESM:
+
+```javascript
+import { MDBX_Env, MDBX_Param } from "mdbxmou";
+```
+
 ## API Reference
 
 ### Environment (MDBX_Env)
@@ -64,19 +72,19 @@ await env.open({
   path: './database',           // Database directory
   keyFlag: MDBX_Param.keyFlag.string,    // Default key encoding (optional)
   valueFlag: MDBX_Param.valueFlag.string, // Default value encoding (optional)
-  envFlag: MDBX_Param.envFlag.nostickythreads
+  flags: MDBX_Param.envFlag.nostickythreads
 });
 ```
 
 Options:
 - `path` - Database directory path
+- `flags` - Environment flags (optional, defaults to `0`)
 - `keyFlag` - Default key encoding for all operations (optional, defaults to Buffer)
   - Only `string` can be set (ordinal mode uses `number`/`bigint` separately)
 - `valueFlag` - Default value encoding for all operations (optional, defaults to Buffer)
-- `envFlag` - Environment flags
-- `mapSize` - Maximum database size
-- `maxReaders` - Maximum number of readers
-- `maxDbs` - Maximum number of databases
+- `maxDbi` - Maximum number of databases (optional, default `32`)
+- `mode` - Filesystem permissions mode (optional, default `0664`)
+- `geometry` - Map size/geometry options (optional)
 
 Note: When `keyFlag` or `valueFlag` are set at environment level, they become defaults for all subsequent operations unless explicitly overridden.
 
@@ -124,14 +132,14 @@ const result = await env.query([
 
 #### Methods
 
-**createMap(keyMode, [valueMode], [flags], [name]) → DBI**
+**createMap(db_name | keyMode, [keyMode | valueMode], [valueMode]) → DBI**
 ```javascript
-// No arguments - default keyMode (0) and valueMode (0)
-const dbi = txn.createMap();
-
 // One argument - keyMode only
 const dbi = txn.createMap(MDBX_Param.keyMode.ordinal);
 
+// One argument - db_name only (uses default keyMode)
+const namedDbi = txn.createMap("my-table");
+
 // Two arguments - keyMode + valueMode
 const dbi = txn.createMap(MDBX_Param.keyMode.ordinal, MDBX_Param.valueMode.multi);
 
@@ -144,17 +152,17 @@ const namedDbi = txn.createMap("my-table", MDBX_Param.keyMode.ordinal, MDBX_Para
 
 > **Note**: Use `createMap` in write transactions - it will create the database if it doesn't exist, or open it if it does. This is safer for new environments.
 
-**openMap(keyMode, [name]) → DBI**
+**openMap(db_name | keyMode, [keyMode]) → DBI**
 ```javascript
-// No arguments - default keyMode (0) 
-const dbi = txn.openMap();
-
 // One argument - keyMode only
 // Number keyMode - keys returned as numbers
 const dbi = txn.openMap(MDBX_Param.keyMode.ordinal);
 // BigInt keyMode - keys returned as BigInts
 const dbi = txn.openMap(BigInt(MDBX_Param.keyMode.ordinal));
 
+// One argument - db_name only (uses default keyMode)
+const namedDbi = txn.openMap("my-table");
+
 // Two arguments - db_name + keyMode
 const namedDbi = txn.openMap("my-table", MDBX_Param.keyMode.ordinal);
 const namedDbiBigInt = txn.openMap("my-table", BigInt(MDBX_Param.keyMode.ordinal));
@@ -536,7 +544,7 @@ try {
   const dbi = txn.createMap(MDBX_Param.keyMode.ordinal);
   
   // This might throw if key already exists with MDBX_NOOVERWRITE
-  dbi.put(txn, 123, "value", MDBX_Param.putFlag.nooverwrite);
+  dbi.put(txn, 123, "value");
   
   txn.commit();
 } catch (error) {
@@ -568,7 +576,17 @@ Note: For ordinal (integer) keys, use keyFlag.number or keyFlag.bigint to specif
 
 ### Environment Flags
 - `MDBX_Param.envFlag.nostickythreads` - Don't stick reader transactions to threads
-- `MDBX_Param.envFlag.readonly` - Open database in read-only mode
+- `MDBX_Param.envFlag.rdonly` - Open database in read-only mode
+- `MDBX_Param.envFlag.validation` - Enable page validation
+- `MDBX_Param.envFlag.exclusive` - Exclusive mode
+- `MDBX_Param.envFlag.accede` - Open existing environment
+- `MDBX_Param.envFlag.writemap` - Use writable memory map
+- `MDBX_Param.envFlag.nordahead` - Disable OS readahead
+- `MDBX_Param.envFlag.nomeminit` - Disable memory initialization
+- `MDBX_Param.envFlag.liforeclaim` - LIFO reclaim
+- `MDBX_Param.envFlag.nometasync` - Disable metadata flushes
+- `MDBX_Param.envFlag.safeNosync` - Safe nosync mode
+- `MDBX_Param.envFlag.utterlyNosync` - Utterly nosync mode
 
 ### Database Modes  
 - `MDBX_Param.dbMode.create` - Create database if it doesn't exist
@@ -576,7 +594,9 @@ Note: For ordinal (integer) keys, use keyFlag.number or keyFlag.bigint to specif
 
 ### Query Modes
 - `MDBX_Param.queryMode.get` - Read operations
-- `MDBX_Param.queryMode.put` - Write operations  
+- `MDBX_Param.queryMode.upsert` - Write operations (insert or update)
+- `MDBX_Param.queryMode.update` - Update existing (MDBX_CURRENT)
+- `MDBX_Param.queryMode.insertUnique` - Insert unique (MDBX_NOOVERWRITE)
 - `MDBX_Param.queryMode.del` - Delete operations
 
 ### Cursor Modes

package/build.js

@@ -1,6 +1,7 @@
 
 var spawnSync = require('child_process').spawnSync;
 var fs = require('fs');
+var path = require('path');
 
 function exec(cmd) {
     const { status } = spawnSync(cmd, {
@@ -14,6 +15,7 @@ function exec(cmd) {
 
 // Create VERSION.json for libmdbx (needed for npm package)
 const versionFile = 'deps/libmdbx/VERSION.json';
+const libmdbxGitMarker = 'deps/libmdbx/.git';
 if (!fs.existsSync(versionFile)) {
     console.log('Creating VERSION.json for libmdbx...');
     const versionJson = {
@@ -27,14 +29,20 @@ if (!fs.existsSync(versionFile)) {
     console.log('VERSION.json created successfully!');
 }
 
-// Patch CMakeLists.txt line 56: if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git" -> if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git"
+// Workaround for npm package: npm does not ship git metadata, while libmdbx
+// may rely on it to determine version info during CMake configure.
+// Apply this patch only when git metadata is missing.
 const cmakeFile = 'deps/libmdbx/CMakeLists.txt';
-if (fs.existsSync(cmakeFile)) {
-    let cmakeContent = fs.readFileSync(cmakeFile, 'utf8').split('\n');
-    if (cmakeContent[55] && cmakeContent[55].trim().startsWith('if(EXISTS')) {
-        cmakeContent[55] = cmakeContent[55].replace('if(EXISTS', 'if(NOT EXISTS');
-        fs.writeFileSync(cmakeFile, cmakeContent.join('\n'));
-        console.log('Patched CMakeLists.txt line 56: if(NOT EXISTS ...');
+if (!fs.existsSync(libmdbxGitMarker) && fs.existsSync(cmakeFile)) {
+    const cmakeText = fs.readFileSync(cmakeFile, 'utf8');
+    const from = 'if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git"';
+    const to = 'if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git"';
+    if (cmakeText.includes(from)) {
+        const patched = cmakeText.replace(from, to);
+        if (patched !== cmakeText) {
+            fs.writeFileSync(cmakeFile, patched);
+            console.log('Patched libmdbx CMakeLists.txt for npm package (no .git).');
+        }
     }
 }
 

package/lib/async.mjs

@@ -0,0 +1,7 @@
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
+const { MDBX_Async_Env } = require("./mdbx_evn_async.js");
+
+export { MDBX_Async_Env };
+export default MDBX_Async_Env;

package/lib/index.mjs

@@ -0,0 +1,12 @@
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
+
+const native = require("./nativemou.js");
+const { MDBX_Async_Env } = require("./mdbx_evn_async.js");
+
+export const MDBX_Env = native.MDBX_Env;
+export const MDBX_Param = native.MDBX_Param;
+export { MDBX_Async_Env };
+
+export default native;

package/lib/mdbx_worker.js

@@ -82,17 +82,21 @@ async function handler(msg) {
 
       case "dbi_put": {
         const { txnId, dbiId, key, value, flags = 0 } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
-        d.dbi.put(key, value, flags);
+        d.dbi.put(t.txn, key, value, flags);
         return ok(id, true);
       }
 
       case "dbi_get": {
         const { txnId, dbiId, key } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
-        const val = d.dbi.get(key);
+        const val = d.dbi.get(t.txn, key);
         // Если val это Buffer, преобразуем в строку для удобства
         const result = (val && Buffer.isBuffer(val)) ? val.toString() : val;
         return ok(id, result);
@@ -100,25 +104,31 @@ async function handler(msg) {
 
       case "dbi_del": {
         const { txnId, dbiId, key } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
-        const r = d.dbi.del(key);
+        const r = d.dbi.del(t.txn, key);
         return ok(id, r);
       }
 
       case "dbi_stat": {
         const { txnId, dbiId } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
-        return ok(id, d.dbi.stat());
+        return ok(id, d.dbi.stat(t.txn));
       }
 
       case "dbi_iter_all": {
         const { txnId, dbiId } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
         const out = [];
-        d.dbi.forEach((k, v) => {
+        d.dbi.forEach(t.txn, (k, v) => {
           out.push({ key: k, value: v });
           return true;
         });
@@ -128,13 +138,15 @@ async function handler(msg) {
       case "dbi_get_batch": {
         // Групповое чтение множества ключей
         const { txnId, dbiId, keys } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
         
         const results = [];
         for (const key of keys) {
           try {
-            const val = d.dbi.get(key);
+            const val = d.dbi.get(t.txn, key);
             if (val !== undefined && val !== null) {
               const result = (val && Buffer.isBuffer(val)) ? val.toString() : val;
               results.push({ key, value: result, found: true });
@@ -151,13 +163,15 @@ async function handler(msg) {
       case "dbi_put_batch": {
         // Групповая запись множества пар ключ-значение
         const { txnId, dbiId, items, flags = 0 } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
         
         const results = [];
         for (const item of items) {
           try {
-            d.dbi.put(item.key, item.value, flags);
+            d.dbi.put(t.txn, item.key, item.value, flags);
             results.push({ key: item.key, success: true });
           } catch (e) {
             results.push({ key: item.key, success: false, error: e.message });
@@ -169,13 +183,15 @@ async function handler(msg) {
       case "dbi_del_batch": {
         // Групповое удаление множества ключей
         const { txnId, dbiId, keys } = params;
+        const t = txns.get(txnId);
+        if (!t) throw new Error("no txn");
         const d = dbis.get(dbiId);
         if (!d || d.txnId !== txnId) throw new Error("no dbi");
         
         const results = [];
         for (const key of keys) {
           try {
-            const r = d.dbi.del(key);
+            const r = d.dbi.del(t.txn, key);
             results.push({ key, deleted: r });
           } catch (e) {
             results.push({ key, deleted: false, error: e.message });

package/package.json

@@ -1,5 +1,17 @@
 {
   "main": "lib/nativemou.js",
+  "exports": {
+    ".": {
+      "import": "./lib/index.mjs",
+      "require": "./lib/nativemou.js"
+    },
+    "./async": {
+      "import": "./lib/async.mjs",
+      "require": "./lib/mdbx_evn_async.js"
+    },
+    "./nativemou": "./lib/nativemou.js",
+    "./package.json": "./package.json"
+  },
   "files": [
     "lib/**/*",
     "src/**/*",
@@ -18,6 +30,7 @@
     "e3": "node ./test/e3.js",
     "e33": "node ./test/e33.js",
     "e4": "node ./test/e4.js",
+    "e4async": "node ./test/e4async.mjs",
     "e5": "node ./test/e5.js",
     "build": "node build.js",
     "build-dev": "node build-dev.js",
@@ -25,7 +38,7 @@
   },
   "gypfile": true,
   "name": "mdbxmou",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Node bindings for mdbx",
   "repository": {
     "type": "git",