Permalink
Browse files

websocket, break: deprecated WebSocketHandler.

  • Loading branch information...
xicilion committed Oct 20, 2017
1 parent 8d00946 commit c39d7037f0cbdefa7d3d7019c301f82d9a45d372
View
@@ -277,7 +277,6 @@
<ClInclude Include="include\ifs\Timer.h" />
<ClInclude Include="include\ifs\UrlObject.h" />
<ClInclude Include="include\ifs\WebSocket.h" />
<ClInclude Include="include\ifs\WebSocketHandler.h" />
<ClInclude Include="include\ifs\WebSocketMessage.h" />
<ClInclude Include="include\ifs\WebView.h" />
<ClInclude Include="include\ifs\Worker.h" />
@@ -672,9 +672,6 @@
<ClInclude Include="include\ifs\WebSocket.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\WebSocketHandler.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\WebSocketMessage.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
View
@@ -277,7 +277,6 @@
<ClInclude Include="include\ifs\Timer.h" />
<ClInclude Include="include\ifs\UrlObject.h" />
<ClInclude Include="include\ifs\WebSocket.h" />
<ClInclude Include="include\ifs\WebSocketHandler.h" />
<ClInclude Include="include\ifs\WebSocketMessage.h" />
<ClInclude Include="include\ifs\WebView.h" />
<ClInclude Include="include\ifs\Worker.h" />
@@ -672,9 +672,6 @@
<ClInclude Include="include\ifs\WebSocket.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\WebSocketHandler.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\WebSocketMessage.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -5,54 +5,24 @@
* Author: lion
*/
#include "ifs/WebSocketHandler.h"
#include "ifs/Handler.h"
#include "Stats.h"
#ifndef WEBSOCKETHANDLER_H_
#define WEBSOCKETHANDLER_H_
namespace fibjs {
class WebSocketHandler : public WebSocketHandler_base {
class WebSocketHandler : public Handler_base {
FIBER_FREE();
public:
WebSocketHandler();
WebSocketHandler(v8::Local<v8::Function> accept);
public:
// object_base
virtual result_t dispose()
{
return CHECK_ERROR(CALL_E_INVALID_CALL);
}
public:
// Handler_base
virtual result_t invoke(object_base* v, obj_ptr<Handler_base>& retVal,
AsyncEvent* ac);
public:
// HandlerEx_base
virtual result_t onerror(v8::Local<v8::Object> hdlrs);
virtual result_t get_handler(obj_ptr<Handler_base>& retVal);
virtual result_t set_handler(Handler_base* newVal);
virtual result_t get_stats(obj_ptr<Stats_base>& retVal);
public:
// WebSocketHandler_base
virtual result_t get_maxSize(int32_t& retVal);
virtual result_t set_maxSize(int32_t newVal);
public:
obj_ptr<Stream_base> m_stm;
obj_ptr<Stats> m_stats;
private:
obj_ptr<Handler_base> m_hdlr;
obj_ptr<Handler_base> m_err_hdlr;
int32_t m_maxSize;
bool m_event;
};
} /* namespace fibjs */

This file was deleted.

Oops, something went wrong.
View
@@ -17,7 +17,6 @@
namespace fibjs {
class WebSocketMessage_base;
class WebSocketHandler_base;
class WebSocket_base;
class Stream_base;
class Handler_base;
@@ -75,7 +74,6 @@ class ws_base : public object_base {
}
#include "WebSocketMessage.h"
#include "WebSocketHandler.h"
#include "WebSocket.h"
#include "Stream.h"
#include "Handler.h"
@@ -91,7 +89,6 @@ inline ClassInfo& ws_base::class_info()
static ClassData::ClassObject s_object[] = {
{ "Message", WebSocketMessage_base::class_info },
{ "Handler", WebSocketHandler_base::class_info },
{ "Socket", WebSocket_base::class_info }
};
Oops, something went wrong.

0 comments on commit c39d703

Please sign in to comment.