k2hr3-api 1.0.38 → 1.0.40

package/ChangeLog

@@ -1,3 +1,15 @@
+k2hr3-api (1.0.40) unstable; urgency=low
+
+  * Fixed the options as the npm audit issue was fixed - #131
+
+ -- Takeshi Nakatani <ggtakec@gmail.com>  Thu, 20 Feb 2025 09:28:41 +0900
+
+k2hr3-api (1.0.39) unstable; urgency=low
+
+  * Changed publish NodeJS versions to v22 and Fixed scripts, etc - #129
+
+ -- Takeshi Nakatani <ggtakec@gmail.com>  Mon, 17 Feb 2025 17:12:05 +0900
+
 k2hr3-api (1.0.38) unstable; urgency=low
 
   * Updated nodejs_helper for forked repositories - #127

package/README.md

@@ -37,43 +37,43 @@ K2HR3 REST API and K2HR3 API Server is the server side JavaScript program runnin
 ![K2HR3 system overview](https://k2hr3.antpick.ax/images/detail_system_overview.png)
 
 ### Documents
-[K2HR3 Document](https://k2hr3.antpick.ax/index.html)  
-[K2HR3 Web Application Usage](https://k2hr3.antpick.ax/usage_app.html)  
-[K2HR3 Command Line Interface Usage](https://k2hr3.antpick.ax/cli.html)  
-[K2HR3 REST API Usage](https://k2hr3.antpick.ax/api.html)  
-[K2HR3 OpenStack Notification Listener Usage](https://k2hr3.antpick.ax/detail_osnl.html)  
-[K2HR3 Watcher Usage](https://k2hr3.antpick.ax/tools.html)  
-[K2HR3 Get Resource Usage](https://k2hr3.antpick.ax/tools.html)  
-[K2HR3 Utilities for Setup](https://k2hr3.antpick.ax/setup.html)  
-[K2HR3 Demonstration](https://demo.k2hr3.antpick.ax/)
-
-[About k2hdkc](https://k2hdkc.antpick.ax/)  
-[About k2hash](https://k2hash.antpick.ax/)  
-[About chmpx](https://chmpx.antpick.ax/)  
-[About k2hash transaction plugin](https://k2htpdtor.antpick.ax/)  
-
-[About AntPickax](https://antpick.ax/)  
+- [K2HR3 Document](https://k2hr3.antpick.ax/index.html)
+- [K2HR3 Web Application Usage](https://k2hr3.antpick.ax/usage_app.html)
+- [K2HR3 Command Line Interface Usage](https://k2hr3.antpick.ax/cli.html)
+- [K2HR3 REST API Usage](https://k2hr3.antpick.ax/api.html)
+- [K2HR3 OpenStack Notification Listener Usage](https://k2hr3.antpick.ax/detail_osnl.html)
+- [K2HR3 Watcher Usage](https://k2hr3.antpick.ax/tools.html)
+- [K2HR3 Get Resource Usage](https://k2hr3.antpick.ax/tools.html)
+- [K2HR3 Utilities for Setup](https://k2hr3.antpick.ax/setup.html)
+- [K2HR3 Demonstration](https://demo.k2hr3.antpick.ax/)
+
+- [About k2hdkc](https://k2hdkc.antpick.ax/)
+- [About k2hash](https://k2hash.antpick.ax/)
+- [About chmpx](https://chmpx.antpick.ax/)
+- [About k2hash transaction plugin](https://k2htpdtor.antpick.ax/)
+
+- [About AntPickax](https://antpick.ax/)
 
 ### Repositories
-[K2HR3 main repository](https://github.com/yahoojapan/k2hr3)  
-[K2HR3 Web Application repository](https://github.com/yahoojapan/k2hr3_app)  
-[K2HR3 Command Line Interface repository](https://github.com/yahoojapan/k2hr3_cli)  
-[K2HR3 REST API repository](https://github.com/yahoojapan/k2hr3_api)  
-[K2HR3 OpenStack Notification Listener](https://github.com/yahoojapan/k2hr3_osnl)  
-[K2HR3 Utilities](https://github.com/yahoojapan/k2hr3_utils)  
-[K2HR3 Container Registration Sidecar](https://github.com/yahoojapan/k2hr3_sidecar)  
-[K2HR3 Get Resource](https://github.com/yahoojapan/k2hr3_get_resource)  
-
-[k2hdkc](https://github.com/yahoojapan/k2hdkc)  
-[k2hash](https://github.com/yahoojapan/k2hash)  
-[chmpx](https://github.com/yahoojapan/chmpx)  
-[k2hash transaction plugin](https://github.com/yahoojapan/k2htp_dtor)  
+- [K2HR3 main repository](https://github.com/yahoojapan/k2hr3)
+- [K2HR3 Web Application repository](https://github.com/yahoojapan/k2hr3_app)
+- [K2HR3 Command Line Interface repository](https://github.com/yahoojapan/k2hr3_cli)
+- [K2HR3 REST API repository](https://github.com/yahoojapan/k2hr3_api)
+- [K2HR3 OpenStack Notification Listener](https://github.com/yahoojapan/k2hr3_osnl)
+- [K2HR3 Get Resource](https://github.com/yahoojapan/k2hr3_get_resource)
+- [K2HR3 Utilities](https://github.com/yahoojapan/k2hr3_utils)
+- [K2HR3 Container Registration Sidecar](https://github.com/yahoojapan/k2hr3_sidecar)
+
+- [k2hdkc](https://github.com/yahoojapan/k2hdkc)
+- [k2hash](https://github.com/yahoojapan/k2hash)
+- [chmpx](https://github.com/yahoojapan/chmpx)
+- [k2hash transaction plugin](https://github.com/yahoojapan/k2htp_dtor)
 
 ### Packages
-[k2hr3-api(npm packages)](https://www.npmjs.com/package/k2hr3-api)  
+- [k2hr3-api(npm packages)](https://www.npmjs.com/package/k2hr3-api)
 
 ### Docker images
-[k2hr3-api(Docker Hub)](https://hub.docker.com/r/antpickax/k2hr3-api)
+- [k2hr3-api(Docker Hub)](https://hub.docker.com/r/antpickax/k2hr3-api)
 
 ### License
 This software is released under the MIT License, see the license file.

package/app.js

@@ -170,12 +170,10 @@ app.use(function(req, res, next)
 				//
 				// case of specified user credentials(except specified unscoped token)
 				//
-				/* eslint-disable indent, no-mixed-spaces-and-tabs */
 				var result = {
-								result:		false,
-								message:	'not allow CORS(cross-origin resource sharing) to /v1/user/tokens'
-							 };
-				/* eslint-enable indent, no-mixed-spaces-and-tabs */
+					result:		false,
+					message:	'not allow CORS(cross-origin resource sharing) to /v1/user/tokens'
+				 };
 
 				resutil.errResponse(req, res, 405, result, 'application/json; charset=utf-8');
 				return;
@@ -274,12 +272,10 @@ app.use(function(err, req, res, next)		// eslint-disable-line no-unused-vars
 	res.locals.message = err.message;
 	res.locals.error = req.app.get('env') === 'development' ? err : {};
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
 	var result = {
-					result:		false,
-					message:	'Internal server error'
-				 };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		result:		false,
+		message:	'Internal server error'
+	};
 
 	resutil.errResponse(req, res, (err.status || 500), result, 'application/json; charset=utf-8');
 });

package/bin/run.sh

@@ -154,7 +154,7 @@ stop_old_process()
 		#
 		for _ONE_PID in ${ALL_CHILD_PIDS}; do
 			# shellcheck disable=SC2009
-			if ! ps -ax | grep -v grep | grep -v defunct | grep -q "${_ONE_PID}"; then
+			if ( ps -o pid,stat ax 2>/dev/null | grep -v 'PID' | awk '$2~/^[^Z]/ { print $1 }' | grep -q "^${_ONE_PID}$" || exit 1 && exit 0 ); then
 				kill -KILL "${_ONE_PID}" >/dev/null 2>&1
 			fi
 		done
@@ -165,7 +165,7 @@ stop_old_process()
 		#
 		for _ONE_PID in ${ALL_CHILD_PIDS}; do
 			# shellcheck disable=SC2009
-			if ! ps -ax | grep -v grep | grep -v defunct | grep -q "${_ONE_PID}"; then
+			if ( ps -o pid,stat ax 2>/dev/null | grep -v 'PID' | awk '$2~/^[^Z]/ { print $1 }' | grep -q "^${_ONE_PID}$" || exit 1 && exit 0 ); then
 				echo "[ERROR] Could not stop old processes."
 				return 1
 			fi
@@ -195,82 +195,82 @@ while [ $# -ne 0 ]; do
 	if [ -z "$1" ]; then
 		break
 
-	elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--help" ] || [ "$1" = "--HELP" ]; then
+	elif echo "$1" | grep -q -i -e "^-h$" -e "^--help$"; then
 		PrintUsage "${PRGNAME}"
 		exit 0
 
-	elif [ "$1" = "prod" ] || [ "$1" = "-PROD" ] || [ "$1" = "--production" ] || [ "$1" = "--PRODUCTION" ]; then
+	elif echo "$1" | grep -q -i -e "^-prod$" -e "^--production$"; then
 		if [ -n "${NODE_ENV_VALUE}" ]; then
 			echo "[ERROR] already specified --production(-prod) or --development(-dev) option"
 			exit 1
 		fi
 		NODE_ENV_VALUE="production"
 
-	elif [ "$1" = "-dev" ] || [ "$1" = "-DEV" ] || [ "$1" = "--development" ] || [ "$1" = "--DEVELOPMENT" ]; then
+	elif echo "$1" | grep -q -i -e "^-dev$" -e "^--development$"; then
 		if [ -n "${NODE_ENV_VALUE}" ]; then
 			echo "[ERROR] already specified --production(-prod) or --development(-dev) option"
 			exit 1
 		fi
 		NODE_ENV_VALUE="development"
 
-	elif [ "$1" = "-bg" ] || [ "$1" = "-BG" ] || [ "$1" = "--background" ] || [ "$1" = "--BACKGROUND" ]; then
+	elif echo "$1" | grep -q -i -e "^-bg$" -e "^--background$"; then
 		#
 		# Not check multi same option...
 		#
 		BACKGROUND=1
 
-	elif [ "$1" = "--foreground" ] || [ "$1" = "--FOREGROUND" ] || [ "$1" = "-fg" ] || [ "$1" = "-FG" ]; then
+	elif echo "$1" | grep -q -i -e "^-fg$" -e "^--foreground$"; then
 		#
 		# Not check multi same option...
 		#
 		FOREGROUND=1
 
-	elif [ "$1" = "-s" ] || [ "$1" = "-S" ] || [ "$1" = "--stop" ] || [ "$1" = "--STOP" ]; then
+	elif echo "$1" | grep -q -i -e "^-s$" -e "^--stop$"; then
 		if [ "${STOP_OLD_PROCESS}" -ne 0 ]; then
 			echo "[ERROR] already specified --stop(-s) option"
 			exit 1
 		fi
 		STOP_OLD_PROCESS=1
 
-	elif [ "$1" = "-d" ] || [ "$1" = "-D" ] || [ "$1" = "--debug" ] || [ "$1" = "--DEBUG" ]; then
+	elif echo "$1" | grep -q -i -e "^-d$" -e "^--debug$"; then
 		if [ -n "${INSPECTOR_OPT}" ]; then
 			echo "[ERROR] already specified --debug(-d) or --debug-nobrk(-dnobrk) option"
 			exit 1
 		fi
 		INSPECTOR_OPT="--inspect-brk=${LOCAL_HOSTNAME}:9229"
 
-	elif [ "$1" = "-dnobrk" ] || [ "$1" = "-DNOBRK" ] || [ "$1" = "--debug-nobrk" ] || [ "$1" = "--DEBUG-NOBRK" ]; then
+	elif echo "$1" | grep -q -i -e "^-dnobrk$" -e "^--debug-nobrk$"; then
 		if [ -n "${INSPECTOR_OPT}" ]; then
 			echo "[ERROR] already specified --debug(-d) or --debug-nobrk(-dnobrk) option"
 			exit 1
 		fi
 		INSPECTOR_OPT="--inspect=${LOCAL_HOSTNAME}:9229"
 
-	elif [ "$1" = "-dl" ] || [ "$1" = "-DL" ] || [ "$1" = "--debuglevel" ] || [ "$1" = "--DEBUGLEVEL" ]; then
+	elif echo "$1" | grep -q -i -e "^-dl$" -e "^--debuglevel$"; then
 		shift
 		if [ $# -eq 0 ]; then
 			echo "[ERROR] --debuglevel(-dl) option needs parameter(dbg/msg/warn/err/custom debug level)"
 			exit 1
 		fi
-		if [ "$1" = "dbg" ] || [ "$1" = "DBG" ] || [ "$1" = "debug" ] || [ "$1" = "DEBUG" ]; then
+		if echo "$1" | grep -q -i -e "^dbg$" -e "^debug$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-dl) option already is set"
 				exit 1
 			fi
 			DEBUG_ENV_LEVEL=4
-		elif [ "$1" = "msg" ] || [ "$1" = "MSG" ] || [ "$1" = "message" ] || [ "$1" = "MESSAGE" ] || [ "$1" = "info" ] || [ "$1" = "INFO" ]; then
+		elif echo "$1" | grep -q -i -e "^msg$" -e "^message$" -e "^info$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-dl) option already is set"
 				exit 1
 			fi
 			DEBUG_ENV_LEVEL=3
-		elif [ "$1" = "warn" ] || [ "$1" = "WARN" ] || [ "$1" = "warning" ] || [ "$1" = "WARNING" ]; then
+		elif echo "$1" | grep -q -i -e "^wan$" -e "^warn$" -e "^warning$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-dl) option already is set"
 				exit 1
 			fi
 			DEBUG_ENV_LEVEL=2
-		elif [ "$1" = "err" ] || [ "$1" = "ERR" ] || [ "$1" = "error" ] || [ "$1" = "ERROR" ]; then
+		elif echo "$1" | grep -q -i -e "^err$" -e "^error$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-dl) option already is set"
 				exit 1
@@ -286,14 +286,14 @@ while [ $# -ne 0 ]; do
 			DEBUG_ENV_CUSTOM="${DEBUG_ENV_CUSTOM}$1"
 		fi
 
-	elif [ "$1" = "-w" ] || [ "$1" = "-W" ] || [ "$1" = "--watcher" ] || [ "$1" = "--WATCHER" ] || [ "$1" = "--watch" ] || [ "$1" = "--WATCH" ]; then
+	elif echo "$1" | grep -q -i -e "^-w$" -e "^--watcher$" -e "^--watch$"; then
 		if [ "${WATCHER_PROC}" -ne 0 ]; then
 			echo "[ERROR] already specified --watcher(-w) option"
 			exit 1
 		fi
 		WATCHER_PROC=1
 
-	elif [ "$1" = "-os" ] || [ "$1" = "-OS" ] || [ "$1" = "--oneshot" ] || [ "$1" = "--ONESHOT" ]; then
+	elif echo "$1" | grep -q -i -e "^-os$" -e "^--oneshot$"; then
 		if [ "${WATCH_ONESHOT}" -ne 0 ]; then
 			echo "[ERROR] already specified --oneshot(-os) option"
 			exit 1
@@ -394,13 +394,13 @@ elif [ "${DEBUG_ENV_LEVEL}" -ge 1 ]; then
 else
 	DEBUG_ENV_PARAM="LOGLEVEL_SILENT"
     if [ -n "${DEBUG_LEVEL}" ]; then
-		if [ "${DEBUG_LEVEL}" = "dbg" ] || [ "${DEBUG_LEVEL}" = "DBG" ] || [ "${DEBUG_LEVEL}" = "debug" ] || [ "${DEBUG_LEVEL}" = "DEBUG" ]; then
+		if echo "${DEBUG_LEVEL}" | grep -q -i -e "^dbg$" -e "^debug$"; then
 			DEBUG_ENV_PARAM="LOGLEVEL_DBG"
-		elif [ "${DEBUG_LEVEL}" = "msg" ] || [ "${DEBUG_LEVEL}" = "MSG" ] || [ "${DEBUG_LEVEL}" = "message" ] || [ "${DEBUG_LEVEL}" = "MESSAGE" ] || [ "${DEBUG_LEVEL}" = "info" ] || [ "${DEBUG_LEVEL}" = "INFO" ]; then
+		elif echo "${DEBUG_LEVEL}" | grep -q -i -e "^msg$" -e "^message$" -e "^info$"; then
 			DEBUG_ENV_PARAM="LOGLEVEL_MSG"
-		elif [ "${DEBUG_LEVEL}" = "warn" ] || [ "${DEBUG_LEVEL}" = "WARN" ] || [ "${DEBUG_LEVEL}" = "warning" ] || [ "${DEBUG_LEVEL}" = "WARNING" ]; then
+		elif echo "${DEBUG_LEVEL}" | grep -q -i -e "^wan$" -e "^warn$" -e "^warning$"; then
 			DEBUG_ENV_PARAM="LOGLEVEL_WAN"
-		elif [ "${DEBUG_LEVEL}" = "err" ] || [ "${DEBUG_LEVEL}" = "ERR" ] || [ "${DEBUG_LEVEL}" = "error" ] || [ "${DEBUG_LEVEL}" = "ERROR" ]; then
+		elif echo "${DEBUG_LEVEL}" | grep -q -i -e "^err$" -e "^error$"; then
 			DEBUG_ENV_PARAM="LOGLEVEL_ERR"
 		fi
     fi

package/bin/www

@@ -119,7 +119,7 @@ if(cluster.isMaster && (undefined == apiConf.isMultiProc() || false !== apiConf.
 				process.setuid(user);
 				console.log('Succeeded to setuid');
 			} catch (err) {
-				console.log('Failed to setuid');
+				console.log('Failed to setuid', JSON.stringify(err));
 				process.exit(1);
 			}
 		}

package/config/k2hr3-init.sh.templ

@@ -154,7 +154,7 @@ check_os()
 		PKGMGR_BIN="apt-get"
 		PKGMGR_UPDATE_OPT="update -y -qq"
 		PKGMGR_INSTALL_OPT="install -y"
-		PKGMGR_LIST_CMD="apt list --installed"
+		PKGMGR_LIST_CMD="apt-get list --installed"
 
 	elif echo "${ID}" | grep -q -i "debian"; then
 		IS_OS_DEBIAN=1
@@ -162,7 +162,7 @@ check_os()
 		PKGMGR_BIN="apt-get"
 		PKGMGR_UPDATE_OPT="update -y -qq"
 		PKGMGR_INSTALL_OPT="install -y"
-		PKGMGR_LIST_CMD="apt list --installed"
+		PKGMGR_LIST_CMD="apt-get list --installed"
 
 	elif echo "${ID}" | grep -q -i "alpine"; then
 		IS_OS_DEBIAN=0
@@ -585,17 +585,17 @@ while [ $# -ne 0 ]; do
 	if [ -z "$1" ]; then
 		break;
 
-	elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--HELP" ] || [ "$1" = "--help" ]; then
+	elif echo "$1" | grep -q -i -e "^-h$" -e "^--help$"; then
 		func_usage "${SCRIPTNAME}"
 		exit 0
 
-	elif [ "$1" = "-r" ] || [ "$1" = "-R" ] || [ "$1" = "--register" ] || [ "$1" = "--REGISTER" ]; then
+	elif echo "$1" | grep -q -i -e "^-r$" -e "^--register$"; then
 		if [ -n "${SCRIPTMODE}" ]; then
 			exit_err "Already set script mode(${SCRIPTMODE}), thus option($1) is not wrong."
 		fi
 		SCRIPTMODE="r"
 
-	elif [ "$1" = "-d" ] || [ "$1" = "-D" ] || [ "$1" = "--delete" ] || [ "$1" = "--DELETE" ]; then
+	elif echo "$1" | grep -q -i -e "^-d$" -e "^--delete$"; then
 		if [ -n "${SCRIPTMODE}" ]; then
 			exit_err "Already set script mode(${SCRIPTMODE}), thus option($1) is not wrong."
 		fi

package/eslint.config.mjs

@@ -0,0 +1,68 @@
+/*
+ * K2HR3 REST API
+ *
+ * Copyright 2017 Yahoo Japan Corporation.
+ *
+ * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
+ * common management information for the cloud.
+ * K2HR3 can dynamically manage information as "who", "what", "operate".
+ * These are stored as roles, resources, policies in K2hdkc, and the
+ * client system can dynamically read and modify these information.
+ *
+ * For the full copyright and license information, please view
+ * the license file that was distributed with this source code.
+ *
+ * AUTHOR:   Takeshi Nakatani
+ * CREATE:   Fri, Feb 14 2025
+ * REVISION:
+ *
+ */
+
+//
+// [NOTE]
+// This file is the old .eslintrc.js file converted by @eslint/migrate-config.
+//
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+	baseDirectory: __dirname,
+	recommendedConfig: js.configs.recommended,
+	allConfig: js.configs.all
+});
+
+export default [...compat.extends("eslint:recommended"), {
+	languageOptions: {
+		globals: {
+			...globals.node,
+			...globals.browser,
+			...globals.commonjs,
+		},
+		ecmaVersion: 2017,
+		sourceType: "commonjs",
+	},
+	files: ["**/*.js", "**/*.ts", "**/www", "**/watcher"],
+	rules: {
+		indent: ["error", "tab", {
+			SwitchCase: 1,
+		}],
+		"no-console": 0,
+		"linebreak-style": ["error", "unix"],
+		quotes: ["error", "single"],
+		semi: ["error", "always"],
+	},
+}];
+
+/*
+ * 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/lib/cacerts.js

@@ -35,23 +35,24 @@ function loadCACert()
 			fs.statSync(process.env.CAPATH);
 			return fs.readFileSync(process.env.CAPATH);
 		}catch(err){
-			r3logger.elog('CAPATH environment' + process.env.CAPATH + ' file does not exist, then use default ca certs.');
+			r3logger.elog('CAPATH environment' + process.env.CAPATH + ' file does not exist, then use default ca certs.', JSON.stringify(err));
 		}
 	}
 
 	// load one of CA certs
-	/* eslint-disable indent */
-	var	def_certs = [	'/etc/ssl/certs/ca-certificates.crt',
-						'/etc/pki/tls/certs/ca-bundle.crt',
-						'/etc/ssl/certs/ca-bundle.crt',
-						'/etc/ssl/certs/ca-bundle.trust.crt'];
-	/* eslint-enable indent */
+	var	def_certs = [
+		'/etc/ssl/certs/ca-certificates.crt',
+		'/etc/pki/tls/certs/ca-bundle.crt',
+		'/etc/ssl/certs/ca-bundle.crt',
+		'/etc/ssl/certs/ca-bundle.trust.crt'
+	];
 
 	for(var cnt = 0; cnt < def_certs.length; ++cnt){
 		try{
 			fs.statSync(def_certs[cnt]);
 			return fs.readFileSync(def_certs[cnt]);
 		}catch(err){
+			r3logger.dlog(JSON.stringify(err));
 			continue;
 		}
 	}

package/lib/dummyuserapi.js

@@ -716,7 +716,7 @@ exports.getUserUnscopedToken = function(uname, passwd, callback)
 //
 // update token	: not implemented
 //
-exports.getUserUnscopedTokenByToken = function(token, callback)		// eslint-disable-line no-unused-vars
+exports.getUserUnscopedTokenByToken = function(token, callback)
 {
 	var	error = new Error('getUserUnscopedTokenByToken is not implemented');
 	r3logger.elog(error.message);

package/lib/ipwatch.js

@@ -267,7 +267,7 @@ function rawWatchAddressesAlive(oneshotCB)
 			return null;
 		}
 	}catch(error){
-		r3logger.elog('could not load module : ' + (rawIsBasicType() ? './basicipcheck' : localchkipconfig.funcmod));
+		r3logger.elog('could not load module : ' + (rawIsBasicType() ? './basicipcheck' : localchkipconfig.funcmod), JSON.stringify(error));
 		return null;
 	}
 

package/lib/k2hr3acrutil.js

@@ -73,20 +73,18 @@ function rawACRSendVerifyEx(scopedtoken, urlobj, callback)
 		return;
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-						'X-Auth-Token':		scopedtoken							// [NOTE] this token string does not have 'U=' prefix.
-					  };
-	var	options		= {
-						'host':				apiutil.getSafeString(urlobj.host),
-						'port':				urlobj.port,
-						'path': 			apiutil.getSafeString(urlobj.path),
-						'method':			'GET',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		scopedtoken							// [NOTE] this token string does not have 'U=' prefix.
+	};
+	var	options = {
+		'host':				apiutil.getSafeString(urlobj.host),
+		'port':				urlobj.port,
+		'path': 			apiutil.getSafeString(urlobj.path),
+		'method':			'GET',
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/lib/k2hr3apiutil.js

@@ -104,7 +104,7 @@ function rawCheckSimpleJSON(str)
 	}
 	try{
 		var tmp = JSON.parse(str);						// eslint-disable-line no-unused-vars
-	}catch(exception){
+	}catch(exception){									// eslint-disable-line no-unused-vars
 		return false;
 	}
 	return true;
@@ -117,7 +117,7 @@ function rawParseJSON(str)
 	}
 	try{
 		return JSON.parse(str);
-	}catch(exception){
+	}catch(exception){									// eslint-disable-line no-unused-vars
 		return null;
 	}
 }
@@ -1183,7 +1183,7 @@ function rawCheckFileExist(file)
 	}
 	try{
 		fs.statSync(file);
-	}catch(err){
+	}catch(err){							// eslint-disable-line no-unused-vars
 		return false;
 	}
 	return true;
@@ -1197,7 +1197,7 @@ function rawReadFileContents(file)
 	}
 	try{
 		contents = fs.readFileSync(file).toString();
-	}catch(err){
+	}catch(err){							// eslint-disable-line no-unused-vars
 		return contents;
 	}
 	return contents;
@@ -1221,7 +1221,7 @@ function rawCheckMakeDir(path)
 	}
 	try{
 		fs.mkdirSync(path);
-	}catch(err){
+	}catch(err){							// eslint-disable-line no-unused-vars
 		return false;
 	}
 	return true;

package/lib/k2hr3cryptutil.js

@@ -68,6 +68,7 @@ function rawR3Encrypt(str, passphrase, algorithm)
 		// convert '/', '?', ':' characters.
 		return encodeURIComponent(cryptedStr);
 	}catch(exception){
+		r3logger.dlog(JSON.stringify(exception));
 		return null;
 	}
 }
@@ -122,6 +123,7 @@ function rawR3Decrypt(str, passphrase, algorithm)
 		}
 		return decryptedStr;
 	}catch(exception){
+		r3logger.dlog(JSON.stringify(exception));
 		return null;
 	}
 }