Changed support NodeJS and Fixed some code (#139)

Author: ggtakec

.github/workflows/ci.yml

@@ -59,18 +59,18 @@ jobs:
       fail-fast: false
 
       matrix:
-        node-version: [20, 22, 24]
+        node-version: [22, 24]
 
     steps:
       #
       # Checks-out your repository under $GITHUB_WORKSPACE, so your
       # job can access it
       #
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -145,18 +145,18 @@ jobs:
         # <default tag flag>:   If you want to use the created Docker image as the default image, specify "default".
         #
         imageinfo:
-          - alpine:3.22,alpine:3.22,alpine,default
-          - ubuntu:24.04,ubuntu:24.04,ubuntu
+          - alpine:3.23,alpine:3.23,alpine,default
+          - ubuntu:26.04,ubuntu:26.04,ubuntu
 
     #
     # Run building and pushing helper
     #
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       #
       # Login to avoid the Docker Hub rate limit
@@ -170,7 +170,7 @@ jobs:
       #
       - name: Login to DockerHub
         if: ${{ github.event_name != 'pull_request' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESSTOKEN }}

.github/workflows/imagetypevars.sh

@@ -93,7 +93,7 @@ elif [ "${CI_DOCKER_IMAGE_OSTYPE}" = "ubuntu" ]; then
 	PKG_INSTALL_CURL="curl"
 	PKG_INSTALL_BASE="g++ make nodejs k2hdkc-dev dnsutils procps"
 
-	NODE_MAJOR=18
+	NODE_MAJOR=24
 	PKG_REPO_SETUP_NODEJS="
 		${PKGMGR_NAME} install -y ca-certificates gnupg
 		mkdir -p /etc/apt/keyrings

.github/workflows/nodejstypevars.sh

@@ -79,18 +79,6 @@ if [ -z "${CI_NODEJS_MAJOR_VERSION}" ]; then
 	#
 	:
 
-elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then
-	INSTALLER_BIN="apt-get"
-	UPDATE_CMD="update"
-	UPDATE_CMD_ARG=""
-	INSTALL_CMD="install"
-	INSTALL_CMD_ARG=""
-	INSTALL_AUTO_ARG="-y"
-	INSTALL_QUIET_ARG="-qq"
-	INSTALL_PKG_LIST="git gcc g++ make k2hdkc-dev"
-
-	IS_NPM_PUBLISHER=0
-
 elif [ "${CI_NODEJS_MAJOR_VERSION}" = "22" ]; then
 	INSTALLER_BIN="apt-get"
 	UPDATE_CMD="update"

config/k2hr3-init.sh.templ

@@ -741,9 +741,9 @@ if [ "${SCRIPTMODE}" = "r" ]; then
 		RESOLVE_DOMAIN=$(grep -i '^domain' /etc/resolv.conf | awk '{print $NF}')
 	fi
 
-	if [ -n "${RESOLVE_DOMAIN}" ]; then
+	if [ -n "${RESOLVE_DOMAIN}" ] && [ -n "${LOCAL_HOSTNAME}" ]; then
 		LOCAL_FULL_HOSTNAME="${LOCAL_HOSTNAME}.${RESOLVE_DOMAIN}"
-	elif [ -n "${LOCAL_DOMAIN}" ]; then
+	elif [ -n "${LOCAL_DOMAIN}" ] && [ -n "${LOCAL_HOSTNAME}" ]; then
 		LOCAL_FULL_HOSTNAME="${LOCAL_HOSTNAME}.${LOCAL_DOMAIN}"
 	else
 		LOCAL_FULL_HOSTNAME=$(hostname -f)

package.json

@@ -11,8 +11,8 @@
     "dateformat": "^5.0.3",
     "debug": "~4.4.3",
     "express": "^5.2.1",
-    "jose": "^6.2.1",
-    "k2hdkc": "^2.0.3",
+    "jose": "^6.2.2",
+    "k2hdkc": "^2.0.4",
     "morgan": "~1.10.1",
     "rotating-file-stream": "^3.2.9"
   },
@@ -39,20 +39,20 @@
     "@eslint/js": "^10.0.1",
     "@types/body-parser": "^1.19.6",
     "@types/chai": "^5.2.3",
-    "@types/config": "^3.3.5",
+    "@types/config": "^4.4.0",
     "@types/cookie-parser": "^1.4.10",
     "@types/dateformat": "^5.0.3",
-    "@types/debug": "^4.1.12",
+    "@types/debug": "^4.1.13",
     "@types/express": "^5.0.6",
     "@types/mocha": "^10.0.10",
     "@types/morgan": "^1.9.10",
-    "@types/node": "^25.4.0",
-    "@typescript-eslint/eslint-plugin": "^8.57.0",
-    "@typescript-eslint/parser": "^8.57.0",
+    "@types/node": "^25.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.59.0",
+    "@typescript-eslint/parser": "^8.59.0",
     "chai": "^6.2.2",
     "chai-http": "^5.1.2",
-    "eslint": "^10.0.3",
-    "globals": "^17.4.0",
+    "eslint": "^10.2.1",
+    "globals": "^17.5.0",
     "mocha": "^11.7.5",
     "nyc": "^18.0.0",
     "typescript": "^5.9.3"