fix(gateway): don"t let webchat clobber last route
This commit is contained in:
@@ -893,6 +893,70 @@ describe("gateway server", () => {
|
|||||||
await server.close();
|
await server.close();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("chat.send does not overwrite last delivery route", async () => {
|
||||||
|
const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-gw-"));
|
||||||
|
testSessionStorePath = path.join(dir, "sessions.json");
|
||||||
|
await fs.writeFile(
|
||||||
|
testSessionStorePath,
|
||||||
|
JSON.stringify(
|
||||||
|
{
|
||||||
|
main: {
|
||||||
|
sessionId: "sess-main",
|
||||||
|
updatedAt: Date.now(),
|
||||||
|
lastChannel: "whatsapp",
|
||||||
|
lastTo: "+1555",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
null,
|
||||||
|
2,
|
||||||
|
),
|
||||||
|
"utf-8",
|
||||||
|
);
|
||||||
|
|
||||||
|
const { server, ws } = await startServerWithClient();
|
||||||
|
ws.send(
|
||||||
|
JSON.stringify({
|
||||||
|
type: "hello",
|
||||||
|
minProtocol: 1,
|
||||||
|
maxProtocol: 1,
|
||||||
|
client: { name: "test", version: "1", platform: "test", mode: "test" },
|
||||||
|
caps: [],
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
await onceMessage(ws, (o) => o.type === "hello-ok");
|
||||||
|
|
||||||
|
const reqId = "chat-route";
|
||||||
|
ws.send(
|
||||||
|
JSON.stringify({
|
||||||
|
type: "req",
|
||||||
|
id: reqId,
|
||||||
|
method: "chat.send",
|
||||||
|
params: {
|
||||||
|
sessionKey: "main",
|
||||||
|
message: "hello",
|
||||||
|
idempotencyKey: "idem-route",
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
const res = await onceMessage(
|
||||||
|
ws,
|
||||||
|
(o) => o.type === "res" && o.id === reqId,
|
||||||
|
);
|
||||||
|
expect(res.ok).toBe(true);
|
||||||
|
|
||||||
|
const stored = JSON.parse(
|
||||||
|
await fs.readFile(testSessionStorePath, "utf-8"),
|
||||||
|
) as {
|
||||||
|
main?: { lastChannel?: string; lastTo?: string };
|
||||||
|
};
|
||||||
|
expect(stored.main?.lastChannel).toBe("whatsapp");
|
||||||
|
expect(stored.main?.lastTo).toBe("+1555");
|
||||||
|
|
||||||
|
ws.close();
|
||||||
|
await server.close();
|
||||||
|
});
|
||||||
|
|
||||||
test("presence includes client fingerprint", async () => {
|
test("presence includes client fingerprint", async () => {
|
||||||
const { server, ws } = await startServerWithClient();
|
const { server, ws } = await startServerWithClient();
|
||||||
ws.send(
|
ws.send(
|
||||||
|
|||||||
@@ -868,9 +868,7 @@ export async function startGatewayServer(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const { cfg, storePath, store, entry } = loadSessionEntry(
|
const { storePath, store, entry } = loadSessionEntry(p.sessionKey);
|
||||||
p.sessionKey,
|
|
||||||
);
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const sessionId = entry?.sessionId ?? randomUUID();
|
const sessionId = entry?.sessionId ?? randomUUID();
|
||||||
const sessionEntry: SessionEntry = {
|
const sessionEntry: SessionEntry = {
|
||||||
@@ -882,12 +880,6 @@ export async function startGatewayServer(
|
|||||||
lastChannel: entry?.lastChannel,
|
lastChannel: entry?.lastChannel,
|
||||||
lastTo: entry?.lastTo,
|
lastTo: entry?.lastTo,
|
||||||
};
|
};
|
||||||
const mainKey =
|
|
||||||
(cfg.inbound?.reply?.session?.mainKey ?? "main").trim() || "main";
|
|
||||||
if (p.sessionKey === mainKey) {
|
|
||||||
sessionEntry.lastChannel = "webchat";
|
|
||||||
delete sessionEntry.lastTo;
|
|
||||||
}
|
|
||||||
if (store) {
|
if (store) {
|
||||||
store[p.sessionKey] = sessionEntry;
|
store[p.sessionKey] = sessionEntry;
|
||||||
if (storePath) {
|
if (storePath) {
|
||||||
|
|||||||
Reference in New Issue
Block a user