mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 01:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Execute websocket callbacks in the ui thread

Browse Source
This commit is contained in:
lampysprites 2021-10-02 18:34:17 +07:00
parent 22e3e6244a
commit 2aa3fdbd95
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/script/websocket_class.cpp
View File

@ -11,9 +11,9 @@
#include "app/app.h" #include "app/app.h"
#include "app/console.h" #include "app/console.h"
#include "app/script/docobj.h"
#include "app/script/engine.h" #include "app/script/engine.h"
#include "app/script/luacpp.h" #include "app/script/luacpp.h"
#include "ui/system.h"
#include <ixwebsocket/IXNetSystem.h> #include <ixwebsocket/IXNetSystem.h>
#include <ixwebsocket/IXWebSocket.h> #include <ixwebsocket/IXWebSocket.h>
@ -46,19 +46,25 @@ int WebSocket_new(lua_State* L)
if (type == LUA_TFUNCTION) { if (type == LUA_TFUNCTION) {
int onreceiveRef = luaL_ref(L, LUA_REGISTRYINDEX); int onreceiveRef = luaL_ref(L, LUA_REGISTRYINDEX);
ws->setOnMessageCallback([L, ws, onreceiveRef](const ix::WebSocketMessagePtr& msg) { ws->setOnMessageCallback(
lua_rawgeti(L, LUA_REGISTRYINDEX, onreceiveRef); [L, ws, onreceiveRef](const ix::WebSocketMessagePtr& msg) {
lua_pushnumber(L, (msg->binary ? MESSAGE_TYPE_BINARY : static_cast<int>(msg->type))); int msgType =
lua_pushlstring(L, msg->str.c_str(), msg->str.length()); (msg->binary ? MESSAGE_TYPE_BINARY : static_cast<int>(msg->type));
std::string msgData = msg->str;
if (lua_pcall(L, 2, 0, 0)) { ui::execute_from_ui_thread([=]() {
if (const char* s = lua_tostring(L, -1)) { lua_rawgeti(L, LUA_REGISTRYINDEX, onreceiveRef);
App::instance()->scriptEngine()->consolePrint(s); lua_pushinteger(L, msgType);
ws->disableAutomaticReconnection(); lua_pushlstring(L, msgData.c_str(), msgData.length());
ws->close();
} if (lua_pcall(L, 2, 0, 0)) {
} if (const char* s = lua_tostring(L, -1)) {
}); App::instance()->scriptEngine()->consolePrint(s);
ws->stop();
}
}
});
});
} }
else { else {
lua_pop(L, 1); lua_pop(L, 1);
@ -114,7 +120,6 @@ int WebSocket_connect(lua_State* L)
{ {
auto ws = get_ptr<ix::WebSocket>(L, 1); auto ws = get_ptr<ix::WebSocket>(L, 1);
lua_pop(L, 1); lua_pop(L, 1);
ws->enableAutomaticReconnection();
ws->start(); ws->start();
return 0; return 0;
} }
@ -123,8 +128,7 @@ int WebSocket_close(lua_State* L)
{ {
auto ws = get_ptr<ix::WebSocket>(L, 1); auto ws = get_ptr<ix::WebSocket>(L, 1);
lua_pop(L, 1); lua_pop(L, 1);
ws->disableAutomaticReconnection(); ws->stop();
ws->close();
return 0; return 0;
} }