Merge branch 'main' into feature/remove-auth

Author: mamchurovskyy

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.24.4
+        go-version: 1.24.x
 
     - name: Get coverage tool
       run: |
@@ -27,7 +27,7 @@ jobs:
         BRANCH_NAME="${PATHS[1]}_${PATHS[2]}"
         echo $BRANCH_NAME
         echo "BRANCH=$(echo ${BRANCH_NAME})" >> $GITHUB_ENV
-        
+
     - name: Create failing badge
       uses: schneegans/dynamic-badges-action@v1.0.0
       with:
@@ -44,14 +44,14 @@ jobs:
         cd application/backend
         go test ./... -coverprofile cover.out
         go tool cover -func cover.out > covered.txt
-      
+
     - name: Get coverage
       run: |
         cd application/backend
         for word in $(cat covered.txt); do total_percent=$word; done
         echo $total_percent
         echo "COVERAGE=$total_percent" >> $GITHUB_ENV
-        
+
     - name: Create passing badge
       uses: schneegans/dynamic-badges-action@v1.0.0
       if: ${{ env.COVERAGE!=null }}
@@ -63,7 +63,7 @@ jobs:
         message: Passed
         color: green
         namedLogo: checkmarx
-        
+
     - name: Create coverage badge
       uses: schneegans/dynamic-badges-action@v1.0.0
       if: ${{ env.COVERAGE!=null }}

.gitignore

@@ -0,0 +1,9 @@
+.ai-factory.json
+.mcp.json
+AGENTS.md
+skills-lock.json
+.codex/
+.agents/
+.ai-factory/
+
+**/__pycache__/

README.md

@@ -95,4 +95,30 @@ Once done, just go to <your host> and login as "admin" with <any password>.
 ### Docket socket URL
 By default the app will connect using the raw unix socket. But this can be overriden via the ENV variable `DOCKER_HOST`. That way you can specify fully qualified URL to the socket or URL of an docker socket proxy.
 
-In `compose-socket-proxy.yml` you can see a sample compose file for starting the socket proxy. To use it in the app set `DOCKER_HOST=http://localhost:2375` in the ENV.
+In `compose-socket-proxy.yml` you can see a sample compose file for starting the socket proxy. To use it in the app set `DOCKER_HOST=http://localhost:2375` in the ENV.
+
+## Local Docker testing
+
+Use the local test compose to run `onlogs + socket-proxy + logprinter` together:
+
+```sh
+cd application
+docker compose -f compose-local-test.yml up --build
+```
+
+Open `http://localhost:2874` and login with:
+
+- Username: `admin`
+- Password: `admin`
+
+Stop containers:
+
+```sh
+docker compose -f compose-local-test.yml down
+```
+
+Stop and remove volumes too (clean state):
+
+```sh
+docker compose -f compose-local-test.yml down -v
+```

application/backend/app/containerdb/containerdb.go

@@ -3,6 +3,7 @@ package containerdb
 import (
 	"fmt"
 	"os"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -207,6 +208,7 @@ var (
 	logCleanupMu     sync.Mutex
 	nextCleanup      time.Time
 	isCleanupRunning bool
+	ansiEscapeRegex  = regexp.MustCompile(`[\x1B\x9B][[\]()#;?]*(?:(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])`)
 )
 
 func MaybeScheduleCleanup(host string, container string) {
@@ -275,6 +277,11 @@ func PutLogMessage(db *leveldb.DB, host string, container string, message_item [
 }
 
 func fitsForSearch(logLine string, message string, caseSensetivity bool) bool {
+	logLine = ansiEscapeRegex.ReplaceAllString(logLine, "")
+	message = ansiEscapeRegex.ReplaceAllString(message, "")
+	logLine = strings.Join(strings.Fields(logLine), " ")
+	message = strings.Join(strings.Fields(message), " ")
+
 	if !caseSensetivity {
 		logLine = strings.ToLower(logLine)
 		message = strings.ToLower(message)

application/backend/app/containerdb/containerdb_test.go

@@ -98,3 +98,19 @@ func TestGetLogs(t *testing.T) {
 		t.Error("Invalid last logItem datetime: ", logs[3][0])
 	}
 }
+
+func TestFitsForSearchWithANSI(t *testing.T) {
+	logLine := "\x1b[37mWARNING\x1b[2m AzL4Y8oR KsTdiwHodbZ0i \tmOK2Wz \x1b[0m"
+
+	if !fitsForSearch(logLine, "WARNING Az", true) {
+		t.Error("Expected query to match when ANSI escape codes are present")
+	}
+
+	if !fitsForSearch(logLine, "KsTdiwHodbZ0i m", true) {
+		t.Error("Expected query to match across tab-separated boundary")
+	}
+
+	if fitsForSearch(logLine, "NOT_PRESENT", true) {
+		t.Error("Expected non-existing query not to match")
+	}
+}

application/backend/app/daemon/daemon.go

@@ -161,7 +161,8 @@ func (h *DaemonService) CreateDaemonToDBStream(ctx context.Context, containerNam
 func (h *DaemonService) GetContainersList(ctx context.Context) []string {
 	result, err := h.DockerClient.GetContainerNames(ctx)
 	if err != nil {
-		panic(err)
+		fmt.Println("ERROR: failed to get containers list from docker daemon:", err)
+		return vars.DockerContainers
 	}
 
 	var names []string

application/backend/app/routes/routes_test.go

@@ -22,7 +22,7 @@ import (
 )
 
 func initTestConfig() *RouteController {
-	cli, _ := client.NewClientWithOpts(client.FromEnv)
+	cli, _ := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	defer cli.Close()
 
 	dockerService := &docker.DockerService{

application/backend/app/streamer/streamer_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func initTestConfig() *StreamController {
-	cli, _ := client.NewClientWithOpts(client.FromEnv)
+	cli, _ := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	defer cli.Close()
 
 	dockerService := &docker.DockerService{

application/backend/main.go

@@ -45,8 +45,16 @@ func main() {
 	godotenv.Load(".env")
 	init_config()
 
-	cli, _ := client.NewClientWithOpts(client.FromEnv)
+	cli, err := client.NewClientWithOpts(
+		client.FromEnv,
+		client.WithAPIVersionNegotiation(),
+	)
+	if err != nil {
+		fmt.Println("ERROR: unable to initialize Docker client:", err)
+		return
+	}
 	defer cli.Close()
+	fmt.Println("INFO: Docker client initialized with API version negotiation")
 
 	dockerService := &docker.DockerService{
 		Client: cli,

application/build.sh

@@ -1,2 +1,2 @@
 # docker buildx create --use
-docker buildx build --load --platform=linux/amd64,linux/arm64 --tag "devforth/onlogs:latest" --tag "devforth/onlogs:1.1.4" .
+docker buildx build --load --platform=linux/amd64,linux/arm64 --tag "devforth/onlogs:latest" --tag "devforth/onlogs:1.1.11" .