Code changes for nkolban#329

nkolban · nkolban · commit 3943f99a5dba · 2017-12-30T19:20:22.000-06:00
Note that this is an interface breaking change.
diff --git a/cpp_utils/WebSocket.cpp b/cpp_utils/WebSocket.cpp
@@ -158,7 +158,7 @@ class WebSocketReader: public Task {
 				case OPCODE_BINARY: {
 					if (pWebSocketHandler != nullptr) {
 						WebSocketInputStreambuf streambuf(pWebSocket->getSocket(), payloadLen, frame.mask==1?mask:nullptr);
-						pWebSocketHandler->onMessage(&streambuf);
+						pWebSocketHandler->onMessage(&streambuf, pWebSocket);
 						//streambuf.discard();
 					}
 					break;
@@ -203,7 +203,8 @@ class WebSocketReader: public Task {
  * If no over-riding handler is provided for the "close" event, this method is called.
  */
 void WebSocketHandler::onClose() {
-	ESP_LOGD("WebSocketHandler", ">> WebSocketHandler:onClose()");
+	ESP_LOGD("WebSocketHandler", ">> onClose");
+	ESP_LOGD("WebSocketHandler", "<< onClose");
 } // onClose
 
 
@@ -217,8 +218,9 @@ void WebSocketHandler::onClose() {
  * ```
  * This will read the whole message into the string stream.
  */
-void WebSocketHandler::onMessage(WebSocketInputStreambuf* pWebSocketInputStreambuf) {
-	ESP_LOGD("WebSocketHandler", ">> onMessage")
+void WebSocketHandler::onMessage(WebSocketInputStreambuf* pWebSocketInputStreambuf, WebSocket *pWebSocket) {
+	ESP_LOGD("WebSocketHandler", ">> onMessage");
+	ESP_LOGD("WebSocketHandler", "<< onMessage");
 } // onData
 
 
@@ -227,7 +229,8 @@ void WebSocketHandler::onMessage(WebSocketInputStreambuf* pWebSocketInputStreamb
  * If no over-riding handler is provided for the "error" event, this method is called.
  */
 void WebSocketHandler::onError(std::string error) {
-	ESP_LOGD("WebSocketHandler", ">> WebSocketHandler:onError()");
+	ESP_LOGD("WebSocketHandler", ">> onError: %s", error.c_str());
+	ESP_LOGD("WebSocketHandler", "<< onError");
 } // onError
 
 
diff --git a/cpp_utils/WebSocket.h b/cpp_utils/WebSocket.h
@@ -13,6 +13,7 @@
 #undef close
 #undef send
 class WebSocketReader;
+class WebSocket;
 
 // +-------------------------------+
 // | WebSocketInputStreambuf |
@@ -45,7 +46,7 @@ class WebSocketHandler {
 public:
 	virtual ~WebSocketHandler();
 	virtual void onClose();
-	virtual void onMessage(WebSocketInputStreambuf *pWebSocketInputStreambuf);
+	virtual void onMessage(WebSocketInputStreambuf *pWebSocketInputStreambuf, WebSocket *pWebSocket);
 	virtual void onError(std::string error);
 };
 
