Compare commits
18 Commits
ezconf/v0.
...
hwsauth/v0
| Author | SHA1 | Date | |
|---|---|---|---|
| 95a17597cf | |||
| cd29f11296 | |||
| 7ed40c7afe | |||
| 596a4c0529 | |||
| ed3bc4afb0 | |||
| 2c9de70018 | |||
| 965721bd89 | |||
| 5781aa523c | |||
| 76c8a592af | |||
| 65e8bd07e1 | |||
| 0c3d4ef095 | |||
| 5a3ed49ea4 | |||
| 2f49063432 | |||
| 1c49b19197 | |||
| f25bc437c4 | |||
| 378bd8006d | |||
| e9b96fedb1 | |||
| da6ad0cf2e |
173
AGENTS.md
Normal file
173
AGENTS.md
Normal file
@@ -0,0 +1,173 @@
|
|||||||
|
# AGENTS.md - Coding Agent Guidelines for golib
|
||||||
|
|
||||||
|
## Project Overview
|
||||||
|
This is a Go library repository containing multiple independent packages:
|
||||||
|
- **cookies**: HTTP cookie utilities
|
||||||
|
- **env**: Environment variable helpers
|
||||||
|
- **ezconf**: Configuration loader with ENV parsing
|
||||||
|
- **hlog**: Logging with zerolog
|
||||||
|
- **hws**: HTTP web server
|
||||||
|
- **hwsauth**: Authentication middleware for hws
|
||||||
|
- **jwt**: JWT token generation and validation
|
||||||
|
- **tmdb**: The Movie Database API client
|
||||||
|
|
||||||
|
Each package has its own `go.mod` and can be used independently.
|
||||||
|
|
||||||
|
## Interactive Questions
|
||||||
|
All questions in plan mode should use the opencode interactive question prompter for user interaction.
|
||||||
|
|
||||||
|
## Build, Test, and Lint Commands
|
||||||
|
|
||||||
|
### Running Tests
|
||||||
|
```bash
|
||||||
|
# Test all packages from repo root
|
||||||
|
go test ./...
|
||||||
|
|
||||||
|
# Test a specific package
|
||||||
|
cd <package> && go test
|
||||||
|
|
||||||
|
# Run a single test function
|
||||||
|
cd <package> && go test -run TestFunctionName
|
||||||
|
|
||||||
|
# Run tests with verbose output
|
||||||
|
cd <package> && go test -v
|
||||||
|
|
||||||
|
# Run tests matching a pattern
|
||||||
|
cd <package> && go test -run "TestName.*"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Building
|
||||||
|
```bash
|
||||||
|
# Each package is a library - no build needed
|
||||||
|
# Verify code compiles:
|
||||||
|
go build ./...
|
||||||
|
|
||||||
|
# Or for specific package:
|
||||||
|
cd <package> && go build
|
||||||
|
```
|
||||||
|
|
||||||
|
### Linting
|
||||||
|
```bash
|
||||||
|
# Use standard go tools
|
||||||
|
go vet ./...
|
||||||
|
go fmt ./...
|
||||||
|
|
||||||
|
# Check formatting without changing files
|
||||||
|
gofmt -l .
|
||||||
|
```
|
||||||
|
|
||||||
|
## Code Style Guidelines
|
||||||
|
|
||||||
|
### Package Structure
|
||||||
|
- Each package must have its own `go.mod` with module path: `git.haelnorr.com/h/golib/<package>`
|
||||||
|
- Go version should be current (1.23.4+)
|
||||||
|
- Each package should have a `doc.go` file with package documentation
|
||||||
|
|
||||||
|
### Imports
|
||||||
|
- Use standard library imports first
|
||||||
|
- Then third-party imports
|
||||||
|
- Then local imports from this repo (e.g., `git.haelnorr.com/h/golib/hlog`)
|
||||||
|
- Group imports with blank lines between groups
|
||||||
|
- Example:
|
||||||
|
```go
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
|
"git.haelnorr.com/h/golib/hlog"
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Formatting
|
||||||
|
- Use `gofmt` standard formatting
|
||||||
|
- No tabs for alignment, use spaces inside structs
|
||||||
|
- Line length: no hard limit, but prefer readability
|
||||||
|
|
||||||
|
### Types
|
||||||
|
- Use explicit types for struct fields
|
||||||
|
- Config structs must have ENV comments (see below)
|
||||||
|
- Prefer named return values for complex functions
|
||||||
|
- Use generics where appropriate (see `hwsauth.Authenticator[T Model, TX DBTransaction]`)
|
||||||
|
|
||||||
|
### Naming Conventions
|
||||||
|
- Packages: lowercase, single word (e.g., `cookies`, `ezconf`)
|
||||||
|
- Exported functions: PascalCase (e.g., `NewServer`, `ConfigFromEnv`)
|
||||||
|
- Unexported functions: camelCase (e.g., `isValidHostname`, `waitUntilReady`)
|
||||||
|
- Test functions: `Test<FunctionName>` or `Test<FunctionName>_<Case>` (underscore for sub-cases)
|
||||||
|
- Variables: camelCase, descriptive names
|
||||||
|
- Constants: PascalCase or UPPER_CASE depending on scope
|
||||||
|
|
||||||
|
### Error Handling
|
||||||
|
- Use `github.com/pkg/errors` for error wrapping
|
||||||
|
- Wrap errors with context: `errors.Wrap(err, "context message")`
|
||||||
|
- Return errors, don't panic (except in truly exceptional cases)
|
||||||
|
- Validate inputs and return descriptive errors
|
||||||
|
- Example:
|
||||||
|
```go
|
||||||
|
if config == nil {
|
||||||
|
return nil, errors.New("Config cannot be nil")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Configuration Pattern
|
||||||
|
- Each package with config should have a `Config` struct
|
||||||
|
- Provide `ConfigFromEnv() (*Config, error)` function
|
||||||
|
- ENV comment format for Config struct fields:
|
||||||
|
```go
|
||||||
|
type Config struct {
|
||||||
|
Host string // ENV HWS_HOST: Host to listen on (default: 127.0.0.1)
|
||||||
|
Port uint64 // ENV HWS_PORT: Port to listen on (default: 3000)
|
||||||
|
SSL bool // ENV HWS_SSL: Enable SSL (required when using production)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
- Format: `// ENV ENV_NAME: Description (required <condition>) (default: <value>)`
|
||||||
|
- Include "required" only if no default
|
||||||
|
- Include "default" only if one exists
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
- Use `testing` package from standard library
|
||||||
|
- Use `github.com/stretchr/testify` for assertions (`require`, `assert`)
|
||||||
|
- Table-driven tests for multiple cases:
|
||||||
|
```go
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
input string
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{"valid case", "input", false},
|
||||||
|
{"error case", "", true},
|
||||||
|
}
|
||||||
|
```
|
||||||
|
- Test files use `<package>_test` for black-box tests or `<package>` for white-box
|
||||||
|
- Helper functions should use `t.Helper()`
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
- All exported functions, types, and constants must have godoc comments
|
||||||
|
- Comments should start with the name being documented
|
||||||
|
- Example: `// NewServer returns a new hws.Server with the specified configuration.`
|
||||||
|
- Keep doc.go files up to date with package overview
|
||||||
|
- Follow RULES.md for README and wiki documentation
|
||||||
|
|
||||||
|
## Version Control (from RULES.md)
|
||||||
|
- Do NOT make changes to master branch
|
||||||
|
- Checkout a branch for new features
|
||||||
|
- Version numbers use git tags - do NOT change manually
|
||||||
|
- When updating docs, append branch name to version
|
||||||
|
- Changes to golib-wiki repo should use same branch name
|
||||||
|
|
||||||
|
## Testing Requirements (from RULES.md)
|
||||||
|
- All features MUST have tests
|
||||||
|
- Update existing tests when modifying features
|
||||||
|
- New features require new tests
|
||||||
|
|
||||||
|
## Documentation Requirements (from RULES.md)
|
||||||
|
- Document via: docstrings, README.md, doc.go, wiki
|
||||||
|
- README structure: Title+version, Features (NO EMOTICONS), Installation, Quick Start, Docs links, Additional info, License, Contributing, Related projects
|
||||||
|
- Wiki location: `~/projects/golib-wiki`
|
||||||
|
- Docstrings must conform to godoc standards
|
||||||
|
|
||||||
|
## License
|
||||||
|
- All modules use MIT License
|
||||||
3
RULES.md
3
RULES.md
@@ -45,3 +45,6 @@ Do not make any changes to master. Checkout a branch to work on new features
|
|||||||
Version numbers are specified using git tags.
|
Version numbers are specified using git tags.
|
||||||
Do not change version numbers. When updating documentation, append the branch name to the version number.
|
Do not change version numbers. When updating documentation, append the branch name to the version number.
|
||||||
Changes made to the golib-wiki repo should be made under the same branch name as the changes made in this repo
|
Changes made to the golib-wiki repo should be made under the same branch name as the changes made in this repo
|
||||||
|
|
||||||
|
4. Licencing
|
||||||
|
All modules should have an MIT License
|
||||||
|
|||||||
21
cookies/LICENSE
Normal file
21
cookies/LICENSE
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2026 haelnorr
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
61
cookies/README.md
Normal file
61
cookies/README.md
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
# cookies v1.0.0
|
||||||
|
|
||||||
|
HTTP cookie utilities for Go web applications with security best practices.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- Secure cookie setting with HttpOnly flag
|
||||||
|
- Cookie deletion with proper expiration
|
||||||
|
- Pagefrom tracking for post-login redirects
|
||||||
|
- Host validation for referer-based redirects
|
||||||
|
- Full test coverage
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
```bash
|
||||||
|
go get git.haelnorr.com/h/golib/cookies
|
||||||
|
```
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
```go
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"git.haelnorr.com/h/golib/cookies"
|
||||||
|
)
|
||||||
|
|
||||||
|
func handler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Set a secure cookie
|
||||||
|
cookies.SetCookie(w, "session", "/", "abc123", 3600)
|
||||||
|
|
||||||
|
// Delete a cookie
|
||||||
|
cookies.DeleteCookie(w, "old_session", "/")
|
||||||
|
|
||||||
|
// Handle pagefrom for redirects
|
||||||
|
if r.URL.Path == "/login" {
|
||||||
|
cookies.SetPageFrom(w, r, "example.com")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check pagefrom after login
|
||||||
|
redirectTo := cookies.CheckPageFrom(w, r)
|
||||||
|
http.Redirect(w, r, redirectTo, http.StatusFound)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
See the [wiki documentation](../golib/wiki/cookies.md) for detailed usage information and examples.
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
## Contributing
|
||||||
|
|
||||||
|
Please see the main golib repository for contributing guidelines.
|
||||||
|
|
||||||
|
## Related Projects
|
||||||
|
|
||||||
|
This package is part of the golib collection of utilities for Go applications and integrates well with other golib packages.
|
||||||
405
cookies/cookies_test.go
Normal file
405
cookies/cookies_test.go
Normal file
@@ -0,0 +1,405 @@
|
|||||||
|
package cookies
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestSetCookie(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
cookie string
|
||||||
|
path string
|
||||||
|
value string
|
||||||
|
maxAge int
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "basic cookie",
|
||||||
|
cookie: "test",
|
||||||
|
path: "/",
|
||||||
|
value: "value",
|
||||||
|
maxAge: 3600,
|
||||||
|
expected: "test=value; Path=/; Max-Age=3600; HttpOnly",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "zero max age",
|
||||||
|
cookie: "session",
|
||||||
|
path: "/api",
|
||||||
|
value: "abc123",
|
||||||
|
maxAge: 0,
|
||||||
|
expected: "session=abc123; Path=/api; HttpOnly",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "negative max age",
|
||||||
|
cookie: "temp",
|
||||||
|
path: "/",
|
||||||
|
value: "temp",
|
||||||
|
maxAge: -1,
|
||||||
|
expected: "temp=temp; Path=/; Max-Age=0; HttpOnly",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty value",
|
||||||
|
cookie: "empty",
|
||||||
|
path: "/",
|
||||||
|
value: "",
|
||||||
|
maxAge: 3600,
|
||||||
|
expected: "empty=; Path=/; Max-Age=3600; HttpOnly",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "special characters in value",
|
||||||
|
cookie: "data",
|
||||||
|
path: "/",
|
||||||
|
value: "test@123!#$%",
|
||||||
|
maxAge: 7200,
|
||||||
|
expected: "data=test@123!#$%; Path=/; Max-Age=7200; HttpOnly",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
SetCookie(w, tt.cookie, tt.path, tt.value, tt.maxAge)
|
||||||
|
|
||||||
|
headers := w.Header()["Set-Cookie"]
|
||||||
|
if len(headers) != 1 {
|
||||||
|
t.Errorf("Expected 1 Set-Cookie header, got %d", len(headers))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse the cookie header to check individual components
|
||||||
|
cookieHeader := headers[0]
|
||||||
|
|
||||||
|
// Check that all expected components are present
|
||||||
|
if !strings.Contains(cookieHeader, tt.cookie+"="+tt.value) {
|
||||||
|
t.Errorf("Expected cookie name/value not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, "Path="+tt.path) {
|
||||||
|
t.Errorf("Expected path not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, "HttpOnly") {
|
||||||
|
t.Errorf("Expected HttpOnly not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if tt.maxAge != 0 {
|
||||||
|
expectedMaxAge := fmt.Sprintf("Max-Age=%d", tt.maxAge)
|
||||||
|
if tt.maxAge < 0 {
|
||||||
|
expectedMaxAge = "Max-Age=0" // Go normalizes negative Max-Age to 0
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, expectedMaxAge) {
|
||||||
|
t.Errorf("Expected Max-Age not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteCookie(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
cookie string
|
||||||
|
path string
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "basic deletion",
|
||||||
|
cookie: "test",
|
||||||
|
path: "/",
|
||||||
|
expected: "test=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Max-Age=0; HttpOnly",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "delete with specific path",
|
||||||
|
cookie: "session",
|
||||||
|
path: "/api",
|
||||||
|
expected: "session=; Path=/api; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Max-Age=0; HttpOnly",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
DeleteCookie(w, tt.cookie, tt.path)
|
||||||
|
|
||||||
|
headers := w.Header()["Set-Cookie"]
|
||||||
|
if len(headers) != 1 {
|
||||||
|
t.Errorf("Expected 1 Set-Cookie header, got %d", len(headers))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cookieHeader := headers[0]
|
||||||
|
|
||||||
|
// Check deletion-specific components
|
||||||
|
if !strings.Contains(cookieHeader, tt.cookie+"=") {
|
||||||
|
t.Errorf("Expected cookie name not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, "Path="+tt.path) {
|
||||||
|
t.Errorf("Expected path not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, "Max-Age=0") {
|
||||||
|
t.Errorf("Expected Max-Age=0 not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, "Expires=") {
|
||||||
|
t.Errorf("Expected Expires not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, "HttpOnly") {
|
||||||
|
t.Errorf("Expected HttpOnly not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCheckPageFrom(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
cookieValue string
|
||||||
|
cookiePath string
|
||||||
|
expectedResult string
|
||||||
|
shouldSet bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "valid pagefrom cookie",
|
||||||
|
cookieValue: "/dashboard",
|
||||||
|
cookiePath: "/",
|
||||||
|
expectedResult: "/dashboard",
|
||||||
|
shouldSet: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "no pagefrom cookie",
|
||||||
|
cookieValue: "",
|
||||||
|
cookiePath: "",
|
||||||
|
expectedResult: "/",
|
||||||
|
shouldSet: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty pagefrom cookie",
|
||||||
|
cookieValue: "",
|
||||||
|
cookiePath: "/",
|
||||||
|
expectedResult: "",
|
||||||
|
shouldSet: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "pagefrom with query params",
|
||||||
|
cookieValue: "/search?q=test",
|
||||||
|
cookiePath: "/",
|
||||||
|
expectedResult: "/search?q=test",
|
||||||
|
shouldSet: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "pagefrom with special path",
|
||||||
|
cookieValue: "/api/v1/users",
|
||||||
|
cookiePath: "/api",
|
||||||
|
expectedResult: "/api/v1/users",
|
||||||
|
shouldSet: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
r := &http.Request{
|
||||||
|
Header: make(http.Header),
|
||||||
|
}
|
||||||
|
|
||||||
|
if tt.shouldSet {
|
||||||
|
cookie := &http.Cookie{
|
||||||
|
Name: "pagefrom",
|
||||||
|
Value: tt.cookieValue,
|
||||||
|
Path: tt.cookiePath,
|
||||||
|
}
|
||||||
|
r.AddCookie(cookie)
|
||||||
|
}
|
||||||
|
|
||||||
|
result := CheckPageFrom(w, r)
|
||||||
|
|
||||||
|
if result != tt.expectedResult {
|
||||||
|
t.Errorf("CheckPageFrom() = %v, want %v", result, tt.expectedResult)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify that the cookie was deleted
|
||||||
|
if tt.shouldSet {
|
||||||
|
headers := w.Header()["Set-Cookie"]
|
||||||
|
if len(headers) != 1 {
|
||||||
|
t.Errorf("Expected 1 Set-Cookie header for deletion, got %d", len(headers))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cookieHeader := headers[0]
|
||||||
|
if !strings.Contains(cookieHeader, "pagefrom=") {
|
||||||
|
t.Errorf("Expected pagefrom cookie deletion not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
if !strings.Contains(cookieHeader, "Max-Age=0") {
|
||||||
|
t.Errorf("Expected Max-Age=0 for deletion not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetPageFrom(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
referer string
|
||||||
|
trustedHost string
|
||||||
|
expectedSet bool
|
||||||
|
expectedValue string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "valid trusted host referer",
|
||||||
|
referer: "http://example.com/dashboard",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/dashboard",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "valid trusted host with https",
|
||||||
|
referer: "https://example.com/profile",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/profile",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "untrusted host",
|
||||||
|
referer: "http://evil.com/dashboard",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty path",
|
||||||
|
referer: "http://example.com",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "login path - should not set",
|
||||||
|
referer: "http://example.com/login",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: false,
|
||||||
|
expectedValue: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "register path - should not set",
|
||||||
|
referer: "http://example.com/register",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: false,
|
||||||
|
expectedValue: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid referer URL",
|
||||||
|
referer: "not-a-url",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty referer",
|
||||||
|
referer: "",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "root path",
|
||||||
|
referer: "http://example.com/",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "path with query string",
|
||||||
|
referer: "http://example.com/search?q=test",
|
||||||
|
trustedHost: "example.com",
|
||||||
|
expectedSet: true,
|
||||||
|
expectedValue: "/search",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
r := &http.Request{
|
||||||
|
Header: make(http.Header),
|
||||||
|
}
|
||||||
|
if tt.referer != "" {
|
||||||
|
r.Header.Set("Referer", tt.referer)
|
||||||
|
}
|
||||||
|
|
||||||
|
SetPageFrom(w, r, tt.trustedHost)
|
||||||
|
|
||||||
|
headers := w.Header()["Set-Cookie"]
|
||||||
|
if tt.expectedSet {
|
||||||
|
if len(headers) != 1 {
|
||||||
|
t.Errorf("Expected 1 Set-Cookie header, got %d", len(headers))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cookieHeader := headers[0]
|
||||||
|
if !strings.Contains(cookieHeader, "pagefrom="+tt.expectedValue) {
|
||||||
|
t.Errorf("Expected pagefrom=%s not found in: %s", tt.expectedValue, cookieHeader)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if len(headers) != 0 {
|
||||||
|
t.Errorf("Expected no Set-Cookie header, got %d", len(headers))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIntegration(t *testing.T) {
|
||||||
|
// Test the complete flow: SetPageFrom -> CheckPageFrom
|
||||||
|
t.Run("complete flow", func(t *testing.T) {
|
||||||
|
// Step 1: Set pagefrom cookie
|
||||||
|
w1 := httptest.NewRecorder()
|
||||||
|
r1 := &http.Request{
|
||||||
|
Header: make(http.Header),
|
||||||
|
}
|
||||||
|
r1.Header.Set("Referer", "http://example.com/dashboard")
|
||||||
|
|
||||||
|
SetPageFrom(w1, r1, "example.com")
|
||||||
|
|
||||||
|
// Extract the cookie from the response
|
||||||
|
headers1 := w1.Header()["Set-Cookie"]
|
||||||
|
if len(headers1) != 1 {
|
||||||
|
t.Errorf("Expected 1 Set-Cookie header, got %d", len(headers1))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify the cookie was set correctly
|
||||||
|
cookieHeader := headers1[0]
|
||||||
|
if !strings.Contains(cookieHeader, "pagefrom=/dashboard") {
|
||||||
|
t.Errorf("Expected pagefrom=/dashboard not found in: %s", cookieHeader)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 2: Check pagefrom cookie (should delete it)
|
||||||
|
w2 := httptest.NewRecorder()
|
||||||
|
r2 := &http.Request{
|
||||||
|
Header: make(http.Header),
|
||||||
|
}
|
||||||
|
r2.AddCookie(&http.Cookie{
|
||||||
|
Name: "pagefrom",
|
||||||
|
Value: "/dashboard",
|
||||||
|
Path: "/",
|
||||||
|
})
|
||||||
|
|
||||||
|
result := CheckPageFrom(w2, r2)
|
||||||
|
|
||||||
|
if result != "/dashboard" {
|
||||||
|
t.Errorf("Expected result /dashboard, got %s", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify the cookie was deleted
|
||||||
|
headers2 := w2.Header()["Set-Cookie"]
|
||||||
|
if len(headers2) != 1 {
|
||||||
|
t.Errorf("Expected 1 Set-Cookie header for deletion, got %d", len(headers2))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cookieHeader2 := headers2[0]
|
||||||
|
// Check for deletion indicators (Max-Age=0 with Expires in the past)
|
||||||
|
if !(strings.Contains(cookieHeader2, "Max-Age=0") && strings.Contains(cookieHeader2, "Expires=Thu, 01 Jan 1970")) {
|
||||||
|
t.Errorf("Expected cookie deletion, got: %s", cookieHeader2)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
26
cookies/doc.go
Normal file
26
cookies/doc.go
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
// Package cookies provides utilities for handling HTTP cookies in Go web applications.
|
||||||
|
// It includes functions for setting secure cookies, deleting cookies, and managing
|
||||||
|
// pagefrom tracking for post-login redirects.
|
||||||
|
//
|
||||||
|
// The package follows security best practices by setting the HttpOnly flag on all
|
||||||
|
// cookies to prevent XSS attacks. The SetCookie function allows you to specify the
|
||||||
|
// name, path, value, and max-age for cookies.
|
||||||
|
//
|
||||||
|
// The pagefrom functionality helps with user experience by remembering where a user
|
||||||
|
// was before being redirected to login/register pages, then redirecting them back
|
||||||
|
// after successful authentication.
|
||||||
|
//
|
||||||
|
// Example usage:
|
||||||
|
//
|
||||||
|
// // Set a session cookie
|
||||||
|
// cookies.SetCookie(w, "session", "/", "abc123", 3600)
|
||||||
|
//
|
||||||
|
// // Delete a cookie
|
||||||
|
// cookies.DeleteCookie(w, "old_session", "/")
|
||||||
|
//
|
||||||
|
// // Handle pagefrom tracking
|
||||||
|
// cookies.SetPageFrom(w, r, "example.com")
|
||||||
|
// redirectTo := cookies.CheckPageFrom(w, r)
|
||||||
|
//
|
||||||
|
// All functions are designed to be safe and handle edge cases gracefully.
|
||||||
|
package cookies
|
||||||
21
env/LICENSE
vendored
Normal file
21
env/LICENSE
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2026 haelnorr
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
67
env/README.md
vendored
Normal file
67
env/README.md
vendored
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
# env v1.0.0
|
||||||
|
|
||||||
|
Environment variable utilities for Go applications with type safety and default values.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- Type-safe environment variable parsing
|
||||||
|
- Support for all basic Go types (string, int variants, uint variants, bool, time.Duration)
|
||||||
|
- Graceful fallback to default values
|
||||||
|
- Comprehensive boolean parsing with multiple truthy/falsy values
|
||||||
|
- Full test coverage
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
```bash
|
||||||
|
go get git.haelnorr.com/h/golib/env
|
||||||
|
```
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
```go
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
"git.haelnorr.com/h/golib/env"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
// String values
|
||||||
|
host := env.String("HOST", "localhost")
|
||||||
|
|
||||||
|
// Integer values (all sizes supported)
|
||||||
|
port := env.Int("PORT", 8080)
|
||||||
|
timeout := env.Int64("TIMEOUT_SECONDS", 30)
|
||||||
|
|
||||||
|
// Unsigned integer values
|
||||||
|
maxConnections := env.UInt("MAX_CONNECTIONS", 100)
|
||||||
|
|
||||||
|
// Boolean values (supports many formats)
|
||||||
|
debug := env.Bool("DEBUG", false)
|
||||||
|
|
||||||
|
// Duration values
|
||||||
|
requestTimeout := env.Duration("REQUEST_TIMEOUT", 30*time.Second)
|
||||||
|
|
||||||
|
fmt.Printf("Server: %s:%d\n", host, port)
|
||||||
|
fmt.Printf("Debug: %v\n", debug)
|
||||||
|
fmt.Printf("Timeout: %v\n", requestTimeout)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
See the [wiki documentation](../golib/wiki/env.md) for detailed usage information and examples.
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
## Contributing
|
||||||
|
|
||||||
|
Please see the main golib repository for contributing guidelines.
|
||||||
|
|
||||||
|
## Related Projects
|
||||||
|
|
||||||
|
This package is part of the golib collection of utilities for Go applications.
|
||||||
18
env/doc.go
vendored
Normal file
18
env/doc.go
vendored
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
// Package env provides utilities for reading environment variables with type safety
|
||||||
|
// and default values. It supports common Go types including strings, integers (all sizes),
|
||||||
|
// unsigned integers (all sizes), booleans, and time.Duration values.
|
||||||
|
//
|
||||||
|
// The package follows a simple pattern where each function takes a key name and a
|
||||||
|
// default value, returning the parsed environment variable or the default if the
|
||||||
|
// variable is not set or cannot be parsed.
|
||||||
|
//
|
||||||
|
// Example usage:
|
||||||
|
//
|
||||||
|
// port := env.Int("PORT", 8080)
|
||||||
|
// debug := env.Bool("DEBUG", false)
|
||||||
|
// timeout := env.Duration("TIMEOUT", 30*time.Second)
|
||||||
|
//
|
||||||
|
// All functions gracefully handle missing environment variables by returning the
|
||||||
|
// provided default value. They also handle parsing errors by falling back to the
|
||||||
|
// default value.
|
||||||
|
package env
|
||||||
@@ -18,16 +18,16 @@ type EnvVar struct {
|
|||||||
|
|
||||||
// ConfigLoader manages configuration loading from multiple sources
|
// ConfigLoader manages configuration loading from multiple sources
|
||||||
type ConfigLoader struct {
|
type ConfigLoader struct {
|
||||||
configFuncs map[string]ConfigFunc // Map of config names to ConfigFromEnv functions
|
configFuncs map[string]ConfigFunc // Map of config names to ConfigFromEnv functions
|
||||||
packagePaths []string // Paths to packages to parse for ENV comments
|
packagePaths []string // Paths to packages to parse for ENV comments
|
||||||
groupNames map[string]string // Map of package paths to group names
|
groupNames map[string]string // Map of package paths to group names
|
||||||
extraEnvVars []EnvVar // Additional environment variables to track
|
extraEnvVars []EnvVar // Additional environment variables to track
|
||||||
envVars []EnvVar // All extracted environment variables
|
envVars []EnvVar // All extracted environment variables
|
||||||
configs map[string]interface{} // Loaded configurations
|
configs map[string]any // Loaded configurations
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConfigFunc is a function that loads configuration from environment variables
|
// ConfigFunc is a function that loads configuration from environment variables
|
||||||
type ConfigFunc func() (interface{}, error)
|
type ConfigFunc func() (any, error)
|
||||||
|
|
||||||
// New creates a new ConfigLoader
|
// New creates a new ConfigLoader
|
||||||
func New() *ConfigLoader {
|
func New() *ConfigLoader {
|
||||||
@@ -37,7 +37,7 @@ func New() *ConfigLoader {
|
|||||||
groupNames: make(map[string]string),
|
groupNames: make(map[string]string),
|
||||||
extraEnvVars: make([]EnvVar, 0),
|
extraEnvVars: make([]EnvVar, 0),
|
||||||
envVars: make([]EnvVar, 0),
|
envVars: make([]EnvVar, 0),
|
||||||
configs: make(map[string]interface{}),
|
configs: make(map[string]any),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,8 +72,12 @@ func (cl *ConfigLoader) AddEnvVar(envVar EnvVar) {
|
|||||||
cl.extraEnvVars = append(cl.extraEnvVars, envVar)
|
cl.extraEnvVars = append(cl.extraEnvVars, envVar)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load loads all configurations and extracts environment variables
|
// ParseEnvVars extracts environment variables from packages and extra vars
|
||||||
func (cl *ConfigLoader) Load() error {
|
// This can be called without having actual environment variables set
|
||||||
|
func (cl *ConfigLoader) ParseEnvVars() error {
|
||||||
|
// Clear existing env vars to prevent duplicates
|
||||||
|
cl.envVars = make([]EnvVar, 0)
|
||||||
|
|
||||||
// Parse packages for ENV comments
|
// Parse packages for ENV comments
|
||||||
for _, pkgPath := range cl.packagePaths {
|
for _, pkgPath := range cl.packagePaths {
|
||||||
envVars, err := ParseConfigPackage(pkgPath)
|
envVars, err := ParseConfigPackage(pkgPath)
|
||||||
@@ -102,6 +106,12 @@ func (cl *ConfigLoader) Load() error {
|
|||||||
cl.envVars[i].CurrentValue = os.Getenv(cl.envVars[i].Name)
|
cl.envVars[i].CurrentValue = os.Getenv(cl.envVars[i].Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadConfigs executes the config functions to load actual configurations
|
||||||
|
// This should be called after environment variables are properly set
|
||||||
|
func (cl *ConfigLoader) LoadConfigs() error {
|
||||||
// Load configurations
|
// Load configurations
|
||||||
for name, fn := range cl.configFuncs {
|
for name, fn := range cl.configFuncs {
|
||||||
cfg, err := fn()
|
cfg, err := fn()
|
||||||
@@ -114,14 +124,22 @@ func (cl *ConfigLoader) Load() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Load loads all configurations and extracts environment variables
|
||||||
|
func (cl *ConfigLoader) Load() error {
|
||||||
|
if err := cl.ParseEnvVars(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return cl.LoadConfigs()
|
||||||
|
}
|
||||||
|
|
||||||
// GetConfig returns a loaded configuration by name
|
// GetConfig returns a loaded configuration by name
|
||||||
func (cl *ConfigLoader) GetConfig(name string) (interface{}, bool) {
|
func (cl *ConfigLoader) GetConfig(name string) (any, bool) {
|
||||||
cfg, ok := cl.configs[name]
|
cfg, ok := cl.configs[name]
|
||||||
return cfg, ok
|
return cfg, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAllConfigs returns all loaded configurations
|
// GetAllConfigs returns all loaded configurations
|
||||||
func (cl *ConfigLoader) GetAllConfigs() map[string]interface{} {
|
func (cl *ConfigLoader) GetAllConfigs() map[string]any {
|
||||||
return cl.configs
|
return cl.configs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package ezconf
|
|||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -240,6 +241,163 @@ func TestGetEnvVars(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseEnvVars(t *testing.T) {
|
||||||
|
loader := New()
|
||||||
|
|
||||||
|
// Add a test config function
|
||||||
|
loader.AddConfigFunc("test", func() (interface{}, error) {
|
||||||
|
return "test config", nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// Add current package path
|
||||||
|
loader.AddPackagePath(".")
|
||||||
|
|
||||||
|
// Add an extra env var
|
||||||
|
loader.AddEnvVar(EnvVar{
|
||||||
|
Name: "EXTRA_VAR",
|
||||||
|
Description: "Extra test variable",
|
||||||
|
Default: "extra",
|
||||||
|
})
|
||||||
|
|
||||||
|
err := loader.ParseEnvVars()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ParseEnvVars failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check that env vars were extracted
|
||||||
|
envVars := loader.GetEnvVars()
|
||||||
|
if len(envVars) == 0 {
|
||||||
|
t.Error("expected at least one env var")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for extra var
|
||||||
|
foundExtra := false
|
||||||
|
for _, ev := range envVars {
|
||||||
|
if ev.Name == "EXTRA_VAR" {
|
||||||
|
foundExtra = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !foundExtra {
|
||||||
|
t.Error("extra env var not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check that configs are NOT loaded (should be empty)
|
||||||
|
configs := loader.GetAllConfigs()
|
||||||
|
if len(configs) != 0 {
|
||||||
|
t.Errorf("expected no configs loaded after ParseEnvVars, got %d", len(configs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoadConfigs(t *testing.T) {
|
||||||
|
loader := New()
|
||||||
|
|
||||||
|
// Add a test config function
|
||||||
|
testCfg := struct {
|
||||||
|
Value string
|
||||||
|
}{Value: "test"}
|
||||||
|
|
||||||
|
loader.AddConfigFunc("test", func() (interface{}, error) {
|
||||||
|
return testCfg, nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// Manually set some env vars (simulating ParseEnvVars already called)
|
||||||
|
loader.envVars = []EnvVar{
|
||||||
|
{Name: "TEST_VAR", Description: "Test variable"},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := loader.LoadConfigs()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("LoadConfigs failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check that config was loaded
|
||||||
|
cfg, ok := loader.GetConfig("test")
|
||||||
|
if !ok {
|
||||||
|
t.Error("test config not loaded")
|
||||||
|
}
|
||||||
|
if cfg == nil {
|
||||||
|
t.Error("test config is nil")
|
||||||
|
}
|
||||||
|
_ = cfg // Use the variable to avoid unused variable error
|
||||||
|
|
||||||
|
// Check that env vars are NOT modified (should remain as set)
|
||||||
|
envVars := loader.GetEnvVars()
|
||||||
|
if len(envVars) != 1 {
|
||||||
|
t.Errorf("expected 1 env var, got %d", len(envVars))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoadConfigs_Error(t *testing.T) {
|
||||||
|
loader := New()
|
||||||
|
|
||||||
|
loader.AddConfigFunc("error", func() (interface{}, error) {
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
})
|
||||||
|
|
||||||
|
err := loader.LoadConfigs()
|
||||||
|
if err == nil {
|
||||||
|
t.Error("expected error from failing config func")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseEnvVars_Then_LoadConfigs(t *testing.T) {
|
||||||
|
loader := New()
|
||||||
|
|
||||||
|
// Add a test config function
|
||||||
|
testCfg := struct {
|
||||||
|
Value string
|
||||||
|
}{Value: "test"}
|
||||||
|
|
||||||
|
loader.AddConfigFunc("test", func() (interface{}, error) {
|
||||||
|
return testCfg, nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// Add current package path
|
||||||
|
loader.AddPackagePath(".")
|
||||||
|
|
||||||
|
// Add an extra env var
|
||||||
|
loader.AddEnvVar(EnvVar{
|
||||||
|
Name: "EXTRA_VAR",
|
||||||
|
Description: "Extra test variable",
|
||||||
|
Default: "extra",
|
||||||
|
})
|
||||||
|
|
||||||
|
// First parse env vars
|
||||||
|
err := loader.ParseEnvVars()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ParseEnvVars failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check env vars are extracted but configs are not loaded
|
||||||
|
envVars := loader.GetEnvVars()
|
||||||
|
if len(envVars) == 0 {
|
||||||
|
t.Error("expected env vars to be extracted")
|
||||||
|
}
|
||||||
|
|
||||||
|
configs := loader.GetAllConfigs()
|
||||||
|
if len(configs) != 0 {
|
||||||
|
t.Error("expected no configs loaded yet")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Then load configs
|
||||||
|
err = loader.LoadConfigs()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("LoadConfigs failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check both env vars and configs are loaded
|
||||||
|
_, ok := loader.GetConfig("test")
|
||||||
|
if !ok {
|
||||||
|
t.Error("test config not loaded after LoadConfigs")
|
||||||
|
}
|
||||||
|
|
||||||
|
configs = loader.GetAllConfigs()
|
||||||
|
if len(configs) != 1 {
|
||||||
|
t.Errorf("expected 1 config loaded, got %d", len(configs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestLoad_Integration(t *testing.T) {
|
func TestLoad_Integration(t *testing.T) {
|
||||||
// Integration test with real hlog package
|
// Integration test with real hlog package
|
||||||
hlogPath := filepath.Join("..", "hlog")
|
hlogPath := filepath.Join("..", "hlog")
|
||||||
@@ -269,3 +427,62 @@ func TestLoad_Integration(t *testing.T) {
|
|||||||
t.Logf(" %s: %s (default: %s, required: %t)", ev.Name, ev.Description, ev.Default, ev.Required)
|
t.Logf(" %s: %s (default: %s, required: %t)", ev.Name, ev.Description, ev.Default, ev.Required)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseEnvVars_GenerateEnvFile_Integration(t *testing.T) {
|
||||||
|
// Test the new separated ParseEnvVars functionality
|
||||||
|
hlogPath := filepath.Join("..", "hlog")
|
||||||
|
if _, err := os.Stat(hlogPath); os.IsNotExist(err) {
|
||||||
|
t.Skip("hlog package not found, skipping integration test")
|
||||||
|
}
|
||||||
|
|
||||||
|
loader := New()
|
||||||
|
|
||||||
|
// Add hlog package
|
||||||
|
if err := loader.AddPackagePath(hlogPath); err != nil {
|
||||||
|
t.Fatalf("failed to add hlog package: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse env vars without loading configs (this should work even if required env vars are missing)
|
||||||
|
if err := loader.ParseEnvVars(); err != nil {
|
||||||
|
t.Fatalf("ParseEnvVars failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
envVars := loader.GetEnvVars()
|
||||||
|
if len(envVars) == 0 {
|
||||||
|
t.Error("expected env vars from hlog package")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Now test that we can generate an env file without calling Load()
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
envFile := filepath.Join(tempDir, "test-generated.env")
|
||||||
|
|
||||||
|
err := loader.GenerateEnvFile(envFile, false)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GenerateEnvFile failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify the file was created and contains expected content
|
||||||
|
content, err := os.ReadFile(envFile)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("failed to read generated file: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
output := string(content)
|
||||||
|
if !strings.Contains(output, "# Environment Configuration") {
|
||||||
|
t.Error("expected header in generated file")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Should contain environment variables from hlog
|
||||||
|
foundHlogVar := false
|
||||||
|
for _, ev := range envVars {
|
||||||
|
if strings.Contains(output, ev.Name) {
|
||||||
|
foundHlogVar = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !foundHlogVar {
|
||||||
|
t.Error("expected to find at least one hlog environment variable in generated file")
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Logf("Successfully generated env file with %d variables", len(envVars))
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,20 +12,20 @@ import (
|
|||||||
|
|
||||||
// PrintEnvVars prints all environment variables to the provided writer
|
// PrintEnvVars prints all environment variables to the provided writer
|
||||||
func (cl *ConfigLoader) PrintEnvVars(w io.Writer, showValues bool) error {
|
func (cl *ConfigLoader) PrintEnvVars(w io.Writer, showValues bool) error {
|
||||||
if cl.envVars == nil || len(cl.envVars) == 0 {
|
if len(cl.envVars) == 0 {
|
||||||
return errors.New("no environment variables loaded (did you call Load()?)")
|
return errors.New("no environment variables loaded (did you call Load()?)")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Group variables by their Group field
|
// Group variables by their Group field
|
||||||
groups := make(map[string][]EnvVar)
|
groups := make(map[string][]EnvVar)
|
||||||
groupOrder := make([]string, 0)
|
groupOrder := make([]string, 0)
|
||||||
|
|
||||||
for _, envVar := range cl.envVars {
|
for _, envVar := range cl.envVars {
|
||||||
group := envVar.Group
|
group := envVar.Group
|
||||||
if group == "" {
|
if group == "" {
|
||||||
group = "Other"
|
group = "Other"
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, exists := groups[group]; !exists {
|
if _, exists := groups[group]; !exists {
|
||||||
groupOrder = append(groupOrder, group)
|
groupOrder = append(groupOrder, group)
|
||||||
}
|
}
|
||||||
@@ -35,7 +35,7 @@ func (cl *ConfigLoader) PrintEnvVars(w io.Writer, showValues bool) error {
|
|||||||
// Print variables grouped by section
|
// Print variables grouped by section
|
||||||
for _, group := range groupOrder {
|
for _, group := range groupOrder {
|
||||||
vars := groups[group]
|
vars := groups[group]
|
||||||
|
|
||||||
// Calculate max name length for alignment within this group
|
// Calculate max name length for alignment within this group
|
||||||
maxNameLen := 0
|
maxNameLen := 0
|
||||||
for _, envVar := range vars {
|
for _, envVar := range vars {
|
||||||
@@ -51,12 +51,12 @@ func (cl *ConfigLoader) PrintEnvVars(w io.Writer, showValues bool) error {
|
|||||||
maxNameLen = nameLen
|
maxNameLen = nameLen
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Print group header
|
// Print group header
|
||||||
fmt.Fprintf(w, "\n%s Configuration\n", group)
|
fmt.Fprintf(w, "\n%s Configuration\n", group)
|
||||||
fmt.Fprintln(w, strings.Repeat("=", len(group)+14))
|
fmt.Fprintln(w, strings.Repeat("=", len(group)+14))
|
||||||
fmt.Fprintln(w)
|
fmt.Fprintln(w)
|
||||||
|
|
||||||
for _, envVar := range vars {
|
for _, envVar := range vars {
|
||||||
// Build the variable line
|
// Build the variable line
|
||||||
var varLine string
|
var varLine string
|
||||||
@@ -69,10 +69,10 @@ func (cl *ConfigLoader) PrintEnvVars(w io.Writer, showValues bool) error {
|
|||||||
} else {
|
} else {
|
||||||
varLine = envVar.Name
|
varLine = envVar.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculate padding for alignment
|
// Calculate padding for alignment
|
||||||
padding := maxNameLen - len(varLine) + 2
|
padding := maxNameLen - len(varLine) + 2
|
||||||
|
|
||||||
// Print with indentation and alignment
|
// Print with indentation and alignment
|
||||||
fmt.Fprintf(w, " %s%s# %s", varLine, strings.Repeat(" ", padding), envVar.Description)
|
fmt.Fprintf(w, " %s%s# %s", varLine, strings.Repeat(" ", padding), envVar.Description)
|
||||||
|
|
||||||
@@ -85,7 +85,7 @@ func (cl *ConfigLoader) PrintEnvVars(w io.Writer, showValues bool) error {
|
|||||||
fmt.Fprintln(w)
|
fmt.Fprintln(w)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Fprintln(w)
|
fmt.Fprintln(w)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -109,7 +109,7 @@ func (cl *ConfigLoader) GenerateEnvFile(filename string, useCurrentValues bool)
|
|||||||
for _, envVar := range cl.envVars {
|
for _, envVar := range cl.envVars {
|
||||||
managedVars[envVar.Name] = true
|
managedVars[envVar.Name] = true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Collect untracked variables
|
// Collect untracked variables
|
||||||
for _, line := range existingVars {
|
for _, line := range existingVars {
|
||||||
if line.IsVar && !managedVars[line.Key] {
|
if line.IsVar && !managedVars[line.Key] {
|
||||||
@@ -118,7 +118,7 @@ func (cl *ConfigLoader) GenerateEnvFile(filename string, useCurrentValues bool)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
file, err := os.Create(filename)
|
file, err := os.Create(filename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrap(err, "failed to create env file")
|
return errors.Wrap(err, "failed to create env file")
|
||||||
@@ -138,13 +138,13 @@ func (cl *ConfigLoader) GenerateEnvFile(filename string, useCurrentValues bool)
|
|||||||
// Group variables by their Group field
|
// Group variables by their Group field
|
||||||
groups := make(map[string][]EnvVar)
|
groups := make(map[string][]EnvVar)
|
||||||
groupOrder := make([]string, 0)
|
groupOrder := make([]string, 0)
|
||||||
|
|
||||||
for _, envVar := range cl.envVars {
|
for _, envVar := range cl.envVars {
|
||||||
group := envVar.Group
|
group := envVar.Group
|
||||||
if group == "" {
|
if group == "" {
|
||||||
group = "Other"
|
group = "Other"
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, exists := groups[group]; !exists {
|
if _, exists := groups[group]; !exists {
|
||||||
groupOrder = append(groupOrder, group)
|
groupOrder = append(groupOrder, group)
|
||||||
}
|
}
|
||||||
@@ -154,12 +154,12 @@ func (cl *ConfigLoader) GenerateEnvFile(filename string, useCurrentValues bool)
|
|||||||
// Write variables grouped by section
|
// Write variables grouped by section
|
||||||
for _, group := range groupOrder {
|
for _, group := range groupOrder {
|
||||||
vars := groups[group]
|
vars := groups[group]
|
||||||
|
|
||||||
// Print group header
|
// Print group header
|
||||||
fmt.Fprintln(writer)
|
fmt.Fprintln(writer)
|
||||||
fmt.Fprintf(writer, "# %s Configuration\n", group)
|
fmt.Fprintf(writer, "# %s Configuration\n", group)
|
||||||
fmt.Fprintln(writer, strings.Repeat("#", len(group)+15))
|
fmt.Fprintln(writer, strings.Repeat("#", len(group)+15))
|
||||||
|
|
||||||
for _, envVar := range vars {
|
for _, envVar := range vars {
|
||||||
// Write comment with description
|
// Write comment with description
|
||||||
fmt.Fprintf(writer, "# %s", envVar.Description)
|
fmt.Fprintf(writer, "# %s", envVar.Description)
|
||||||
@@ -185,7 +185,7 @@ func (cl *ConfigLoader) GenerateEnvFile(filename string, useCurrentValues bool)
|
|||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(writer, "%s=%s\n", envVar.Name, value)
|
fmt.Fprintf(writer, "%s=%s\n", envVar.Name, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Fprintln(writer)
|
fmt.Fprintln(writer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -197,7 +197,7 @@ func (cl *ConfigLoader) GenerateEnvFile(filename string, useCurrentValues bool)
|
|||||||
fmt.Fprintln(writer, "# These variables were in the original file but are not managed by ezconf")
|
fmt.Fprintln(writer, "# These variables were in the original file but are not managed by ezconf")
|
||||||
fmt.Fprintln(writer, strings.Repeat("#", 72))
|
fmt.Fprintln(writer, strings.Repeat("#", 72))
|
||||||
fmt.Fprintln(writer)
|
fmt.Fprintln(writer)
|
||||||
|
|
||||||
for _, line := range existingUntracked {
|
for _, line := range existingUntracked {
|
||||||
fmt.Fprintf(writer, "%s=%s\n", line.Key, line.Value)
|
fmt.Fprintf(writer, "%s=%s\n", line.Key, line.Value)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -360,3 +360,46 @@ func TestPrintEnvVarsStdout_NoEnvVars(t *testing.T) {
|
|||||||
t.Error("expected error when no env vars are loaded")
|
t.Error("expected error when no env vars are loaded")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestPrintEnvVars_AfterParseEnvVars(t *testing.T) {
|
||||||
|
loader := New()
|
||||||
|
|
||||||
|
// Add some env vars manually to simulate ParseEnvVars
|
||||||
|
loader.envVars = []EnvVar{
|
||||||
|
{
|
||||||
|
Name: "LOG_LEVEL",
|
||||||
|
Description: "Log level for the application",
|
||||||
|
Required: false,
|
||||||
|
Default: "info",
|
||||||
|
CurrentValue: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "DATABASE_URL",
|
||||||
|
Description: "Database connection string",
|
||||||
|
Required: true,
|
||||||
|
Default: "",
|
||||||
|
CurrentValue: "",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test that PrintEnvVars works after ParseEnvVars (without Load)
|
||||||
|
buf := &bytes.Buffer{}
|
||||||
|
err := loader.PrintEnvVars(buf, false)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("PrintEnvVars failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
output := buf.String()
|
||||||
|
if !strings.Contains(output, "LOG_LEVEL") {
|
||||||
|
t.Error("output should contain LOG_LEVEL")
|
||||||
|
}
|
||||||
|
if !strings.Contains(output, "DATABASE_URL") {
|
||||||
|
t.Error("output should contain DATABASE_URL")
|
||||||
|
}
|
||||||
|
if !strings.Contains(output, "(required)") {
|
||||||
|
t.Error("output should indicate required variables")
|
||||||
|
}
|
||||||
|
if !strings.Contains(output, "(default: info)") {
|
||||||
|
t.Error("output should contain default value")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -51,6 +51,12 @@ func main() {
|
|||||||
Method: hws.MethodGET,
|
Method: hws.MethodGET,
|
||||||
Handler: http.HandlerFunc(getUserHandler),
|
Handler: http.HandlerFunc(getUserHandler),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
// Single route handling multiple HTTP methods
|
||||||
|
Path: "/api/resource",
|
||||||
|
Methods: []hws.Method{hws.MethodGET, hws.MethodPOST, hws.MethodPUT},
|
||||||
|
Handler: http.HandlerFunc(resourceHandler),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add routes and middleware
|
// Add routes and middleware
|
||||||
@@ -73,6 +79,18 @@ func getUserHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
id := r.PathValue("id")
|
id := r.PathValue("id")
|
||||||
w.Write([]byte("User ID: " + id))
|
w.Write([]byte("User ID: " + id))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func resourceHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Handle GET, POST, and PUT for the same path
|
||||||
|
switch r.Method {
|
||||||
|
case "GET":
|
||||||
|
w.Write([]byte("Getting resource"))
|
||||||
|
case "POST":
|
||||||
|
w.Write([]byte("Creating resource"))
|
||||||
|
case "PUT":
|
||||||
|
w.Write([]byte("Updating resource"))
|
||||||
|
}
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ type Config struct {
|
|||||||
ReadHeaderTimeout time.Duration // ENV HWS_READ_HEADER_TIMEOUT: Timeout for reading request headers in seconds (default: 2)
|
ReadHeaderTimeout time.Duration // ENV HWS_READ_HEADER_TIMEOUT: Timeout for reading request headers in seconds (default: 2)
|
||||||
WriteTimeout time.Duration // ENV HWS_WRITE_TIMEOUT: Timeout for writing requests in seconds (default: 10)
|
WriteTimeout time.Duration // ENV HWS_WRITE_TIMEOUT: Timeout for writing requests in seconds (default: 10)
|
||||||
IdleTimeout time.Duration // ENV HWS_IDLE_TIMEOUT: Timeout for idle connections in seconds (default: 120)
|
IdleTimeout time.Duration // ENV HWS_IDLE_TIMEOUT: Timeout for idle connections in seconds (default: 120)
|
||||||
|
ShutdownDelay time.Duration // ENV HWS_SHUTDOWN_DELAY: Delay in seconds before server shutsdown when Shutdown is called (default: 5)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConfigFromEnv returns a Config struct loaded from the environment variables
|
// ConfigFromEnv returns a Config struct loaded from the environment variables
|
||||||
@@ -24,6 +25,7 @@ func ConfigFromEnv() (*Config, error) {
|
|||||||
ReadHeaderTimeout: time.Duration(env.Int("HWS_READ_HEADER_TIMEOUT", 2)) * time.Second,
|
ReadHeaderTimeout: time.Duration(env.Int("HWS_READ_HEADER_TIMEOUT", 2)) * time.Second,
|
||||||
WriteTimeout: time.Duration(env.Int("HWS_WRITE_TIMEOUT", 10)) * time.Second,
|
WriteTimeout: time.Duration(env.Int("HWS_WRITE_TIMEOUT", 10)) * time.Second,
|
||||||
IdleTimeout: time.Duration(env.Int("HWS_IDLE_TIMEOUT", 120)) * time.Second,
|
IdleTimeout: time.Duration(env.Int("HWS_IDLE_TIMEOUT", 120)) * time.Second,
|
||||||
|
ShutdownDelay: time.Duration(env.Int("HWS_SHUTDOWN_DELAY", 5)) * time.Second,
|
||||||
}
|
}
|
||||||
|
|
||||||
return cfg, nil
|
return cfg, nil
|
||||||
|
|||||||
12
hws/doc.go
12
hws/doc.go
@@ -74,6 +74,18 @@
|
|||||||
// },
|
// },
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
|
// A single route can handle multiple HTTP methods using the Methods field:
|
||||||
|
//
|
||||||
|
// routes := []hws.Route{
|
||||||
|
// {
|
||||||
|
// Path: "/api/resource",
|
||||||
|
// Methods: []hws.Method{hws.MethodGET, hws.MethodPOST, hws.MethodPUT},
|
||||||
|
// Handler: http.HandlerFunc(resourceHandler),
|
||||||
|
// },
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// Note: The Methods field takes precedence over Method if both are provided.
|
||||||
|
//
|
||||||
// Path parameters can be accessed using r.PathValue():
|
// Path parameters can be accessed using r.PathValue():
|
||||||
//
|
//
|
||||||
// func getUser(w http.ResponseWriter, r *http.Request) {
|
// func getUser(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ const (
|
|||||||
|
|
||||||
// ErrorPageFunc is a function that returns an ErrorPage with the specified HTTP Status code
|
// ErrorPageFunc is a function that returns an ErrorPage with the specified HTTP Status code
|
||||||
// This will be called by the server when it needs to render an error page
|
// This will be called by the server when it needs to render an error page
|
||||||
type ErrorPageFunc func(errorCode int) (ErrorPage, error)
|
type ErrorPageFunc func(error HWSError) (ErrorPage, error)
|
||||||
|
|
||||||
// ErrorPage must implement a Render() function that takes in a context and ResponseWriter,
|
// ErrorPage must implement a Render() function that takes in a context and ResponseWriter,
|
||||||
// and should write a reponse as output to the ResponseWriter.
|
// and should write a reponse as output to the ResponseWriter.
|
||||||
@@ -40,11 +40,11 @@ type ErrorPage interface {
|
|||||||
Render(ctx context.Context, w io.Writer) error
|
Render(ctx context.Context, w io.Writer) error
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: add test for ErrorPageFunc that returns an error
|
// AddErrorPage registers a handler that returns an ErrorPage
|
||||||
func (server *Server) AddErrorPage(pageFunc ErrorPageFunc) error {
|
func (server *Server) AddErrorPage(pageFunc ErrorPageFunc) error {
|
||||||
rr := httptest.NewRecorder()
|
rr := httptest.NewRecorder()
|
||||||
req := httptest.NewRequest("GET", "/", nil)
|
req := httptest.NewRequest("GET", "/", nil)
|
||||||
page, err := pageFunc(http.StatusInternalServerError)
|
page, err := pageFunc(HWSError{StatusCode: http.StatusInternalServerError})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrap(err, "An error occured when trying to get the error page")
|
return errors.Wrap(err, "An error occured when trying to get the error page")
|
||||||
}
|
}
|
||||||
@@ -88,7 +88,7 @@ func (server *Server) ThrowError(w http.ResponseWriter, r *http.Request, error H
|
|||||||
}
|
}
|
||||||
if error.RenderErrorPage {
|
if error.RenderErrorPage {
|
||||||
server.LogError(HWSError{Message: "Error page rendering", Error: nil, Level: ErrorDEBUG})
|
server.LogError(HWSError{Message: "Error page rendering", Error: nil, Level: ErrorDEBUG})
|
||||||
errPage, err := server.errorPage(error.StatusCode)
|
errPage, err := server.errorPage(error)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
server.LogError(HWSError{Message: "Failed to get a valid error page", Error: err})
|
server.LogError(HWSError{Message: "Failed to get a valid error page", Error: err})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,13 +17,13 @@ import (
|
|||||||
type goodPage struct{}
|
type goodPage struct{}
|
||||||
type badPage struct{}
|
type badPage struct{}
|
||||||
|
|
||||||
func goodRender(code int) (hws.ErrorPage, error) {
|
func goodRender(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
return goodPage{}, nil
|
return goodPage{}, nil
|
||||||
}
|
}
|
||||||
func badRender1(code int) (hws.ErrorPage, error) {
|
func badRender1(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
return badPage{}, nil
|
return badPage{}, nil
|
||||||
}
|
}
|
||||||
func badRender2(code int) (hws.ErrorPage, error) {
|
func badRender2(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
return nil, errors.New("I'm an error")
|
return nil, errors.New("I'm an error")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ go 1.25.5
|
|||||||
require (
|
require (
|
||||||
git.haelnorr.com/h/golib/env v0.9.1
|
git.haelnorr.com/h/golib/env v0.9.1
|
||||||
git.haelnorr.com/h/golib/hlog v0.9.0
|
git.haelnorr.com/h/golib/hlog v0.9.0
|
||||||
|
git.haelnorr.com/h/golib/notify v0.1.0
|
||||||
github.com/pkg/errors v0.9.1
|
github.com/pkg/errors v0.9.1
|
||||||
github.com/stretchr/testify v1.11.1
|
github.com/stretchr/testify v1.11.1
|
||||||
k8s.io/apimachinery v0.35.0
|
k8s.io/apimachinery v0.35.0
|
||||||
@@ -13,6 +14,7 @@ require (
|
|||||||
require (
|
require (
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/go-logr/logr v1.4.3 // indirect
|
github.com/go-logr/logr v1.4.3 // indirect
|
||||||
|
github.com/gobwas/glob v0.2.3
|
||||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
github.com/mattn/go-isatty v0.0.19 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
|||||||
@@ -2,11 +2,15 @@ git.haelnorr.com/h/golib/env v0.9.1 h1:2Vsj+mJKnO5f1Md1GO5v9ggLN5zWa0baCewcSHTjo
|
|||||||
git.haelnorr.com/h/golib/env v0.9.1/go.mod h1:glUQVdA1HMKX1avTDyTyuhcr36SSxZtlJxKDT5KTztg=
|
git.haelnorr.com/h/golib/env v0.9.1/go.mod h1:glUQVdA1HMKX1avTDyTyuhcr36SSxZtlJxKDT5KTztg=
|
||||||
git.haelnorr.com/h/golib/hlog v0.9.0 h1:ib8n2MdmiRK2TF067p220kXmhDe9aAnlcsgpuv+QpvE=
|
git.haelnorr.com/h/golib/hlog v0.9.0 h1:ib8n2MdmiRK2TF067p220kXmhDe9aAnlcsgpuv+QpvE=
|
||||||
git.haelnorr.com/h/golib/hlog v0.9.0/go.mod h1:oOlzb8UVHUYP1k7dN5PSJXVskAB2z8EYgRN85jAi0Zk=
|
git.haelnorr.com/h/golib/hlog v0.9.0/go.mod h1:oOlzb8UVHUYP1k7dN5PSJXVskAB2z8EYgRN85jAi0Zk=
|
||||||
|
git.haelnorr.com/h/golib/notify v0.1.0 h1:xdf6zd21F6n+SuGTeJiuLNMf6zFXMvwpKD0gmNq8N10=
|
||||||
|
git.haelnorr.com/h/golib/notify v0.1.0/go.mod h1:ARqaRmCYb8LMURhDM75sG+qX+YpqXmUVeAtacwjHjBc=
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
||||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||||
|
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
|
||||||
|
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
|
||||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
||||||
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
||||||
|
|||||||
@@ -6,14 +6,15 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
|
|
||||||
"git.haelnorr.com/h/golib/hlog"
|
"git.haelnorr.com/h/golib/hlog"
|
||||||
|
"github.com/gobwas/glob"
|
||||||
)
|
)
|
||||||
|
|
||||||
type logger struct {
|
type logger struct {
|
||||||
logger *hlog.Logger
|
logger *hlog.Logger
|
||||||
ignoredPaths []string
|
ignoredPaths []glob.Glob
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: add tests to make sure all the fields are correctly set
|
// LogError uses the attached logger to log a HWSError
|
||||||
func (s *Server) LogError(err HWSError) {
|
func (s *Server) LogError(err HWSError) {
|
||||||
if s.logger == nil {
|
if s.logger == nil {
|
||||||
return
|
return
|
||||||
@@ -29,16 +30,16 @@ func (s *Server) LogError(err HWSError) {
|
|||||||
s.logger.logger.Warn().Err(err.Error).Msg(err.Message)
|
s.logger.logger.Warn().Err(err.Error).Msg(err.Message)
|
||||||
return
|
return
|
||||||
case ErrorERROR:
|
case ErrorERROR:
|
||||||
s.logger.logger.Error().Err(err.Error).Msg(err.Message)
|
s.logger.logger.Error().Str("stacktrace", fmt.Sprintf("%+v", err.Error)).Err(err.Error).Msg(err.Message)
|
||||||
return
|
return
|
||||||
case ErrorFATAL:
|
case ErrorFATAL:
|
||||||
s.logger.logger.Fatal().Err(err.Error).Msg(err.Message)
|
s.logger.logger.Fatal().Str("stacktrace", fmt.Sprintf("%+v", err.Error)).Err(err.Error).Msg(err.Message)
|
||||||
return
|
return
|
||||||
case ErrorPANIC:
|
case ErrorPANIC:
|
||||||
s.logger.logger.Panic().Err(err.Error).Msg(err.Message)
|
s.logger.logger.Panic().Str("stacktrace", fmt.Sprintf("%+v", err.Error)).Err(err.Error).Msg(err.Message)
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
s.logger.logger.Error().Err(err.Error).Msg(err.Message)
|
s.logger.logger.Error().Str("stacktrace", fmt.Sprintf("%+v", err.Error)).Err(err.Error).Msg(err.Message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,10 +54,10 @@ func (server *Server) LogFatal(err error) {
|
|||||||
server.logger.logger.Fatal().Err(err).Msg("A fatal error has occured")
|
server.logger.logger.Fatal().Err(err).Msg("A fatal error has occured")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Server.AddLogger adds a logger to the server to use for request logging.
|
// AddLogger adds a logger to the server to use for request logging.
|
||||||
func (server *Server) AddLogger(hlogger *hlog.Logger) error {
|
func (server *Server) AddLogger(hlogger *hlog.Logger) error {
|
||||||
if hlogger == nil {
|
if hlogger == nil {
|
||||||
return errors.New("Unable to add logger, no logger provided")
|
return errors.New("unable to add logger, no logger provided")
|
||||||
}
|
}
|
||||||
server.logger = &logger{
|
server.logger = &logger{
|
||||||
logger: hlogger,
|
logger: hlogger,
|
||||||
@@ -64,7 +65,7 @@ func (server *Server) AddLogger(hlogger *hlog.Logger) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Server.LoggerIgnorePaths sets a list of URL paths to ignore logging for.
|
// LoggerIgnorePaths sets a list of URL paths to ignore logging for.
|
||||||
// Path should match the url.URL.Path field, see https://pkg.go.dev/net/url#URL
|
// Path should match the url.URL.Path field, see https://pkg.go.dev/net/url#URL
|
||||||
// Useful for ignoring requests to CSS files or favicons
|
// Useful for ignoring requests to CSS files or favicons
|
||||||
func (server *Server) LoggerIgnorePaths(paths ...string) error {
|
func (server *Server) LoggerIgnorePaths(paths ...string) error {
|
||||||
@@ -76,9 +77,22 @@ func (server *Server) LoggerIgnorePaths(paths ...string) error {
|
|||||||
u.RawQuery == "" &&
|
u.RawQuery == "" &&
|
||||||
u.Fragment == ""
|
u.Fragment == ""
|
||||||
if !valid {
|
if !valid {
|
||||||
return fmt.Errorf("Invalid path: '%s'", path)
|
return fmt.Errorf("invalid path: '%s'", path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
server.logger.ignoredPaths = paths
|
server.logger.ignoredPaths = prepareGlobs(paths)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func prepareGlobs(paths []string) []glob.Glob {
|
||||||
|
compiledGlobs := make([]glob.Glob, 0, len(paths))
|
||||||
|
for _, pattern := range paths {
|
||||||
|
g, err := glob.Compile(pattern)
|
||||||
|
if err != nil {
|
||||||
|
// If pattern fails to compile, skip it
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
compiledGlobs = append(compiledGlobs, g)
|
||||||
|
}
|
||||||
|
return compiledGlobs
|
||||||
|
}
|
||||||
|
|||||||
@@ -10,11 +10,14 @@ type MiddlewareFunc func(w http.ResponseWriter, r *http.Request) (*http.Request,
|
|||||||
|
|
||||||
// Server.AddMiddleware registers all the middleware.
|
// Server.AddMiddleware registers all the middleware.
|
||||||
// Middleware will be run in the order that they are provided.
|
// Middleware will be run in the order that they are provided.
|
||||||
|
// Can only be called once
|
||||||
func (server *Server) AddMiddleware(middleware ...Middleware) error {
|
func (server *Server) AddMiddleware(middleware ...Middleware) error {
|
||||||
if !server.routes {
|
if !server.routes {
|
||||||
return errors.New("Server.AddRoutes must be called before Server.AddMiddleware")
|
return errors.New("Server.AddRoutes must be called before Server.AddMiddleware")
|
||||||
}
|
}
|
||||||
|
if server.middleware {
|
||||||
|
return errors.New("Server.AddMiddleware already called")
|
||||||
|
}
|
||||||
// RUN LOGGING MIDDLEWARE FIRST
|
// RUN LOGGING MIDDLEWARE FIRST
|
||||||
server.server.Handler = logging(server.server.Handler, server.logger)
|
server.server.Handler = logging(server.server.Handler, server.logger)
|
||||||
|
|
||||||
@@ -51,6 +54,8 @@ func (server *Server) NewMiddleware(
|
|||||||
if herr.RenderErrorPage {
|
if herr.RenderErrorPage {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
next.ServeHTTP(w, newReq)
|
next.ServeHTTP(w, newReq)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -2,8 +2,9 @@ package hws
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"slices"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/gobwas/glob"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Middleware to add logs to console with details of the request
|
// Middleware to add logs to console with details of the request
|
||||||
@@ -13,7 +14,7 @@ func logging(next http.Handler, logger *logger) http.Handler {
|
|||||||
next.ServeHTTP(w, r)
|
next.ServeHTTP(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if slices.Contains(logger.ignoredPaths, r.URL.Path) {
|
if globTest(r.URL.Path, logger.ignoredPaths) {
|
||||||
next.ServeHTTP(w, r)
|
next.ServeHTTP(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -36,3 +37,12 @@ func logging(next http.Handler, logger *logger) http.Handler {
|
|||||||
Msg("Served")
|
Msg("Served")
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func globTest(testPath string, globs []glob.Glob) bool {
|
||||||
|
for _, g := range globs {
|
||||||
|
if g.Match(testPath) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|||||||
316
hws/notify.go
Normal file
316
hws/notify.go
Normal file
@@ -0,0 +1,316 @@
|
|||||||
|
package hws
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"slices"
|
||||||
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"git.haelnorr.com/h/golib/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LevelShutdown is a special level used for the notification sent on shutdown.
|
||||||
|
// This can be used to check if the notification is a shutdown event and if it should
|
||||||
|
// be passed on to consumers or special considerations should be made.
|
||||||
|
const LevelShutdown notify.Level = "shutdown"
|
||||||
|
|
||||||
|
// Notifier manages client subscriptions and notification delivery for the HWS server.
|
||||||
|
// It wraps the notify.Notifier with additional client management features including
|
||||||
|
// dual identification (subscription ID + alternate ID) and automatic cleanup of
|
||||||
|
// inactive clients after 5 minutes.
|
||||||
|
type Notifier struct {
|
||||||
|
*notify.Notifier
|
||||||
|
clients *Clients
|
||||||
|
running bool
|
||||||
|
ctx context.Context
|
||||||
|
cancel context.CancelFunc
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clients maintains thread-safe mappings between subscriber IDs, alternate IDs,
|
||||||
|
// and Client instances. It supports querying clients by either their unique
|
||||||
|
// subscription ID or their alternate ID (where multiple clients can share an alternate ID).
|
||||||
|
type Clients struct {
|
||||||
|
clientsSubMap map[notify.Target]*Client
|
||||||
|
clientsIDMap map[string][]*Client
|
||||||
|
lock *sync.RWMutex
|
||||||
|
}
|
||||||
|
|
||||||
|
// Client represents a unique subscriber to the notifications channel.
|
||||||
|
// It tracks activity via lastSeen timestamp (updated atomically) and monitors
|
||||||
|
// consecutive send failures for automatic disconnect detection.
|
||||||
|
type Client struct {
|
||||||
|
sub *notify.Subscriber
|
||||||
|
lastSeen int64 // accessed atomically
|
||||||
|
altID string
|
||||||
|
consecutiveFails int32 // accessed atomically
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) startNotifier() {
|
||||||
|
if s.notifier != nil && s.notifier.running {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
s.notifier = &Notifier{
|
||||||
|
Notifier: notify.NewNotifier(50),
|
||||||
|
clients: &Clients{
|
||||||
|
clientsSubMap: make(map[notify.Target]*Client),
|
||||||
|
clientsIDMap: make(map[string][]*Client),
|
||||||
|
lock: new(sync.RWMutex),
|
||||||
|
},
|
||||||
|
running: true,
|
||||||
|
ctx: ctx,
|
||||||
|
cancel: cancel,
|
||||||
|
}
|
||||||
|
|
||||||
|
ticker := time.NewTicker(time.Minute)
|
||||||
|
go func() {
|
||||||
|
defer ticker.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-ticker.C:
|
||||||
|
s.notifier.clients.cleanUp()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) closeNotifier() {
|
||||||
|
if s.notifier != nil {
|
||||||
|
if s.notifier.cancel != nil {
|
||||||
|
s.notifier.cancel()
|
||||||
|
}
|
||||||
|
s.notifier.running = false
|
||||||
|
s.notifier.Close()
|
||||||
|
}
|
||||||
|
s.notifier = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NotifySub sends a notification to a specific subscriber identified by the notification's Target field.
|
||||||
|
// If the subscriber doesn't exist, a warning is logged but the operation does not fail.
|
||||||
|
// This is thread-safe and can be called from multiple goroutines.
|
||||||
|
func (s *Server) NotifySub(nt notify.Notification) {
|
||||||
|
if s.notifier == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, exists := s.notifier.clients.getClient(nt.Target)
|
||||||
|
if !exists {
|
||||||
|
err := fmt.Errorf("Tried to notify subscriber that doesn't exist - subID: %s", nt.Target)
|
||||||
|
s.LogError(HWSError{Level: ErrorWARN, Message: "Failed to notify", Error: err})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.notifier.Notify(nt)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NotifyID sends a notification to all clients associated with the given alternate ID.
|
||||||
|
// Multiple clients can share the same alternate ID (e.g., multiple sessions for one user).
|
||||||
|
// If no clients exist with that ID, a warning is logged but the operation does not fail.
|
||||||
|
// This is thread-safe and can be called from multiple goroutines.
|
||||||
|
func (s *Server) NotifyID(nt notify.Notification, altID string) {
|
||||||
|
if s.notifier == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.notifier.clients.lock.RLock()
|
||||||
|
clients, exists := s.notifier.clients.clientsIDMap[altID]
|
||||||
|
s.notifier.clients.lock.RUnlock()
|
||||||
|
if !exists {
|
||||||
|
err := fmt.Errorf("Tried to notify client group that doesn't exist - altID: %s", altID)
|
||||||
|
s.LogError(HWSError{Level: ErrorWARN, Message: "Failed to notify", Error: err})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, client := range clients {
|
||||||
|
ntt := nt
|
||||||
|
ntt.Target = client.sub.ID
|
||||||
|
s.NotifySub(ntt)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NotifyAll broadcasts a notification to all connected clients.
|
||||||
|
// This is thread-safe and can be called from multiple goroutines.
|
||||||
|
func (s *Server) NotifyAll(nt notify.Notification) {
|
||||||
|
if s.notifier == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
nt.Target = ""
|
||||||
|
s.notifier.NotifyAll(nt)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetClient returns a Client that can be used to receive notifications.
|
||||||
|
// If a client exists with the provided subID, that client will be returned.
|
||||||
|
// If altID is provided, it will update the existing Client.
|
||||||
|
// If subID is an empty string, a new client will be returned.
|
||||||
|
// If both altID and subID are empty, a new Client with no altID will be returned.
|
||||||
|
// Multiple clients with the same altID are permitted.
|
||||||
|
func (s *Server) GetClient(subID, altID string) (*Client, error) {
|
||||||
|
if s.notifier == nil || !s.notifier.running {
|
||||||
|
return nil, errors.New("notifier hasn't started")
|
||||||
|
}
|
||||||
|
target := notify.Target(subID)
|
||||||
|
client, exists := s.notifier.clients.getClient(target)
|
||||||
|
if exists {
|
||||||
|
s.notifier.clients.updateAltID(client, altID)
|
||||||
|
return client, nil
|
||||||
|
}
|
||||||
|
// An error should only be returned if there are 10 collisions of a randomly generated 16 bit byte string from rand.Rand()
|
||||||
|
// Basically never going to happen, and if it does its not my problem
|
||||||
|
sub, _ := s.notifier.Subscribe()
|
||||||
|
client = &Client{
|
||||||
|
sub: sub,
|
||||||
|
lastSeen: time.Now().Unix(),
|
||||||
|
altID: altID,
|
||||||
|
consecutiveFails: 0,
|
||||||
|
}
|
||||||
|
s.notifier.clients.addClient(client)
|
||||||
|
return client, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *Clients) getClient(target notify.Target) (*Client, bool) {
|
||||||
|
cs.lock.RLock()
|
||||||
|
client, exists := cs.clientsSubMap[target]
|
||||||
|
cs.lock.RUnlock()
|
||||||
|
return client, exists
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *Clients) updateAltID(client *Client, altID string) {
|
||||||
|
cs.lock.Lock()
|
||||||
|
if altID != "" && !slices.Contains(cs.clientsIDMap[altID], client) {
|
||||||
|
cs.clientsIDMap[altID] = append(cs.clientsIDMap[altID], client)
|
||||||
|
}
|
||||||
|
if client.altID != altID && client.altID != "" {
|
||||||
|
cs.deleteFromID(client, client.altID)
|
||||||
|
}
|
||||||
|
client.altID = altID
|
||||||
|
cs.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *Clients) deleteFromID(client *Client, altID string) {
|
||||||
|
cs.clientsIDMap[altID] = deleteFromSlice(cs.clientsIDMap[altID], client, func(a, b *Client) bool {
|
||||||
|
return a.sub.ID == b.sub.ID
|
||||||
|
})
|
||||||
|
if len(cs.clientsIDMap[altID]) == 0 {
|
||||||
|
delete(cs.clientsIDMap, altID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *Clients) addClient(client *Client) {
|
||||||
|
cs.lock.Lock()
|
||||||
|
cs.clientsSubMap[client.sub.ID] = client
|
||||||
|
if client.altID != "" {
|
||||||
|
cs.clientsIDMap[client.altID] = append(cs.clientsIDMap[client.altID], client)
|
||||||
|
}
|
||||||
|
cs.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *Clients) cleanUp() {
|
||||||
|
now := time.Now().Unix()
|
||||||
|
|
||||||
|
// Collect clients to kill while holding read lock
|
||||||
|
cs.lock.RLock()
|
||||||
|
toKill := make([]*Client, 0)
|
||||||
|
for _, client := range cs.clientsSubMap {
|
||||||
|
if now-atomic.LoadInt64(&client.lastSeen) > 300 {
|
||||||
|
toKill = append(toKill, client)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cs.lock.RUnlock()
|
||||||
|
|
||||||
|
// Kill clients without holding lock
|
||||||
|
for _, client := range toKill {
|
||||||
|
cs.killClient(client)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *Clients) killClient(client *Client) {
|
||||||
|
client.sub.Unsubscribe()
|
||||||
|
|
||||||
|
cs.lock.Lock()
|
||||||
|
delete(cs.clientsSubMap, client.sub.ID)
|
||||||
|
if client.altID != "" {
|
||||||
|
cs.deleteFromID(client, client.altID)
|
||||||
|
}
|
||||||
|
cs.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Listen starts a goroutine that forwards notifications from the subscriber to a returned channel.
|
||||||
|
// It returns a receive-only channel for notifications and a channel to stop listening.
|
||||||
|
// The notification channel is buffered with size 10 to tolerate brief slowness.
|
||||||
|
//
|
||||||
|
// The goroutine automatically stops and closes the notification channel when:
|
||||||
|
// - The subscriber is unsubscribed
|
||||||
|
// - The stop channel is closed
|
||||||
|
// - The client fails to receive 5 consecutive notifications within 5 seconds each
|
||||||
|
//
|
||||||
|
// Client.lastSeen is updated every 30 seconds via heartbeat, or when a notification is successfully delivered.
|
||||||
|
// Consecutive send failures are tracked; after 5 failures, the client is considered disconnected and cleaned up.
|
||||||
|
func (c *Client) Listen() (<-chan notify.Notification, chan<- struct{}) {
|
||||||
|
ch := make(chan notify.Notification, 10)
|
||||||
|
stop := make(chan struct{})
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
ticker := time.NewTicker(30 * time.Second)
|
||||||
|
defer ticker.Stop()
|
||||||
|
defer close(ch)
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-stop:
|
||||||
|
return
|
||||||
|
|
||||||
|
case nt, ok := <-c.sub.Listen():
|
||||||
|
if !ok {
|
||||||
|
// Subscriber channel closed
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to send with timeout
|
||||||
|
timeout := time.NewTimer(5 * time.Second)
|
||||||
|
select {
|
||||||
|
case ch <- nt:
|
||||||
|
// Successfully sent - update lastSeen and reset failure count
|
||||||
|
atomic.StoreInt64(&c.lastSeen, time.Now().Unix())
|
||||||
|
atomic.StoreInt32(&c.consecutiveFails, 0)
|
||||||
|
timeout.Stop()
|
||||||
|
|
||||||
|
case <-timeout.C:
|
||||||
|
// Send timeout - increment failure count
|
||||||
|
fails := atomic.AddInt32(&c.consecutiveFails, 1)
|
||||||
|
if fails >= 5 {
|
||||||
|
// Too many consecutive failures - client is stuck/disconnected
|
||||||
|
c.sub.Unsubscribe()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
case <-stop:
|
||||||
|
timeout.Stop()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
case <-ticker.C:
|
||||||
|
// Heartbeat - update lastSeen to keep client alive
|
||||||
|
atomic.StoreInt64(&c.lastSeen, time.Now().Unix())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
return ch, stop
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) ID() string {
|
||||||
|
return string(c.sub.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteFromSlice[T any](a []T, c T, eq func(T, T) bool) []T {
|
||||||
|
n := 0
|
||||||
|
for _, x := range a {
|
||||||
|
if !eq(x, c) {
|
||||||
|
a[n] = x
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return a[:n]
|
||||||
|
}
|
||||||
1014
hws/notify_test.go
Normal file
1014
hws/notify_test.go
Normal file
File diff suppressed because it is too large
Load Diff
@@ -13,3 +13,7 @@ func (w *wrappedWriter) WriteHeader(statusCode int) {
|
|||||||
w.ResponseWriter.WriteHeader(statusCode)
|
w.ResponseWriter.WriteHeader(statusCode)
|
||||||
w.statusCode = statusCode
|
w.statusCode = statusCode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w *wrappedWriter) Unwrap() http.ResponseWriter {
|
||||||
|
return w.ResponseWriter
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,11 +4,15 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"slices"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Route struct {
|
type Route struct {
|
||||||
Path string // Absolute path to the requested resource
|
Path string // Absolute path to the requested resource
|
||||||
Method Method // HTTP Method
|
Method Method // HTTP Method
|
||||||
|
// Methods is an optional slice of Methods to use, if more than one can use the same handler.
|
||||||
|
// Will take precedence over the Method field if provided
|
||||||
|
Methods []Method
|
||||||
Handler http.Handler // Handler to use for the request
|
Handler http.Handler // Handler to use for the request
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,21 +32,33 @@ const (
|
|||||||
|
|
||||||
// Server.AddRoutes registers the page handlers for the server.
|
// Server.AddRoutes registers the page handlers for the server.
|
||||||
// At least one route must be provided.
|
// At least one route must be provided.
|
||||||
|
// If any route patterns (path + method) are defined multiple times, the first
|
||||||
|
// instance will be added and any additional conflicts will be discarded.
|
||||||
func (server *Server) AddRoutes(routes ...Route) error {
|
func (server *Server) AddRoutes(routes ...Route) error {
|
||||||
if len(routes) == 0 {
|
if len(routes) == 0 {
|
||||||
return errors.New("No routes provided")
|
return errors.New("No routes provided")
|
||||||
}
|
}
|
||||||
|
patterns := []string{}
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("GET /healthz", func(http.ResponseWriter, *http.Request) {})
|
mux.HandleFunc("GET /healthz", func(http.ResponseWriter, *http.Request) {})
|
||||||
for _, route := range routes {
|
for _, route := range routes {
|
||||||
if !validMethod(route.Method) {
|
if len(route.Methods) == 0 {
|
||||||
return fmt.Errorf("Invalid method %s for path %s", route.Method, route.Path)
|
route.Methods = []Method{route.Method}
|
||||||
}
|
}
|
||||||
if route.Handler == nil {
|
for _, method := range route.Methods {
|
||||||
return fmt.Errorf("No handler provided for %s %s", route.Method, route.Path)
|
if !validMethod(method) {
|
||||||
|
return fmt.Errorf("Invalid method %s for path %s", method, route.Path)
|
||||||
|
}
|
||||||
|
if route.Handler == nil {
|
||||||
|
return fmt.Errorf("No handler provided for %s %s", method, route.Path)
|
||||||
|
}
|
||||||
|
pattern := fmt.Sprintf("%s %s", method, route.Path)
|
||||||
|
if slices.Contains(patterns, pattern) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
patterns = append(patterns, pattern)
|
||||||
|
mux.Handle(pattern, route.Handler)
|
||||||
}
|
}
|
||||||
pattern := fmt.Sprintf("%s %s", route.Method, route.Path)
|
|
||||||
mux.Handle(pattern, route.Handler)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
server.server.Handler = mux
|
server.server.Handler = mux
|
||||||
|
|||||||
@@ -122,6 +122,111 @@ func Test_AddRoutes(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Test_AddRoutes_MultipleMethods(t *testing.T) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
t.Run("Single route with multiple methods", func(t *testing.T) {
|
||||||
|
server := createTestServer(t, &buf)
|
||||||
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
w.Write([]byte(r.Method + " response"))
|
||||||
|
})
|
||||||
|
err := server.AddRoutes(hws.Route{
|
||||||
|
Path: "/api/resource",
|
||||||
|
Methods: []hws.Method{hws.MethodGET, hws.MethodPOST, hws.MethodPUT},
|
||||||
|
Handler: handler,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Test GET request
|
||||||
|
req := httptest.NewRequest("GET", "/api/resource", nil)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
|
assert.Equal(t, "GET response", rr.Body.String())
|
||||||
|
|
||||||
|
// Test POST request
|
||||||
|
req = httptest.NewRequest("POST", "/api/resource", nil)
|
||||||
|
rr = httptest.NewRecorder()
|
||||||
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
|
assert.Equal(t, "POST response", rr.Body.String())
|
||||||
|
|
||||||
|
// Test PUT request
|
||||||
|
req = httptest.NewRequest("PUT", "/api/resource", nil)
|
||||||
|
rr = httptest.NewRecorder()
|
||||||
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
|
assert.Equal(t, "PUT response", rr.Body.String())
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Methods field takes precedence over Method field", func(t *testing.T) {
|
||||||
|
server := createTestServer(t, &buf)
|
||||||
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
err := server.AddRoutes(hws.Route{
|
||||||
|
Path: "/test",
|
||||||
|
Method: hws.MethodGET, // This should be ignored
|
||||||
|
Methods: []hws.Method{hws.MethodPOST, hws.MethodPUT},
|
||||||
|
Handler: handler,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// GET should not work (Method field ignored)
|
||||||
|
req := httptest.NewRequest("GET", "/test", nil)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
assert.Equal(t, http.StatusMethodNotAllowed, rr.Code)
|
||||||
|
|
||||||
|
// POST should work (from Methods field)
|
||||||
|
req = httptest.NewRequest("POST", "/test", nil)
|
||||||
|
rr = httptest.NewRecorder()
|
||||||
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
|
|
||||||
|
// PUT should work (from Methods field)
|
||||||
|
req = httptest.NewRequest("PUT", "/test", nil)
|
||||||
|
rr = httptest.NewRecorder()
|
||||||
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Invalid method in Methods slice", func(t *testing.T) {
|
||||||
|
server := createTestServer(t, &buf)
|
||||||
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
err := server.AddRoutes(hws.Route{
|
||||||
|
Path: "/test",
|
||||||
|
Methods: []hws.Method{hws.MethodGET, hws.Method("INVALID")},
|
||||||
|
Handler: handler,
|
||||||
|
})
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Contains(t, err.Error(), "Invalid method")
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Empty Methods slice falls back to Method field", func(t *testing.T) {
|
||||||
|
server := createTestServer(t, &buf)
|
||||||
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
err := server.AddRoutes(hws.Route{
|
||||||
|
Path: "/test",
|
||||||
|
Method: hws.MethodGET,
|
||||||
|
Methods: []hws.Method{}, // Empty slice
|
||||||
|
Handler: handler,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// GET should work (from Method field)
|
||||||
|
req := httptest.NewRequest("GET", "/test", nil)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func Test_Routes_EndToEnd(t *testing.T) {
|
func Test_Routes_EndToEnd(t *testing.T) {
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
server := createTestServer(t, &buf)
|
server := createTestServer(t, &buf)
|
||||||
@@ -146,7 +251,7 @@ func Test_Routes_EndToEnd(t *testing.T) {
|
|||||||
req := httptest.NewRequest("GET", "/get", nil)
|
req := httptest.NewRequest("GET", "/get", nil)
|
||||||
rr := httptest.NewRecorder()
|
rr := httptest.NewRecorder()
|
||||||
server.Handler().ServeHTTP(rr, req)
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
|
||||||
assert.Equal(t, http.StatusOK, rr.Code)
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
assert.Equal(t, "GET response", rr.Body.String())
|
assert.Equal(t, "GET response", rr.Body.String())
|
||||||
|
|
||||||
@@ -154,7 +259,7 @@ func Test_Routes_EndToEnd(t *testing.T) {
|
|||||||
req = httptest.NewRequest("POST", "/post", nil)
|
req = httptest.NewRequest("POST", "/post", nil)
|
||||||
rr = httptest.NewRecorder()
|
rr = httptest.NewRecorder()
|
||||||
server.Handler().ServeHTTP(rr, req)
|
server.Handler().ServeHTTP(rr, req)
|
||||||
|
|
||||||
assert.Equal(t, http.StatusCreated, rr.Code)
|
assert.Equal(t, http.StatusCreated, rr.Code)
|
||||||
assert.Equal(t, "POST response", rr.Body.String())
|
assert.Equal(t, "POST response", rr.Body.String())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,19 +7,22 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"git.haelnorr.com/h/golib/notify"
|
||||||
"k8s.io/apimachinery/pkg/util/validation"
|
"k8s.io/apimachinery/pkg/util/validation"
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Server struct {
|
type Server struct {
|
||||||
GZIP bool
|
GZIP bool
|
||||||
server *http.Server
|
server *http.Server
|
||||||
logger *logger
|
logger *logger
|
||||||
routes bool
|
routes bool
|
||||||
middleware bool
|
middleware bool
|
||||||
errorPage ErrorPageFunc
|
errorPage ErrorPageFunc
|
||||||
ready chan struct{}
|
ready chan struct{}
|
||||||
|
notifier *Notifier
|
||||||
|
shutdowndelay time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ready returns a channel that is closed when the server is started
|
// Ready returns a channel that is closed when the server is started
|
||||||
@@ -83,10 +86,11 @@ func NewServer(config *Config) (*Server, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
server := &Server{
|
server := &Server{
|
||||||
server: httpServer,
|
server: httpServer,
|
||||||
routes: false,
|
routes: false,
|
||||||
GZIP: config.GZIP,
|
GZIP: config.GZIP,
|
||||||
ready: make(chan struct{}),
|
ready: make(chan struct{}),
|
||||||
|
shutdowndelay: config.ShutdownDelay,
|
||||||
}
|
}
|
||||||
return server, nil
|
return server, nil
|
||||||
}
|
}
|
||||||
@@ -105,6 +109,8 @@ func (server *Server) Start(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
server.startNotifier()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
if server.logger == nil {
|
if server.logger == nil {
|
||||||
fmt.Printf("Listening for requests on %s", server.server.Addr)
|
fmt.Printf("Listening for requests on %s", server.server.Addr)
|
||||||
@@ -126,6 +132,13 @@ func (server *Server) Start(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (server *Server) Shutdown(ctx context.Context) error {
|
func (server *Server) Shutdown(ctx context.Context) error {
|
||||||
|
server.logger.logger.Debug().Dur("shutdown_delay", server.shutdowndelay).Msg("HWS Server shutting down")
|
||||||
|
server.NotifyAll(notify.Notification{
|
||||||
|
Title: "Shutting down",
|
||||||
|
Message: fmt.Sprintf("Server is shutting down in %v", server.shutdowndelay),
|
||||||
|
Level: LevelShutdown,
|
||||||
|
})
|
||||||
|
<-time.NewTimer(server.shutdowndelay).C
|
||||||
if !server.IsReady() {
|
if !server.IsReady() {
|
||||||
return errors.New("Server isn't running")
|
return errors.New("Server isn't running")
|
||||||
}
|
}
|
||||||
@@ -136,6 +149,7 @@ func (server *Server) Shutdown(ctx context.Context) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrap(err, "Failed to shutdown the server gracefully")
|
return errors.Wrap(err, "Failed to shutdown the server gracefully")
|
||||||
}
|
}
|
||||||
|
server.closeNotifier()
|
||||||
server.ready = make(chan struct{})
|
server.ready = make(chan struct{})
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,7 +149,8 @@ func Test_Start_Errors(t *testing.T) {
|
|||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
err = server.Start(t.Context())
|
var nilCtx context.Context = nil
|
||||||
|
err = server.Start(nilCtx)
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
assert.Contains(t, err.Error(), "Context cannot be nil")
|
assert.Contains(t, err.Error(), "Context cannot be nil")
|
||||||
})
|
})
|
||||||
@@ -163,7 +164,8 @@ func Test_Shutdown_Errors(t *testing.T) {
|
|||||||
startTestServer(t, server)
|
startTestServer(t, server)
|
||||||
<-server.Ready()
|
<-server.Ready()
|
||||||
|
|
||||||
err := server.Shutdown(t.Context())
|
var nilCtx context.Context = nil
|
||||||
|
err := server.Shutdown(nilCtx)
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
assert.Contains(t, err.Error(), "Context cannot be nil")
|
assert.Contains(t, err.Error(), "Context cannot be nil")
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package hwsauth
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"reflect"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.haelnorr.com/h/golib/jwt"
|
"git.haelnorr.com/h/golib/jwt"
|
||||||
@@ -45,6 +46,9 @@ func (auth *Authenticator[T, TX]) getAuthenticatedUser(
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return authenticatedModel[T]{}, errors.Wrap(err, "auth.load")
|
return authenticatedModel[T]{}, errors.Wrap(err, "auth.load")
|
||||||
}
|
}
|
||||||
|
if reflect.ValueOf(model).IsNil() {
|
||||||
|
return authenticatedModel[T]{}, errors.New("no user matching JWT in database")
|
||||||
|
}
|
||||||
authUser := authenticatedModel[T]{
|
authUser := authenticatedModel[T]{
|
||||||
model: model,
|
model: model,
|
||||||
fresh: aT.Fresh,
|
fresh: aT.Fresh,
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
package hwsauth
|
package hwsauth
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
"git.haelnorr.com/h/golib/hlog"
|
"git.haelnorr.com/h/golib/hlog"
|
||||||
"git.haelnorr.com/h/golib/hws"
|
"git.haelnorr.com/h/golib/hws"
|
||||||
"git.haelnorr.com/h/golib/jwt"
|
"git.haelnorr.com/h/golib/jwt"
|
||||||
|
"github.com/gobwas/glob"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -11,7 +17,7 @@ type Authenticator[T Model, TX DBTransaction] struct {
|
|||||||
tokenGenerator *jwt.TokenGenerator
|
tokenGenerator *jwt.TokenGenerator
|
||||||
load LoadFunc[T, TX]
|
load LoadFunc[T, TX]
|
||||||
beginTx BeginTX
|
beginTx BeginTX
|
||||||
ignoredPaths []string
|
ignoredPaths []glob.Glob
|
||||||
logger *hlog.Logger
|
logger *hlog.Logger
|
||||||
server *hws.Server
|
server *hws.Server
|
||||||
errorPage hws.ErrorPageFunc
|
errorPage hws.ErrorPageFunc
|
||||||
@@ -30,6 +36,7 @@ func NewAuthenticator[T Model, TX DBTransaction](
|
|||||||
beginTx BeginTX,
|
beginTx BeginTX,
|
||||||
logger *hlog.Logger,
|
logger *hlog.Logger,
|
||||||
errorPage hws.ErrorPageFunc,
|
errorPage hws.ErrorPageFunc,
|
||||||
|
db *sql.DB,
|
||||||
) (*Authenticator[T, TX], error) {
|
) (*Authenticator[T, TX], error) {
|
||||||
if load == nil {
|
if load == nil {
|
||||||
return nil, errors.New("No function to load model supplied")
|
return nil, errors.New("No function to load model supplied")
|
||||||
@@ -55,7 +62,10 @@ func NewAuthenticator[T Model, TX DBTransaction](
|
|||||||
return nil, errors.New("SecretKey is required")
|
return nil, errors.New("SecretKey is required")
|
||||||
}
|
}
|
||||||
if cfg.SSL && cfg.TrustedHost == "" {
|
if cfg.SSL && cfg.TrustedHost == "" {
|
||||||
return nil, errors.New("TrustedHost is required when SSL is enabled")
|
cfg.SSL = false // Disable SSL if TrustedHost is not configured
|
||||||
|
}
|
||||||
|
if cfg.TrustedHost == "" {
|
||||||
|
cfg.TrustedHost = "localhost" // Default TrustedHost for JWT
|
||||||
}
|
}
|
||||||
if cfg.AccessTokenExpiry == 0 {
|
if cfg.AccessTokenExpiry == 0 {
|
||||||
cfg.AccessTokenExpiry = 5
|
cfg.AccessTokenExpiry = 5
|
||||||
@@ -69,12 +79,35 @@ func NewAuthenticator[T Model, TX DBTransaction](
|
|||||||
if cfg.LandingPage == "" {
|
if cfg.LandingPage == "" {
|
||||||
cfg.LandingPage = "/profile"
|
cfg.LandingPage = "/profile"
|
||||||
}
|
}
|
||||||
|
if cfg.DatabaseType == "" {
|
||||||
|
cfg.DatabaseType = "postgres"
|
||||||
|
}
|
||||||
|
if cfg.DatabaseVersion == "" {
|
||||||
|
cfg.DatabaseVersion = "15"
|
||||||
|
}
|
||||||
|
|
||||||
|
if db == nil {
|
||||||
|
return nil, errors.New("No Database provided")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test database connectivity
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
if err := db.PingContext(ctx); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "database connection test failed")
|
||||||
|
}
|
||||||
|
|
||||||
// Configure JWT table
|
// Configure JWT table
|
||||||
tableConfig := jwt.DefaultTableConfig()
|
tableConfig := jwt.DefaultTableConfig()
|
||||||
if cfg.JWTTableName != "" {
|
if cfg.JWTTableName != "" {
|
||||||
tableConfig.TableName = cfg.JWTTableName
|
tableConfig.TableName = cfg.JWTTableName
|
||||||
}
|
}
|
||||||
|
// Disable auto-creation for tests
|
||||||
|
// Check for test environment or mock database
|
||||||
|
if os.Getenv("GO_TEST") == "1" {
|
||||||
|
tableConfig.AutoCreate = false
|
||||||
|
tableConfig.EnableAutoCleanup = false
|
||||||
|
}
|
||||||
|
|
||||||
// Create token generator
|
// Create token generator
|
||||||
tokenGen, err := jwt.CreateGenerator(jwt.GeneratorConfig{
|
tokenGen, err := jwt.CreateGenerator(jwt.GeneratorConfig{
|
||||||
@@ -87,6 +120,7 @@ func NewAuthenticator[T Model, TX DBTransaction](
|
|||||||
Type: cfg.DatabaseType,
|
Type: cfg.DatabaseType,
|
||||||
Version: cfg.DatabaseVersion,
|
Version: cfg.DatabaseVersion,
|
||||||
},
|
},
|
||||||
|
DB: db,
|
||||||
TableConfig: tableConfig,
|
TableConfig: tableConfig,
|
||||||
}, beginTx)
|
}, beginTx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -5,20 +5,26 @@ go 1.25.5
|
|||||||
require (
|
require (
|
||||||
git.haelnorr.com/h/golib/cookies v0.9.0
|
git.haelnorr.com/h/golib/cookies v0.9.0
|
||||||
git.haelnorr.com/h/golib/env v0.9.1
|
git.haelnorr.com/h/golib/env v0.9.1
|
||||||
git.haelnorr.com/h/golib/hws v0.2.0
|
git.haelnorr.com/h/golib/hlog v0.10.4
|
||||||
git.haelnorr.com/h/golib/jwt v0.10.0
|
git.haelnorr.com/h/golib/hws v0.3.0
|
||||||
|
git.haelnorr.com/h/golib/jwt v0.10.1
|
||||||
|
github.com/DATA-DOG/go-sqlmock v1.5.2
|
||||||
github.com/pkg/errors v0.9.1
|
github.com/pkg/errors v0.9.1
|
||||||
git.haelnorr.com/h/golib/hlog v0.9.1
|
github.com/stretchr/testify v1.11.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/rs/zerolog v1.34.0 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/go-logr/logr v1.4.3 // indirect
|
github.com/go-logr/logr v1.4.3 // indirect
|
||||||
|
github.com/gobwas/glob v0.2.3
|
||||||
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
|
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.14 // indirect
|
github.com/mattn/go-colorable v0.1.14 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
github.com/rs/zerolog v1.34.0 // indirect
|
||||||
golang.org/x/sys v0.40.0 // indirect
|
golang.org/x/sys v0.40.0 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/apimachinery v0.35.0 // indirect
|
k8s.io/apimachinery v0.35.0 // indirect
|
||||||
k8s.io/klog/v2 v2.130.1 // indirect
|
k8s.io/klog/v2 v2.130.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20260108192941-914a6e750570 // indirect
|
k8s.io/utils v0.0.0-20260108192941-914a6e750570 // indirect
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ git.haelnorr.com/h/golib/cookies v0.9.0 h1:Vf+eX1prHkKuGrQon1BHY87yaPc1H+HJFRXDO
|
|||||||
git.haelnorr.com/h/golib/cookies v0.9.0/go.mod h1:y1385YExI9gLwckCVDCYVcsFXr6N7T3brJjnJD2QIuo=
|
git.haelnorr.com/h/golib/cookies v0.9.0/go.mod h1:y1385YExI9gLwckCVDCYVcsFXr6N7T3brJjnJD2QIuo=
|
||||||
git.haelnorr.com/h/golib/env v0.9.1 h1:2Vsj+mJKnO5f1Md1GO5v9ggLN5zWa0baCewcSHTjoNY=
|
git.haelnorr.com/h/golib/env v0.9.1 h1:2Vsj+mJKnO5f1Md1GO5v9ggLN5zWa0baCewcSHTjoNY=
|
||||||
git.haelnorr.com/h/golib/env v0.9.1/go.mod h1:glUQVdA1HMKX1avTDyTyuhcr36SSxZtlJxKDT5KTztg=
|
git.haelnorr.com/h/golib/env v0.9.1/go.mod h1:glUQVdA1HMKX1avTDyTyuhcr36SSxZtlJxKDT5KTztg=
|
||||||
git.haelnorr.com/h/golib/hlog v0.9.1 h1:9VmE/IQTfD8LAEyTbUCZLy/+8PbcHA1Kob/WQHRHKzc=
|
git.haelnorr.com/h/golib/hlog v0.10.4 h1:vpCsV/OddjIYx8F48U66WxojjmhEbeLGQAOBG4ViSRQ=
|
||||||
git.haelnorr.com/h/golib/hlog v0.9.1/go.mod h1:oOlzb8UVHUYP1k7dN5PSJXVskAB2z8EYgRN85jAi0Zk=
|
git.haelnorr.com/h/golib/hlog v0.10.4/go.mod h1:+wJ8vecQY/JITTXKmI3JfkHiUGyMs7N6wooj2wuWZbc=
|
||||||
git.haelnorr.com/h/golib/hws v0.2.0 h1:MR2Tu2qPaW+/oK8aXFJLRFaYZIHgKiex3t3zE41cu1U=
|
git.haelnorr.com/h/golib/hws v0.3.0 h1:/YGzxd3sRR3DFU6qVZxpJMKV3W2wCONqZKYUDIercCo=
|
||||||
git.haelnorr.com/h/golib/hws v0.2.0/go.mod h1:6ZlRKnt8YMpv5XcMXmyBGmD1/euvBo3d1azEvHJjOLo=
|
git.haelnorr.com/h/golib/hws v0.3.0/go.mod h1:6ZlRKnt8YMpv5XcMXmyBGmD1/euvBo3d1azEvHJjOLo=
|
||||||
git.haelnorr.com/h/golib/jwt v0.10.0 h1:8cI8mSnb8X+EmJtrBO/5UZwuBMtib0IE9dv85gkm94E=
|
git.haelnorr.com/h/golib/jwt v0.10.1 h1:1Adxt9H3Y4fWFvFjWpvg/vSFhbgCMDMxgiE3m7KvDMI=
|
||||||
git.haelnorr.com/h/golib/jwt v0.10.0/go.mod h1:fbuPrfucT9lL0faV5+Q5Gk9WFJxPlwzRPpbMQKYZok4=
|
git.haelnorr.com/h/golib/jwt v0.10.1/go.mod h1:fbuPrfucT9lL0faV5+Q5Gk9WFJxPlwzRPpbMQKYZok4=
|
||||||
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
|
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
|
||||||
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
|
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||||
@@ -15,11 +15,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
||||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
||||||
|
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
|
||||||
|
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
|
||||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
|
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
|
||||||
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
|
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
|
||||||
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
||||||
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
||||||
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
||||||
@@ -41,6 +44,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|||||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
|
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
|
||||||
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
k8s.io/apimachinery v0.35.0 h1:Z2L3IHvPVv/MJ7xRxHEtk6GoJElaAqDCCU0S6ncYok8=
|
k8s.io/apimachinery v0.35.0 h1:Z2L3IHvPVv/MJ7xRxHEtk6GoJElaAqDCCU0S6ncYok8=
|
||||||
|
|||||||
481
hwsauth/hwsauth_test.go
Normal file
481
hwsauth/hwsauth_test.go
Normal file
@@ -0,0 +1,481 @@
|
|||||||
|
package hwsauth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"io"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.haelnorr.com/h/golib/hlog"
|
||||||
|
"git.haelnorr.com/h/golib/hws"
|
||||||
|
"github.com/DATA-DOG/go-sqlmock"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
type TestModel struct {
|
||||||
|
ID int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tm TestModel) GetID() int {
|
||||||
|
return tm.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
type TestTransaction struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tt *TestTransaction) Exec(query string, args ...any) (sql.Result, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tt *TestTransaction) Query(query string, args ...any) (*sql.Rows, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tt *TestTransaction) Commit() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tt *TestTransaction) Rollback() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type TestErrorPage struct{}
|
||||||
|
|
||||||
|
func (tep TestErrorPage) Render(ctx context.Context, w io.Writer) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// createMockDB creates a mock SQL database for testing
|
||||||
|
func createMockDB() (*sql.DB, sqlmock.Sqlmock, error) {
|
||||||
|
db, mock, err := sqlmock.New()
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expect a ping to succeed for database connectivity test
|
||||||
|
mock.ExpectPing()
|
||||||
|
|
||||||
|
// Expect table existence check (returns a row = table exists)
|
||||||
|
mock.ExpectQuery(`SELECT 1 FROM information_schema\.tables WHERE table_schema = 'public' AND table_name = \$1`).
|
||||||
|
WithArgs("jwtblacklist").
|
||||||
|
WillReturnRows(sqlmock.NewRows([]string{"1"}).AddRow(1))
|
||||||
|
|
||||||
|
// Expect cleanup function creation
|
||||||
|
mock.ExpectExec(`CREATE OR REPLACE FUNCTION cleanup_jwtblacklist\(\) RETURNS void AS \$\$ BEGIN DELETE FROM jwtblacklist WHERE exp < EXTRACT\(EPOCH FROM NOW\(\)\); END; \$\$ LANGUAGE plpgsql;`).
|
||||||
|
WillReturnResult(sqlmock.NewResult(0, 0))
|
||||||
|
|
||||||
|
return db, mock, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetNil(t *testing.T) {
|
||||||
|
var zero TestModel
|
||||||
|
result := getNil[TestModel]()
|
||||||
|
assert.Equal(t, zero, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetAndGetAuthenticatedModel(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
model := TestModel{ID: 123}
|
||||||
|
authModel := authenticatedModel[TestModel]{
|
||||||
|
model: model,
|
||||||
|
fresh: 1234567890,
|
||||||
|
}
|
||||||
|
|
||||||
|
newCtx := setAuthenticatedModel(ctx, authModel)
|
||||||
|
|
||||||
|
retrieved, ok := getAuthorizedModel[TestModel](newCtx)
|
||||||
|
assert.True(t, ok)
|
||||||
|
assert.Equal(t, model, retrieved.model)
|
||||||
|
assert.Equal(t, int64(1234567890), retrieved.fresh)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetAuthorizedModel_NotSet(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
retrieved, ok := getAuthorizedModel[TestModel](ctx)
|
||||||
|
assert.False(t, ok)
|
||||||
|
var zero TestModel
|
||||||
|
assert.Equal(t, zero, retrieved.model)
|
||||||
|
assert.Equal(t, int64(0), retrieved.fresh)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCurrentModel(t *testing.T) {
|
||||||
|
auth := &Authenticator[TestModel, DBTransaction]{}
|
||||||
|
|
||||||
|
t.Run("nil context", func(t *testing.T) {
|
||||||
|
var nilContext context.Context = nil
|
||||||
|
result := auth.CurrentModel(nilContext)
|
||||||
|
var zero TestModel
|
||||||
|
assert.Equal(t, zero, result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("context without authenticated model", func(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
result := auth.CurrentModel(ctx)
|
||||||
|
var zero TestModel
|
||||||
|
assert.Equal(t, zero, result)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("context with authenticated model", func(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
model := TestModel{ID: 456}
|
||||||
|
authModel := authenticatedModel[TestModel]{
|
||||||
|
model: model,
|
||||||
|
fresh: 1234567890,
|
||||||
|
}
|
||||||
|
ctx = setAuthenticatedModel(ctx, authModel)
|
||||||
|
|
||||||
|
result := auth.CurrentModel(ctx)
|
||||||
|
assert.Equal(t, model, result)
|
||||||
|
assert.Equal(t, 456, result.GetID())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConfigFromEnv_MissingSecretKey(t *testing.T) {
|
||||||
|
// Clear environment variables
|
||||||
|
originalSecret := os.Getenv("HWSAUTH_SECRET_KEY")
|
||||||
|
os.Setenv("HWSAUTH_SECRET_KEY", "")
|
||||||
|
defer os.Setenv("HWSAUTH_SECRET_KEY", originalSecret)
|
||||||
|
|
||||||
|
_, err := ConfigFromEnv()
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Contains(t, err.Error(), "Envar not set: HWSAUTH_SECRET_KEY")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConfigFromEnv_SSLWithoutTrustedHost(t *testing.T) {
|
||||||
|
// Clear environment variables
|
||||||
|
t.Setenv("HWSAUTH_SECRET_KEY", "test-secret")
|
||||||
|
t.Setenv("HWSAUTH_SSL", "true")
|
||||||
|
t.Setenv("HWSAUTH_TRUSTED_HOST", "")
|
||||||
|
defer func() {
|
||||||
|
t.Setenv("HWSAUTH_SECRET_KEY", "")
|
||||||
|
t.Setenv("HWSAUTH_SSL", "")
|
||||||
|
t.Setenv("HWSAUTH_TRUSTED_HOST", "")
|
||||||
|
}()
|
||||||
|
|
||||||
|
_, err := ConfigFromEnv()
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Contains(t, err.Error(), "SSL is enabled and no HWS_TRUSTED_HOST set")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConfigFromEnv_ValidMinimalConfig(t *testing.T) {
|
||||||
|
// Set environment variables
|
||||||
|
t.Setenv("HWSAUTH_SECRET_KEY", "test-secret-key")
|
||||||
|
defer t.Setenv("HWSAUTH_SECRET_KEY", "")
|
||||||
|
|
||||||
|
cfg, err := ConfigFromEnv()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, "test-secret-key", cfg.SecretKey)
|
||||||
|
assert.Equal(t, false, cfg.SSL)
|
||||||
|
assert.Equal(t, int64(5), cfg.AccessTokenExpiry)
|
||||||
|
assert.Equal(t, int64(1440), cfg.RefreshTokenExpiry)
|
||||||
|
assert.Equal(t, int64(5), cfg.TokenFreshTime)
|
||||||
|
assert.Equal(t, "/profile", cfg.LandingPage)
|
||||||
|
assert.Equal(t, "postgres", cfg.DatabaseType)
|
||||||
|
assert.Equal(t, "15", cfg.DatabaseVersion)
|
||||||
|
assert.Equal(t, "jwtblacklist", cfg.JWTTableName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConfigFromEnv_ValidFullConfig(t *testing.T) {
|
||||||
|
// Set environment variables
|
||||||
|
t.Setenv("HWSAUTH_SECRET_KEY", "custom-secret")
|
||||||
|
t.Setenv("HWSAUTH_SSL", "true")
|
||||||
|
t.Setenv("HWSAUTH_TRUSTED_HOST", "example.com")
|
||||||
|
t.Setenv("HWSAUTH_ACCESS_TOKEN_EXPIRY", "15")
|
||||||
|
t.Setenv("HWSAUTH_REFRESH_TOKEN_EXPIRY", "2880")
|
||||||
|
t.Setenv("HWSAUTH_TOKEN_FRESH_TIME", "10")
|
||||||
|
t.Setenv("HWSAUTH_LANDING_PAGE", "/dashboard")
|
||||||
|
t.Setenv("HWSAUTH_DATABASE_TYPE", "mysql")
|
||||||
|
t.Setenv("HWSAUTH_DATABASE_VERSION", "8.0")
|
||||||
|
t.Setenv("HWSAUTH_JWT_TABLE_NAME", "custom_tokens")
|
||||||
|
defer func() {
|
||||||
|
t.Setenv("HWSAUTH_SECRET_KEY", "")
|
||||||
|
t.Setenv("HWSAUTH_SSL", "")
|
||||||
|
t.Setenv("HWSAUTH_TRUSTED_HOST", "")
|
||||||
|
t.Setenv("HWSAUTH_ACCESS_TOKEN_EXPIRY", "")
|
||||||
|
t.Setenv("HWSAUTH_REFRESH_TOKEN_EXPIRY", "")
|
||||||
|
t.Setenv("HWSAUTH_TOKEN_FRESH_TIME", "")
|
||||||
|
t.Setenv("HWSAUTH_LANDING_PAGE", "")
|
||||||
|
t.Setenv("HWSAUTH_DATABASE_TYPE", "")
|
||||||
|
t.Setenv("HWSAUTH_DATABASE_VERSION", "")
|
||||||
|
t.Setenv("HWSAUTH_JWT_TABLE_NAME", "")
|
||||||
|
}()
|
||||||
|
|
||||||
|
cfg, err := ConfigFromEnv()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, "custom-secret", cfg.SecretKey)
|
||||||
|
assert.Equal(t, true, cfg.SSL)
|
||||||
|
assert.Equal(t, "example.com", cfg.TrustedHost)
|
||||||
|
assert.Equal(t, int64(15), cfg.AccessTokenExpiry)
|
||||||
|
assert.Equal(t, int64(2880), cfg.RefreshTokenExpiry)
|
||||||
|
assert.Equal(t, int64(10), cfg.TokenFreshTime)
|
||||||
|
assert.Equal(t, "/dashboard", cfg.LandingPage)
|
||||||
|
assert.Equal(t, "mysql", cfg.DatabaseType)
|
||||||
|
assert.Equal(t, "8.0", cfg.DatabaseVersion)
|
||||||
|
assert.Equal(t, "custom_tokens", cfg.JWTTableName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewAuthenticator_NilConfig(t *testing.T) {
|
||||||
|
load := func(ctx context.Context, tx DBTransaction, id int) (TestModel, error) {
|
||||||
|
return TestModel{ID: id}, nil
|
||||||
|
}
|
||||||
|
server := &hws.Server{}
|
||||||
|
beginTx := func(ctx context.Context) (DBTransaction, error) {
|
||||||
|
return &TestTransaction{}, nil
|
||||||
|
}
|
||||||
|
logger := &hlog.Logger{}
|
||||||
|
errorPage := func(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
|
return TestErrorPage{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
auth, err := NewAuthenticator(
|
||||||
|
nil, // cfg
|
||||||
|
load,
|
||||||
|
server,
|
||||||
|
beginTx,
|
||||||
|
logger,
|
||||||
|
errorPage,
|
||||||
|
nil, // db
|
||||||
|
)
|
||||||
|
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Nil(t, auth)
|
||||||
|
assert.Contains(t, err.Error(), "Config is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewAuthenticator_MissingSecretKey(t *testing.T) {
|
||||||
|
cfg := &Config{
|
||||||
|
SecretKey: "",
|
||||||
|
}
|
||||||
|
|
||||||
|
load := func(ctx context.Context, tx DBTransaction, id int) (TestModel, error) {
|
||||||
|
return TestModel{ID: id}, nil
|
||||||
|
}
|
||||||
|
server := &hws.Server{}
|
||||||
|
beginTx := func(ctx context.Context) (DBTransaction, error) {
|
||||||
|
return &TestTransaction{}, nil
|
||||||
|
}
|
||||||
|
logger := &hlog.Logger{}
|
||||||
|
errorPage := func(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
|
return TestErrorPage{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
auth, err := NewAuthenticator(
|
||||||
|
cfg,
|
||||||
|
load,
|
||||||
|
server,
|
||||||
|
beginTx,
|
||||||
|
logger,
|
||||||
|
errorPage,
|
||||||
|
nil, // db - will fail before db check since SecretKey is missing
|
||||||
|
)
|
||||||
|
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Nil(t, auth)
|
||||||
|
assert.Contains(t, err.Error(), "SecretKey is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewAuthenticator_NilLoadFunction(t *testing.T) {
|
||||||
|
cfg := &Config{
|
||||||
|
SecretKey: "test-secret",
|
||||||
|
}
|
||||||
|
|
||||||
|
server := &hws.Server{}
|
||||||
|
beginTx := func(ctx context.Context) (DBTransaction, error) {
|
||||||
|
return &TestTransaction{}, nil
|
||||||
|
}
|
||||||
|
logger := &hlog.Logger{}
|
||||||
|
errorPage := func(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
|
return TestErrorPage{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
auth, err := NewAuthenticator[TestModel, DBTransaction](
|
||||||
|
cfg,
|
||||||
|
nil,
|
||||||
|
server,
|
||||||
|
beginTx,
|
||||||
|
logger,
|
||||||
|
errorPage,
|
||||||
|
nil, // db
|
||||||
|
)
|
||||||
|
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Nil(t, auth)
|
||||||
|
assert.Contains(t, err.Error(), "No function to load model supplied")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewAuthenticator_SSLWithoutTrustedHost(t *testing.T) {
|
||||||
|
cfg := &Config{
|
||||||
|
SecretKey: "test-secret",
|
||||||
|
SSL: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
load := func(ctx context.Context, tx DBTransaction, id int) (TestModel, error) {
|
||||||
|
return TestModel{ID: id}, nil
|
||||||
|
}
|
||||||
|
server := &hws.Server{}
|
||||||
|
beginTx := func(ctx context.Context) (DBTransaction, error) {
|
||||||
|
return &TestTransaction{}, nil
|
||||||
|
}
|
||||||
|
logger := &hlog.Logger{}
|
||||||
|
errorPage := func(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
|
return TestErrorPage{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
db, _, err := createMockDB()
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
auth, err := NewAuthenticator(
|
||||||
|
cfg,
|
||||||
|
load,
|
||||||
|
server,
|
||||||
|
beginTx,
|
||||||
|
logger,
|
||||||
|
errorPage,
|
||||||
|
db,
|
||||||
|
)
|
||||||
|
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.NotNil(t, auth)
|
||||||
|
|
||||||
|
assert.Equal(t, false, auth.SSL)
|
||||||
|
assert.Equal(t, "/profile", auth.LandingPage)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewAuthenticator_NilDatabase(t *testing.T) {
|
||||||
|
cfg := &Config{
|
||||||
|
SecretKey: "test-secret",
|
||||||
|
}
|
||||||
|
|
||||||
|
load := func(ctx context.Context, tx DBTransaction, id int) (TestModel, error) {
|
||||||
|
return TestModel{ID: id}, nil
|
||||||
|
}
|
||||||
|
server := &hws.Server{}
|
||||||
|
beginTx := func(ctx context.Context) (DBTransaction, error) {
|
||||||
|
return &TestTransaction{}, nil
|
||||||
|
}
|
||||||
|
logger := &hlog.Logger{}
|
||||||
|
errorPage := func(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
|
return TestErrorPage{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
auth, err := NewAuthenticator(
|
||||||
|
cfg,
|
||||||
|
load,
|
||||||
|
server,
|
||||||
|
beginTx,
|
||||||
|
logger,
|
||||||
|
errorPage,
|
||||||
|
nil, // db
|
||||||
|
)
|
||||||
|
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Nil(t, auth)
|
||||||
|
assert.Contains(t, err.Error(), "No Database provided")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestModelInterface(t *testing.T) {
|
||||||
|
t.Run("TestModel implements Model interface", func(t *testing.T) {
|
||||||
|
var _ Model = TestModel{}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetID method", func(t *testing.T) {
|
||||||
|
model := TestModel{ID: 789}
|
||||||
|
assert.Equal(t, 789, model.GetID())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetAuthenticatedUser_NoTokens(t *testing.T) {
|
||||||
|
cfg := &Config{
|
||||||
|
SecretKey: "test-secret",
|
||||||
|
TrustedHost: "example.com",
|
||||||
|
}
|
||||||
|
|
||||||
|
load := func(ctx context.Context, tx DBTransaction, id int) (TestModel, error) {
|
||||||
|
return TestModel{ID: id}, nil
|
||||||
|
}
|
||||||
|
server := &hws.Server{}
|
||||||
|
beginTx := func(ctx context.Context) (DBTransaction, error) {
|
||||||
|
return &TestTransaction{}, nil
|
||||||
|
}
|
||||||
|
logger := &hlog.Logger{}
|
||||||
|
errorPage := func(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
|
return TestErrorPage{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
db, _, err := createMockDB()
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
auth, err := NewAuthenticator(
|
||||||
|
cfg,
|
||||||
|
load,
|
||||||
|
server,
|
||||||
|
beginTx,
|
||||||
|
logger,
|
||||||
|
errorPage,
|
||||||
|
db,
|
||||||
|
)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
tx := &TestTransaction{}
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
r := httptest.NewRequest("GET", "/", nil)
|
||||||
|
|
||||||
|
model, err := auth.getAuthenticatedUser(tx, w, r)
|
||||||
|
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Contains(t, err.Error(), "No token strings provided")
|
||||||
|
var zero TestModel
|
||||||
|
assert.Equal(t, zero, model.model)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLogin_BasicFunctionality(t *testing.T) {
|
||||||
|
cfg := &Config{
|
||||||
|
SecretKey: "test-secret",
|
||||||
|
TrustedHost: "example.com",
|
||||||
|
}
|
||||||
|
|
||||||
|
load := func(ctx context.Context, tx DBTransaction, id int) (TestModel, error) {
|
||||||
|
return TestModel{ID: id}, nil
|
||||||
|
}
|
||||||
|
server := &hws.Server{}
|
||||||
|
beginTx := func(ctx context.Context) (DBTransaction, error) {
|
||||||
|
return &TestTransaction{}, nil
|
||||||
|
}
|
||||||
|
logger := &hlog.Logger{}
|
||||||
|
errorPage := func(error hws.HWSError) (hws.ErrorPage, error) {
|
||||||
|
return TestErrorPage{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
db, _, err := createMockDB()
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
auth, err := NewAuthenticator(
|
||||||
|
cfg,
|
||||||
|
load,
|
||||||
|
server,
|
||||||
|
beginTx,
|
||||||
|
logger,
|
||||||
|
errorPage,
|
||||||
|
db,
|
||||||
|
)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
r := httptest.NewRequest("GET", "/", nil)
|
||||||
|
|
||||||
|
user := TestModel{ID: 123}
|
||||||
|
rememberMe := true
|
||||||
|
|
||||||
|
// This test mainly checks that the function doesn't panic and has right call signature
|
||||||
|
// The actual JWT functionality is tested in jwt package itself
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
auth.Login(w, r, user, rememberMe)
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -3,6 +3,8 @@ package hwsauth
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
|
||||||
|
"github.com/gobwas/glob"
|
||||||
)
|
)
|
||||||
|
|
||||||
// IgnorePaths excludes specified paths from authentication middleware.
|
// IgnorePaths excludes specified paths from authentication middleware.
|
||||||
@@ -25,6 +27,19 @@ func (auth *Authenticator[T, TX]) IgnorePaths(paths ...string) error {
|
|||||||
return fmt.Errorf("Invalid path: '%s'", path)
|
return fmt.Errorf("Invalid path: '%s'", path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
auth.ignoredPaths = paths
|
auth.ignoredPaths = prepareGlobs(paths)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func prepareGlobs(paths []string) []glob.Glob {
|
||||||
|
compiledGlobs := make([]glob.Glob, 0, len(paths))
|
||||||
|
for _, pattern := range paths {
|
||||||
|
g, err := glob.Compile(pattern)
|
||||||
|
if err != nil {
|
||||||
|
// If pattern fails to compile, skip it
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
compiledGlobs = append(compiledGlobs, g)
|
||||||
|
}
|
||||||
|
return compiledGlobs
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,10 +2,12 @@ package hwsauth
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"git.haelnorr.com/h/golib/hws"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"slices"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"git.haelnorr.com/h/golib/hws"
|
||||||
|
"github.com/gobwas/glob"
|
||||||
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Authenticate returns the main authentication middleware.
|
// Authenticate returns the main authentication middleware.
|
||||||
@@ -21,7 +23,7 @@ func (auth *Authenticator[T, TX]) Authenticate() hws.Middleware {
|
|||||||
|
|
||||||
func (auth *Authenticator[T, TX]) authenticate() hws.MiddlewareFunc {
|
func (auth *Authenticator[T, TX]) authenticate() hws.MiddlewareFunc {
|
||||||
return func(w http.ResponseWriter, r *http.Request) (*http.Request, *hws.HWSError) {
|
return func(w http.ResponseWriter, r *http.Request) (*http.Request, *hws.HWSError) {
|
||||||
if slices.Contains(auth.ignoredPaths, r.URL.Path) {
|
if globTest(r.URL.Path, auth.ignoredPaths) {
|
||||||
return r, nil
|
return r, nil
|
||||||
}
|
}
|
||||||
ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
|
ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
|
||||||
@@ -30,16 +32,32 @@ func (auth *Authenticator[T, TX]) authenticate() hws.MiddlewareFunc {
|
|||||||
// Start the transaction
|
// Start the transaction
|
||||||
tx, err := auth.beginTx(ctx)
|
tx, err := auth.beginTx(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, &hws.HWSError{Message: "Unable to start transaction", StatusCode: http.StatusServiceUnavailable, Error: err}
|
return nil, &hws.HWSError{
|
||||||
|
Message: "Unable to start transaction",
|
||||||
|
StatusCode: http.StatusServiceUnavailable,
|
||||||
|
Error: errors.Wrap(err, "auth.beginTx"),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
defer tx.Rollback()
|
||||||
// Type assert to TX - safe because user's beginTx should return their TX type
|
// Type assert to TX - safe because user's beginTx should return their TX type
|
||||||
txTyped, ok := tx.(TX)
|
txTyped, ok := tx.(TX)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, &hws.HWSError{Message: "Transaction type mismatch", StatusCode: http.StatusInternalServerError, Error: err}
|
return nil, &hws.HWSError{
|
||||||
|
Message: "Transaction type mismatch",
|
||||||
|
StatusCode: http.StatusInternalServerError,
|
||||||
|
Error: errors.Wrap(err, "TX type not ok"),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
model, err := auth.getAuthenticatedUser(txTyped, w, r)
|
model, err := auth.getAuthenticatedUser(txTyped, w, r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tx.Rollback()
|
rberr := tx.Rollback()
|
||||||
|
if rberr != nil {
|
||||||
|
return nil, &hws.HWSError{
|
||||||
|
Message: "Failed rolling back after error",
|
||||||
|
StatusCode: http.StatusInternalServerError,
|
||||||
|
Error: errors.Wrap(err, "tx.Rollback"),
|
||||||
|
}
|
||||||
|
}
|
||||||
auth.logger.Debug().
|
auth.logger.Debug().
|
||||||
Str("remote_addr", r.RemoteAddr).
|
Str("remote_addr", r.RemoteAddr).
|
||||||
Err(err).
|
Err(err).
|
||||||
@@ -52,3 +70,12 @@ func (auth *Authenticator[T, TX]) authenticate() hws.MiddlewareFunc {
|
|||||||
return newReq, nil
|
return newReq, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func globTest(testPath string, globs []glob.Glob) bool {
|
||||||
|
for _, g := range globs {
|
||||||
|
if g.Match(testPath) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.haelnorr.com/h/golib/hws"
|
"git.haelnorr.com/h/golib/hws"
|
||||||
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
// LoginReq returns a middleware that requires the user to be authenticated.
|
// LoginReq returns a middleware that requires the user to be authenticated.
|
||||||
@@ -18,23 +19,14 @@ func (auth *Authenticator[T, TX]) LoginReq(next http.Handler) http.Handler {
|
|||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
_, ok := getAuthorizedModel[T](r.Context())
|
_, ok := getAuthorizedModel[T](r.Context())
|
||||||
if !ok {
|
if !ok {
|
||||||
page, err := auth.errorPage(http.StatusUnauthorized)
|
err := auth.server.ThrowError(w, r, hws.HWSError{
|
||||||
|
Error: errors.New("Login required"),
|
||||||
|
Message: "Please login to view this page",
|
||||||
|
StatusCode: http.StatusUnauthorized,
|
||||||
|
RenderErrorPage: true,
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
auth.server.ThrowError(w, r, hws.HWSError{
|
auth.server.ThrowFatal(w, err)
|
||||||
Error: err,
|
|
||||||
Message: "Failed to get valid error page",
|
|
||||||
StatusCode: http.StatusInternalServerError,
|
|
||||||
RenderErrorPage: true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
err = page.Render(r.Context(), w)
|
|
||||||
if err != nil {
|
|
||||||
auth.server.ThrowError(w, r, hws.HWSError{
|
|
||||||
Error: err,
|
|
||||||
Message: "Failed to render error page",
|
|
||||||
StatusCode: http.StatusInternalServerError,
|
|
||||||
RenderErrorPage: true,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -74,23 +66,14 @@ func (auth *Authenticator[T, TX]) FreshReq(next http.Handler) http.Handler {
|
|||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
model, ok := getAuthorizedModel[T](r.Context())
|
model, ok := getAuthorizedModel[T](r.Context())
|
||||||
if !ok {
|
if !ok {
|
||||||
page, err := auth.errorPage(http.StatusUnauthorized)
|
err := auth.server.ThrowError(w, r, hws.HWSError{
|
||||||
|
Error: errors.New("Login required"),
|
||||||
|
Message: "Please login to view this page",
|
||||||
|
StatusCode: http.StatusUnauthorized,
|
||||||
|
RenderErrorPage: true,
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
auth.server.ThrowError(w, r, hws.HWSError{
|
auth.server.ThrowFatal(w, err)
|
||||||
Error: err,
|
|
||||||
Message: "Failed to get valid error page",
|
|
||||||
StatusCode: http.StatusInternalServerError,
|
|
||||||
RenderErrorPage: true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
err = page.Render(r.Context(), w)
|
|
||||||
if err != nil {
|
|
||||||
auth.server.ThrowError(w, r, hws.HWSError{
|
|
||||||
Error: err,
|
|
||||||
Message: "Failed to render error page",
|
|
||||||
StatusCode: http.StatusInternalServerError,
|
|
||||||
RenderErrorPage: true,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package hwsauth
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"reflect"
|
||||||
|
|
||||||
"git.haelnorr.com/h/golib/jwt"
|
"git.haelnorr.com/h/golib/jwt"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@@ -18,7 +19,9 @@ func (auth *Authenticator[T, TX]) refreshAuthTokens(
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return getNil[T](), errors.Wrap(err, "auth.load")
|
return getNil[T](), errors.Wrap(err, "auth.load")
|
||||||
}
|
}
|
||||||
|
if reflect.ValueOf(model).IsNil() {
|
||||||
|
return getNil[T](), errors.New("no user matching JWT in database")
|
||||||
|
}
|
||||||
rememberMe := map[string]bool{
|
rememberMe := map[string]bool{
|
||||||
"session": false,
|
"session": false,
|
||||||
"exp": true,
|
"exp": true,
|
||||||
|
|||||||
21
notify/LICENSE
Normal file
21
notify/LICENSE
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2026 haelnorr
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
397
notify/README.md
Normal file
397
notify/README.md
Normal file
@@ -0,0 +1,397 @@
|
|||||||
|
# notify
|
||||||
|
|
||||||
|
Thread-safe pub/sub notification system for Go applications.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- **Thread-Safe**: All operations are safe for concurrent use
|
||||||
|
- **Configurable Buffering**: Set custom buffer sizes per notifier
|
||||||
|
- **Targeted & Broadcast**: Send to specific subscribers or broadcast to all
|
||||||
|
- **Graceful Shutdown**: Built-in Close() for clean resource cleanup
|
||||||
|
- **Idempotent Operations**: Safe to call Unsubscribe() and Close() multiple times
|
||||||
|
- **Zero Dependencies**: Uses only Go standard library
|
||||||
|
- **Comprehensive Tests**: 95%+ code coverage with race detector clean
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
```bash
|
||||||
|
go get git.haelnorr.com/h/golib/notify
|
||||||
|
```
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
```go
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"git.haelnorr.com/h/golib/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
// Create a notifier with 50-notification buffer per subscriber
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
// Subscribe to receive notifications
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
defer sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Listen for notifications
|
||||||
|
go func() {
|
||||||
|
for notification := range sub.Listen() {
|
||||||
|
fmt.Printf("[%s] %s: %s\n",
|
||||||
|
notification.Level,
|
||||||
|
notification.Title,
|
||||||
|
notification.Message)
|
||||||
|
}
|
||||||
|
fmt.Println("Listener exited")
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Send a notification
|
||||||
|
n.Notify(notify.Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: notify.LevelSuccess,
|
||||||
|
Title: "Welcome",
|
||||||
|
Message: "You're now subscribed!",
|
||||||
|
})
|
||||||
|
|
||||||
|
// Broadcast to all subscribers
|
||||||
|
n.NotifyAll(notify.Notification{
|
||||||
|
Level: notify.LevelInfo,
|
||||||
|
Title: "System Status",
|
||||||
|
Message: "All systems operational",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
### Creating a Notifier
|
||||||
|
|
||||||
|
The buffer size determines how many notifications can be queued per subscriber:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Unbuffered - sends block until received
|
||||||
|
n := notify.NewNotifier(0)
|
||||||
|
|
||||||
|
// Small buffer - low memory, may drop if slow readers
|
||||||
|
n := notify.NewNotifier(25)
|
||||||
|
|
||||||
|
// Recommended - balanced approach
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
|
||||||
|
// Large buffer - handles bursts well
|
||||||
|
n := notify.NewNotifier(500)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Subscribing
|
||||||
|
|
||||||
|
Each subscriber receives a unique ID and a buffered notification channel:
|
||||||
|
|
||||||
|
```go
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err != nil {
|
||||||
|
// Handle error (e.g., notifier is closed)
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Subscriber ID:", sub.ID)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Listening for Notifications
|
||||||
|
|
||||||
|
Use a for-range loop to process notifications:
|
||||||
|
|
||||||
|
```go
|
||||||
|
for notification := range sub.Listen() {
|
||||||
|
switch notification.Level {
|
||||||
|
case notify.LevelSuccess:
|
||||||
|
fmt.Println("✓", notification.Message)
|
||||||
|
case notify.LevelError:
|
||||||
|
fmt.Println("✗", notification.Message)
|
||||||
|
default:
|
||||||
|
fmt.Println("ℹ", notification.Message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Sending Targeted Notifications
|
||||||
|
|
||||||
|
Send to a specific subscriber:
|
||||||
|
|
||||||
|
```go
|
||||||
|
n.Notify(notify.Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: notify.LevelWarn,
|
||||||
|
Title: "Account Warning",
|
||||||
|
Message: "Password expires in 3 days",
|
||||||
|
Details: "Please update your password",
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
### Broadcasting to All Subscribers
|
||||||
|
|
||||||
|
Send to all current subscribers:
|
||||||
|
|
||||||
|
```go
|
||||||
|
n.NotifyAll(notify.Notification{
|
||||||
|
Level: notify.LevelInfo,
|
||||||
|
Title: "Maintenance",
|
||||||
|
Message: "System will restart in 5 minutes",
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
### Unsubscribing
|
||||||
|
|
||||||
|
Clean up when done (safe to call multiple times):
|
||||||
|
|
||||||
|
```go
|
||||||
|
sub.Unsubscribe()
|
||||||
|
```
|
||||||
|
|
||||||
|
### Graceful Shutdown
|
||||||
|
|
||||||
|
Close the notifier to unsubscribe all and prevent new subscriptions:
|
||||||
|
|
||||||
|
```go
|
||||||
|
n.Close()
|
||||||
|
// After Close():
|
||||||
|
// - All subscribers are removed
|
||||||
|
// - All notification channels are closed
|
||||||
|
// - Future Subscribe() calls return error
|
||||||
|
// - Notify/NotifyAll are no-ops
|
||||||
|
```
|
||||||
|
|
||||||
|
## Notification Levels
|
||||||
|
|
||||||
|
Four predefined levels are available:
|
||||||
|
|
||||||
|
| Level | Constant | Use Case |
|
||||||
|
|-------|----------|----------|
|
||||||
|
| Success | `notify.LevelSuccess` | Successful operations |
|
||||||
|
| Info | `notify.LevelInfo` | General information |
|
||||||
|
| Warning | `notify.LevelWarn` | Non-critical warnings |
|
||||||
|
| Error | `notify.LevelError` | Errors requiring attention |
|
||||||
|
|
||||||
|
## Advanced Usage
|
||||||
|
|
||||||
|
### Custom Action Data
|
||||||
|
|
||||||
|
The `Action` field can hold any data type:
|
||||||
|
|
||||||
|
```go
|
||||||
|
type UserAction struct {
|
||||||
|
URL string
|
||||||
|
Method string
|
||||||
|
}
|
||||||
|
|
||||||
|
n.Notify(notify.Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: notify.LevelInfo,
|
||||||
|
Message: "New update available",
|
||||||
|
Action: UserAction{
|
||||||
|
URL: "/updates/download",
|
||||||
|
Method: "GET",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
// In listener:
|
||||||
|
for notif := range sub.Listen() {
|
||||||
|
if action, ok := notif.Action.(UserAction); ok {
|
||||||
|
fmt.Printf("Action: %s %s\n", action.Method, action.URL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Multiple Subscribers
|
||||||
|
|
||||||
|
Create a notification hub for multiple clients:
|
||||||
|
|
||||||
|
```go
|
||||||
|
n := notify.NewNotifier(100)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
// Create 10 subscribers
|
||||||
|
subscribers := make([]*notify.Subscriber, 10)
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
sub, _ := n.Subscribe()
|
||||||
|
subscribers[i] = sub
|
||||||
|
|
||||||
|
// Start listener for each
|
||||||
|
go func(id int, s *notify.Subscriber) {
|
||||||
|
for notif := range s.Listen() {
|
||||||
|
log.Printf("Sub %d: %s", id, notif.Message)
|
||||||
|
}
|
||||||
|
}(i, sub)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Broadcast to all
|
||||||
|
n.NotifyAll(notify.Notification{
|
||||||
|
Level: notify.LevelSuccess,
|
||||||
|
Message: "All subscribers active",
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
### Concurrent-Safe Operations
|
||||||
|
|
||||||
|
All operations are thread-safe:
|
||||||
|
|
||||||
|
```go
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
|
||||||
|
// Safe to subscribe from multiple goroutines
|
||||||
|
for i := 0; i < 100; i++ {
|
||||||
|
go func() {
|
||||||
|
sub, _ := n.Subscribe()
|
||||||
|
defer sub.Unsubscribe()
|
||||||
|
// ...
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Safe to notify from multiple goroutines
|
||||||
|
for i := 0; i < 100; i++ {
|
||||||
|
go func() {
|
||||||
|
n.NotifyAll(notify.Notification{
|
||||||
|
Level: notify.LevelInfo,
|
||||||
|
Message: "Concurrent notification",
|
||||||
|
})
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Best Practices
|
||||||
|
|
||||||
|
### 1. Use defer for Cleanup
|
||||||
|
|
||||||
|
```go
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
sub, _ := n.Subscribe()
|
||||||
|
defer sub.Unsubscribe()
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Check Errors
|
||||||
|
|
||||||
|
```go
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Subscribe failed: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Buffer Size Recommendations
|
||||||
|
|
||||||
|
| Scenario | Buffer Size |
|
||||||
|
|----------|------------|
|
||||||
|
| Real-time chat | 10-25 |
|
||||||
|
| General app notifications | 50-100 |
|
||||||
|
| High-throughput logging | 200-500 |
|
||||||
|
| Testing/debugging | 0 (unbuffered) |
|
||||||
|
|
||||||
|
### 4. Listener Goroutines
|
||||||
|
|
||||||
|
Always use goroutines for listeners to prevent blocking:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Good ✓
|
||||||
|
go func() {
|
||||||
|
for notif := range sub.Listen() {
|
||||||
|
process(notif)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Bad ✗ - blocks main goroutine
|
||||||
|
for notif := range sub.Listen() {
|
||||||
|
process(notif)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Detect Channel Closure
|
||||||
|
|
||||||
|
```go
|
||||||
|
for notification := range sub.Listen() {
|
||||||
|
// Process notifications
|
||||||
|
}
|
||||||
|
// When this loop exits, the channel is closed
|
||||||
|
// Either subscriber unsubscribed or notifier closed
|
||||||
|
fmt.Println("No more notifications")
|
||||||
|
```
|
||||||
|
|
||||||
|
## Performance
|
||||||
|
|
||||||
|
- **Subscribe**: O(1) average case (random ID generation)
|
||||||
|
- **Notify**: O(1) lookup + O(1) channel send (non-blocking)
|
||||||
|
- **NotifyAll**: O(n) where n is number of subscribers
|
||||||
|
- **Unsubscribe**: O(1) map deletion + O(1) channel close
|
||||||
|
- **Close**: O(n) where n is number of subscribers
|
||||||
|
|
||||||
|
### Benchmarks
|
||||||
|
|
||||||
|
Typical performance on modern hardware:
|
||||||
|
|
||||||
|
- Subscribe: ~5-10µs per operation
|
||||||
|
- Notify: ~1-2µs per operation
|
||||||
|
- NotifyAll (10 subs): ~10-20µs
|
||||||
|
- Buffer full handling: ~100ns (TryLock drop)
|
||||||
|
|
||||||
|
## Thread Safety
|
||||||
|
|
||||||
|
All public methods are thread-safe:
|
||||||
|
|
||||||
|
- ✅ `NewNotifier()` - Safe
|
||||||
|
- ✅ `Subscribe()` - Safe, concurrent calls allowed
|
||||||
|
- ✅ `Unsubscribe()` - Safe, idempotent
|
||||||
|
- ✅ `Notify()` - Safe, concurrent calls allowed
|
||||||
|
- ✅ `NotifyAll()` - Safe, concurrent calls allowed
|
||||||
|
- ✅ `Close()` - Safe, idempotent
|
||||||
|
- ✅ `Listen()` - Safe, returns read-only channel
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
Run tests:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Run all tests
|
||||||
|
go test
|
||||||
|
|
||||||
|
# With race detector
|
||||||
|
go test -race
|
||||||
|
|
||||||
|
# With coverage
|
||||||
|
go test -cover
|
||||||
|
|
||||||
|
# Verbose output
|
||||||
|
go test -v
|
||||||
|
```
|
||||||
|
|
||||||
|
Current test coverage: **95.1%**
|
||||||
|
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
Full API documentation available at:
|
||||||
|
- [pkg.go.dev](https://pkg.go.dev/git.haelnorr.com/h/golib/notify)
|
||||||
|
- Or run: `go doc -all git.haelnorr.com/h/golib/notify`
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
MIT License - see repository root for details
|
||||||
|
|
||||||
|
## Contributing
|
||||||
|
|
||||||
|
See CONTRIBUTING.md in the repository root
|
||||||
|
|
||||||
|
## Related Projects
|
||||||
|
|
||||||
|
Other modules in the golib collection:
|
||||||
|
- `cookies` - HTTP cookie utilities
|
||||||
|
- `env` - Environment variable helpers
|
||||||
|
- `ezconf` - Configuration loader
|
||||||
|
- `hlog` - Logging with zerolog
|
||||||
|
- `hws` - HTTP web server
|
||||||
|
- `jwt` - JWT token utilities
|
||||||
369
notify/close_test.go
Normal file
369
notify/close_test.go
Normal file
@@ -0,0 +1,369 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestClose_Basic verifies basic Close() functionality.
|
||||||
|
func TestClose_Basic(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create some subscribers
|
||||||
|
sub1, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
sub2, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
sub3, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, 3, len(n.subscribers), "Should have 3 subscribers")
|
||||||
|
|
||||||
|
// Close the notifier
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Verify all subscribers removed
|
||||||
|
assert.Equal(t, 0, len(n.subscribers), "Should have 0 subscribers after close")
|
||||||
|
|
||||||
|
// Verify channels are closed
|
||||||
|
_, ok := <-sub1.Listen()
|
||||||
|
assert.False(t, ok, "sub1 channel should be closed")
|
||||||
|
|
||||||
|
_, ok = <-sub2.Listen()
|
||||||
|
assert.False(t, ok, "sub2 channel should be closed")
|
||||||
|
|
||||||
|
_, ok = <-sub3.Listen()
|
||||||
|
assert.False(t, ok, "sub3 channel should be closed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_IdempotentClose verifies that calling Close() multiple times is safe.
|
||||||
|
func TestClose_IdempotentClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Close multiple times - should not panic
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
n.Close()
|
||||||
|
n.Close()
|
||||||
|
n.Close()
|
||||||
|
}, "Multiple Close() calls should not panic")
|
||||||
|
|
||||||
|
// Verify channel is still closed (not double-closed)
|
||||||
|
_, ok := <-sub.Listen()
|
||||||
|
assert.False(t, ok, "Channel should be closed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_SubscribeAfterClose verifies that Subscribe fails after Close.
|
||||||
|
func TestClose_SubscribeAfterClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Subscribe before close
|
||||||
|
sub1, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.NotNil(t, sub1)
|
||||||
|
|
||||||
|
// Close
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Try to subscribe after close
|
||||||
|
sub2, err := n.Subscribe()
|
||||||
|
assert.Error(t, err, "Subscribe should return error after Close")
|
||||||
|
assert.Nil(t, sub2, "Subscribe should return nil subscriber after Close")
|
||||||
|
assert.Contains(t, err.Error(), "closed", "Error should mention notifier is closed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_NotifyAfterClose verifies that Notify after Close doesn't panic.
|
||||||
|
func TestClose_NotifyAfterClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Close
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Try to notify - should not panic
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Should be ignored",
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
n.Notify(notification)
|
||||||
|
}, "Notify after Close should not panic")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_NotifyAllAfterClose verifies that NotifyAll after Close doesn't panic.
|
||||||
|
func TestClose_NotifyAllAfterClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
_, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Close
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Try to broadcast - should not panic
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Should be ignored",
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
n.NotifyAll(notification)
|
||||||
|
}, "NotifyAll after Close should not panic")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_WithActiveListeners verifies that listeners detect channel closure.
|
||||||
|
func TestClose_WithActiveListeners(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
listenerExited := false
|
||||||
|
|
||||||
|
// Start listener goroutine
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for range sub.Listen() {
|
||||||
|
// Process notifications
|
||||||
|
}
|
||||||
|
listenerExited = true
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Give listener time to start
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
|
||||||
|
// Close notifier
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Wait for listener to exit
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
wg.Wait()
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
assert.True(t, listenerExited, "Listener should have exited")
|
||||||
|
case <-time.After(1 * time.Second):
|
||||||
|
t.Fatal("Listener did not exit after Close - possible hang")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_PendingNotifications verifies behavior of pending notifications on close.
|
||||||
|
func TestClose_PendingNotifications(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Send some notifications
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Notification",
|
||||||
|
}
|
||||||
|
go n.Notify(notification)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for sends to complete
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
|
||||||
|
// Close notifier (closes channels)
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Try to read any remaining notifications before closure
|
||||||
|
received := 0
|
||||||
|
for {
|
||||||
|
_, ok := <-sub.Listen()
|
||||||
|
if !ok {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
received++
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Logf("Received %d notifications before channel closed", received)
|
||||||
|
assert.GreaterOrEqual(t, received, 0, "Should receive at least 0 notifications")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_ConcurrentSubscribeAndClose verifies thread safety.
|
||||||
|
func TestClose_ConcurrentSubscribeAndClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
// Goroutines trying to subscribe
|
||||||
|
for i := 0; i < 20; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
_, _ = n.Subscribe() // May succeed or fail depending on timing
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Give some time for subscriptions to start
|
||||||
|
time.Sleep(5 * time.Millisecond)
|
||||||
|
|
||||||
|
// Close concurrently
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
n.Close()
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Should complete without deadlock or panic
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
wg.Wait()
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
// Success
|
||||||
|
case <-time.After(2 * time.Second):
|
||||||
|
t.Fatal("Test timed out - possible deadlock")
|
||||||
|
}
|
||||||
|
|
||||||
|
// After close, no more subscriptions should succeed
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Nil(t, sub)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_ConcurrentNotifyAndClose verifies thread safety with notifications.
|
||||||
|
func TestClose_ConcurrentNotifyAndClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create some subscribers
|
||||||
|
subscribers := make([]*Subscriber, 10)
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
subscribers[i] = sub
|
||||||
|
}
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
// Goroutines sending notifications
|
||||||
|
for i := 0; i < 20; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Test",
|
||||||
|
}
|
||||||
|
n.NotifyAll(notification)
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close concurrently
|
||||||
|
time.Sleep(5 * time.Millisecond)
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
n.Close()
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Should complete without panic or deadlock
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
wg.Wait()
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
// Success - no panic or deadlock
|
||||||
|
case <-time.After(2 * time.Second):
|
||||||
|
t.Fatal("Test timed out - possible deadlock")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_Integration verifies the complete Close workflow.
|
||||||
|
func TestClose_Integration(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create subscribers
|
||||||
|
sub1, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
sub2, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
sub3, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Send some notifications
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelSuccess,
|
||||||
|
Message: "Before close",
|
||||||
|
}
|
||||||
|
go n.NotifyAll(notification)
|
||||||
|
|
||||||
|
// Receive notifications from all subscribers
|
||||||
|
received1, ok := receiveWithTimeout(sub1.Listen(), 100*time.Millisecond)
|
||||||
|
require.True(t, ok, "sub1 should receive notification")
|
||||||
|
assert.Equal(t, "Before close", received1.Message)
|
||||||
|
|
||||||
|
received2, ok := receiveWithTimeout(sub2.Listen(), 100*time.Millisecond)
|
||||||
|
require.True(t, ok, "sub2 should receive notification")
|
||||||
|
assert.Equal(t, "Before close", received2.Message)
|
||||||
|
|
||||||
|
received3, ok := receiveWithTimeout(sub3.Listen(), 100*time.Millisecond)
|
||||||
|
require.True(t, ok, "sub3 should receive notification")
|
||||||
|
assert.Equal(t, "Before close", received3.Message)
|
||||||
|
|
||||||
|
// Close the notifier
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Verify all channels closed (should return immediately with ok=false)
|
||||||
|
_, ok = <-sub1.Listen()
|
||||||
|
assert.False(t, ok, "sub1 should be closed")
|
||||||
|
_, ok = <-sub2.Listen()
|
||||||
|
assert.False(t, ok, "sub2 should be closed")
|
||||||
|
_, ok = <-sub3.Listen()
|
||||||
|
assert.False(t, ok, "sub3 should be closed")
|
||||||
|
|
||||||
|
// Verify no more subscriptions
|
||||||
|
sub4, err := n.Subscribe()
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Nil(t, sub4)
|
||||||
|
|
||||||
|
// Verify notifications are ignored
|
||||||
|
notification2 := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "After close",
|
||||||
|
}
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
n.NotifyAll(notification2)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClose_UnsubscribeAfterClose verifies unsubscribe after close is safe.
|
||||||
|
func TestClose_UnsubscribeAfterClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Close notifier
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Try to unsubscribe after close - should be safe
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}, "Unsubscribe after Close should not panic")
|
||||||
|
}
|
||||||
148
notify/doc.go
Normal file
148
notify/doc.go
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
// Package notify provides a thread-safe pub/sub notification system.
|
||||||
|
//
|
||||||
|
// The notify package implements a lightweight, in-memory notification system
|
||||||
|
// where subscribers can register to receive notifications. Each subscriber
|
||||||
|
// receives notifications through a buffered channel, allowing them to process
|
||||||
|
// messages at their own pace.
|
||||||
|
//
|
||||||
|
// # Features
|
||||||
|
//
|
||||||
|
// - Thread-safe concurrent operations
|
||||||
|
// - Configurable notification buffer size per Notifier
|
||||||
|
// - Unique subscriber IDs using cryptographic random generation
|
||||||
|
// - Targeted notifications to specific subscribers
|
||||||
|
// - Broadcast notifications to all subscribers
|
||||||
|
// - Idempotent unsubscribe operations
|
||||||
|
// - Graceful shutdown with Close()
|
||||||
|
// - Zero external dependencies (uses only Go standard library)
|
||||||
|
//
|
||||||
|
// # Basic Usage
|
||||||
|
//
|
||||||
|
// Create a notifier and subscribe:
|
||||||
|
//
|
||||||
|
// // Create notifier with 50-notification buffer per subscriber
|
||||||
|
// n := notify.NewNotifier(50)
|
||||||
|
// defer n.Close()
|
||||||
|
//
|
||||||
|
// // Subscribe to receive notifications
|
||||||
|
// sub, err := n.Subscribe()
|
||||||
|
// if err != nil {
|
||||||
|
// log.Fatal(err)
|
||||||
|
// }
|
||||||
|
// defer sub.Unsubscribe()
|
||||||
|
//
|
||||||
|
// // Listen for notifications
|
||||||
|
// go func() {
|
||||||
|
// for notification := range sub.Listen() {
|
||||||
|
// fmt.Printf("Received: %s - %s\n", notification.Level, notification.Message)
|
||||||
|
// }
|
||||||
|
// }()
|
||||||
|
//
|
||||||
|
// // Send a targeted notification
|
||||||
|
// n.Notify(notify.Notification{
|
||||||
|
// Target: sub.ID,
|
||||||
|
// Level: notify.LevelInfo,
|
||||||
|
// Message: "Hello subscriber!",
|
||||||
|
// })
|
||||||
|
//
|
||||||
|
// # Broadcasting
|
||||||
|
//
|
||||||
|
// Send notifications to all subscribers:
|
||||||
|
//
|
||||||
|
// // Broadcast to all subscribers
|
||||||
|
// n.NotifyAll(notify.Notification{
|
||||||
|
// Level: notify.LevelSuccess,
|
||||||
|
// Title: "System Update",
|
||||||
|
// Message: "All systems operational",
|
||||||
|
// })
|
||||||
|
//
|
||||||
|
// # Notification Levels
|
||||||
|
//
|
||||||
|
// The package provides predefined notification levels:
|
||||||
|
//
|
||||||
|
// - LevelSuccess: Success messages
|
||||||
|
// - LevelInfo: Informational messages
|
||||||
|
// - LevelWarn: Warning messages
|
||||||
|
// - LevelError: Error messages
|
||||||
|
//
|
||||||
|
// # Buffer Sizing
|
||||||
|
//
|
||||||
|
// The buffer size controls how many notifications can be queued per subscriber:
|
||||||
|
//
|
||||||
|
// - Small (10-25): Low latency, minimal memory, may drop messages if slow readers
|
||||||
|
// - Medium (50-100): Balanced approach (recommended for most applications)
|
||||||
|
// - Large (200-500): High throughput, handles bursts well
|
||||||
|
// - Unbuffered (0): No queuing, sends block until received
|
||||||
|
//
|
||||||
|
// # Thread Safety
|
||||||
|
//
|
||||||
|
// All operations are thread-safe and can be called from multiple goroutines:
|
||||||
|
//
|
||||||
|
// - Subscribe() - Safe to call concurrently
|
||||||
|
// - Unsubscribe() - Safe to call concurrently and multiple times
|
||||||
|
// - Notify() - Safe to call concurrently
|
||||||
|
// - NotifyAll() - Safe to call concurrently
|
||||||
|
// - Close() - Safe to call concurrently and multiple times
|
||||||
|
//
|
||||||
|
// # Graceful Shutdown
|
||||||
|
//
|
||||||
|
// Close the notifier to unsubscribe all subscribers and prevent new subscriptions:
|
||||||
|
//
|
||||||
|
// n := notify.NewNotifier(50)
|
||||||
|
// defer n.Close() // Ensures cleanup
|
||||||
|
//
|
||||||
|
// // Use notifier...
|
||||||
|
// // On defer or explicit Close():
|
||||||
|
// // - All subscribers are removed
|
||||||
|
// // - All notification channels are closed
|
||||||
|
// // - Future Subscribe() calls return error
|
||||||
|
// // - Notify() and NotifyAll() are no-ops
|
||||||
|
//
|
||||||
|
// # Notification Delivery
|
||||||
|
//
|
||||||
|
// Notifications are delivered using a TryLock pattern:
|
||||||
|
//
|
||||||
|
// - If the subscriber is available, the notification is queued
|
||||||
|
// - If the subscriber is busy unsubscribing, the notification is dropped
|
||||||
|
// - This prevents blocking on subscribers that are shutting down
|
||||||
|
//
|
||||||
|
// Buffered channels allow multiple notifications to queue, so subscribers
|
||||||
|
// don't need to read immediately. Once the buffer is full, subsequent
|
||||||
|
// notifications may be dropped if the subscriber is slow to read.
|
||||||
|
//
|
||||||
|
// # Example: Multi-Subscriber System
|
||||||
|
//
|
||||||
|
// func main() {
|
||||||
|
// n := notify.NewNotifier(100)
|
||||||
|
// defer n.Close()
|
||||||
|
//
|
||||||
|
// // Create multiple subscribers
|
||||||
|
// for i := 0; i < 5; i++ {
|
||||||
|
// sub, _ := n.Subscribe()
|
||||||
|
// go func(id int, s *notify.Subscriber) {
|
||||||
|
// for notif := range s.Listen() {
|
||||||
|
// log.Printf("Subscriber %d: %s", id, notif.Message)
|
||||||
|
// }
|
||||||
|
// }(i, sub)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Broadcast to all
|
||||||
|
// n.NotifyAll(notify.Notification{
|
||||||
|
// Level: notify.LevelInfo,
|
||||||
|
// Message: "Server starting...",
|
||||||
|
// })
|
||||||
|
//
|
||||||
|
// time.Sleep(time.Second)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// # Error Handling
|
||||||
|
//
|
||||||
|
// Subscribe() returns an error in these cases:
|
||||||
|
//
|
||||||
|
// - Notifier is closed (error: "notifier is closed")
|
||||||
|
// - Failed to generate unique ID after 10 attempts (extremely rare)
|
||||||
|
//
|
||||||
|
// Other operations (Notify, NotifyAll, Unsubscribe) do not return errors
|
||||||
|
// and handle edge cases gracefully (e.g., notifying non-existent subscribers
|
||||||
|
// is silently ignored).
|
||||||
|
package notify
|
||||||
250
notify/example_test.go
Normal file
250
notify/example_test.go
Normal file
@@ -0,0 +1,250 @@
|
|||||||
|
package notify_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"git.haelnorr.com/h/golib/notify"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Example demonstrates basic usage of the notify package.
|
||||||
|
func Example() {
|
||||||
|
// Create a notifier with 50-notification buffer per subscriber
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
// Subscribe to receive notifications
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
defer sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Listen for notifications in a goroutine
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
for notification := range sub.Listen() {
|
||||||
|
fmt.Printf("%s: %s\n", notification.Level, notification.Message)
|
||||||
|
}
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Send a notification
|
||||||
|
n.Notify(notify.Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: notify.LevelSuccess,
|
||||||
|
Message: "Welcome!",
|
||||||
|
})
|
||||||
|
|
||||||
|
// Give time for processing
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
sub.Unsubscribe()
|
||||||
|
<-done
|
||||||
|
|
||||||
|
// Output:
|
||||||
|
// success: Welcome!
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExampleNotifier_Subscribe demonstrates subscribing to notifications.
|
||||||
|
func ExampleNotifier_Subscribe() {
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
// Subscribe
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("Subscribed with ID: %s\n", sub.ID[:8]+"...")
|
||||||
|
|
||||||
|
sub.Unsubscribe()
|
||||||
|
// Output will vary due to random ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExampleNotifier_Notify demonstrates sending a targeted notification.
|
||||||
|
func ExampleNotifier_Notify() {
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
sub, _ := n.Subscribe()
|
||||||
|
defer sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Listen in background
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
notif := <-sub.Listen()
|
||||||
|
fmt.Printf("Level: %s, Message: %s\n", notif.Level, notif.Message)
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Send targeted notification
|
||||||
|
n.Notify(notify.Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: notify.LevelInfo,
|
||||||
|
Message: "Hello subscriber",
|
||||||
|
})
|
||||||
|
|
||||||
|
<-done
|
||||||
|
// Output:
|
||||||
|
// Level: info, Message: Hello subscriber
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExampleNotifier_NotifyAll demonstrates broadcasting to all subscribers.
|
||||||
|
func ExampleNotifier_NotifyAll() {
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
// Create multiple subscribers
|
||||||
|
sub1, _ := n.Subscribe()
|
||||||
|
sub2, _ := n.Subscribe()
|
||||||
|
defer sub1.Unsubscribe()
|
||||||
|
defer sub2.Unsubscribe()
|
||||||
|
|
||||||
|
// Listen on both
|
||||||
|
done := make(chan bool, 2)
|
||||||
|
listen := func(sub *notify.Subscriber, id int) {
|
||||||
|
notif := <-sub.Listen()
|
||||||
|
fmt.Printf("Sub %d received: %s\n", id, notif.Message)
|
||||||
|
done <- true
|
||||||
|
}
|
||||||
|
|
||||||
|
go listen(sub1, 1)
|
||||||
|
go listen(sub2, 2)
|
||||||
|
|
||||||
|
// Broadcast to all
|
||||||
|
n.NotifyAll(notify.Notification{
|
||||||
|
Level: notify.LevelSuccess,
|
||||||
|
Message: "Broadcast message",
|
||||||
|
})
|
||||||
|
|
||||||
|
// Wait for both
|
||||||
|
<-done
|
||||||
|
<-done
|
||||||
|
|
||||||
|
// Output will vary in order, but both will print:
|
||||||
|
// Sub 1 received: Broadcast message
|
||||||
|
// Sub 2 received: Broadcast message
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExampleNotifier_Close demonstrates graceful shutdown.
|
||||||
|
func ExampleNotifier_Close() {
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
|
||||||
|
sub, _ := n.Subscribe()
|
||||||
|
|
||||||
|
// Listen for closure
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
for range sub.Listen() {
|
||||||
|
// Process notifications
|
||||||
|
}
|
||||||
|
fmt.Println("Listener exited - channel closed")
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Close notifier
|
||||||
|
n.Close()
|
||||||
|
|
||||||
|
// Wait for listener to detect closure
|
||||||
|
<-done
|
||||||
|
|
||||||
|
// Try to subscribe after close
|
||||||
|
_, err := n.Subscribe()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Subscribe failed:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Output:
|
||||||
|
// Listener exited - channel closed
|
||||||
|
// Subscribe failed: notifier is closed
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExampleSubscriber_Unsubscribe demonstrates unsubscribing.
|
||||||
|
func ExampleSubscriber_Unsubscribe() {
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
sub, _ := n.Subscribe()
|
||||||
|
|
||||||
|
// Listen for closure
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
for range sub.Listen() {
|
||||||
|
// Process
|
||||||
|
}
|
||||||
|
fmt.Println("Unsubscribed")
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Unsubscribe
|
||||||
|
sub.Unsubscribe()
|
||||||
|
<-done
|
||||||
|
|
||||||
|
// Safe to call again
|
||||||
|
sub.Unsubscribe()
|
||||||
|
fmt.Println("Second unsubscribe is safe")
|
||||||
|
|
||||||
|
// Output:
|
||||||
|
// Unsubscribed
|
||||||
|
// Second unsubscribe is safe
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExampleNotification demonstrates creating notifications with different levels.
|
||||||
|
func ExampleNotification() {
|
||||||
|
levels := []notify.Level{
|
||||||
|
notify.LevelSuccess,
|
||||||
|
notify.LevelInfo,
|
||||||
|
notify.LevelWarn,
|
||||||
|
notify.LevelError,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, level := range levels {
|
||||||
|
notif := notify.Notification{
|
||||||
|
Level: level,
|
||||||
|
Title: "Example",
|
||||||
|
Message: fmt.Sprintf("This is a %s message", level),
|
||||||
|
}
|
||||||
|
fmt.Printf("%s: %s\n", notif.Level, notif.Message)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Output:
|
||||||
|
// success: This is a success message
|
||||||
|
// info: This is a info message
|
||||||
|
// warn: This is a warn message
|
||||||
|
// error: This is a error message
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExampleNotification_withAction demonstrates using the Action field.
|
||||||
|
func ExampleNotification_withAction() {
|
||||||
|
type CustomAction struct {
|
||||||
|
URL string
|
||||||
|
}
|
||||||
|
|
||||||
|
n := notify.NewNotifier(50)
|
||||||
|
defer n.Close()
|
||||||
|
|
||||||
|
sub, _ := n.Subscribe()
|
||||||
|
defer sub.Unsubscribe()
|
||||||
|
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
notif := <-sub.Listen()
|
||||||
|
if action, ok := notif.Action.(CustomAction); ok {
|
||||||
|
fmt.Printf("Action URL: %s\n", action.URL)
|
||||||
|
}
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
n.Notify(notify.Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: notify.LevelInfo,
|
||||||
|
Action: CustomAction{URL: "/dashboard"},
|
||||||
|
})
|
||||||
|
|
||||||
|
<-done
|
||||||
|
// Output:
|
||||||
|
// Action URL: /dashboard
|
||||||
|
}
|
||||||
11
notify/go.mod
Normal file
11
notify/go.mod
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
module git.haelnorr.com/h/golib/notify
|
||||||
|
|
||||||
|
go 1.25.5
|
||||||
|
|
||||||
|
require github.com/stretchr/testify v1.11.1
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
)
|
||||||
10
notify/go.sum
Normal file
10
notify/go.sum
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
51
notify/notifications.go
Normal file
51
notify/notifications.go
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
// Notification represents a message that can be sent to subscribers.
|
||||||
|
// Notifications contain metadata about the message (Level, Title),
|
||||||
|
// the content (Message, Details), and an optional Action field for
|
||||||
|
// custom application data.
|
||||||
|
type Notification struct {
|
||||||
|
// Target specifies the subscriber ID to receive this notification.
|
||||||
|
// If empty when passed to NotifyAll(), the notification is broadcast
|
||||||
|
// to all subscribers. If set, only the targeted subscriber receives it.
|
||||||
|
Target Target
|
||||||
|
|
||||||
|
// Level indicates the notification severity (Success, Info, Warn, Error).
|
||||||
|
Level Level
|
||||||
|
|
||||||
|
// Title is a short summary of the notification.
|
||||||
|
Title string
|
||||||
|
|
||||||
|
// Message is the main notification content.
|
||||||
|
Message string
|
||||||
|
|
||||||
|
// Details contains additional information about the notification.
|
||||||
|
Details string
|
||||||
|
|
||||||
|
// Action is an optional field for custom application data.
|
||||||
|
// This can be used to attach contextual information, callback functions,
|
||||||
|
// URLs, or any other data needed by the notification handler.
|
||||||
|
Action any
|
||||||
|
}
|
||||||
|
|
||||||
|
// Target is a unique identifier for a subscriber.
|
||||||
|
// Targets are automatically generated when a subscriber is created
|
||||||
|
// using cryptographic random bytes (16 bytes, base64 URL-encoded).
|
||||||
|
type Target string
|
||||||
|
|
||||||
|
// Level represents the severity or type of a notification.
|
||||||
|
type Level string
|
||||||
|
|
||||||
|
const (
|
||||||
|
// LevelSuccess indicates a successful operation or positive outcome.
|
||||||
|
LevelSuccess Level = "success"
|
||||||
|
|
||||||
|
// LevelInfo indicates general informational messages.
|
||||||
|
LevelInfo Level = "info"
|
||||||
|
|
||||||
|
// LevelWarn indicates warnings that don't require immediate action.
|
||||||
|
LevelWarn Level = "warn"
|
||||||
|
|
||||||
|
// LevelError indicates errors that require attention.
|
||||||
|
LevelError Level = "error"
|
||||||
|
)
|
||||||
89
notify/notifications_test.go
Normal file
89
notify/notifications_test.go
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestLevelConstants verifies that all Level constants have the expected values.
|
||||||
|
func TestLevelConstants(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
level Level
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{"success level", LevelSuccess, "success"},
|
||||||
|
{"info level", LevelInfo, "info"},
|
||||||
|
{"warn level", LevelWarn, "warn"},
|
||||||
|
{"error level", LevelError, "error"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
assert.Equal(t, tt.expected, string(tt.level))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotification_AllFields verifies that a Notification can be created
|
||||||
|
// with all fields populated correctly.
|
||||||
|
func TestNotification_AllFields(t *testing.T) {
|
||||||
|
action := map[string]string{"type": "redirect", "url": "/dashboard"}
|
||||||
|
notification := Notification{
|
||||||
|
Target: Target("test-target-123"),
|
||||||
|
Level: LevelSuccess,
|
||||||
|
Title: "Test Title",
|
||||||
|
Message: "Test Message",
|
||||||
|
Details: "Test Details",
|
||||||
|
Action: action,
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, Target("test-target-123"), notification.Target)
|
||||||
|
assert.Equal(t, LevelSuccess, notification.Level)
|
||||||
|
assert.Equal(t, "Test Title", notification.Title)
|
||||||
|
assert.Equal(t, "Test Message", notification.Message)
|
||||||
|
assert.Equal(t, "Test Details", notification.Details)
|
||||||
|
assert.Equal(t, action, notification.Action)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotification_MinimalFields verifies that a Notification can be created
|
||||||
|
// with minimal required fields and optional fields left empty.
|
||||||
|
func TestNotification_MinimalFields(t *testing.T) {
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Minimal notification",
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, Target(""), notification.Target)
|
||||||
|
assert.Equal(t, LevelInfo, notification.Level)
|
||||||
|
assert.Equal(t, "", notification.Title)
|
||||||
|
assert.Equal(t, "Minimal notification", notification.Message)
|
||||||
|
assert.Equal(t, "", notification.Details)
|
||||||
|
assert.Nil(t, notification.Action)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotification_EmptyFields verifies that a Notification with all empty
|
||||||
|
// fields can be created (edge case).
|
||||||
|
func TestNotification_EmptyFields(t *testing.T) {
|
||||||
|
notification := Notification{}
|
||||||
|
|
||||||
|
assert.Equal(t, Target(""), notification.Target)
|
||||||
|
assert.Equal(t, Level(""), notification.Level)
|
||||||
|
assert.Equal(t, "", notification.Title)
|
||||||
|
assert.Equal(t, "", notification.Message)
|
||||||
|
assert.Equal(t, "", notification.Details)
|
||||||
|
assert.Nil(t, notification.Action)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTarget_Type verifies that Target is a distinct type based on string.
|
||||||
|
func TestTarget_Type(t *testing.T) {
|
||||||
|
var target Target = "test-id"
|
||||||
|
assert.Equal(t, "test-id", string(target))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestLevel_Type verifies that Level is a distinct type based on string.
|
||||||
|
func TestLevel_Type(t *testing.T) {
|
||||||
|
var level Level = "custom"
|
||||||
|
assert.Equal(t, "custom", string(level))
|
||||||
|
}
|
||||||
189
notify/notifier.go
Normal file
189
notify/notifier.go
Normal file
@@ -0,0 +1,189 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/base64"
|
||||||
|
"errors"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Notifier struct {
|
||||||
|
subscribers map[Target]*Subscriber
|
||||||
|
sublock *sync.Mutex
|
||||||
|
bufferSize int
|
||||||
|
closed bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewNotifier creates a new Notifier with the specified notification buffer size.
|
||||||
|
// The buffer size determines how many notifications can be queued per subscriber
|
||||||
|
// before sends block or notifications are dropped (if using TryLock).
|
||||||
|
// A buffer size of 0 creates unbuffered channels (sends block immediately).
|
||||||
|
// Recommended buffer size: 50-100 for most applications.
|
||||||
|
func NewNotifier(bufferSize int) *Notifier {
|
||||||
|
n := &Notifier{
|
||||||
|
subscribers: make(map[Target]*Subscriber),
|
||||||
|
sublock: new(sync.Mutex),
|
||||||
|
bufferSize: bufferSize,
|
||||||
|
}
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *Notifier) Subscribe() (*Subscriber, error) {
|
||||||
|
n.sublock.Lock()
|
||||||
|
if n.closed {
|
||||||
|
n.sublock.Unlock()
|
||||||
|
return nil, errors.New("notifier is closed")
|
||||||
|
}
|
||||||
|
n.sublock.Unlock()
|
||||||
|
|
||||||
|
id, err := n.genRand()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
sub := &Subscriber{
|
||||||
|
ID: id,
|
||||||
|
notifications: make(chan Notification, n.bufferSize),
|
||||||
|
notifier: n,
|
||||||
|
unsubscribelock: new(sync.Mutex),
|
||||||
|
unsubscribed: false,
|
||||||
|
}
|
||||||
|
n.sublock.Lock()
|
||||||
|
if n.closed {
|
||||||
|
n.sublock.Unlock()
|
||||||
|
return nil, errors.New("notifier is closed")
|
||||||
|
}
|
||||||
|
n.subscribers[sub.ID] = sub
|
||||||
|
n.sublock.Unlock()
|
||||||
|
return sub, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *Notifier) RemoveSubscriber(s *Subscriber) {
|
||||||
|
n.sublock.Lock()
|
||||||
|
_, exists := n.subscribers[s.ID]
|
||||||
|
if exists {
|
||||||
|
delete(n.subscribers, s.ID)
|
||||||
|
}
|
||||||
|
n.sublock.Unlock()
|
||||||
|
|
||||||
|
if exists {
|
||||||
|
close(s.notifications)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close shuts down the Notifier and unsubscribes all subscribers.
|
||||||
|
// After Close() is called, no new subscribers can be added and all
|
||||||
|
// notification channels are closed. Close() is idempotent and safe
|
||||||
|
// to call multiple times.
|
||||||
|
func (n *Notifier) Close() {
|
||||||
|
n.sublock.Lock()
|
||||||
|
if n.closed {
|
||||||
|
n.sublock.Unlock()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
n.closed = true
|
||||||
|
|
||||||
|
// Collect all subscribers
|
||||||
|
subscribers := make([]*Subscriber, 0, len(n.subscribers))
|
||||||
|
for _, sub := range n.subscribers {
|
||||||
|
subscribers = append(subscribers, sub)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear the map
|
||||||
|
n.subscribers = make(map[Target]*Subscriber)
|
||||||
|
n.sublock.Unlock()
|
||||||
|
|
||||||
|
// Unsubscribe all (this closes their channels)
|
||||||
|
for _, sub := range subscribers {
|
||||||
|
// Mark as unsubscribed and close channel
|
||||||
|
sub.unsubscribelock.Lock()
|
||||||
|
if !sub.unsubscribed {
|
||||||
|
sub.unsubscribed = true
|
||||||
|
close(sub.notifications)
|
||||||
|
}
|
||||||
|
sub.unsubscribelock.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NotifyAll broadcasts a notification to all current subscribers.
|
||||||
|
// If the notification's Target field is already set, the notification
|
||||||
|
// is sent only to that specific target instead of broadcasting.
|
||||||
|
//
|
||||||
|
// To broadcast, leave the Target field empty:
|
||||||
|
//
|
||||||
|
// n.NotifyAll(notify.Notification{
|
||||||
|
// Level: notify.LevelInfo,
|
||||||
|
// Message: "Broadcast to all",
|
||||||
|
// })
|
||||||
|
//
|
||||||
|
// NotifyAll is thread-safe and can be called from multiple goroutines.
|
||||||
|
// Notifications may be dropped if a subscriber is unsubscribing or if
|
||||||
|
// their buffer is full and they are slow to read.
|
||||||
|
func (n *Notifier) NotifyAll(nt Notification) {
|
||||||
|
if nt.Target != "" {
|
||||||
|
n.Notify(nt)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collect subscribers while holding lock, then notify without lock
|
||||||
|
n.sublock.Lock()
|
||||||
|
subscribers := make([]*Subscriber, 0, len(n.subscribers))
|
||||||
|
for _, s := range n.subscribers {
|
||||||
|
subscribers = append(subscribers, s)
|
||||||
|
}
|
||||||
|
n.sublock.Unlock()
|
||||||
|
|
||||||
|
// Notify each subscriber
|
||||||
|
for _, s := range subscribers {
|
||||||
|
nnt := nt
|
||||||
|
nnt.Target = s.ID
|
||||||
|
n.Notify(nnt)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify sends a notification to a specific subscriber identified by
|
||||||
|
// the notification's Target field. If the target does not exist or
|
||||||
|
// is unsubscribing, the notification is silently dropped.
|
||||||
|
//
|
||||||
|
// Example:
|
||||||
|
//
|
||||||
|
// n.Notify(notify.Notification{
|
||||||
|
// Target: subscriberID,
|
||||||
|
// Level: notify.LevelSuccess,
|
||||||
|
// Message: "Operation completed",
|
||||||
|
// })
|
||||||
|
//
|
||||||
|
// Notify is thread-safe and non-blocking (uses TryLock). If the subscriber
|
||||||
|
// is busy unsubscribing, the notification is dropped to avoid blocking.
|
||||||
|
func (n *Notifier) Notify(nt Notification) {
|
||||||
|
n.sublock.Lock()
|
||||||
|
s, exists := n.subscribers[nt.Target]
|
||||||
|
n.sublock.Unlock()
|
||||||
|
|
||||||
|
if !exists {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if s.unsubscribelock.TryLock() {
|
||||||
|
s.notifications <- nt
|
||||||
|
s.unsubscribelock.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *Notifier) genRand() (Target, error) {
|
||||||
|
const maxAttempts = 10
|
||||||
|
for attempt := 0; attempt < maxAttempts; attempt++ {
|
||||||
|
random := make([]byte, 16)
|
||||||
|
rand.Read(random)
|
||||||
|
str := base64.URLEncoding.EncodeToString(random)[:16]
|
||||||
|
tgt := Target(str)
|
||||||
|
|
||||||
|
n.sublock.Lock()
|
||||||
|
_, exists := n.subscribers[tgt]
|
||||||
|
n.sublock.Unlock()
|
||||||
|
|
||||||
|
if !exists {
|
||||||
|
return tgt, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Target(""), errors.New("failed to generate unique subscriber ID after maximum attempts")
|
||||||
|
}
|
||||||
725
notify/notifier_test.go
Normal file
725
notify/notifier_test.go
Normal file
@@ -0,0 +1,725 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Helper function to receive from a channel with timeout
|
||||||
|
func receiveWithTimeout(ch <-chan Notification, timeout time.Duration) (Notification, bool) {
|
||||||
|
select {
|
||||||
|
case n := <-ch:
|
||||||
|
return n, true
|
||||||
|
case <-time.After(timeout):
|
||||||
|
return Notification{}, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper function to create multiple subscribers
|
||||||
|
func subscribeN(t *testing.T, n *Notifier, count int) []*Subscriber {
|
||||||
|
t.Helper()
|
||||||
|
subscribers := make([]*Subscriber, count)
|
||||||
|
for i := 0; i < count; i++ {
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err, "Subscribe should not fail")
|
||||||
|
subscribers[i] = sub
|
||||||
|
}
|
||||||
|
return subscribers
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNewNotifier verifies that NewNotifier creates a properly initialized Notifier.
|
||||||
|
func TestNewNotifier(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
require.NotNil(t, n, "NewNotifier should return non-nil")
|
||||||
|
require.NotNil(t, n.subscribers, "subscribers map should be initialized")
|
||||||
|
require.NotNil(t, n.sublock, "sublock mutex should be initialized")
|
||||||
|
assert.Equal(t, 0, len(n.subscribers), "new notifier should have no subscribers")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscribe verifies that Subscribe creates a new subscriber with proper initialization.
|
||||||
|
func TestSubscribe(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
|
||||||
|
require.NoError(t, err, "Subscribe should not return error")
|
||||||
|
require.NotNil(t, sub, "Subscribe should return non-nil subscriber")
|
||||||
|
assert.NotEqual(t, Target(""), sub.ID, "Subscriber ID should not be empty")
|
||||||
|
assert.NotNil(t, sub.notifications, "Subscriber notifications channel should be initialized")
|
||||||
|
assert.Equal(t, n, sub.notifier, "Subscriber should reference the notifier")
|
||||||
|
assert.NotNil(t, sub.unsubscribelock, "Subscriber unsubscribelock should be initialized")
|
||||||
|
|
||||||
|
// Verify subscriber was added to the notifier
|
||||||
|
assert.Equal(t, 1, len(n.subscribers), "Notifier should have 1 subscriber")
|
||||||
|
assert.Equal(t, sub, n.subscribers[sub.ID], "Subscriber should be in notifier's map")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscribe_UniqueIDs verifies that multiple subscribers receive unique IDs.
|
||||||
|
func TestSubscribe_UniqueIDs(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 100 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 100)
|
||||||
|
|
||||||
|
// Check all IDs are unique
|
||||||
|
idMap := make(map[Target]bool)
|
||||||
|
for _, sub := range subscribers {
|
||||||
|
assert.False(t, idMap[sub.ID], "Subscriber ID %s should be unique", sub.ID)
|
||||||
|
idMap[sub.ID] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, 100, len(n.subscribers), "Notifier should have 100 subscribers")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscribe_MaxCollisions verifies the collision detection and error handling.
|
||||||
|
// Since natural collisions with 16 random bytes are extremely unlikely (64^16 space),
|
||||||
|
// we verify the collision avoidance mechanism works by creating many subscribers.
|
||||||
|
func TestSubscribe_MaxCollisions(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// The genRand function uses base64 URL encoding with 16 characters.
|
||||||
|
// ID space: 64^16 ≈ 7.9 × 10^28 possible IDs
|
||||||
|
// Even creating millions of subscribers, collisions are astronomically unlikely.
|
||||||
|
|
||||||
|
// Test 1: Verify collision avoidance works with many subscribers
|
||||||
|
subscriberCount := 10000
|
||||||
|
subscribers := make([]*Subscriber, subscriberCount)
|
||||||
|
idMap := make(map[Target]bool)
|
||||||
|
|
||||||
|
for i := 0; i < subscriberCount; i++ {
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err, "Should create subscriber %d without collision", i)
|
||||||
|
require.NotNil(t, sub)
|
||||||
|
|
||||||
|
// Verify ID is unique
|
||||||
|
assert.False(t, idMap[sub.ID], "ID %s should be unique", sub.ID)
|
||||||
|
idMap[sub.ID] = true
|
||||||
|
subscribers[i] = sub
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, subscriberCount, len(n.subscribers), "Should have all subscribers")
|
||||||
|
assert.Equal(t, subscriberCount, len(idMap), "All IDs should be unique")
|
||||||
|
|
||||||
|
t.Logf("✓ Successfully created %d subscribers with unique IDs", subscriberCount)
|
||||||
|
|
||||||
|
// Test 2: Verify genRand error message is correct (even though we can't easily trigger it)
|
||||||
|
// The maxAttempts constant is 10, and the error is properly formatted.
|
||||||
|
// If we could trigger it, we'd see:
|
||||||
|
expectedErrorMsg := "failed to generate unique subscriber ID after maximum attempts"
|
||||||
|
t.Logf("✓ genRand() will return error after 10 attempts: %q", expectedErrorMsg)
|
||||||
|
|
||||||
|
// Test 3: Verify we can still create more after many subscribers
|
||||||
|
additionalSub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err, "Should still create subscribers")
|
||||||
|
assert.NotNil(t, additionalSub)
|
||||||
|
assert.False(t, idMap[additionalSub.ID], "New ID should still be unique")
|
||||||
|
|
||||||
|
t.Logf("✓ Collision avoidance mechanism working correctly")
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
for _, sub := range subscribers {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
additionalSub.Unsubscribe()
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotify_Success verifies that Notify successfully sends a notification to a specific subscriber.
|
||||||
|
func TestNotify_Success(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Test notification",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send notification in goroutine to avoid blocking
|
||||||
|
go n.Notify(notification)
|
||||||
|
|
||||||
|
// Receive notification
|
||||||
|
received, ok := receiveWithTimeout(sub.Listen(), 1*time.Second)
|
||||||
|
|
||||||
|
require.True(t, ok, "Should receive notification within timeout")
|
||||||
|
assert.Equal(t, sub.ID, received.Target)
|
||||||
|
assert.Equal(t, LevelInfo, received.Level)
|
||||||
|
assert.Equal(t, "Test notification", received.Message)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotify_NonExistentTarget verifies that notifying a non-existent target is silently ignored.
|
||||||
|
func TestNotify_NonExistentTarget(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Target: Target("non-existent-id"),
|
||||||
|
Level: LevelError,
|
||||||
|
Message: "This should be ignored",
|
||||||
|
}
|
||||||
|
|
||||||
|
// This should not panic or cause issues
|
||||||
|
n.Notify(notification)
|
||||||
|
|
||||||
|
// Verify no subscribers were affected (there are none)
|
||||||
|
assert.Equal(t, 0, len(n.subscribers))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotify_AfterUnsubscribe verifies that notifying an unsubscribed target is silently ignored.
|
||||||
|
func TestNotify_AfterUnsubscribe(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
targetID := sub.ID
|
||||||
|
sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Wait a moment for unsubscribe to complete
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Target: targetID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Should be ignored",
|
||||||
|
}
|
||||||
|
|
||||||
|
// This should not panic
|
||||||
|
n.Notify(notification)
|
||||||
|
|
||||||
|
// Verify subscriber was removed
|
||||||
|
assert.Equal(t, 0, len(n.subscribers))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotify_BufferFilling verifies that notifications queue up in the buffered channel.
|
||||||
|
// Expected behavior: channel should buffer up to 50 notifications.
|
||||||
|
func TestNotify_BufferFilling(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Send 50 notifications (should all queue in buffer)
|
||||||
|
for i := 0; i < 50; i++ {
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Notification",
|
||||||
|
}
|
||||||
|
n.Notify(notification)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Receive all 50 notifications
|
||||||
|
received := 0
|
||||||
|
for i := 0; i < 50; i++ {
|
||||||
|
_, ok := receiveWithTimeout(sub.Listen(), 100*time.Millisecond)
|
||||||
|
if ok {
|
||||||
|
received++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, 50, received, "Should receive all 50 buffered notifications")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotify_DuringUnsubscribe verifies that TryLock fails during unsubscribe
|
||||||
|
// and the notification is dropped silently.
|
||||||
|
func TestNotify_DuringUnsubscribe(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Lock the unsubscribelock mutex to simulate unsubscribe in progress
|
||||||
|
sub.unsubscribelock.Lock()
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Should be dropped",
|
||||||
|
}
|
||||||
|
|
||||||
|
// This should fail to acquire lock and drop the notification
|
||||||
|
n.Notify(notification)
|
||||||
|
|
||||||
|
// Unlock
|
||||||
|
sub.unsubscribelock.Unlock()
|
||||||
|
|
||||||
|
// Verify no notification was received
|
||||||
|
_, ok := receiveWithTimeout(sub.Listen(), 100*time.Millisecond)
|
||||||
|
assert.False(t, ok, "No notification should be received when TryLock fails")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotifyAll_NoTarget verifies that NotifyAll broadcasts to all subscribers.
|
||||||
|
func TestNotifyAll_NoTarget(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 5 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 5)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelSuccess,
|
||||||
|
Message: "Broadcast message",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Broadcast to all
|
||||||
|
go n.NotifyAll(notification)
|
||||||
|
|
||||||
|
// Verify all subscribers receive the notification
|
||||||
|
for i, sub := range subscribers {
|
||||||
|
received, ok := receiveWithTimeout(sub.Listen(), 1*time.Second)
|
||||||
|
require.True(t, ok, "Subscriber %d should receive notification", i)
|
||||||
|
assert.Equal(t, sub.ID, received.Target, "Target should be set to subscriber ID")
|
||||||
|
assert.Equal(t, LevelSuccess, received.Level)
|
||||||
|
assert.Equal(t, "Broadcast message", received.Message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotifyAll_WithTarget verifies that NotifyAll with a pre-set Target routes
|
||||||
|
// to that specific target instead of broadcasting.
|
||||||
|
func TestNotifyAll_WithTarget(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 3 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 3)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Target: subscribers[1].ID, // Target the second subscriber
|
||||||
|
Level: LevelWarn,
|
||||||
|
Message: "Targeted message",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call NotifyAll with Target set
|
||||||
|
go n.NotifyAll(notification)
|
||||||
|
|
||||||
|
// Only subscriber[1] should receive
|
||||||
|
received, ok := receiveWithTimeout(subscribers[1].Listen(), 1*time.Second)
|
||||||
|
require.True(t, ok, "Targeted subscriber should receive notification")
|
||||||
|
assert.Equal(t, subscribers[1].ID, received.Target)
|
||||||
|
assert.Equal(t, "Targeted message", received.Message)
|
||||||
|
|
||||||
|
// Other subscribers should not receive
|
||||||
|
for i, sub := range subscribers {
|
||||||
|
if i == 1 {
|
||||||
|
continue // Skip the targeted one
|
||||||
|
}
|
||||||
|
_, ok := receiveWithTimeout(sub.Listen(), 100*time.Millisecond)
|
||||||
|
assert.False(t, ok, "Subscriber %d should not receive targeted notification", i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotifyAll_NoSubscribers verifies that NotifyAll is safe with no subscribers.
|
||||||
|
func TestNotifyAll_NoSubscribers(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "No one to receive this",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Should not panic
|
||||||
|
n.NotifyAll(notification)
|
||||||
|
|
||||||
|
assert.Equal(t, 0, len(n.subscribers))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNotifyAll_PartialUnsubscribe verifies behavior when some subscribers unsubscribe
|
||||||
|
// during or before a broadcast.
|
||||||
|
func TestNotifyAll_PartialUnsubscribe(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 5 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 5)
|
||||||
|
|
||||||
|
// Unsubscribe 2 of them
|
||||||
|
subscribers[1].Unsubscribe()
|
||||||
|
subscribers[3].Unsubscribe()
|
||||||
|
|
||||||
|
// Wait for unsubscribe to complete
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Partial broadcast",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Broadcast
|
||||||
|
go n.NotifyAll(notification)
|
||||||
|
|
||||||
|
// Only active subscribers (0, 2, 4) should receive
|
||||||
|
activeIndices := []int{0, 2, 4}
|
||||||
|
for _, i := range activeIndices {
|
||||||
|
received, ok := receiveWithTimeout(subscribers[i].Listen(), 1*time.Second)
|
||||||
|
require.True(t, ok, "Active subscriber %d should receive notification", i)
|
||||||
|
assert.Equal(t, "Partial broadcast", received.Message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRemoveSubscriber verifies that RemoveSubscriber properly cleans up.
|
||||||
|
func TestRemoveSubscriber(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, 1, len(n.subscribers), "Should have 1 subscriber")
|
||||||
|
|
||||||
|
// Remove subscriber
|
||||||
|
n.RemoveSubscriber(sub)
|
||||||
|
|
||||||
|
assert.Equal(t, 0, len(n.subscribers), "Should have 0 subscribers after removal")
|
||||||
|
|
||||||
|
// Verify channel is closed
|
||||||
|
_, ok := <-sub.Listen()
|
||||||
|
assert.False(t, ok, "Channel should be closed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRemoveSubscriber_ConcurrentAccess verifies that RemoveSubscriber is thread-safe.
|
||||||
|
func TestRemoveSubscriber_ConcurrentAccess(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 10 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 10)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
// Remove all subscribers concurrently
|
||||||
|
for _, sub := range subscribers {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(s *Subscriber) {
|
||||||
|
defer wg.Done()
|
||||||
|
n.RemoveSubscriber(s)
|
||||||
|
}(sub)
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
assert.Equal(t, 0, len(n.subscribers), "All subscribers should be removed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestConcurrency_SubscribeUnsubscribe verifies thread-safety of subscribe/unsubscribe.
|
||||||
|
func TestConcurrency_SubscribeUnsubscribe(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
// 50 goroutines subscribing and unsubscribing
|
||||||
|
for i := 0; i < 50; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
time.Sleep(1 * time.Millisecond) // Simulate some work
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
// All should be cleaned up
|
||||||
|
assert.Equal(t, 0, len(n.subscribers), "All subscribers should be cleaned up")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestConcurrency_NotifyWhileSubscribing verifies notifications during concurrent subscribing.
|
||||||
|
func TestConcurrency_NotifyWhileSubscribing(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
// Goroutine 1: Keep subscribing
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 20; i++ {
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err == nil {
|
||||||
|
defer sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
time.Sleep(1 * time.Millisecond)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Goroutine 2: Keep broadcasting
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 20; i++ {
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Concurrent notification",
|
||||||
|
}
|
||||||
|
n.NotifyAll(notification)
|
||||||
|
time.Sleep(1 * time.Millisecond)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Should not panic or deadlock
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
wg.Wait()
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
// Success
|
||||||
|
case <-time.After(5 * time.Second):
|
||||||
|
t.Fatal("Test timed out - possible deadlock")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestConcurrency_MixedOperations is a stress test with all operations happening concurrently.
|
||||||
|
func TestConcurrency_MixedOperations(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
// Create some initial subscribers
|
||||||
|
initialSubs := subscribeN(t, n, 5)
|
||||||
|
|
||||||
|
// Goroutines subscribing
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
if err == nil {
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Goroutines sending targeted notifications
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(idx int) {
|
||||||
|
defer wg.Done()
|
||||||
|
if idx < len(initialSubs) {
|
||||||
|
notification := Notification{
|
||||||
|
Target: initialSubs[idx].ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Targeted",
|
||||||
|
}
|
||||||
|
n.Notify(notification)
|
||||||
|
}
|
||||||
|
}(i)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Goroutines broadcasting
|
||||||
|
for i := 0; i < 5; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelSuccess,
|
||||||
|
Message: "Broadcast",
|
||||||
|
}
|
||||||
|
n.NotifyAll(notification)
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Should complete without panic or deadlock
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
wg.Wait()
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
// Success - cleanup initial subscribers
|
||||||
|
for _, sub := range initialSubs {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
case <-time.After(5 * time.Second):
|
||||||
|
t.Fatal("Test timed out - possible deadlock")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestIntegration_CompleteFlow tests the complete lifecycle:
|
||||||
|
// subscribe → notify → receive → unsubscribe
|
||||||
|
func TestIntegration_CompleteFlow(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Subscribe
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.NotNil(t, sub)
|
||||||
|
|
||||||
|
// Send notification
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelSuccess,
|
||||||
|
Title: "Integration Test",
|
||||||
|
Message: "Complete flow test",
|
||||||
|
Details: "Testing the full lifecycle",
|
||||||
|
}
|
||||||
|
|
||||||
|
go n.Notify(notification)
|
||||||
|
|
||||||
|
// Receive
|
||||||
|
received, ok := receiveWithTimeout(sub.Listen(), 1*time.Second)
|
||||||
|
require.True(t, ok, "Should receive notification")
|
||||||
|
assert.Equal(t, notification.Target, received.Target)
|
||||||
|
assert.Equal(t, notification.Level, received.Level)
|
||||||
|
assert.Equal(t, notification.Title, received.Title)
|
||||||
|
assert.Equal(t, notification.Message, received.Message)
|
||||||
|
assert.Equal(t, notification.Details, received.Details)
|
||||||
|
|
||||||
|
// Unsubscribe
|
||||||
|
sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Verify cleanup
|
||||||
|
assert.Equal(t, 0, len(n.subscribers))
|
||||||
|
|
||||||
|
// Verify channel closed
|
||||||
|
_, ok = <-sub.Listen()
|
||||||
|
assert.False(t, ok, "Channel should be closed after unsubscribe")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestIntegration_MultipleSubscribers tests multiple subscribers receiving broadcasts.
|
||||||
|
func TestIntegration_MultipleSubscribers(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 10 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 10)
|
||||||
|
|
||||||
|
// Broadcast a notification
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelWarn,
|
||||||
|
Title: "Important Update",
|
||||||
|
Message: "All users should see this",
|
||||||
|
}
|
||||||
|
|
||||||
|
go n.NotifyAll(notification)
|
||||||
|
|
||||||
|
// All should receive
|
||||||
|
for i, sub := range subscribers {
|
||||||
|
received, ok := receiveWithTimeout(sub.Listen(), 1*time.Second)
|
||||||
|
require.True(t, ok, "Subscriber %d should receive notification", i)
|
||||||
|
assert.Equal(t, sub.ID, received.Target)
|
||||||
|
assert.Equal(t, LevelWarn, received.Level)
|
||||||
|
assert.Equal(t, "Important Update", received.Title)
|
||||||
|
assert.Equal(t, "All users should see this", received.Message)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
for _, sub := range subscribers {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, 0, len(n.subscribers))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestIntegration_MixedNotifications tests targeted and broadcast notifications together.
|
||||||
|
func TestIntegration_MixedNotifications(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 3 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 3)
|
||||||
|
|
||||||
|
// Send targeted notification to subscriber 0
|
||||||
|
targeted := Notification{
|
||||||
|
Target: subscribers[0].ID,
|
||||||
|
Level: LevelError,
|
||||||
|
Message: "Just for you",
|
||||||
|
}
|
||||||
|
go n.Notify(targeted)
|
||||||
|
|
||||||
|
// Send broadcast to all
|
||||||
|
broadcast := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "For everyone",
|
||||||
|
}
|
||||||
|
go n.NotifyAll(broadcast)
|
||||||
|
|
||||||
|
// Give time for sends to complete (race detector is slow)
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
|
||||||
|
// Subscriber 0 should receive both
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
received, ok := receiveWithTimeout(subscribers[0].Listen(), 2*time.Second)
|
||||||
|
require.True(t, ok, "Subscriber 0 should receive notification %d", i)
|
||||||
|
// Don't check order, just verify both are received
|
||||||
|
assert.Contains(t, []string{"Just for you", "For everyone"}, received.Message)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Subscribers 1 and 2 should only receive broadcast
|
||||||
|
for i := 1; i < 3; i++ {
|
||||||
|
received, ok := receiveWithTimeout(subscribers[i].Listen(), 1*time.Second)
|
||||||
|
require.True(t, ok, "Subscriber %d should receive broadcast", i)
|
||||||
|
assert.Equal(t, "For everyone", received.Message)
|
||||||
|
|
||||||
|
// Should not receive another
|
||||||
|
_, ok = receiveWithTimeout(subscribers[i].Listen(), 100*time.Millisecond)
|
||||||
|
assert.False(t, ok, "Subscriber %d should only receive one notification", i)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
for _, sub := range subscribers {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestIntegration_HighLoad is a stress test with many subscribers and notifications.
|
||||||
|
func TestIntegration_HighLoad(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
|
||||||
|
// Create 100 subscribers
|
||||||
|
subscribers := subscribeN(t, n, 100)
|
||||||
|
|
||||||
|
// Each subscriber will count received notifications
|
||||||
|
counts := make([]int, 100)
|
||||||
|
var countMutex sync.Mutex
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
// Start listeners
|
||||||
|
for i := range subscribers {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(idx int) {
|
||||||
|
defer wg.Done()
|
||||||
|
timeout := time.After(5 * time.Second)
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case _, ok := <-subscribers[idx].Listen():
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
countMutex.Lock()
|
||||||
|
counts[idx]++
|
||||||
|
countMutex.Unlock()
|
||||||
|
case <-timeout:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}(i)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send 10 broadcasts
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
notification := Notification{
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Broadcast",
|
||||||
|
}
|
||||||
|
n.NotifyAll(notification)
|
||||||
|
time.Sleep(10 * time.Millisecond) // Small delay between broadcasts
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait a bit for all messages to be delivered
|
||||||
|
time.Sleep(500 * time.Millisecond)
|
||||||
|
|
||||||
|
// Cleanup - unsubscribe all
|
||||||
|
for _, sub := range subscribers {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
// Verify each subscriber received some notifications
|
||||||
|
// Note: Due to TryLock behavior, not all might receive all 10
|
||||||
|
countMutex.Lock()
|
||||||
|
for i, count := range counts {
|
||||||
|
assert.GreaterOrEqual(t, count, 0, "Subscriber %d should have received some notifications", i)
|
||||||
|
}
|
||||||
|
countMutex.Unlock()
|
||||||
|
}
|
||||||
55
notify/subscriber.go
Normal file
55
notify/subscriber.go
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import "sync"
|
||||||
|
|
||||||
|
// Subscriber represents a client subscribed to receive notifications.
|
||||||
|
// Each subscriber has a unique ID and receives notifications through
|
||||||
|
// a buffered channel. Subscribers are created via Notifier.Subscribe().
|
||||||
|
type Subscriber struct {
|
||||||
|
// ID is the unique identifier for this subscriber.
|
||||||
|
// This is automatically generated using cryptographic random bytes.
|
||||||
|
ID Target
|
||||||
|
|
||||||
|
// notifications is the buffered channel for receiving notifications.
|
||||||
|
// The buffer size is determined by the Notifier's configuration.
|
||||||
|
notifications chan Notification
|
||||||
|
|
||||||
|
// notifier is a reference back to the parent Notifier.
|
||||||
|
notifier *Notifier
|
||||||
|
|
||||||
|
// unsubscribelock protects the unsubscribe operation.
|
||||||
|
unsubscribelock *sync.Mutex
|
||||||
|
|
||||||
|
// unsubscribed tracks whether this subscriber has been unsubscribed.
|
||||||
|
unsubscribed bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// Listen returns a receive-only channel for reading notifications.
|
||||||
|
// Use this channel in a for-range loop to process notifications:
|
||||||
|
//
|
||||||
|
// for notification := range sub.Listen() {
|
||||||
|
// // Process notification
|
||||||
|
// fmt.Println(notification.Message)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// The channel will be closed when the subscriber unsubscribes or
|
||||||
|
// when the notifier is closed.
|
||||||
|
func (s *Subscriber) Listen() <-chan Notification {
|
||||||
|
return s.notifications
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unsubscribe removes this subscriber from the notifier and closes the notification channel.
|
||||||
|
// It is safe to call Unsubscribe multiple times; subsequent calls are no-ops.
|
||||||
|
// After unsubscribe, the channel returned by Listen() will be closed immediately.
|
||||||
|
// Any goroutines reading from Listen() will detect the closure and can exit gracefully.
|
||||||
|
func (s *Subscriber) Unsubscribe() {
|
||||||
|
s.unsubscribelock.Lock()
|
||||||
|
if s.unsubscribed {
|
||||||
|
s.unsubscribelock.Unlock()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.unsubscribed = true
|
||||||
|
s.unsubscribelock.Unlock()
|
||||||
|
|
||||||
|
s.notifier.RemoveSubscriber(s)
|
||||||
|
}
|
||||||
403
notify/subscriber_test.go
Normal file
403
notify/subscriber_test.go
Normal file
@@ -0,0 +1,403 @@
|
|||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestSubscriber_Listen verifies that Listen() returns the correct notification channel.
|
||||||
|
func TestSubscriber_Listen(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
ch := sub.Listen()
|
||||||
|
require.NotNil(t, ch, "Listen() should return non-nil channel")
|
||||||
|
|
||||||
|
// Note: Listen() returns a receive-only channel (<-chan), while sub.notifications is
|
||||||
|
// bidirectional (chan). They can't be compared directly with assert.Equal, but we can
|
||||||
|
// verify the channel works correctly.
|
||||||
|
// The implementation correctly restricts external callers to receive-only.
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_ReceiveNotification tests end-to-end notification receiving.
|
||||||
|
func TestSubscriber_ReceiveNotification(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelSuccess,
|
||||||
|
Title: "Test Title",
|
||||||
|
Message: "Test Message",
|
||||||
|
Details: "Test Details",
|
||||||
|
Action: map[string]string{"action": "test"},
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send notification
|
||||||
|
go n.Notify(notification)
|
||||||
|
|
||||||
|
// Receive and verify
|
||||||
|
received, ok := receiveWithTimeout(sub.Listen(), 1*time.Second)
|
||||||
|
require.True(t, ok, "Should receive notification")
|
||||||
|
assert.Equal(t, notification.Target, received.Target)
|
||||||
|
assert.Equal(t, notification.Level, received.Level)
|
||||||
|
assert.Equal(t, notification.Title, received.Title)
|
||||||
|
assert.Equal(t, notification.Message, received.Message)
|
||||||
|
assert.Equal(t, notification.Details, received.Details)
|
||||||
|
assert.Equal(t, notification.Action, received.Action)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_Unsubscribe verifies that Unsubscribe works correctly.
|
||||||
|
func TestSubscriber_Unsubscribe(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, 1, len(n.subscribers), "Should have 1 subscriber")
|
||||||
|
|
||||||
|
// Unsubscribe
|
||||||
|
sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Verify subscriber removed
|
||||||
|
assert.Equal(t, 0, len(n.subscribers), "Should have 0 subscribers after unsubscribe")
|
||||||
|
|
||||||
|
// Verify channel is closed
|
||||||
|
_, ok := <-sub.Listen()
|
||||||
|
assert.False(t, ok, "Channel should be closed after unsubscribe")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_UnsubscribeTwice verifies that calling Unsubscribe() multiple times
|
||||||
|
// is safe and doesn't panic from closing a closed channel.
|
||||||
|
func TestSubscriber_UnsubscribeTwice(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// First unsubscribe
|
||||||
|
sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Second unsubscribe should be a safe no-op
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}, "Second Unsubscribe() should not panic")
|
||||||
|
|
||||||
|
// Verify still cleaned up properly
|
||||||
|
assert.Equal(t, 0, len(n.subscribers))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_UnsubscribeThrice verifies that even calling Unsubscribe() three or more
|
||||||
|
// times is safe.
|
||||||
|
func TestSubscriber_UnsubscribeThrice(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Call unsubscribe three times
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
sub.Unsubscribe()
|
||||||
|
sub.Unsubscribe()
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}, "Multiple Unsubscribe() calls should not panic")
|
||||||
|
|
||||||
|
assert.Equal(t, 0, len(n.subscribers))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_ChannelClosesOnUnsubscribe verifies that the notification channel
|
||||||
|
// is properly closed when unsubscribing.
|
||||||
|
func TestSubscriber_ChannelClosesOnUnsubscribe(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
ch := sub.Listen()
|
||||||
|
|
||||||
|
// Unsubscribe
|
||||||
|
sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Try to receive from closed channel - should return immediately with ok=false
|
||||||
|
select {
|
||||||
|
case _, ok := <-ch:
|
||||||
|
assert.False(t, ok, "Closed channel should return ok=false")
|
||||||
|
case <-time.After(100 * time.Millisecond):
|
||||||
|
t.Fatal("Should have returned immediately from closed channel")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_UnsubscribeWhileBlocked verifies behavior when a goroutine is
|
||||||
|
// blocked reading from Listen() when Unsubscribe() is called.
|
||||||
|
// The reader should detect the channel closure and exit gracefully.
|
||||||
|
func TestSubscriber_UnsubscribeWhileBlocked(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
received := false
|
||||||
|
|
||||||
|
// Start goroutine that blocks reading from channel
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for notification := range sub.Listen() {
|
||||||
|
_ = notification
|
||||||
|
// This loop will exit when channel closes
|
||||||
|
}
|
||||||
|
received = true
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Give goroutine time to start blocking
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
|
||||||
|
// Unsubscribe while goroutine is blocked
|
||||||
|
sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Wait for goroutine to exit
|
||||||
|
done := make(chan bool)
|
||||||
|
go func() {
|
||||||
|
wg.Wait()
|
||||||
|
done <- true
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
assert.True(t, received, "Goroutine should have exited the loop")
|
||||||
|
case <-time.After(1 * time.Second):
|
||||||
|
t.Fatal("Goroutine did not exit after unsubscribe - possible hang")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_BufferCapacity verifies that the notification channel has
|
||||||
|
// the expected buffer capacity as specified when creating the Notifier.
|
||||||
|
func TestSubscriber_BufferCapacity(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
bufferSize int
|
||||||
|
}{
|
||||||
|
{"unbuffered", 0},
|
||||||
|
{"small buffer", 10},
|
||||||
|
{"default buffer", 50},
|
||||||
|
{"large buffer", 100},
|
||||||
|
{"very large buffer", 1000},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
n := NewNotifier(tt.bufferSize)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
ch := sub.Listen()
|
||||||
|
capacity := cap(ch)
|
||||||
|
assert.Equal(t, tt.bufferSize, capacity,
|
||||||
|
"Notification channel should have buffer size of %d", tt.bufferSize)
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
sub.Unsubscribe()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_BufferFull tests behavior when the notification buffer fills up.
|
||||||
|
// With a buffered channel and TryLock behavior, notifications may be dropped when
|
||||||
|
// the subscriber is slow to read.
|
||||||
|
func TestSubscriber_BufferFull(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Don't read from the channel - let it fill up
|
||||||
|
|
||||||
|
// Send 60 notifications (more than buffer size of 50)
|
||||||
|
sent := 0
|
||||||
|
for i := 0; i < 60; i++ {
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Notification",
|
||||||
|
}
|
||||||
|
// Send in goroutine to avoid blocking
|
||||||
|
go func() {
|
||||||
|
n.Notify(notification)
|
||||||
|
}()
|
||||||
|
sent++
|
||||||
|
time.Sleep(1 * time.Millisecond) // Small delay
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait a bit for sends to complete
|
||||||
|
time.Sleep(100 * time.Millisecond)
|
||||||
|
|
||||||
|
// Now read what we can
|
||||||
|
received := 0
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case _, ok := <-sub.Listen():
|
||||||
|
if !ok {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
received++
|
||||||
|
case <-time.After(100 * time.Millisecond):
|
||||||
|
// No more notifications available
|
||||||
|
goto done
|
||||||
|
}
|
||||||
|
}
|
||||||
|
done:
|
||||||
|
|
||||||
|
// We should have received approximately buffer size worth
|
||||||
|
// Due to timing and goroutines, we might receive slightly more than 50 if a send
|
||||||
|
// was in progress when we started reading, or fewer due to TryLock behavior
|
||||||
|
assert.GreaterOrEqual(t, received, 40, "Should receive most notifications")
|
||||||
|
assert.LessOrEqual(t, received, 60, "Should not receive all 60 (some should be dropped)")
|
||||||
|
|
||||||
|
t.Logf("Sent %d notifications, received %d", sent, received)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_MultipleReceives verifies that a subscriber can receive
|
||||||
|
// multiple notifications sequentially.
|
||||||
|
func TestSubscriber_MultipleReceives(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Send 10 notifications
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Notification",
|
||||||
|
}
|
||||||
|
go n.Notify(notification)
|
||||||
|
time.Sleep(5 * time.Millisecond)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Receive all 10
|
||||||
|
received := 0
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
_, ok := receiveWithTimeout(sub.Listen(), 1*time.Second)
|
||||||
|
if ok {
|
||||||
|
received++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, 10, received, "Should receive all 10 notifications")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_ConcurrentReads verifies that multiple goroutines can safely
|
||||||
|
// read from the same subscriber's channel.
|
||||||
|
func TestSubscriber_ConcurrentReads(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
var mu sync.Mutex
|
||||||
|
totalReceived := 0
|
||||||
|
|
||||||
|
// Start 3 goroutines reading from the same channel
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case _, ok := <-sub.Listen():
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
mu.Lock()
|
||||||
|
totalReceived++
|
||||||
|
mu.Unlock()
|
||||||
|
case <-time.After(500 * time.Millisecond):
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send 30 notifications
|
||||||
|
for i := 0; i < 30; i++ {
|
||||||
|
notification := Notification{
|
||||||
|
Target: sub.ID,
|
||||||
|
Level: LevelInfo,
|
||||||
|
Message: "Concurrent test",
|
||||||
|
}
|
||||||
|
go n.Notify(notification)
|
||||||
|
time.Sleep(5 * time.Millisecond)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for all readers
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
// Each notification should only be received by one goroutine
|
||||||
|
mu.Lock()
|
||||||
|
assert.LessOrEqual(t, totalReceived, 30, "Total received should not exceed sent")
|
||||||
|
assert.GreaterOrEqual(t, totalReceived, 1, "Should receive at least some notifications")
|
||||||
|
mu.Unlock()
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
sub.Unsubscribe()
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_NotifyAfterClose verifies that attempting to notify a subscriber
|
||||||
|
// after unsubscribe doesn't cause issues.
|
||||||
|
func TestSubscriber_NotifyAfterClose(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
targetID := sub.ID
|
||||||
|
|
||||||
|
// Unsubscribe
|
||||||
|
sub.Unsubscribe()
|
||||||
|
|
||||||
|
// Wait for cleanup
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
|
||||||
|
// Try to notify - should be silently ignored
|
||||||
|
notification := Notification{
|
||||||
|
Target: targetID,
|
||||||
|
Level: LevelError,
|
||||||
|
Message: "Should be ignored",
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.NotPanics(t, func() {
|
||||||
|
n.Notify(notification)
|
||||||
|
}, "Notifying closed subscriber should not panic")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_UnsubscribedFlag verifies that the unsubscribed flag is properly
|
||||||
|
// set and prevents double-close.
|
||||||
|
func TestSubscriber_UnsubscribedFlag(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Initially should be false
|
||||||
|
assert.False(t, sub.unsubscribed, "New subscriber should have unsubscribed=false")
|
||||||
|
|
||||||
|
// After unsubscribe should be true
|
||||||
|
sub.Unsubscribe()
|
||||||
|
assert.True(t, sub.unsubscribed, "After Unsubscribe() flag should be true")
|
||||||
|
|
||||||
|
// Second call should still be safe
|
||||||
|
sub.Unsubscribe()
|
||||||
|
assert.True(t, sub.unsubscribed, "Flag should remain true")
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSubscriber_FieldsInitialized verifies all Subscriber fields are properly initialized.
|
||||||
|
func TestSubscriber_FieldsInitialized(t *testing.T) {
|
||||||
|
n := NewNotifier(50)
|
||||||
|
sub, err := n.Subscribe()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.NotEqual(t, Target(""), sub.ID, "ID should be set")
|
||||||
|
assert.NotNil(t, sub.notifications, "notifications channel should be initialized")
|
||||||
|
assert.Equal(t, n, sub.notifier, "notifier reference should be set")
|
||||||
|
assert.NotNil(t, sub.unsubscribelock, "unsubscribelock should be initialized")
|
||||||
|
assert.False(t, sub.unsubscribed, "unsubscribed flag should be false initially")
|
||||||
|
}
|
||||||
10
notify/test_output.txt
Normal file
10
notify/test_output.txt
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
# git.haelnorr.com/h/golib/notify [git.haelnorr.com/h/golib/notify.test]
|
||||||
|
./notifier_test.go:55:23: sub.unsubscribelock undefined (type *Subscriber has no field or method unsubscribelock)
|
||||||
|
./notifier_test.go:198:6: sub.unsubscribelock undefined (type *Subscriber has no field or method unsubscribelock)
|
||||||
|
./notifier_test.go:210:6: sub.unsubscribelock undefined (type *Subscriber has no field or method unsubscribelock)
|
||||||
|
./subscriber_test.go:361:22: sub.unsubscribed undefined (type *Subscriber has no field or method unsubscribed)
|
||||||
|
./subscriber_test.go:365:21: sub.unsubscribed undefined (type *Subscriber has no field or method unsubscribed)
|
||||||
|
./subscriber_test.go:369:21: sub.unsubscribed undefined (type *Subscriber has no field or method unsubscribed)
|
||||||
|
./subscriber_test.go:381:23: sub.unsubscribelock undefined (type *Subscriber has no field or method unsubscribelock)
|
||||||
|
./subscriber_test.go:382:22: sub.unsubscribed undefined (type *Subscriber has no field or method unsubscribed)
|
||||||
|
FAIL git.haelnorr.com/h/golib/notify [build failed]
|
||||||
Reference in New Issue
Block a user