archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

single error event function in socketserver

Browse Source
This commit is contained in:
Thorsten von Eicken 2015-12-13 12:32:09 -08:00
parent 8bb4202834
commit a95ff12049
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/network/esp8266/tests/projects/socket-test-multiple.js
View File

@ -2,7 +2,7 @@
// Test multiple concurrent connections
test_host = "h.voneicken.com"; // <======= confirgure for your local server running the test_http.rb sinatra server
test_host = "h.voneicken.com"; // <======= configure for your local server running the test_http.rb sinatra server
test_port = 4567;
var test_ip = 0; // will be resolved

50
libs/network/socketserver.c
View File

@ -273,6 +273,25 @@ void socketKill(JsNetwork *net) {
#endif
}
// Fire error events on up to two objects if there is an error, returns true if there is an error
// The error events have a code field and a message field.
static bool fireErrorEvent(int error, JsVar *obj1, JsVar *obj2) {
bool hadError = error < 0 && error != SOCKET_ERR_CLOSED;
JsVar *params[1];
if (hadError) {
params[0] = jsvNewWithFlags(JSV_OBJECT);
jsvObjectSetChildAndUnLock(params[0], "code", jsvNewFromInteger(error));
jsvObjectSetChildAndUnLock(params[0], "message",
jsvNewFromString(socketErrorString(error)));
if (obj1 != NULL)
jsiQueueObjectCallbacks(obj1, HTTP_NAME_ON_ERROR, params, 1);
if (obj2 != NULL)
jsiQueueObjectCallbacks(obj2, HTTP_NAME_ON_ERROR, params, 1);
jsvUnLock(params[0]);
}
return hadError;
}
// -----------------------------
bool socketServerConnectionsIdle(JsNetwork *net) {
@ -367,21 +386,11 @@ bool socketServerConnectionsIdle(JsNetwork *net) {
}
jsvUnLock(receiveData);
// fire the error listeners
bool hadError = error < 0 && error != SOCKET_ERR_CLOSED;
JsVar *params[1];
if (hadError) {
params[0] = jsvNewWithFlags(JSV_OBJECT);
jsvObjectSetChildAndUnLock(params[0], "code", jsvNewFromInteger(error));
jsvObjectSetChildAndUnLock(params[0], "message",
jsvNewFromString(socketErrorString(error)));
jsiQueueObjectCallbacks(connection, HTTP_NAME_ON_ERROR, params, 1);
jsiQueueObjectCallbacks(socket, HTTP_NAME_ON_ERROR, params, 1);
jsvUnLock(params[0]);
}
// fire error events
bool hadError = fireErrorEvent(error, connection, socket);
// fire the close listeners
params[0] = jsvNewFromBool(hadError);
JsVar *params[1] = { jsvNewFromBool(hadError) };
jsiQueueObjectCallbacks(connection, HTTP_NAME_ON_CLOSE, params, 1);
jsiQueueObjectCallbacks(socket, HTTP_NAME_ON_CLOSE, params, 1);
jsvUnLock(params[0]);
@ -538,20 +547,11 @@ bool socketClientConnectionsIdle(JsNetwork *net) {
jsvUnLock(connectionName);
socketClosed = true;
// we have an error if the socket wasn't closed orderly
bool hadError = error < 0 && error != SOCKET_ERR_CLOSED;
JsVar *params[1];
if (hadError) {
params[0] = jsvNewWithFlags(JSV_OBJECT);
jsvObjectSetChildAndUnLock(params[0], "code", jsvNewFromInteger(error));
jsvObjectSetChildAndUnLock(params[0], "message",
jsvNewFromString(socketErrorString(error)));
jsiQueueObjectCallbacks(connection, HTTP_NAME_ON_ERROR, params, 1);
jsvUnLock(params[0]);
}
// fire error event, if ther eis an error
bool hadError = fireErrorEvent(error, connection, NULL);
// close callback must happen after error callback
params[0] = jsvNewFromBool(hadError);
JsVar *params[1] = { jsvNewFromBool(hadError) };
jsiQueueObjectCallbacks(socket, HTTP_NAME_ON_CLOSE, params, 1);
jsvUnLock(params[0]);
}