lightcrystal/underbbs
2
1
Fork 0
Code Issues 15 Pull requests Projects 1 Releases Packages Wiki Activity

don't add redundant IDs to batch timers, close data channel properly

Browse source
This commit is contained in:
Iris Lightshard 2024-08-22 19:49:17 -06:00
parent bb7d4e2f7d
commit 7a2eb99eb6
Signed by: nilix
GPG key ID: 688407174966CAF3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/ts/batch-timer.ts
View file

@ -10,9 +10,11 @@ export class BatchTimer {
} }
public queue(id: string, timeout: number){ public queue(id: string, timeout: number){
this._timer = new Date().getTime() + timeout; if (!this._batch.includes(id)) {
this._batch.push(id); this._timer = new Date().getTime() + timeout;
setTimeout(this.checkBatch.bind(this), timeout); this._batch.push(id);
setTimeout(this.checkBatch.bind(this), timeout);
}
} }
private checkBatch() { private checkBatch() {

3
server/server.go
View file

@ -98,6 +98,7 @@ func (self *BBSServer) subscribeHandler(w http.ResponseWriter, r *http.Request)
case <-ctx.Done(): case <-ctx.Done():
fmt.Println("subscriber has disconnected") fmt.Println("subscriber has disconnected")
close(s.data)
return //ctx.Err() return //ctx.Err()
} }
} }
@ -109,6 +110,8 @@ func (self *BBSServer) subscribeHandler(w http.ResponseWriter, r *http.Request)
// block on the data channel, serializing and passing the data to the subscriber // block on the data channel, serializing and passing the data to the subscriber
listen([]chan models.SocketData{s.data}, s.msgs) listen([]chan models.SocketData{s.data}, s.msgs)
fmt.Println("data listener is done!")
if errors.Is(err, context.Canceled) { if errors.Is(err, context.Canceled) {
return return
} }