k2hdkc 2.0.1 → 2.0.3

package/buildutils/node_prebuild_install.sh

@@ -182,6 +182,11 @@ check_and_download_asset_file()
 		PRNINFO "Not found ${ASSET_TGZ_FILENAME} file."
 		return 1
 	fi
+	if ! tar tvfz "${SRCTOP}/${ASSET_TGZ_FILENAME}" >/dev/null 2>&1; then
+		PRNINFO "${ASSET_TGZ_FILENAME} file is not tar.gz format."
+		rm -f "${SRCTOP}/${ASSET_TGZ_FILENAME}" 2>/dev/null
+		return 1
+	fi
 	if ! _RESULT_CODE=$("${CURLCMD}" -s -S -L -w '%{http_code}' -o "${SRCTOP}/${ASSET_SHA256_FILENAME}" -X GET "${ASSET_SHA256_DOWNLOAD_URL}" --insecure); then
 		PRNINFO "Failed to get sha256 file(${ASSET_SHA256_FILENAME})."
 		rm -f "${SRCTOP}/${ASSET_SHA256_FILENAME}" 2>/dev/null
@@ -203,10 +208,14 @@ check_and_download_asset_file()
 	SHA256_VALUE=$(awk '{print $1}' "${SRCTOP}/${ASSET_SHA256_FILENAME}" 2>/dev/null | tr -d '\n')
 	if ! DL_TGZ_SHA256_VALUE=$(sha256sum "${SRCTOP}/${ASSET_TGZ_FILENAME}" 2>/dev/null | awk '{print $1}' 2>/dev/null | tr -d '\n'); then
 		PRNINFO "Failed to make sha256 value from download tgz file."
+		rm -f "${SRCTOP}/${ASSET_TGZ_FILENAME}" 2>/dev/null
+		rm -f "${SRCTOP}/${ASSET_SHA256_FILENAME}" 2>/dev/null
 		return 1
 	fi
 	if [ -z "${SHA256_VALUE}" ] || [ -z "${DL_TGZ_SHA256_VALUE}" ] || [ "${SHA256_VALUE}" != "${DL_TGZ_SHA256_VALUE}" ]; then
 		PRNINFO "The sha256 value of the downloaded tgz file is incorrect."
+		rm -f "${SRCTOP}/${ASSET_TGZ_FILENAME}" 2>/dev/null
+		rm -f "${SRCTOP}/${ASSET_SHA256_FILENAME}" 2>/dev/null
 		return 1
 	fi
 
@@ -217,6 +226,8 @@ check_and_download_asset_file()
 	cd "${SRCTOP}" || exit 1
 	if ! tar xvfz "${SRCTOP}/${ASSET_TGZ_FILENAME}" >/dev/null 2>&1; then
 		PRNINFO "Could not extract files from ${ASSET_TGZ_FILENAME} file."
+		rm -f "${SRCTOP}/${ASSET_TGZ_FILENAME}" 2>/dev/null
+		rm -f "${SRCTOP}/${ASSET_SHA256_FILENAME}" 2>/dev/null
 		cd "${_CUR_DIR}" || exit 1
 		return 1
 	fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k2hdkc",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "K2HDKC addon library for Node.js",
   "os": "linux",
   "main": "index.js",
@@ -20,33 +20,35 @@
     "buildutils/make_node_prebuild_variables.sh",
     "buildutils/node_prebuild_install.sh",
     "buildutils/node_prebuild.sh",
+    "tsconfig.json",
+    "tsconfig.*.json",
     "README.md",
     "LICENSE"
   ],
   "dependencies": {
     "bindings": "^1.5.0",
-    "node-addon-api": "^8.5.0",
+    "node-addon-api": "^8.6.0",
     "prebuild-install": "^7.1.3"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
-    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-terser": "^1.0.0",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^25.0.8",
+    "@types/node": "^25.5.0",
     "chai": "^6.2.2",
     "mocha": "^11.7.5",
-    "node-gyp": "^12.1.0",
+    "node-gyp": "^12.2.0",
     "prebuild": "^13.0.1",
-    "rollup": "^4.55.1",
+    "rollup": "^4.59.0",
     "typescript": "^5.9.3",
     "ts-node": "^10.9.2"
   },
   "scripts": {
     "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": "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 mv build/cjs ./cjs.backup; mv build/esm ./esm.backup; npm run build:rebuild; rm -rf build/cjs.backup build/esm; mv ./cjs.backup build/cjs; mv ./esm.backup build/esm; 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'",

package/src/k2hdkc_node.cc

@@ -1583,9 +1583,10 @@ Napi::Value K2hdkcNode::GetSubkeys(const Napi::CallbackInfo& info)
 			uint32_t	pos		= 0;
 			for(const auto& str: strarr){
 				std::string	strtmp(str);
+				// Removes any non-printble characters(except spaces and tabs) at the end of the string.
 				while(!strtmp.empty()){
 					unsigned char tmpch = static_cast<unsigned char>(strtmp.back());
-					if('\0' != tmpch && !std::isspace(tmpch)){
+					if(('\0' != tmpch && !std::isspace(tmpch)) || ' ' == tmpch || '\t' == tmpch){
 						break;
 					}
 					strtmp.pop_back();
@@ -1856,7 +1857,10 @@ Napi::Value K2hdkcNode::SetValue(const Napi::CallbackInfo& info)
 	std::string	strval;
 	std::string	strsubkey;
 	std::string	strpass;
-	time_t		expire = 0;
+	time_t		expire			= 0;
+	bool		is_val_set 		= false;
+	bool		is_subkey_set	= false;
+	bool		is_pass_set		= false;
 
 	// target key arguments(for both ontime and permanent connection)
 	if(info.Length() <= (argpos + 1)){
@@ -1871,9 +1875,11 @@ Napi::Value K2hdkcNode::SetValue(const Napi::CallbackInfo& info)
 
 	// target value arguments(for both ontime and permanent connection)
 	if(info[argpos].IsString()){
-		strval = info[argpos++].As<Napi::String>().Utf8Value();
+		strval		= info[argpos++].As<Napi::String>().Utf8Value();
+		is_val_set 	= true;
 	}else{
 		argpos++;
+		is_val_set 	= false;
 	}
 
 	// other arguments for target
@@ -1881,16 +1887,20 @@ Napi::Value K2hdkcNode::SetValue(const Napi::CallbackInfo& info)
 		// target 2'nd parameter is subkey(string or null)
 		if(info[argpos].IsNull()){
 			argpos++;
+			is_subkey_set	= false;
 		}else{
-			strsubkey = info[argpos++].As<Napi::String>().Utf8Value();
+			strsubkey		= info[argpos++].As<Napi::String>().Utf8Value();
+			is_subkey_set	= true;
 		}
 
 		if(argpos < info.Length() && (info[argpos].IsString() || info[argpos].IsNull())){
 			// target 3'rd parameter is pass
 			if(info[argpos].IsNull()){
 				argpos++;
+				is_pass_set	= false;
 			}else{
-				strpass = info[argpos++].As<Napi::String>().Utf8Value();
+				strpass		= info[argpos++].As<Napi::String>().Utf8Value();
+				is_pass_set	= true;
 			}
 
 			if(argpos < info.Length() && info[argpos].IsNumber()){
@@ -1947,13 +1957,13 @@ Napi::Value K2hdkcNode::SetValue(const Napi::CallbackInfo& info)
 
 	// work
 	if(hasCallback){
-		SetValueWorker*	worker = new SetValueWorker(maybeCallback, obj->_k2hdkcslave, conf, ctlport, cuk, auto_rejoin, no_giveup_rejoin, strkey, strval, strsubkey, strpass, expire);
+		SetValueWorker*	worker = new SetValueWorker(maybeCallback, obj->_k2hdkcslave, conf, ctlport, cuk, auto_rejoin, no_giveup_rejoin, strkey, (is_val_set ? &strval : NULL), (is_subkey_set ? &strsubkey : NULL), (is_pass_set ? &strpass : NULL), expire);
 		worker->Queue();
 		return Napi::Boolean::New(env, true);
 	}else{
 		dkcres_type_t	rescode = DKC_NORESTYPE;
 		bool			result	= false;
-		if(!strsubkey.empty()){
+		if(is_subkey_set){
 			// subkey is specified, set value into subkey
 			K2hdkcComAddSubkey*	pComObj;
 			if(!obj->IsInitialize()){
@@ -1965,7 +1975,7 @@ Napi::Value K2hdkcNode::SetValue(const Napi::CallbackInfo& info)
 				Napi::TypeError::New(env, "Internal error: Could not create command object.").ThrowAsJavaScriptException();
 				return env.Undefined();
 			}
-			result = pComObj->CommandSend(reinterpret_cast<const unsigned char*>(strkey.c_str()), strkey.length() + 1, reinterpret_cast<const unsigned char*>(strsubkey.c_str()), strsubkey.length() + 1, (strval.empty() ? NULL : reinterpret_cast<const unsigned char*>(strval.c_str())), (strval.empty() ? 0 : strval.length() + 1), true, (strpass.empty() ? NULL : strpass.c_str()), (expire > 0 ? &expire : NULL), &rescode);
+			result = pComObj->CommandSend(reinterpret_cast<const unsigned char*>(strkey.c_str()), strkey.length() + 1, reinterpret_cast<const unsigned char*>(strsubkey.c_str()), strsubkey.length() + 1, (is_val_set ? reinterpret_cast<const unsigned char*>(strval.c_str()) : NULL), (is_val_set ? strval.length() + 1 : 0), true, (is_pass_set ? strpass.c_str() : NULL), (expire > 0 ? &expire : NULL), &rescode);
 			DKC_DELETE(pComObj);
 		}else{
 			// set value to key
@@ -1979,7 +1989,7 @@ Napi::Value K2hdkcNode::SetValue(const Napi::CallbackInfo& info)
 				Napi::TypeError::New(env, "Internal error: Could not create command object.").ThrowAsJavaScriptException();
 				return env.Undefined();
 			}
-			result = pComObj->CommandSend(reinterpret_cast<const unsigned char*>(strkey.c_str()), strkey.length() + 1, (strval.empty() ? NULL : reinterpret_cast<const unsigned char*>(strval.c_str())), (strval.empty() ? 0 : strval.length() + 1), false, (strpass.empty() ? NULL : strpass.c_str()), (expire > 0 ? &expire : NULL), &rescode);
+			result = pComObj->CommandSend(reinterpret_cast<const unsigned char*>(strkey.c_str()), strkey.length() + 1, (is_val_set ? reinterpret_cast<const unsigned char*>(strval.c_str()) : NULL), (is_val_set ? strval.length() + 1 : 0), false, (is_pass_set ? strpass.c_str() : NULL), (expire > 0 ? &expire : NULL), &rescode);
 			DKC_DELETE(pComObj);
 		}
 		return Napi::Boolean::New(env, result);

package/src/k2hdkc_node_async.h

@@ -515,16 +515,16 @@ class GetAttrsWorker : public Napi::AsyncWorker
 //---------------------------------------------------------
 // SetValueWorker class
 //
-// Constructor:			constructor(const Napi::Function& callback, K2hdkcSlave& slaveobj, const std::string& configuration, int control_port, const std::string& inputcuk, bool is_auto_rejoin, bool is_nogiveup_rejoin, const std::string& key, const std::string& val, const std::string& subkey, const std::string& pass, const time_t input_expire)
+// Constructor:			constructor(const Napi::Function& callback, K2hdkcSlave& slaveobj, const std::string& configuration, int control_port, const std::string& inputcuk, bool is_auto_rejoin, bool is_nogiveup_rejoin, const std::string& key, const std::string* pval, const std::string* psubkey, const std::string* ppass, const time_t input_expire)
 // Callback function:	function(string error)
 //
 //---------------------------------------------------------
 class SetValueWorker : public Napi::AsyncWorker
 {
 	public:
-		SetValueWorker(const Napi::Function& callback, K2hdkcSlave& slaveobj, const std::string& configuration, int control_port, const std::string& inputcuk, bool is_auto_rejoin, bool is_nogiveup_rejoin, const std::string& key, const std::string& val, const std::string& subkey, const std::string& pass, const time_t input_expire) :
+		SetValueWorker(const Napi::Function& callback, K2hdkcSlave& slaveobj, const std::string& configuration, int control_port, const std::string& inputcuk, bool is_auto_rejoin, bool is_nogiveup_rejoin, const std::string& key, const std::string* pval, const std::string* psubkey, const std::string* ppass, const time_t input_expire) :
 			Napi::AsyncWorker(callback), _callbackRef(Napi::Persistent(callback)),
-			_slaveobj(slaveobj), _conf(configuration), _ctlport(control_port), _cuk(inputcuk), _auto_rejoin(is_auto_rejoin), _no_giveup_rejoin(is_nogiveup_rejoin), _strkey(key), _strval(val), _strsubkey(subkey), _strpass(pass), _expire(input_expire)
+			_slaveobj(slaveobj), _conf(configuration), _ctlport(control_port), _cuk(inputcuk), _auto_rejoin(is_auto_rejoin), _no_giveup_rejoin(is_nogiveup_rejoin), _strkey(key), _is_val_set(NULL != pval), _strval(pval ? *pval : ""), _is_subkey_set(NULL != psubkey), _strsubkey(psubkey ? *psubkey : ""), _is_pass_set(NULL != ppass), _strpass(ppass ? *ppass : ""), _expire(input_expire)
 		{
 			_callbackRef.Ref();
 		}
@@ -552,7 +552,7 @@ class SetValueWorker : public Napi::AsyncWorker
 
 			// work
 			dkcres_type_t	rescode = DKC_NORESTYPE;
-			if(!_strsubkey.empty()){
+			if(_is_subkey_set){
 				// subkey is specified, set value into subkey
 				K2hdkcComAddSubkey*	pComObj;
 				if(!_slaveobj.GetChmCntrlObject()){
@@ -564,7 +564,7 @@ class SetValueWorker : public Napi::AsyncWorker
 					SetError("Internal error: Could not create command object.");
 					return;
 				}
-				if(!pComObj->CommandSend(reinterpret_cast<const unsigned char*>(_strkey.c_str()), _strkey.length() + 1, reinterpret_cast<const unsigned char*>(_strsubkey.c_str()), _strsubkey.length() + 1, (_strval.empty() ? NULL : reinterpret_cast<const unsigned char*>(_strval.c_str())), (_strval.empty() ? 0 : _strval.length() + 1), true, (_strpass.empty() ? NULL : _strpass.c_str()), (_expire > 0 ? &_expire : NULL), &rescode)){
+				if(!pComObj->CommandSend(reinterpret_cast<const unsigned char*>(_strkey.c_str()), _strkey.length() + 1, reinterpret_cast<const unsigned char*>(_strsubkey.c_str()), _strsubkey.length() + 1, (_is_val_set ? reinterpret_cast<const unsigned char*>(_strval.c_str()) : NULL), (_is_val_set ? _strval.length() + 1 : 0), true, (_is_pass_set ? _strpass.c_str() : NULL), (_expire > 0 ? &_expire : NULL), &rescode)){
 					SetError("Failed to set value into subkey/key.");
 				}
 				DKC_DELETE(pComObj);
@@ -580,7 +580,7 @@ class SetValueWorker : public Napi::AsyncWorker
 					SetError("Internal error: Could not create command object.");
 					return;
 				}
-				if(!pComObj->CommandSend(reinterpret_cast<const unsigned char*>(_strkey.c_str()), _strkey.length() + 1, (_strval.empty() ? NULL : reinterpret_cast<const unsigned char*>(_strval.c_str())), (_strval.empty() ? 0 : _strval.length() + 1), false, (_strpass.empty() ? NULL : _strpass.c_str()), (_expire > 0 ? &_expire : NULL), &rescode)){
+				if(!pComObj->CommandSend(reinterpret_cast<const unsigned char*>(_strkey.c_str()), _strkey.length() + 1, (_is_val_set ? reinterpret_cast<const unsigned char*>(_strval.c_str()) : NULL), (_is_val_set ? _strval.length() + 1 : 0), false, (_is_pass_set  ? _strpass.c_str() : NULL), (_expire > 0 ? &_expire : NULL), &rescode)){
 					SetError("Failed to set value into key.");
 				}
 				DKC_DELETE(pComObj);
@@ -625,8 +625,11 @@ class SetValueWorker : public Napi::AsyncWorker
 		bool					_no_giveup_rejoin;
 
 		std::string				_strkey;
+		bool					_is_val_set;
 		std::string				_strval;
+		bool					_is_subkey_set;
 		std::string				_strsubkey;
+		bool					_is_pass_set;
 		std::string				_strpass;
 		time_t					_expire;
 };

package/tsconfig.cjs.json

@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "ES2019",
+    "module": "CommonJS",
+    "declaration": false,
+    "emitDeclarationOnly": false,
+    "outDir": "build/cjs",
+    "esModuleInterop": true
+  },
+  "include": [
+    "src/**/*"
+  ]
+}

package/tsconfig.esm.json

@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "ES2019",
+    "module": "ESNext",
+    "declaration": false,
+    "emitDeclarationOnly": false,
+    "outDir": "build/esm",
+    "esModuleInterop": true
+  },
+  "include": [
+    "src/**/*"
+  ]
+}

package/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "target": "ES2019",
+    "module": "CommonJS",
+    "declaration": false,
+    "declarationMap": false,
+    "emitDeclarationOnly": false,
+    "outDir": "build",
+    "rootDir": "src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "moduleResolution": "node",
+    "allowJs": false,
+    "checkJs": false,
+    "resolveJsonModule": true,
+    "types": ["node"]
+  },
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "build",
+    "dist",
+    "types"
+  ]
+}

package/tsconfig.tests.json

@@ -0,0 +1,17 @@
+{
+  "extends": "./tsconfig.cjs.json",
+  "compilerOptions": {
+    "outDir": "tests_cjs",
+    "rootDir": "tests",
+    "sourceMap": false,
+    "types": ["node", "mocha"],
+    "baseUrl": ".",
+    "paths": {
+      "k2hdkc": ["types/index.d.ts"],
+      "k2hdkc/*": ["types/*"]
+    }
+  },
+  "include": [
+    "tests/**/*"
+  ]
+}

package/tsconfig.types.json

@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "types-generated",
+    "rootDir": "src",
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*"
+  ]
+}

package/types/index.d.ts

@@ -26,7 +26,7 @@
 //
 // callable / constructible main factory
 //
-declare function k2hdkc(): k2hdkc.K2hdkcNode;
+declare function k2hdkc(conf?: string | null, port?: number | null, cuk?: string | null, auto_rejoin?: boolean, no_giveup_rejoin?: boolean):	k2hdkc.K2hdkcNode;
 
 declare namespace k2hdkc
 {
@@ -81,7 +81,8 @@ declare namespace k2hdkc
 	export class K2hdkcNode
 	{
 		// Constructor
-		constructor();	// always no arguments
+		constructor(conf?: string | null, port?: number | null, cuk?: string | null, auto_rejoin?: boolean, no_giveup_rejoin?: boolean);
+//		constructor();	// always no arguments
 
 		//-----------------------------------------------------
 		// Methods (Callback can be called)
@@ -1205,8 +1206,8 @@ declare namespace k2hdkc
 	// K2hdkcFactoryType
 	//---------------------------------------------------------
 	export type K2hdkcFactoryType = {
-		():			K2hdkcNode;
-		new():		K2hdkcNode;
+		(conf?: string | null, port?: number | null, cuk?: string | null, auto_rejoin?: boolean, no_giveup_rejoin?: boolean):		K2hdkcNode;
+		new(conf?: string | null, port?: number | null, cuk?: string | null, auto_rejoin?: boolean, no_giveup_rejoin?: boolean):	K2hdkcNode;
 		K2hdkcNode:	typeof K2hdkcNode;
 	};
 } // end namespace k2hdkc