jacob/coms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated history approach.

Browse Source
This commit is contained in:
Jacob Signorovitch
2026-02-14 22:43:42 -05:00
parent fddd499398
commit 9985473ceb
2 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/public/wsModule.js
View File

@@ -56,19 +56,6 @@ export function initWebSocket(username, chatEl, inputContainer, usersListEl) {
users.forEach(({ id, username }) => addUser(id, username)); users.forEach(({ id, username }) => addUser(id, username));
const groups = getGroupedUsers(); const groups = getGroupedUsers();
usersListEl.innerHTML = "Online: " + groups.join(", "); usersListEl.innerHTML = "Online: " + groups.join(", ");
// Replay chat history.
const history = packet.data.history || [];
history.forEach((raw) => {
try {
const histPkt = JSON.parse(raw);
if (histPkt.type === "msg-event") {
const { id, username: u, content, ts, parent } = histPkt.data;
addMessage({ id, username: u, content, ts, parent });
}
} catch (e) {
console.error("Invalid history entry", raw);
}
});
//addNotice(`<i>Users online: ${groups.join(", ")}</i>`); //addNotice(`<i>Users online: ${groups.join(", ")}</i>`);
break; break;
} }

39
server/src/chat.c
View File

@@ -98,7 +98,7 @@ int cb_chat(
for (Session* s = head; s; s = s->next) { for (Session* s = head; s; s = s->next) {
if (session_has_username(s)) { if (session_has_username(s)) {
yyjson_mut_val* uobj = yyjson_mut_obj(wdoc); yyjson_mut_val* uobj = yyjson_mut_obj(wdoc);
yyjson_mut_arr_add_val(wusers, uobj); /* add each user once */
yyjson_mut_arr_add_val(wusers, uobj); yyjson_mut_arr_add_val(wusers, uobj);
yyjson_mut_obj_add_uint( yyjson_mut_obj_add_uint(
wdoc, uobj, "id", session_get_id(s) wdoc, uobj, "id", session_get_id(s)
@@ -108,19 +108,7 @@ int cb_chat(
); );
} }
} }
// Include last 100 messages in the welcome history array. // History will be streamed individually after welcome.
yyjson_mut_val* whist = yyjson_mut_arr(wdoc);
yyjson_mut_obj_add_val(wdoc, wdata, "history", whist);
for (size_t i = 0; i < history_count; ++i) {
size_t idx =
(history_pos + HISTORY_SIZE - history_count + i) %
HISTORY_SIZE;
// Append raw JSON string into history array.
yyjson_mut_val* raw = yyjson_mut_strn(
wdoc, history[idx], history_len[idx]
);
yyjson_mut_arr_add_val(whist, raw);
}
size_t out_len; size_t out_len;
char* out = yyjson_mut_write(wdoc, 0, &out_len); char* out = yyjson_mut_write(wdoc, 0, &out_len);
@@ -129,10 +117,8 @@ int cb_chat(
: SESSION_CHAT_BUF_SIZE; : SESSION_CHAT_BUF_SIZE;
sess->buf_len = copy_len; sess->buf_len = copy_len;
memcpy(&sess->buf[LWS_PRE], out, copy_len); memcpy(&sess->buf[LWS_PRE], out, copy_len);
lws_write( // Schedule the welcome frame for writable callback.
sess->wsi, &sess->buf[LWS_PRE], sess->buf_len, lws_callback_on_writable(sess->wsi);
LWS_WRITE_TEXT
);
free(out); free(out);
yyjson_mut_doc_free(wdoc); yyjson_mut_doc_free(wdoc);
@@ -289,6 +275,21 @@ int cb_chat(
sess->wsi, &sess->buf[LWS_PRE], sess->buf_len, sess->wsi, &sess->buf[LWS_PRE], sess->buf_len,
LWS_WRITE_TEXT LWS_WRITE_TEXT
); );
// #1b: Stream history messages to new client.
for (size_t i = 0; i < history_count; ++i) {
size_t idx =
(history_pos + HISTORY_SIZE - history_count + i) %
HISTORY_SIZE;
size_t hist_len = history_len[idx];
size_t send_len = hist_len < SESSION_CHAT_BUF_SIZE
? hist_len
: SESSION_CHAT_BUF_SIZE;
memcpy(&sess->buf[LWS_PRE], history[idx], send_len);
lws_write(
sess->wsi, &sess->buf[LWS_PRE], send_len,
LWS_WRITE_TEXT
);
}
free(ack_out); free(ack_out);
yyjson_mut_doc_free(ackdoc); yyjson_mut_doc_free(ackdoc);
} }
@@ -312,7 +313,7 @@ int cb_chat(
size_t out_len; size_t out_len;
char* out = yyjson_mut_write(mdoc, 0, &out_len); char* out = yyjson_mut_write(mdoc, 0, &out_len);
/* Store this msg-event JSON in the circular history buffer */ // Store this msg-event JSON in the circular history buffer.
if (history_count == HISTORY_SIZE) { if (history_count == HISTORY_SIZE) {
free(history[history_pos]); free(history[history_pos]);
} else { } else {