k2hdkc 1.0.12 → 2.0.0

package/index.mjs

@@ -0,0 +1,149 @@
+/*
+ * K2HDKC
+ * 
+ * Copyright 2017 Yahoo Japan Corporation.
+ * 
+ * K2HDKC is k2hash based distributed KVS cluster.
+ * K2HDKC uses K2HASH, CHMPX, FULLOCK libraries. K2HDKC supports
+ * distributed KVS cluster server program and client libraries.
+ * 
+ * For the full copyright and license information, please view
+ * the license file that was distributed with this source code.
+ *
+ * AUTHOR:   Takeshi Nakatani
+ * CREATE:   Thu 15 Jan 2026
+ * REVISION:
+ */
+
+//
+// lazy-load the built CJS bundle and provide compatible exports
+//
+// [NOTE]
+// 
+// This file intentionally does NOT require('./build/cjs/index.js') at top-level.
+//
+
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+
+//
+// Load CJS
+//
+let	_loaded_cjs = null;
+function loadCjs()
+{
+	if(null !== _loaded_cjs){
+		return _loaded_cjs;
+	}
+	_loaded_cjs = require('./build/cjs/index.js');
+	return _loaded_cjs;
+}
+
+//
+// Factory that delegates to CJS impl on first use
+//
+function k2hdkcFactory(...args)
+{
+	const cjs	= loadCjs();
+	const impl	= (typeof cjs === 'function') ? cjs : (cjs && cjs.default) ? cjs.default : cjs;
+	if(typeof impl === 'function'){
+		return impl(...args);
+	}
+	return impl;
+}
+
+//
+// Provide callable/constructible proxies for named exports
+//
+// This mirrors createLazyProxy from src/index.ts but scoped to ESM file.
+//
+function createLazyExport(name)
+{
+	let _cached = undefined;
+
+	function loadActual()
+	{
+		if(_cached !== undefined){
+			return _cached;
+		}
+		const _cjs		= loadCjs();
+		const _actual	= (_cjs && _cjs[name]) ? _cjs[name] : (_cjs && _cjs.default && _cjs.default[name]) ? _cjs.default[name] : undefined;
+		if (!_actual){
+			throw new Error("Native export " + JSON.stringify(name) + " is not available from ./build/cjs/index.js");
+		}
+		_cached = _actual;
+		return _cached;
+	}
+
+	const target = function(...args)
+	{
+		const _actual = loadActual();
+		return _actual.apply(this, args);
+	};
+
+	const handler = {
+		apply(_t, thisArg, args) {
+			const _actual = loadActual();
+			return _actual.apply(thisArg, args);
+		},
+		construct(_t, args, newTarget) {
+			const _actual = loadActual();
+			return Reflect.construct(_actual, args, newTarget);
+		},
+		get(_t, prop, receiver) {
+			const _actual = loadActual();
+			return Reflect.get(_actual, prop, receiver);
+		},
+		set(_t, prop, value, receiver) {
+			const _actual = loadActual();
+			return Reflect.set(_actual, prop, value, receiver);
+		},
+		has(_t, prop) {
+			const _actual = loadActual();
+			return prop in _actual;
+		},
+		ownKeys(_t) {
+			const _actual = loadActual();
+			return Reflect.ownKeys(_actual);
+		},
+		getOwnPropertyDescriptor(_t, prop) {
+			const _actual = loadActual();
+			return Object.getOwnPropertyDescriptor(_actual, prop) || undefined;
+		},
+		getPrototypeOf(_t) {
+			const _actual = loadActual();
+			return Object.getPrototypeOf(_actual);
+		},
+		setPrototypeOf(_t, proto) {
+			const _actual = loadActual();
+			return Object.setPrototypeOf(_actual, proto);
+		},
+		defineProperty(_t, prop, descriptor) {
+			const _actual = loadActual();
+			return Reflect.defineProperty(_actual, prop, descriptor);
+		},
+		deleteProperty(_t, prop) {
+			const _actual = loadActual();
+			return Reflect.deleteProperty(_actual, prop);
+		}
+	};
+
+	return new Proxy(target, handler);
+}
+
+//
+// Export named lazy-callable proxies
+//
+export const K2hdkcNode = createLazyExport('K2hdkcNode');
+
+export default k2hdkcFactory;
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
+ */

package/package.json

@@ -1,31 +1,75 @@
 {
   "name": "k2hdkc",
-  "version": "1.0.12",
+  "version": "2.0.0",
   "description": "K2HDKC addon library for Node.js",
   "os": "linux",
   "main": "index.js",
+  "module": "index.mjs",
+  "types": "types/index.d.ts",
   "directories": {
-    "test": "test"
+    "test": "tests"
   },
+  "files": [
+    "index.js",
+    "index.mjs",
+    "binding.gyp",
+    "types",
+    "src",
+    "build/cjs/index.js",
+    "build/esm/index.js",
+    "buildutils/make_node_prebuild_variables.sh",
+    "buildutils/node_prebuild_install.sh",
+    "buildutils/node_prebuild.sh",
+    "README.md",
+    "LICENSE"
+  ],
   "dependencies": {
     "bindings": "^1.5.0",
-    "nan": "^2.22.0"
+    "node-addon-api": "^8.5.0",
+    "prebuild-install": "^7.1.3"
   },
   "devDependencies": {
-    "chai": "^4.5.0",
-    "mocha": "^10.8.2"
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-replace": "^6.0.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@types/chai": "^5.2.3",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^25.0.8",
+    "chai": "^6.2.2",
+    "mocha": "^11.7.5",
+    "node-gyp": "^12.1.0",
+    "prebuild": "^13.0.1",
+    "rollup": "^4.55.1",
+    "typescript": "^5.9.3",
+    "ts-node": "^10.9.2"
   },
   "scripts": {
-    "build": "npm run build:before && npm run build:configure && npm run build:rebuild && npm run build:linkdir && npm run build:after",
-    "build:before": "echo \"Build - Start\"",
-    "build:configure": "if [ -f src/binding.gyp ]; then cd src; fi && node-gyp configure --verbose --release --target_arch=x64 --coverage=true",
-    "build:rebuild": "if [ -f src/binding.gyp ]; then cd src; fi && node-gyp rebuild --verbose --release --target_arch=x64 --coverage=true",
-    "build:linkdir": "if [ ! -f build -a ! -s build ]; then ln -s src/build .; fi",
-    "build:after": "echo \"Build - Succeed\"",
-    "install": "npm run build",
-    "test": "npm run test:all",
-    "test:all": "echo \"Test - k2hdkc all\" && tests/test.sh k2hdkc && echo \"Finished\"",
-    "test:k2hdkc": "echo \"Test - k2hdkc k2hdkc\" && tests/test.sh k2hdkc && echo \"Finished\""
+    "help": "echo 'command list:\n    npm run install\n    npm run install:onlypackages\n    npm run build\n    npm run build:ts\n    npm run build:ts:cjs\n    npm run build:ts:esm\n    npm run build:ts:tests:cjs\n    npm run build:types\n    npm run build:checktypes\n    npm run build:configure\n    npm run build:rebuild\n    npm run build:prebuild\n    npm run build:prebuild:pure\n    npm run build:bundle:esm\n    npm run prepublishOnly\n    npm run lint\n    npm run test\n    npm run test:ci\n    npm run test:all\n    npm run test:smoke\n    npm run test:smoke:cjs\n    npm run test:smoke:esm\n    npm run test:smoke:ts\n    npm run test:k2hdkc\n'",
+    "install": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Install' && ./buildutils/node_prebuild_install.sh || (echo '[INFO] No binaries found, so building from source\n' && if [ -d build/cjs ] && [ -d build/esm ]; then npm run build:rebuild; else npm run build; fi) && echo '-> [DONE] Install\n'",
+    "install:onlypackages": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Install:onlypackages' && npm install --ignore-scripts && echo '-> [DONE] Install:onlypackages\n'",
+    "build": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build' && npm run build:checktypes && npm run build:configure && npm run build:rebuild && npm run build:ts && echo '-> [DONE] Build\n'",
+    "build:ts": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:ts' && npm run build:ts:cjs && npm run build:ts:esm && echo '-> [DONE] Build:ts\n'",
+    "build:ts:cjs": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:ts:cjs' && tsc -p tsconfig.cjs.json && echo '-> [DONE] Build:ts:cjs\n'",
+    "build:ts:esm": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:ts:esm' && tsc -p tsconfig.esm.json && echo '-> [DONE] Build:ts:esm\n'",
+    "build:ts:tests:cjs": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:ts:tests:cjs' && tsc -p tsconfig.tests.json && echo '-> [DONE] Build:ts:tests:cjs\n'",
+    "build:types": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:types' && echo '[NOTICE] We already provide index.d.ts manually, so NOT need to build types.(if run, index.d.ts is generated in \"types-generated\", but NOT use it.)' && tsc -p tsconfig.types.json && echo '-> [DONE] Build:types\n'",
+    "build:checktypes": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:checktypes' && tsc --noEmit -p tsconfig.types.json && echo '-> [DONE] Build:checktypes\n'",
+    "build:configure": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:configure' && if [ -f binding.gyp ]; then (node-gyp configure --verbose --release --target_arch=$(uname -m | sed 's/x86_64/x64/')); else echo '[WARNING] No binding.gyp, skipping configure'; fi && echo '-> [DONE] Build:configure\n'",
+    "build:rebuild": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:rebuild' && if [ -f binding.gyp ]; then (node-gyp rebuild --verbose --release --target_arch=$(uname -m | sed 's/x86_64/x64/')); else echo '[WARNING] No binding.gyp, skipping rebuild'; fi && echo '-> [DONE] Build:rebuild\n'",
+    "build:prebuild": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:prebuild' && ./buildutils/node_prebuild.sh && echo '-> [DONE] Build:prebuild\n'",
+    "build:prebuild:pure": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:prebuild:pure (for only prebuild confirmation)' && GYP_DEFINES=openssl_fips= prebuild --strip --napi --path prebuilds && echo '-> [DONE] Build:prebuild:pure\n'",
+    "build:bundle:esm": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Build:bundle:esm' && echo '[NOTICE] Currently, rollup is NOT necessary, Does NOT use those outputed files, so do NOT run before packaging.' && rollup -c rollup.config.mjs && echo '-> [DONE] Build:bundle:esm\n'",
+    "prepublishOnly": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] PrepublishOnly' && echo '[INFO] Currently, no implementation. If there are signatures and final inspections, etc., the processing will be implemented here.' && echo '-> [DONE] PrepublishOnly\n'",
+    "lint": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Lint' && echo '[INFO] No linter configured' && echo '-> [DONE] Lint\n'",
+    "test": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test' && if [ ! -f build/cjs/index.js ]; then npm run build || exit 1; fi && npm run test:all && echo '-> [DONE] Test\n'",
+    "test:ci": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test:ci' && if [ ! -f build/cjs/index.js ]; then echo '[ERROR] Not found build/cjs/index.js (build missing)'; exit 1; fi && npm run test:all && echo '-> [DONE] Test:ci\n'",
+    "test:all": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test:all' && npm run test:smoke && npm run test:k2hdkc && echo '-> [DONE] Test:all\n'",
+    "test:smoke": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test:smoke' && npm run test:smoke:cjs && npm run test:smoke:esm && npm run test:smoke:ts && echo '-> [DONE] Test:smoke\n'",
+    "test:smoke:cjs": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test:smoke:cjs' && node tests/smoke_test_cjs.js && echo '-> [DONE] Test:smoke:cjs\n'",
+    "test:smoke:esm": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test:smoke:esm' && node tests/smoke_test_esm.mjs && echo '-> [DONE] Test:smoke:esm\n'",
+    "test:smoke:ts": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test:smoke:ts' && tsc --noEmit tests/smoke_test_ts.ts && echo '-> [DONE] Test:smoke:ts\n'",
+    "test:k2hdkc": "export NPM_CONFIG_LOGLEVEL=silent && echo '[START] Test:k2hdkc' && tests/test.sh k2hdkc && echo '-> [DONE] Test:k2hdkc\n'"
   },
   "repository": {
     "type": "git",
@@ -43,15 +87,27 @@
     "transaction",
     "database",
     "queue",
-    "in-memory"
+    "in-memory",
+    "n-api",
+    "native",
+    "addon"
   ],
   "bugs": {
     "url": "http://github.com/yahoojapan/k2hdkc_nodejs/issues",
-    "email": "antpickax-support@mail.yahoo.co.jp"
+    "email": "ml-antpickax-support@lycorp.co.jp"
   },
   "author": "Takeshi Nakatani <ggtakec@gmail.com> (https://github.com/ggtakec)",
   "contributors": [
     "Hirotaka Wakabayashi <hiwakaba@lycorp.co.jp> (https://github.com/hiwakaba)"
   ],
-  "license": "MIT"
+  "license": "MIT",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js"
+    }
+  },
+  "engines": {
+    "node": ">=14"
+  }
 }

package/src/index.ts

@@ -0,0 +1,367 @@
+/*
+ * K2HDKC
+ * 
+ * Copyright 2017 Yahoo Japan Corporation.
+ * 
+ * K2HDKC is k2hash based distributed KVS cluster.
+ * K2HDKC uses K2HASH, CHMPX, FULLOCK libraries. K2HDKC supports
+ * distributed KVS cluster server program and client libraries.
+ * 
+ * For the full copyright and license information, please view
+ * the license file that was distributed with this source code.
+ *
+ * AUTHOR:   Takeshi Nakatani
+ * CREATE:   Fri 9 Nov 2018
+ * REVISION:
+ */
+
+//---------------------------------------------------------
+// High-level TypeScript wrapper for the native k2hdkc addon
+//
+// [NOTE]
+// Implementation intentionally uses `any` for the native
+// binding because detailed types are provided in the
+// hand-written types/index.d.ts which will be included in
+// the package.
+//
+// Lazy-loading, compatibility-preserving implementation for
+// the k2hdkc package.
+//	- ensureNative() loads the native binding on first use.
+//	- copyPropsToFactory preserves callable default + named
+//	  properties.
+//	- createLazyProxy provides callable/constructible named
+//	  exports.
+//
+//---------------------------------------------------------
+// How to call this module supported(index.js/index.mjs)
+//---------------------------------------------------------
+//	- CommonJS
+//		const k2hdkc     = require('k2hdkc');
+//		const k2hdkcobj  = k2hdkc();
+//
+//	- CommonJS(reference constuctor directly)
+//		const k2hdkc     = require('k2hdkc');
+//		const k2hdkcNode = k2hdkc.K2hdkcNode;
+//		const k2hdkcobj  = k2hdkc();
+//
+//	- TypeScript(1)
+//		import k2hdkc from 'k2hdkc';
+//		const k2hdkcobj  = k2hdkc();
+//
+//	- TypeScript(2)
+//		import k2hdkc from 'k2hdkc';
+//		const k2hdkcobj  = new k2hdkc();
+//
+//	- TypeScript(3: compatible calling)
+//		import k2hdkc    = require('k2hdkc');
+//		const k2hdkcobj  = k2hdkc();
+//
+//	- TypeScript(reference constuctor directly)
+//		import k2hdkc from 'k2hdkc';
+//		const k2hdkcNode = k2hdkc.K2hdkcNode;
+//		const k2hdkcobj  = k2hdkc();
+//
+//	- ESM(pure ES module files: guaranteed version)
+//		import { createRequire } from 'module';
+//		const require    = createRequire(import.meta.url);
+//		const k2hdkc     = require('k2hdkc');
+//		const k2hdkcobj  = k2hdkc();
+//---------------------------------------------------------
+
+type AnyFn = (...args: any[]) => any;
+
+let _native: any = undefined;
+let _nativeLoaded = false;
+
+// [NOTE]
+// Copy properties from native onto the factory(mirrors original runtime
+// normalization)
+// We try to preserve descriptors when possible.
+//
+function copyPropsToFactory(k2hdkcFactory: AnyFn, factory_native: any)
+{
+	if(!factory_native || (typeof factory_native !== 'object' && typeof factory_native !== 'function')){
+		return;
+	}
+
+	try{
+		Object.getOwnPropertyNames(factory_native).forEach((name) => {
+			if(name === 'prototype'){
+				return;
+			}
+			try{
+				const	desc = Object.getOwnPropertyDescriptor(factory_native, name);
+				if(desc){
+					Object.defineProperty(k2hdkcFactory, name, desc);
+				}
+			}catch{
+				try{
+					(k2hdkcFactory as any)[name] = factory_native[name];
+				}catch{
+					// ignore
+				}
+			}
+		});
+
+		Object.getOwnPropertySymbols(factory_native).forEach((sym) => {
+			try{
+				const	desc = Object.getOwnPropertyDescriptor(factory_native, sym as any);
+				if(desc){
+					Object.defineProperty(k2hdkcFactory, sym as any, desc);
+				}
+			}catch{
+				try{
+					(k2hdkcFactory as any)[sym as any] = factory_native[sym as any];
+				}catch{
+					// ignore
+				}
+			}
+		});
+	}catch{
+		// ignore odd cases(native undefined or primitive)
+	}
+
+	try{
+		if(factory_native && factory_native.K2hdkcNode){
+			(k2hdkcFactory as any).K2hdkcNode = factory_native.K2hdkcNode;
+		}
+	}catch{
+		// ignore
+	}
+}
+
+// [NOTE]
+// Load native on first need. Also call copyPropsToFactory once after
+// loading.
+// require('bindings') may throw if native not present at build/test time
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+//
+function ensureNative(): any
+{
+	if(_nativeLoaded){
+		return _native;
+	}
+	_nativeLoaded = true;
+
+	try{
+		const bindings = require('bindings');
+		_native = bindings('k2hdkc');
+	}catch{
+		_native = undefined;
+	}
+
+	// [NOTE]
+	// If we successfully loaded native, copy properties onto the factory so
+	//  default export retains the same shape as before (callable + named
+	//  properties).
+	//
+	if(_native){
+		try{
+			// [NOTE]
+			// k2hdkcFactory is hoisted(function declaration), safe to
+			// reference here
+			copyPropsToFactory(k2hdkcFactory as AnyFn, _native);
+		}catch{
+			// swallow copy errors to preserve robustness
+		}
+	}
+	return _native;
+}
+
+// [NOTE]
+// Default factory that mirrors previous behavior
+//
+function k2hdkcFactory(...args: any[]): any
+{
+	const _factory_native = ensureNative();
+	if(typeof _factory_native === 'function'){
+		try{
+			const retobj = (_factory_native as AnyFn).apply(null, args);
+			if(retobj !== undefined){
+				return retobj;
+			}
+		}catch{
+			// fallthrough to constructor fallback
+		}
+	}
+
+	if(_factory_native && typeof _factory_native.K2hdkcNode === 'function'){
+		try{
+			return new _factory_native.K2hdkcNode(...args);
+		}catch{
+			// fallthrough
+		}
+	}
+
+	// fallback: return native itself (could be an object with properties)
+	return _factory_native;
+}
+
+// [NOTE]
+// Returns a callable & constructible Proxy that forwards to native export
+//
+function createLazyProxy(name: string): AnyFn
+{
+	let _cached: any = undefined;
+
+	function loadActual()
+	{
+		if(_cached !== undefined){
+			return _cached;
+		}
+		const _lazy_native	= ensureNative();
+		const _actual		= _lazy_native && _lazy_native[name] ? _lazy_native[name] : undefined;
+		if(!_actual){
+			throw new Error("Native export " + JSON.stringify(name) + " is not available");
+		}
+		_cached = _actual;
+		return _cached;
+	}
+
+	const target = function (this: any, ...args: any[])
+	{
+		const _actual = loadActual();
+		return _actual.apply(this, args);
+	};
+
+	const handler: ProxyHandler<any> = {
+		apply(_t, thisArg, args) {
+			const _actual = loadActual();
+			return _actual.apply(thisArg, args);
+		},
+		construct(_t, args, newTarget) {
+			const _actual = loadActual();
+			return Reflect.construct(_actual, args, newTarget);
+		},
+		get(_t, prop, receiver) {
+			const _actual = loadActual();
+			return Reflect.get(_actual, prop, receiver);
+		},
+		set(_t, prop, value, receiver) {
+			const _actual = loadActual();
+			return Reflect.set(_actual, prop, value, receiver);
+		},
+		has(_t, prop) {
+			const _actual = loadActual();
+			return prop in _actual;
+		},
+		ownKeys(_t) {
+			const _actual = loadActual();
+			return Reflect.ownKeys(_actual);
+		},
+		getOwnPropertyDescriptor(_t, prop) {
+			const _actual = loadActual();
+			return Object.getOwnPropertyDescriptor(_actual, prop) || undefined;
+		},
+		getPrototypeOf(_t) {
+			const _actual = loadActual();
+			return Object.getPrototypeOf(_actual);
+		},
+		setPrototypeOf(_t, proto) {
+			const _actual = loadActual();
+			return Object.setPrototypeOf(_actual, proto);
+		},
+		defineProperty(_t, prop, descriptor) {
+			const _actual = loadActual();
+			return Reflect.defineProperty(_actual, prop, descriptor);
+		},
+		deleteProperty(_t, prop) {
+			const _actual = loadActual();
+			return Reflect.deleteProperty(_actual, prop);
+		}
+	};
+
+	return new Proxy(target as AnyFn, handler) as AnyFn;
+}
+
+//
+// Export named proxies to keep compatibility with existing consumers
+//
+// Named convenience exports (runtime values).
+// Types are provided by types/index.d.ts.
+//
+export const K2hdkcNode = createLazyProxy('K2hdkcNode');
+
+export default k2hdkcFactory;
+
+//
+// Compatibility normalization for CommonJS output
+//
+// [NOTE]
+// When TypeScript/packager emits CommonJS, it can produce "module.exports = { default: ..., ... }"
+// which causes ESM consumers to get an object whose "default" is the callable factory.
+// Normalize module.exports so that "require(...)" yields a callable function while
+// preserving named properties.
+// This runs only in CommonJS environments and is intentionally defensive.
+//
+declare const module: any;
+
+try{
+	if(typeof module !== 'undefined' && module && module.exports){
+		const	own_module_export = module.exports as any;
+
+		//
+		// If module.exports is exactly { default: fn }, replace module.exports with fn.
+		//
+		if(	own_module_export													&&
+			typeof own_module_export === 'object'								&&
+			Object.prototype.hasOwnProperty.call(own_module_export, 'default')	&&
+			typeof own_module_export.default === 'function'						&&
+			Object.keys(own_module_export).length === 1							)
+		{
+			module.exports = own_module_export.default;
+
+		}else if(own_module_export && typeof own_module_export === 'object' && typeof own_module_export.default === 'function'){
+			//
+			// If default is a function but other named exports exist,
+			// prefer a top-level callable while preserving named props.
+			//
+			try{
+				const	defaultFn = own_module_export.default as Function;
+
+				// If top-level is not already callable, make it so.
+				if(typeof own_module_export !== 'function'){
+					// create a callable wrapper that forwards to defaultFn
+					const	callable = function(this: any, ...args: any[]){
+						return defaultFn.apply(this, args);
+					};
+
+					// copy named properties from original exports except 'default'
+					Object.keys(own_module_export).forEach((key) => {
+						if(key === 'default'){
+							return;
+						}
+						try{
+							(callable as any)[key] = own_module_export[key];
+						}catch{
+							// ignore
+						}
+					});
+
+					// preserve reference to original module
+					try{
+						(callable as any).__orig_module = own_module_export;
+					}catch{
+						// ignore
+					}
+
+					// replace module.exports with callable that also carries named props
+					module.exports = callable;
+				}
+			}catch{
+				// swallow normalization errors - not critical
+			}
+		}
+	}
+}catch{
+	// ignore
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
+ */

package/src/k2hdkc.cc

@@ -15,25 +15,38 @@
  * REVISION:
  */
 
+#include <napi.h>
 #include "k2hdkc_node.h"
 
-using namespace v8 ;
-
 //---------------------------------------------------------
 // k2hdkc node object
 //---------------------------------------------------------
-NAN_METHOD(CreateObject)
+// [NOTE]
+// The logic for receiving arguments when switching to N-API has been removed.
+// This is because the arguments were not used in the first place and did not
+// need to be defined.
+//
+Napi::Value CreateObject(const Napi::CallbackInfo& info)
 {
-	K2hdkcNode::NewInstance(info);
+	return K2hdkcNode::NewInstance(info);
 }
 
-void InitAll(Local<Object> exports, Local<Object> module)
+Napi::Object InitAll(Napi::Env env, Napi::Object exports)
 {
-	K2hdkcNode::Init();
-	Nan::SetMethod(module, "exports", CreateObject);
+	// Class registration (creating a constructor)
+	K2hdkcNode::Init(env, exports);
+
+	// Create a factory function that returns module.exports
+	Napi::Function createFn = Napi::Function::New(env, CreateObject, "k2hdkc");
+
+	// Allow to use "require('k2hdkc').K2hdkcNode"
+	createFn.Set("K2hdkcNode", K2hdkcNode::constructor.Value());
+
+	// Replace module.exports with this function (does not break existing "require('k2hdkc')()".)
+	return createFn;
 }
 
-NODE_MODULE(k2hdkc , InitAll)
+NODE_API_MODULE(k2hdkc, InitAll)
 
 /*
  * Local variables: