Add client socket support for 'html-cast' functionality to thin client.

5 files changed, 126 insertions, 0 deletions

diff --git a/ctor.cc b/ctor.cc
index 058506f..fa30fdc 100644
--- a/ctor.cc
+++ b/ctor.cc
@@ -18,6 +18,8 @@ BuildConfigurations myConfigs()
 				"src/moc_mainwindow.cc",
 				"src/viewer.cc",
 				"src/moc_viewer.cc",
+				"src/client.cc",
+				"src/moc_client.cc",
 			},
 			.flags = {
 				.cxxflags = {
@@ -25,12 +27,14 @@ BuildConfigurations myConfigs()
 					"-I/usr/include/qt5/QtCore",
 					"-I/usr/include/qt5/QtGui",
 					"-I/usr/include/qt5/QtWidgets",
+					"-I/usr/include/qt5/QtNetwork",
 					"-fPIC",
 					"-Wall", "-Werror", "-Wextra",// "-Wconversion",
 					"-g",
 				},
 				.ldflags = {
 					"-lQt5Core",
+					"-lQt5Network",
 					"-lQt5Gui",
 					"-lQt5Widgets",
 					"-lsqlite3",
diff --git a/src/client.cc b/src/client.cc
new file mode 100644
index 0000000..bcc7958
--- /dev/null
+++ b/src/client.cc
@@ -0,0 +1,77 @@
+#include "client.h"
+
+#include <QTcpSocket>
+#include <QTimer>
+
+Client::Client(QObject *parent)
+	: QObject(parent)
+{
+	socket = new QTcpSocket(this);
+	connect(socket, &QTcpSocket::errorOccurred,
+	        this, &Client::errorOccurred);
+	connect(socket, &QTcpSocket::connected,
+	        this, &Client::connected);
+	connect(socket, &QTcpSocket::disconnected,
+	        this, &Client::disconnected);
+
+	timer = new QTimer(this);
+	timer->setSingleShot(true);
+	connect(timer, &QTimer::timeout, this, &Client::timeout);
+}
+
+bool Client::connectToHost(const QString& host)
+{
+	this->host = host;
+	retryConnect();
+	return true;
+}
+
+bool Client::writeData(const QByteArray& data)
+{
+	if(socket->state() != QAbstractSocket::ConnectedState)
+	{
+		return false;
+	}
+
+	socket->write(data);
+	return socket->waitForBytesWritten(100); // wait at most 100ms
+}
+
+void Client::errorOccurred(QAbstractSocket::SocketError socketError)
+{
+	if(socketError == QAbstractSocket::NetworkError ||
+	   socketError == QAbstractSocket::ConnectionRefusedError)
+	{
+		if(retries > 0)
+		{
+			timer->setInterval(interval * 1000);
+			retries--;
+		}
+		else
+		{
+			timer->setInterval(interval_long * 1000);
+		}
+		timer->start();
+	}
+}
+
+void Client::connected()
+{
+	emit isConnected();
+}
+
+void Client::disconnected()
+{
+	emit isDisconnected();
+	retryConnect();
+}
+
+void Client::timeout()
+{
+	retryConnect();
+}
+
+void Client::retryConnect()
+{
+	socket->connectToHost(host, 1024);
+}
diff --git a/src/client.h b/src/client.h
new file mode 100644
index 0000000..d590a59
--- /dev/null
+++ b/src/client.h
@@ -0,0 +1,38 @@
+// -*- c++ -*-
+#pragma once
+
+#include <QtCore>
+#include <QtNetwork>
+
+class QTcpSocket;
+class QTimer;
+
+class Client
+	: public QObject
+{
+	Q_OBJECT
+public:
+	Client(QObject *parent = 0);
+
+public slots:
+	bool connectToHost(const QString& host);
+	bool writeData(const QByteArray& data);
+	void errorOccurred(QAbstractSocket::SocketError socketError);
+	void connected();
+	void disconnected();
+	void timeout();
+
+signals:
+	void isConnected();
+	void isDisconnected();
+
+private:
+	void retryConnect();
+
+	QTcpSocket *socket;
+	QString host;
+	QTimer *timer;
+	int retries{10};
+	int interval{5};
+	int interval_long{120};
+};
diff --git a/src/viewer.cc b/src/viewer.cc
index 9ed0dba..ac9796c 100644
--- a/src/viewer.cc
+++ b/src/viewer.cc
@@ -32,6 +32,7 @@
 #include <QHBoxLayout>
 
 #include "recipe.h"
+#include "client.h"
 
 Viewer::Viewer()
 {
@@ -39,6 +40,8 @@ Viewer::Viewer()
 	textEdit = new QTextEdit();
 	layout()->addWidget(textEdit);
 	textEdit->setReadOnly(true);
+	//client.connectToHost("127.0.0.1");
+	client.connectToHost("192.168.0.46");
 }
 
 void Viewer::show(const Recipe& recipe)
@@ -93,4 +96,6 @@ void Viewer::show(const Recipe& recipe)
 		"<p>" + instructions + "</p>"
 		;
 	textEdit->setHtml(html);
+
+	client.writeData(html.toUtf8());
 }
diff --git a/src/viewer.h b/src/viewer.h
index f65a53d..8788d45 100644
--- a/src/viewer.h
+++ b/src/viewer.h
@@ -29,6 +29,7 @@
 #include <QWidget>
 
 #include "recipe.h"
+#include "client.h"
 
 class QTextEdit;
 
@@ -43,4 +44,5 @@ public:
 
 private:
 	QTextEdit* textEdit{nullptr};
+	Client client;
 };