MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-07 19:13:20 +00:00
Code Issues Releases Wiki Activity

1. Added 'removeListener' event to EventEmitter

Browse Source 
2. Fixed bug with callback deletions in EventEmitter.removeAllListeners
This commit is contained in:
Bryan Roe
2020-06-01 11:21:12 -07:00
parent c97a58f037
commit fa983efa6f
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
microscript/ILibduktape_EventEmitter.c
View File

@@ -465,6 +465,12 @@ duk_ret_t ILibDuktape_EventEmitter_removeListener(duk_context *ctx)
ILibLinkedList_Remove(node);
emitter->totalListeners[0]--;
ILibDuktape_EventEmitter_SetupEmit(ctx, emitter->object, "removeListener"); // [emit][this][removeListener]
duk_dup(ctx, 0); // [emit][this][removeListener][name]
duk_dup(ctx, 1); // [emit][this][removeListener][name][callback]
if (duk_pcall_method(ctx, 3) != 0) { ILibDuktape_Process_UncaughtException(ctx); }
duk_pop(ctx); // ...
// Delete reference to saved callback
duk_push_heapptr(ctx, emitter->tmpObject);
duk_del_prop_string(ctx, -1, Duktape_GetStashKey(callback));
@@ -485,15 +491,28 @@ duk_ret_t ILibDuktape_EventEmitter_removeAllListeners(duk_context *ctx)
eventList = ILibHashtable_Get(emitter->eventTable, NULL, eventName, (int)eventNameLen);
if (eventList == NULL) { return(ILibDuktape_Error(ctx, "EventEmitter.removeAllListeners(): Event '%s' not found", eventName)); }
duk_push_heapptr(ctx, emitter->tmpObject);
duk_push_array(ctx); // [array]
duk_push_heapptr(ctx, emitter->tmpObject); // [array][tmpObject]
while ((node=ILibLinkedList_GetNode_Head(eventList)) != NULL)
{
{ // [array][tmpObject][callback]
duk_get_prop_string(ctx, -1, Duktape_GetStashKey(ILibLinkedList_GetDataFromNode(node)));
duk_array_push(ctx, -3); // [array][tmpObject]
// Delete reference to callback function
duk_del_prop_string(ctx, -1, Duktape_GetStashKey(((ILibDuktape_EventEmitter_EmitStruct*)ILibLinkedList_GetDataFromNode(node))->func));
duk_del_prop_string(ctx, -1, Duktape_GetStashKey(ILibLinkedList_GetDataFromNode(node)));
ILibLinkedList_Remove(node);
}
duk_pop(ctx);
duk_pop(ctx); // [array]
emitter->totalListeners[0] = 0;
while (duk_get_length(ctx, -1) > 0)
{
ILibDuktape_EventEmitter_SetupEmit(ctx, emitter->object, "removeListener"); // [array][emit][this][removeListener]
duk_dup(ctx, 0); // [array][emit][this][removeListener][name]
duk_array_pop(ctx, -5); // [array][emit][this][removeListener][name][callback]
if (duk_pcall_method(ctx, 3) != 0) { ILibDuktape_Process_UncaughtException(ctx); }
duk_pop(ctx); // [array]
}
duk_pop(ctx); // ...
}
return(0);
}
@@ -645,7 +664,9 @@ ILibDuktape_EventEmitter* ILibDuktape_EventEmitter_Create(duk_context *ctx)
ILibDuktape_CreateInstanceMethod(ctx, "eventNames", ILibDuktape_EventEmitter_eventNames, 0);
ILibDuktape_CreateInstanceMethod(ctx, "listenerCount", ILibDuktape_EventEmitter_listenerCount, 1);
ILibDuktape_CreateInstanceMethod(ctx, "removeListener", ILibDuktape_EventEmitter_removeListener, 2);
ILibDuktape_EventEmitter_CreateEventEx(retVal, "removeListener");
ILibDuktape_CreateProperty_InstanceMethod(ctx, "removeListener", ILibDuktape_EventEmitter_removeListener, 2);
ILibDuktape_CreateInstanceMethod(ctx, "removeAllListeners", ILibDuktape_EventEmitter_removeAllListeners, DUK_VARARGS);
ILibDuktape_CreateInstanceMethod(ctx, "emit", ILibDuktape_EventEmitter_emit, DUK_VARARGS);
ILibDuktape_CreateInstanceMethod(ctx, "emit_returnValue", ILibDuktape_EventEmitter_emitReturnValue, DUK_VARARGS);