From b68bb68981a45907b39d1916425af3a431a0339d Mon Sep 17 00:00:00 2001
From: Solar <cochinageorge@gmail.com>
Date: Sun, 3 Aug 2025 15:39:42 +0200
Subject: [PATCH] refactor 2: put miniws code in isolated module in miniws/

---
 .gitignore                          |  1 +
 go.mod                              |  4 ++--
 go.work                             |  6 ++++++
 main.go                             | 12 ++----------
 miniws/consts.go                    |  8 ++++++++
 miniws/go.mod                       |  3 +++
 miniws/go.sum                       |  0
 logger.go => miniws/logger.go       |  2 +-
 utils.go => miniws/utils.go         |  2 +-
 webserver.go => miniws/webserver.go |  2 +-
 10 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 go.work
 create mode 100644 miniws/consts.go
 create mode 100644 miniws/go.mod
 create mode 100644 miniws/go.sum
 rename logger.go => miniws/logger.go (99%)
 rename utils.go => miniws/utils.go (95%)
 rename webserver.go => miniws/webserver.go (99%)

diff --git a/.gitignore b/.gitignore
index 6a394fa..b007c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 !*.go
 !go.sum
 !go.mod
+!go.work
 
 !README.md
 !LICENSE
diff --git a/go.mod b/go.mod
index f20619e..78ef297 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
-module com.github/shlldev/miniws
+module github.com/shlldev/miniws
 
-go 1.22.2
+go 1.24.5
 
 require github.com/akamensky/argparse v1.4.0
diff --git a/go.work b/go.work
new file mode 100644
index 0000000..dfca84e
--- /dev/null
+++ b/go.work
@@ -0,0 +1,6 @@
+go 1.24.5
+
+use (
+    .
+    ./miniws
+)
\ No newline at end of file
diff --git a/main.go b/main.go
index f5df94b..edf76cd 100644
--- a/main.go
+++ b/main.go
@@ -5,17 +5,10 @@ import (
 	"os"
 
 	"github.com/akamensky/argparse"
-)
-
-const (
-	FILENAME_ACCESSLOG       string = "access.log"
-	FILENAME_ERRORLOG        string = "error.log"
-	FILENAME_IPFILTER        string = "ipfilter.conf"
-	FILENAME_USERAGENTFILTER string = "useragentfilter.conf"
+	"github.com/shlldev/miniws/miniws"
 )
 
 func main() {
-
 	parser := argparse.NewParser("miniws", "")
 
 	port := parser.Int("p", "port", &argparse.Options{Default: 8040})
@@ -30,7 +23,6 @@ func main() {
 		return
 	}
 
-	webserver := NewWebServer(*port, *logFolder, *configFolder)
+	webserver := miniws.NewWebServer(*port, *logFolder, *configFolder)
 	webserver.Run()
-
 }
diff --git a/miniws/consts.go b/miniws/consts.go
new file mode 100644
index 0000000..c95eaa4
--- /dev/null
+++ b/miniws/consts.go
@@ -0,0 +1,8 @@
+package miniws
+
+const (
+	FILENAME_ACCESSLOG       string = "access.log"
+	FILENAME_ERRORLOG        string = "error.log"
+	FILENAME_IPFILTER        string = "ipfilter.conf"
+	FILENAME_USERAGENTFILTER string = "useragentfilter.conf"
+)
diff --git a/miniws/go.mod b/miniws/go.mod
new file mode 100644
index 0000000..22a0144
--- /dev/null
+++ b/miniws/go.mod
@@ -0,0 +1,3 @@
+module github.com/shlldev/miniws/miniws
+
+go 1.22.2
diff --git a/miniws/go.sum b/miniws/go.sum
new file mode 100644
index 0000000..e69de29
diff --git a/logger.go b/miniws/logger.go
similarity index 99%
rename from logger.go
rename to miniws/logger.go
index 354df40..b161fee 100644
--- a/logger.go
+++ b/miniws/logger.go
@@ -1,4 +1,4 @@
-package main
+package miniws
 
 import (
 	"fmt"
diff --git a/utils.go b/miniws/utils.go
similarity index 95%
rename from utils.go
rename to miniws/utils.go
index 6a10ef0..5c00258 100644
--- a/utils.go
+++ b/miniws/utils.go
@@ -1,4 +1,4 @@
-package main
+package miniws
 
 import (
 	"strconv"
diff --git a/webserver.go b/miniws/webserver.go
similarity index 99%
rename from webserver.go
rename to miniws/webserver.go
index f081391..f31e8de 100644
--- a/webserver.go
+++ b/miniws/webserver.go
@@ -1,4 +1,4 @@
-package main
+package miniws
 
 import (
 	"errors"