Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/84.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Read ephemeral events from the stable `ephemeral` transaction key, falling back to the unstable MSC2409 key. Fixes ephemeral events (typing, receipts, presence) being dropped from spec-compliant homeservers.
5 changes: 4 additions & 1 deletion src/app-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,10 @@ export class AppService extends EventEmitter {
}

const events = req.body.events || [];
const ephemeral = req.body["de.sorunome.msc2409.ephemeral"] || [];
// Ephemeral events are delivered under the stable `ephemeral` key by
// spec-compliant homeservers; fall back to the unstable MSC2409 key for
// older ones. See https://spec.matrix.org/v1.13/application-service-api/#put_matrixappv1transactionstxnid
const ephemeral = req.body.ephemeral || req.body["de.sorunome.msc2409.ephemeral"] || [];

if (this.lastProcessedTxnId === txnId) {
res.send({}); // duplicate
Expand Down
56 changes: 56 additions & 0 deletions test/test_app-service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { AppService } from "../src/app-service";
import { expect } from "chai";
import { Request, Response } from "express";

const HS_TOKEN = "hstoken";

function mockReq(txnId: string, body: unknown): Request {
return {
params: { txnId },
query: { access_token: HS_TOKEN },
headers: {},
body,
} as unknown as Request;
}

function mockRes(): Response {
return {
status() { return this; },
send() { return this; },
} as unknown as Response;
}

describe("AppService", () => {
describe("onTransaction ephemeral events", () => {
function receive(body: unknown): Record<string, unknown>[] {
const appservice = new AppService({ homeserverToken: HS_TOKEN });
const received: Record<string, unknown>[] = [];
appservice.on("ephemeral", (ev) => received.push(ev));
// onTransaction is private; exercise it directly with a valid token
(appservice as unknown as { onTransaction: (req: Request, res: Response) => void })
.onTransaction(mockReq("1", body), mockRes());
return received;
}

function mockReceipt() {
return { type: "m.receipt", content: { "!e:example.org": { "m.read": { "@u:example.org": { ts: Date.now() } } } } };
}

it("emits ephemeral events sent under the stable `ephemeral` key", () => {
const receipt = mockReceipt();
expect(receive({ ephemeral: [receipt] })).to.deep.equal([receipt]);
});

it("still emits ephemeral events under the unstable MSC2409 key", () => {
const receipt = mockReceipt();
expect(receive({ "de.sorunome.msc2409.ephemeral": [receipt] })).to.deep.equal([receipt]);
});
Comment thread
AndrewFerr marked this conversation as resolved.

it("prefers the stable key when both are present", () => {
const stable = { type: "m.receipt", content: { stable: true } };
const unstable = { type: "m.receipt", content: { stable: false } };
expect(receive({ ephemeral: [stable], "de.sorunome.msc2409.ephemeral": [unstable] }))
.to.deep.equal([stable]);
});
});
});
Loading