admin/go-socket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin/go-socket:b5623feb5a797da9a7974121366d078c2ba18c51
Branches Tags
admin/go-socket:main
..
compare: admin/go-socket:cb003d235fadba47391be733cc49cb1b2e5f7cfc
Branches Tags
admin/go-socket:main

2 Commits
b5623feb5a .. cb003d235f

Author SHA1 Message Date
admin cb003d235f add channel set desc 2026-05-02 13:01:14 +02:00
admin 40cb7736c2 fix channel caches, add hub functions to api endpoints 2026-05-02 12:59:57 +02:00
9 changed files with 209 additions and 70 deletions
Expand all files Collapse all files
machine-client/.gitignore
+1
View File
@@ -0,0 +1 @@
.idea
machine-client/index.html
+1 -46
View File
@@ -3,52 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>go-socket debug</title> <title>go-socket debug</title>
<style> <link rel="stylesheet" href="style.css">
body { font-family: monospace; background: #1a1a1a; color: #e0e0e0; margin: 20px; }
h1 { color: #aaa; font-size: 1.2em; margin-bottom: 12px; }
.config { margin-bottom: 10px; }
.config label { color: #888; }
.config input { background: #2a2a2a; color: #e0e0e0; border: 1px solid #444; padding: 4px 8px; width: 300px; }
#log-header { display: flex; align-items: center; gap: 10px; margin-bottom: 6px; }
#log-header span { color: #888; font-size: 1em; }
#clear-log { background: #2a2a2a; color: #888; border: 1px solid #444; padding: 3px 10px; cursor: pointer; font-size: 0.85em; font-family: monospace; }
#log { background: #111; border: 1px solid #333; padding: 10px; height: 340px; overflow-y: auto; font-size: 0.85em; white-space: pre-wrap; word-break: break-all; margin-bottom: 14px; }
.log-ws { color: #8af; }
.log-http { color: #af8; }
.log-err { color: #f88; }
.log-info { color: #666; }
#btn-row { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 10px; }
#btn-row button {
background: #2a2a2a; color: #ccc; border: 1px solid #444;
padding: 5px 10px; cursor: pointer; font-family: monospace; font-size: 0.8em;
}
#btn-row button:hover { background: #333; border-color: #666; }
#btn-row button.active { background: #2a3a2a; border-color: #4a4; color: #af8; }
#btn-row button.active.ws { background: #2a2a3a; border-color: #44a; color: #88f; }
#btn-row button.warn { color: #f88; }
#form-panel { display: none; background: #1e1e1e; border: 1px solid #333; padding: 12px; margin-bottom: 6px; }
#form-panel.open { display: block; }
#form-title { color: #888; font-size: 0.85em; margin-bottom: 10px; }
.form-content { display: none; }
.form-content.active { display: block; }
.field { margin-bottom: 7px; }
.field label { display: inline-block; width: 160px; color: #777; font-size: 0.88em; }
.field input { background: #2a2a2a; color: #e0e0e0; border: 1px solid #444; padding: 4px 8px; width: 260px; font-family: monospace; font-size: 0.88em; }
.hint { color: #555; font-size: 0.78em; margin-left: 5px; }
.form-actions { margin-top: 10px; display: flex; gap: 8px; align-items: center; }
button.send { background: #2a4a2a; color: #8f8; border: 1px solid #4a4; padding: 5px 16px; cursor: pointer; font-family: monospace; }
button.send:hover { background: #3a5a3a; }
button.ws-action { background: #2a2a4a; color: #88f; border: 1px solid #44a; padding: 5px 14px; cursor: pointer; font-family: monospace; }
button.ws-action:hover { background: #3a3a5a; }
button.ws-danger { background: #4a2a2a; color: #f88; border: 1px solid #a44; padding: 5px 14px; cursor: pointer; font-family: monospace; }
.ws-status { font-size: 0.82em; }
.ws-status.connected { color: #8f8; }
.ws-status.disconnected { color: #f88; }
</style>
</head> </head>
<body> <body>
<h1>go-socket debug</h1> <h1>go-socket debug</h1>
machine-client/style.css
+44
View File
@@ -0,0 +1,44 @@
body { font-family: monospace; background: #1a1a1a; color: #e0e0e0; margin: 20px; }
h1 { color: #aaa; font-size: 1.2em; margin-bottom: 12px; }
.config { margin-bottom: 10px; }
.config label { color: #888; }
.config input { background: #2a2a2a; color: #e0e0e0; border: 1px solid #444; padding: 4px 8px; width: 300px; }
#log-header { display: flex; align-items: center; gap: 10px; margin-bottom: 6px; }
#log-header span { color: #888; font-size: 1em; }
#clear-log { background: #2a2a2a; color: #888; border: 1px solid #444; padding: 3px 10px; cursor: pointer; font-size: 0.85em; font-family: monospace; }
#log { background: #111; border: 1px solid #333; padding: 10px; height: 340px; overflow-y: auto; font-size: 0.85em; white-space: pre-wrap; word-break: break-all; margin-bottom: 14px; }
.log-ws { color: #8af; }
.log-http { color: #af8; }
.log-err { color: #f88; }
.log-info { color: #666; }
#btn-row { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 10px; }
#btn-row button {
background: #2a2a2a; color: #ccc; border: 1px solid #444;
padding: 5px 10px; cursor: pointer; font-family: monospace; font-size: 0.8em;
}
#btn-row button:hover { background: #333; border-color: #666; }
#btn-row button.active { background: #2a3a2a; border-color: #4a4; color: #af8; }
#btn-row button.active.ws { background: #2a2a3a; border-color: #44a; color: #88f; }
#btn-row button.warn { color: #f88; }
#form-panel { display: none; background: #1e1e1e; border: 1px solid #333; padding: 12px; margin-bottom: 6px; }
#form-panel.open { display: block; }
#form-title { color: #888; font-size: 0.85em; margin-bottom: 10px; }
.form-content { display: none; }
.form-content.active { display: block; }
.field { margin-bottom: 7px; }
.field label { display: inline-block; width: 160px; color: #777; font-size: 0.88em; }
.field input { background: #2a2a2a; color: #e0e0e0; border: 1px solid #444; padding: 4px 8px; width: 260px; font-family: monospace; font-size: 0.88em; }
.hint { color: #555; font-size: 0.78em; margin-left: 5px; }
.form-actions { margin-top: 10px; display: flex; gap: 8px; align-items: center; }
button.send { background: #2a4a2a; color: #8f8; border: 1px solid #4a4; padding: 5px 16px; cursor: pointer; font-family: monospace; }
button.send:hover { background: #3a5a3a; }
button.ws-action { background: #2a2a4a; color: #88f; border: 1px solid #44a; padding: 5px 14px; cursor: pointer; font-family: monospace; }
button.ws-action:hover { background: #3a3a5a; }
button.ws-danger { background: #4a2a2a; color: #f88; border: 1px solid #a44; padding: 5px 14px; cursor: pointer; font-family: monospace; }
.ws-status { font-size: 0.82em; }
.ws-status.connected { color: #8f8; }
.ws-status.disconnected { color: #f88; }
main.go
+23
View File
@@ -38,6 +38,7 @@ func main() {
http.HandleFunc("POST /user", withCORS(httpRequest.HandleUserNew)) http.HandleFunc("POST /user", withCORS(httpRequest.HandleUserNew))
http.HandleFunc("DELETE /user", withCORS(httpRequest.HandleUserDelete)) http.HandleFunc("DELETE /user", withCORS(httpRequest.HandleUserDelete))
http.HandleFunc("GET /user", withCORS(httpRequest.HandleUserGetUser)) http.HandleFunc("GET /user", withCORS(httpRequest.HandleUserGetUser))
http.HandleFunc("GET /users", withCORS(httpRequest.HandleUserGetUsers))
http.HandleFunc("PATCH /user/profile", withCORS(httpRequest.HandleUserModProfile)) http.HandleFunc("PATCH /user/profile", withCORS(httpRequest.HandleUserModProfile))
http.HandleFunc("PATCH /user/avatar", withCORS(httpRequest.HandleSetUserAvatar)) http.HandleFunc("PATCH /user/avatar", withCORS(httpRequest.HandleSetUserAvatar))
http.HandleFunc("PATCH /user/profilebg", withCORS(httpRequest.HandleSetUserProfileBg)) http.HandleFunc("PATCH /user/profilebg", withCORS(httpRequest.HandleSetUserProfileBg))
@@ -60,7 +61,29 @@ func main() {
http.HandleFunc("POST /hub", withCORS(httpRequest.HandleHubCreate)) http.HandleFunc("POST /hub", withCORS(httpRequest.HandleHubCreate))
http.HandleFunc("POST /hub/message", withCORS(httpRequest.HandleHubMessage)) http.HandleFunc("POST /hub/message", withCORS(httpRequest.HandleHubMessage))
http.HandleFunc("GET /hubs", withCORS(httpRequest.HandleGetHubs)) http.HandleFunc("GET /hubs", withCORS(httpRequest.HandleGetHubs))
http.HandleFunc("GET /hubs/channels", withCORS(httpRequest.HandleGetChannels))
http.HandleFunc("GET /hubs/users", withCORS(httpRequest.HandleGetHubUsers))
http.HandleFunc("PUT /hub/join", withCORS(httpRequest.HandleHubJoin)) http.HandleFunc("PUT /hub/join", withCORS(httpRequest.HandleHubJoin))
http.HandleFunc("PATCH /hub/name", withCORS(httpRequest.HandleHubSetName))
http.HandleFunc("PATCH /hub/color", withCORS(httpRequest.HandleHubSetColor))
http.HandleFunc("DELETE /hub", withCORS(httpRequest.HandleHubRemove))
http.HandleFunc("PATCH /hub/usercolorallowed", withCORS(httpRequest.HandleHubToggleUserColorAllowed))
http.HandleFunc("DELETE /hub/user", withCORS(httpRequest.HandleHubUserRemove))
http.HandleFunc("PATCH /hub/user/name", withCORS(httpRequest.HandleHubRenameUser))
http.HandleFunc("PATCH /hub/self/name", withCORS(httpRequest.HandleHubRenameSelf))
http.HandleFunc("PATCH /hub/user/mute", withCORS(httpRequest.HandleHubToggleMuteUser))
http.HandleFunc("PUT /hub/user/role", withCORS(httpRequest.HandleHubUserAddRole))
http.HandleFunc("DELETE /hub/user/role", withCORS(httpRequest.HandleHubUserRemoveRole))
http.HandleFunc("PUT /hub/role", httpRequest.HandleHubCreateRole)
http.HandleFunc("DELETE /hub/role", withCORS(httpRequest.HandleHubRemoveRole))
http.HandleFunc("PATCH /hub/role/name", withCORS(httpRequest.HandleRoleSetName))
http.HandleFunc("PATCH /hub/role/color", withCORS(httpRequest.HandleRoleSetColor))
http.HandleFunc("PATCH /hub/role/permissions", withCORS(httpRequest.HandleRoleSetPermissions))
http.HandleFunc("DELETE /hub/self/role", withCORS(httpRequest.HandleRoleSelfRemove))
http.HandleFunc("PUT /hub/channel", withCORS(httpRequest.HandleChannelCreate))
http.HandleFunc("DELETE /hub/channel", withCORS(httpRequest.HandleChannelRemove))
http.HandleFunc("PATCH /hub/name", withCORS(httpRequest.HandleChannelSetName))
http.HandleFunc("PATCH /hub/description", withCORS(httpRequest.HandleChannelSetDescription))
http.HandleFunc("POST /connection/message", withCORS(httpRequest.HandleDm)) http.HandleFunc("POST /connection/message", withCORS(httpRequest.HandleDm))
http.HandleFunc("GET /ws", wsServer.ServeWsConnection) http.HandleFunc("GET /ws", wsServer.ServeWsConnection)
packages/cache/cache.go
Vendored
+12
View File
@@ -26,6 +26,18 @@ func GetUserById(id uuid.UUID) (*types.User, error) {
} }
return user, nil return user, nil
} }
func GetUsersByIds(ids []uuid.UUID) (users []*types.User, err error) {
Mu.RLock()
defer Mu.RUnlock()
for _, id := range ids {
user, ok := Users[id]
if !ok {
return nil, fmt.Errorf("if %s not found", id)
}
users = append(users, user)
}
return users, nil
}
func GetUserByName(name string) (*types.User, error) { func GetUserByName(name string) (*types.User, error) {
Mu.RLock() Mu.RLock()
defer Mu.RUnlock() defer Mu.RUnlock()
packages/convertions/convertions.go
+1 -1
View File
@@ -50,7 +50,7 @@ func StringToUuid(str string) (uuid.UUID, error) {
return uuid.Parse(str) return uuid.Parse(str)
} }
func StringToUuidSlice(uuidStr string) ([]uuid.UUID, error) { func StringToUuids(uuidStr string) ([]uuid.UUID, error) {
if uuidStr == "" { if uuidStr == "" {
return nil, errors.New("empty string") return nil, errors.New("empty string")
} }
packages/httpRequest/connectionsAndDms.go
+1 -1
View File
@@ -98,7 +98,7 @@ func HandleUserGetConnectionsUnreadMessages(response http.ResponseWriter, reques
return return
} }
connectionIds, err := convertions.StringToUuidSlice(request.URL.Query().Get("connections")) connectionIds, err := convertions.StringToUuids(request.URL.Query().Get("connections"))
if err != nil { if err != nil {
http.Error(response, "invalid uuid format", http.StatusBadRequest) http.Error(response, "invalid uuid format", http.StatusBadRequest)
return return
packages/httpRequest/hubs.go
+92 -22
View File
@@ -54,31 +54,55 @@ func hubUserHighestRoleId(u *types.HubUser, h *types.Hub) (id uint8) {
return id return id
} }
func updateUserChannelCache(u *types.HubUser, c *types.HubChannel) { func updateChannelCacheForSpecUserAndChannel(u *types.HubUser, c *types.HubChannel) {
c.Mu.Lock() c.Mu.Lock()
defer c.Mu.Unlock() defer c.Mu.Unlock()
if u.Roles.DoesIntersect(c.RolesCanView) {
c.UsersCachedPermissions[u.OriginalId] |= types.CachedUserCanView if u == nil {
delete(c.UsersCachedPermissions, c.Id)
} else { } else {
c.UsersCachedPermissions[u.OriginalId] &^= types.CachedUserCanView if u.Roles.DoesIntersect(c.RolesCanView) {
} c.UsersCachedPermissions[u.OriginalId] |= types.CachedUserCanView
if u.Roles.DoesIntersect(c.RolesCanReadHistory) { } else {
c.UsersCachedPermissions[u.OriginalId] |= types.CachedUserCanReadHistory c.UsersCachedPermissions[u.OriginalId] &^= types.CachedUserCanView
} else { }
c.UsersCachedPermissions[u.OriginalId] &^= types.CachedUserCanReadHistory if u.Roles.DoesIntersect(c.RolesCanReadHistory) {
} c.UsersCachedPermissions[u.OriginalId] |= types.CachedUserCanReadHistory
if u.Roles.DoesIntersect(c.RolesCanMessage) { } else {
c.UsersCachedPermissions[u.OriginalId] |= types.CachedUserCanMessage c.UsersCachedPermissions[u.OriginalId] &^= types.CachedUserCanReadHistory
} else { }
c.UsersCachedPermissions[u.OriginalId] &^= types.CachedUserCanMessage if u.Roles.DoesIntersect(c.RolesCanMessage) {
c.UsersCachedPermissions[u.OriginalId] |= types.CachedUserCanMessage
} else {
c.UsersCachedPermissions[u.OriginalId] &^= types.CachedUserCanMessage
}
} }
} }
func updateChannelCache(c *types.HubChannel, h *types.Hub) { func updateChannelCacheForSpecChannel(c *types.HubChannel, h *types.Hub) {
h.Mu.RLock() h.Mu.RLock()
defer h.Mu.RUnlock() defer h.Mu.RUnlock()
for _, u := range h.Users { for _, u := range h.Users {
updateUserChannelCache(u, c) updateChannelCacheForSpecUserAndChannel(u, c)
}
}
func updateChannelCacheForSpecUser(u *types.HubUser, h *types.Hub) {
h.Mu.RLock()
defer h.Mu.RUnlock()
for _, c := range h.Channels {
updateChannelCacheForSpecUserAndChannel(u, c)
}
}
func updateChannelCacheForSpecRole(r *types.HubRole, h *types.Hub) {
h.Mu.Lock()
defer h.Mu.Unlock()
for _, u := range h.Users {
if !u.Roles.ContainsRoleId(r.Id) {
continue
}
updateChannelCacheForSpecUser(u, h)
} }
} }
@@ -178,9 +202,12 @@ func HandleHubJoin(response http.ResponseWriter, request *http.Request) {
hubUser := types.NewHubUser() hubUser := types.NewHubUser()
hubUser.OriginalId = user.Id hubUser.OriginalId = user.Id
hubUser.Roles.Add(hub.JoinRole.Id) if hub.JoinRole != nil {
hubUser.Roles.Add(hub.JoinRole.Id)
}
hubUser.CreatedAt = time.Now() hubUser.CreatedAt = time.Now()
hub.Users[hubUser.OriginalId] = hubUser hub.Users[hubUser.OriginalId] = hubUser
updateChannelCacheForSpecUser(hubUser, hub)
} }
func HandleHubMessage(response http.ResponseWriter, request *http.Request) { func HandleHubMessage(response http.ResponseWriter, request *http.Request) {
@@ -307,7 +334,7 @@ func HandleGetHubUsers(response http.ResponseWriter, request *http.Request) {
} }
ctx := request.Context() ctx := request.Context()
_, requestor, hub, err := getHubUserIfValidWithResponseOnFail(ctx, response, request) _, requestor, hub, err := getHubUserIfValidWithResponseOnFail(ctx, response, request)
if { if err != nil {
return return
} }
users := make([]*types.HubUser, 0) users := make([]*types.HubUser, 0)
@@ -423,6 +450,7 @@ func HandleHubUserRemove(response http.ResponseWriter, request *http.Request) {
} }
hub.Mu.Lock() hub.Mu.Lock()
delete(hub.Users, targetId) delete(hub.Users, targetId)
updateChannelCacheForSpecUser(target, hub)
hub.Mu.Unlock() hub.Mu.Unlock()
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
} }
@@ -526,6 +554,7 @@ func HandleHubUserAddRole(response http.ResponseWriter, request *http.Request) {
return return
} }
target.Roles.Add(roleId) target.Roles.Add(roleId)
updateChannelCacheForSpecUser(target, hub)
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
} }
@@ -557,6 +586,7 @@ func HandleHubUserRemoveRole(response http.ResponseWriter, request *http.Request
return return
} }
target.Roles.Remove(roleId) target.Roles.Remove(roleId)
updateChannelCacheForSpecUser(target, hub)
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
} }
@@ -709,6 +739,7 @@ func HandleRoleSetPermissions(response http.ResponseWriter, request *http.Reques
return return
} }
madeChange := false
query := request.URL.Query() query := request.URL.Query()
for key, values := range query { for key, values := range query {
permission, ok := types.PermissionLookup(key) permission, ok := types.PermissionLookup(key)
@@ -725,20 +756,35 @@ func HandleRoleSetPermissions(response http.ResponseWriter, request *http.Reques
} }
if convertions.StringToBool(values[0]) { if convertions.StringToBool(values[0]) {
targetRole.Permissions.Grant(permission) if !targetRole.Permissions.Has(permission) {
madeChange = true
targetRole.Permissions.Grant(permission)
}
} else { } else {
targetRole.Permissions.Revoke(permission) if targetRole.Permissions.Has(permission) {
madeChange = true
targetRole.Permissions.Revoke(permission)
}
} }
} }
if !madeChange {
response.WriteHeader(http.StatusNoContent)
response.Write([]byte("no changes made"))
return
}
updateChannelCacheForSpecRole(targetRole, hub)
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
} }
func HandleRoleSelfRemove(response http.ResponseWriter, request *http.Request) { func HandleRoleSelfRemove(response http.ResponseWriter, request *http.Request) {
requestor, _, _, usedRoleId, ok := hubPermissionContext(response, request, normal, types.PermissionUserSelfRoleRemove) requestor, hub, _, usedRoleId, ok := hubPermissionContext(response, request, normal, types.PermissionUserSelfRoleRemove)
if !ok { if !ok {
return return
} }
requestor.Roles.Remove(usedRoleId) requestor.Roles.Remove(usedRoleId)
updateChannelCacheForSpecUser(requestor, hub)
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
} }
@@ -777,7 +823,7 @@ func HandleChannelCreate(response http.ResponseWriter, request *http.Request) {
} }
hub.Mu.Unlock() hub.Mu.Unlock()
updateChannelCache(newHubChannel, hub) updateChannelCacheForSpecChannel(newHubChannel, hub)
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
} }
@@ -824,3 +870,27 @@ func HandleChannelSetName(response http.ResponseWriter, request *http.Request) {
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
} }
func HandleChannelSetDescription(response http.ResponseWriter, request *http.Request) {
_, hub, _, _, ok := hubPermissionContext(response, request, normal, types.PermissionSetChannelDescription)
if !ok {
return
}
newDescription := request.FormValue("description")
channelId, err := convertions.StringToUint8(request.FormValue("id"))
if err != nil {
http.Error(response, "invalid channel id", http.StatusBadRequest)
return
}
hub.Mu.Lock()
channel := hub.Channels[channelId]
if channel == nil {
http.Error(response, "no such channel", http.StatusNotFound)
return
}
channel.Description = newDescription
hub.Mu.Unlock()
response.WriteHeader(http.StatusAccepted)
}
packages/httpRequest/user.go
+34
View File
@@ -252,3 +252,37 @@ func HandleUserGetUser(response http.ResponseWriter, request *http.Request) {
response.WriteHeader(http.StatusAccepted) response.WriteHeader(http.StatusAccepted)
response.Write(userData) response.Write(userData)
} }
func HandleUserGetUsers(response http.ResponseWriter, request *http.Request) {
if !validCheckWithResponseOnFail(response, request, normal) {
return
}
ctx := request.Context()
_, err := getUserByToken(ctx, request.Header.Get("token"))
if err != nil {
http.Error(response, "invalid token", http.StatusUnauthorized)
return
}
targetIds, err := convertions.StringToUuids(request.URL.Query().Get("targetids"))
if err != nil {
http.Error(response, "invalid targetids", http.StatusBadRequest)
return
}
users, err := cache.GetUsersByIds(targetIds)
if err != nil {
http.Error(response, err.Error(), http.StatusBadRequest)
return
}
userData, err := json.Marshal(users)
if err != nil {
http.Error(response, "json parse error", http.StatusInternalServerError)
return
}
response.WriteHeader(http.StatusAccepted)
response.Write(userData)
}