cadence/out-of-your-element
cadence/out-of-your-element
4
10
Fork 7
Code Issues 15 Pull requests 3 Releases 32 Activity

Various homeserver state FST and queue fixes #101

Open
l1s5 wants to merge 6 commits from l1s5/out-of-your-element:homeserver-online-check-fixes into main
pull from: l1s5/out-of-your-element:homeserver-online-check-fixes
merge into: cadence:main
Conversation 1 Commits 6 Files changed 4 +16 -11
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2c650742f0 - Show all commits

matrix: refactor d2m packet enqueuing

Prev Next 
Merge `setErrorWithPacket` into `queuePacket`.
Also set a more accurate type.
l1s5 2026-10-28 07:48:04 +09:00
commit 2c650742f0
Signed by untrusted user: l1s5
GPG key ID: D0A90CC905B58D9B

2
src/m2d/event-dispatcher.js
View file

@ -130,7 +130,7 @@ async function sendError(roomID, source, type, e, payload) {
|| (e instanceof mreq.MatrixServerError && [502, 503].includes(e.httpStatus) && e.errcode === "CX_SERVER_ERROR") || (e instanceof mreq.MatrixServerError && [502, 503].includes(e.httpStatus) && e.errcode === "CX_SERVER_ERROR")
) { ) {
// Matrix homeserver is down (reverse proxy indicated failure) // Matrix homeserver is down (reverse proxy indicated failure)
homeserverStatus.homeserverStatus.setErrorWithPacket([source, payload]) homeserverStatus.homeserverStatus.queuePacket([source, payload])
} }
} }
} }

21
src/matrix/homeserver-status.js
View file

@ -1,8 +1,8 @@
// @ts-check // @ts-check
const assert = require("assert").strict
const Denque = require("denque") const Denque = require("denque")
const StateMachine = require("snowtransfer").StateMachine const StateMachine = require("snowtransfer").StateMachine
const Ty = require("../types")
const passthrough = require("../passthrough") const passthrough = require("../passthrough")
const {sync} = passthrough const {sync} = passthrough
@ -140,19 +140,24 @@ const homeserverStatus = sync.remember(() => new class HomeserverStatus {
} }
/** /**
* When not real time, call this for incoming packets to queue them to be sent in order later. * Queue a packet to be sent in order later, particularly when the homeserver is not realtime.
*
* Queueing while realtime implies the homeserver went down, so this also transitions the state to offline.
*
* @param {["Discord", import("cloudstorm").IGatewayMessage]
* | ["Matrix", Ty.Event.Outer<any>]} sourceAndPacket
*/ */
queuePacket(sourceAndPacket) { queuePacket(sourceAndPacket) {
assert(!this.isRealTime()) if (this.sm.currentStateName === "recovering" && this.queue.peekFront()?.[1] === sourceAndPacket[1]) {
this.queue.push(sourceAndPacket) this.sm.doTransition("error")
return
} }
setErrorWithPacket(sourceAndPacket) { if (this.isRealTime()) {
const wasRecovering = this.sm.currentStateName === "recovering"
this.sm.doTransition("error") this.sm.doTransition("error")
if (!wasRecovering) { // if was recovering then sourceAndPacket is already in the right place in queue
this.queuePacket(sourceAndPacket)
} }
this.queue.push(sourceAndPacket)
} }
}) })