fix: bug not allowing set custom key.

Dockerfile

@@ -1,20 +1,23 @@
 FROM node:lts-slim AS base
 
+RUN npm install -g holesail@1.10.1
+
+FROM base AS dev
+
 WORKDIR /
 COPY run.sh .
 COPY fetch-my-mc-connector.js .
 RUN chmod +x run.sh
 
-RUN npm install -g holesail@2.0.3
+ENV MODE=server
+ENV HOST=0.0.0.0
+ENV PORT=8989
+ENV PUBLIC=true
+ENV USERNAME=admin
+ENV PASSWORD=admin
+ENV ROLE=user 
+ENV KEY=""
+ENV MY_MC_API_KEY=""
+#ENV FORCE ""
 
-ENV MODE server
+CMD [ "/usr/bin/bash", "/run.sh" ]
-ENV HOST 0.0.0.0
-ENV PORT 8989
-ENV PUBLIC true
-ENV USERNAME admin
-ENV PASSWORD admin
-ENV ROLE user 
-ENV CONNECTOR ""
-ENV FORCE ""
-
-ENTRYPOINT [ "/run.sh" ]

README.md

@@ -17,7 +17,7 @@ The following environment variables are available:
 - HOST: The hostname or IP address to use for the client or server mode.
 - PUBLIC: A boolean value indicating whether the server should use a public connetor string. Only applicable in server mode.
 - FORCE: A boolean value indicating whether to force a short connector string of less than 32 chars. Only applicable in server and filemanager modes.
-- CONNECTOR: A connector string used to identify the connection. Can be used in client, server, and filemanager modes.
+- KEY: A string used to identify the connection. Can be used in client, server, and filemanager modes.
 - USERNAME: The username to use for authentication in filemanager mode.
 - PASSWORD: The password to use for authentication in filemanager mode.
 - ROLE: The role to assign to the user in filemanager mode. Can be either admin or user.
@@ -41,7 +41,7 @@ docker run -d --name holesail \
   -e MODE=server \
   -e PORT=25565 \
   -e HOST=minecraft \
-  -e CONNECTOR=very-super-secret \
+  -e KEY=very-super-secret \
   -e PUBLIC=false \
   --network holesail \
   anaxios/holesail:latest
@@ -66,7 +66,7 @@ services:
       PORT: 25565
       HOST: minecraft
       PUBLIC: false
-      CONNECTOR: very-super-secret
+      KEY: very-super-secret
     networks:
       - holesail
 
@@ -101,18 +101,17 @@ services:
   holesail:
     container_name: holesail
     restart: unless-stopped
-    network_mode: "host"
+    ports:
+      - 8989:8989
     image: anaxios/holesail:latest
     environment:
       MODE: client
       PORT: 8989
       HOST: 0.0.0.0
       PUBLIC: false
-      CONNECTOR: very-super-secret
+      KEY: very-super-secret
 ```
 
-**Note:** Client mode only works on Linux, and is incompatible with Windows and Mac.
-
 ### Filemanager Mode
 
 In Filemanager mode, Holesail-docker serves a file manager interface. Example `docker-compose.yml` file:
@@ -131,7 +130,7 @@ services:
       ROLE: user
       USERNAME: admin
       PASSWORD: admin
-      CONNECTOR: very-super-secret
+      KEY: very-super-secret
     volumes:
       - <host dir>:/data
 ```
@@ -153,7 +152,7 @@ services:
       PORT: 25565
       HOST: minecraft
       PUBLIC: false
-      CONNECTOR: very-super-secret
+      KEY: very-super-secret
     networks:
       - holesail
 

fetch-my-mc-connector.js

@@ -1,4 +1,4 @@
-const apiKey = process.env.CONNECTOR;
+const apiKey = process.env.MY_MC_API_KEY;
 
 const result = fetch('https://api.my-mc.link/my-hash',{
     method: "GET",
@@ -9,5 +9,9 @@ const result = fetch('https://api.my-mc.link/my-hash',{
             const r = await response.json();
             if (r.success == true) {
                 console.log(r.message);
-            }      
+            } else {
+                throw new Error("failed to fetch holesail key");
+            }
+        }).catch(err => {
+            throw Error(err);
         })

run.sh

@@ -25,9 +25,9 @@ success() {
   print "$GREEN" "$1"
 }
 
-get_connector_my-mc() {
+#get_connector_my_mc() {
-  printf "$(node /fetch-my-mc-connector.js)"
+#  KEY="$(/usr/local/bin/node /fetch-my-mc-connector.js)"
-}
+#}
 
 cmd_argument_builder () {
   local args="";
@@ -35,14 +35,16 @@ cmd_argument_builder () {
     "client")
       [[ "$PORT" ]]            && args="$args --port $PORT";
       [[ "$HOST" ]]            && args="$args --host $HOST";
-      [[ "$CONNECTOR" ]]       && args="$args $CONNECTOR";
+      [[ "$KEY" ]]             && args="$args $KEY";
+      #[[ "$UDP" = "true" ]]    && args="$args --udp";
       ;;
     "server")
       [[ "$PORT" ]]            && args="$args --live $PORT";
       [[ "$HOST" ]]            && args="$args --host $HOST";
       [[ "$PUBLIC" = "true" ]] && args="$args --public";
       [[ "$FORCE" = "true" ]]  && args="$args --force";
-      [[ "$CONNECTOR" ]]       && args="$args --connector $CONNECTOR";
+      [[ "$KEY" ]]             && args="$args --connector $KEY";
+      #[[ "$UDP" = "true" ]]    && args="$args --udp";
       ;;
     "filemanager")
       args="--filemanager";
@@ -53,29 +55,25 @@ cmd_argument_builder () {
       [[ "$PASSWORD" ]]        && args="$args --password $PASSWORD";
       [[ "$ROLE" = "admin" ]]  && args="$args --role admin";
       [[ "$ROLE" = "user" ]]   && args="$args --role user";
-      [[ "$CONNECTOR" ]]       && args="$args --connector $CONNECTOR";
+      [[ "$KEY" ]]             && args="$args --key $KEY";
-      ;;
+      #[[ "$UDP" = "true" ]]    && args="$args --udp";
-    "my-mc")
-      [[ "$PORT" ]]            && args="$args --port $PORT";
-      [[ "$HOST" ]]            && args="$args --host $HOST";
-      [[ "$CONNECTOR" ]]       && args="$args $(get_connector_my-mc)";
       ;;
+#    "my-mc")
+#      #if ! get_connector_my_mc; then exit 1; fi
+#      [[ "$PORT" ]]            && args="$args --port $PORT";
+#      [[ "$HOST" ]]            && args="$args --host $HOST";
+#      [[ "$KEY" ]]             && args="$args --connect $KEY";
+#      #[[ "$UDP" = "true" ]]    && args="$args --udp";
+#      ;;
   esac	
 
   printf "%s" "$args";
 }
 
-ARGS="$(cmd_argument_builder)"
-
-if [[ ! $ARGS ]]; then
-  error "Invalid Mode."
-  exit 1
-fi
-
 # SIGUSR1-handler
-# my_handler() {
+my_handler() {
-#   echo "my_handler"
+  echo "my_handler"
-# }
+}
 
 term_handler() {
   if [ $pid -ne 0 ]; then
@@ -85,17 +83,25 @@ term_handler() {
   exit 143; # 128 + 15 -- SIGTERM
 }
 
+
+
+ARGS="$(cmd_argument_builder)"
+
+if [[ ! $ARGS ]]; then
+  error "Invalid Mode."
+  exit 1
+fi
+
 # setup handlers
 # on callback, kill the last background process, which is `tail -f /dev/null` and execute the specified handler
 #trap 'kill ${!}; my_handler' SIGUSR1
-trap 'kill ${!}; term_handler' SIGTERM
+trap 'kill ${!}; term_handler' SIGTERM SIGINT
 
 # run application
-holesail $ARGS &
+/usr/local/bin/holesail $ARGS &
 pid="$!"
 
 # wait forever
-while true
+while true; do
-do
   tail -f /dev/null & wait ${!}
 done