tasiaiso/tildefriends
1
0
Fork 0
forked from cory/tildefriends
Code Issues Pull Requests Releases Wiki Activity

Fixing various badness as I still can't get rooms to work.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4038 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2022-11-13 22:02:54 +00:00
parent 20ebdea9d1
commit 046bf7e2a9
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/ssb.js
View File

@ -96,6 +96,9 @@ function tunnel_attendants(request) {
function send_blobs_create_wants(connection) { function send_blobs_create_wants(connection) {
connection.send_json({'name': ['blobs', 'createWants'], 'type': 'source', 'args': []}, function on_blob_create_wants(message) { connection.send_json({'name': ['blobs', 'createWants'], 'type': 'source', 'args': []}, function on_blob_create_wants(message) {
if (message.message?.name === 'Error') {
return;
}
Object.keys(message.message).forEach(function(id) { Object.keys(message.message).forEach(function(id) {
if (message.message[id] < 0) { if (message.message[id] < 0) {
if (g_wants_requests[connection.id]) { if (g_wants_requests[connection.id]) {
@ -234,6 +237,9 @@ ssb.addRpc(['tunnel', 'isRoom'], function(request) {
}); });
function notify_attendant_changed(id, type) { function notify_attendant_changed(id, type) {
if (!id) {
print(`notify_attendant_changed called with id=${id}`);
}
for (let r of Object.values(g_attendants)) { for (let r of Object.values(g_attendants)) {
try { try {
r.send_json({ r.send_json({
@ -241,8 +247,8 @@ function notify_attendant_changed(id, type) {
id: id, id: id,
}); });
} catch (e) { } catch (e) {
print(`Removing ${r.connection.id} from g_attendants in ${type}.`, e); print(`Removing ${id} from g_attendants in ${type}.`, e);
delete g_attendants[r.connection.id]; delete g_attendants[id];
} }
} }
} }

22
src/ssb.js.c
View File

@ -750,29 +750,9 @@ void tf_ssb_run_file(JSContext* context, const char* file_name)
fclose(file); fclose(file);
JSValue result = JS_Eval(context, source, file_size, file_name, 0); JSValue result = JS_Eval(context, source, file_size, file_name, 0);
if (JS_IsError(context, result)) if (tf_util_report_error(context, result))
{ {
printf("Error running %s.\n", file_name); printf("Error running %s.\n", file_name);
const char* value = JS_ToCString(context, result);
printf("ERROR: %s\n", value);
JS_FreeCString(context, value);
JSValue stack = JS_GetPropertyStr(context, result, "stack");
if (!JS_IsUndefined(stack))
{
const char* stack_str = JS_ToCString(context, stack);
printf("%s\n", stack_str);
JS_FreeCString(context, stack_str);
}
JS_FreeValue(context, stack);
}
else if (JS_IsException(result))
{
printf("Exception running %s.\n", file_name);
JSValue error = JS_GetException(context);
const char* value = JS_ToCString(context, error);
printf("Exception: %s\n", value);
JS_FreeCString(context, value);
JS_FreeValue(context, error);
} }
JSRuntime* runtime = JS_GetRuntime(context); JSRuntime* runtime = JS_GetRuntime(context);