mirror of
https://github.com/status-im/status-go.git
synced 2026-08-27 15:11:09 +00:00
Igor Sirotin
5029be4631
`server` was one Go package doing three unrelated jobs. Each moves to where it belongs: server/pairing/ -> services/pairing/ server_media*.go, handlers*.go, testdata/ -> services/media/ server.go, certs.go, ips.go, timeout.go, device.go, listen_*.go, servertest/ -> internal/httpserver/ MediaServer is renamed to media.Server (and NewMediaServer to media.NewServer) now that it has a package to be named against. Deliberately untouched: StatusNode.MediaServer(), which is an accessor method rather than the type, and the unrelated identifiers that only share the prefix (MediaServerImageID, MediaServerContactIcon, MediaServerEnableTLS, ...). Two identifiers had to be reassigned to make the boundary clean: - certs.go held both the generic X509/TLS helpers and the media server's process-global certificate. Split: the generic half stays in internal/httpserver, generateMediaTLSCert and PublicMediaTLSCert move to services/media. - HandlerPatternMap was declared in handlers.go but is a plain HTTP type that server.go depends on; it moves to internal/httpserver. The media server URL tests moved with the type, and reached three unexported Server fields they could touch while everything shared a package. internal/httpserver now exposes ListeningAddr() and CachedPort() (both reasonable API) plus a clearly-marked SetURLStateForTest. Nothing else crossed the boundary, and the split is one-directional: services/media and services/pairing import internal/httpserver, never the reverse. refs #7067
35 lines
531 B
Go
35 lines
531 B
Go
package httpserver
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
)
|
|
|
|
var (
|
|
local = ".local"
|
|
)
|
|
|
|
func RemoveSuffix(input, suffix string) string {
|
|
il := len(input)
|
|
sl := len(suffix)
|
|
if il > sl {
|
|
if input[il-sl:] == suffix {
|
|
return input[:il-sl]
|
|
}
|
|
}
|
|
return input
|
|
}
|
|
|
|
func parseHostname(hostname string) string {
|
|
hostname = RemoveSuffix(hostname, local)
|
|
return strings.ReplaceAll(hostname, "-", " ")
|
|
}
|
|
|
|
func GetDeviceName() (string, error) {
|
|
name, err := os.Hostname()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return parseHostname(name), nil
|
|
}
|