unixs scheme aka local unix socket with serial protocol supported

silicon-heaven · Jan 29, 2024 · f49cc98 · f49cc98
1 parent 1085eaa
commit f49cc98
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/3rdparty/libshv b/3rdparty/libshv
diff --git a/shvspy/src/appversion.h b/shvspy/src/appversion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define APP_VERSION "1.6.1"
+#define APP_VERSION "1.7.0"
 
diff --git a/shvspy/src/dlgbrokerproperties.cpp b/shvspy/src/dlgbrokerproperties.cpp
@@ -30,6 +30,7 @@ DlgBrokerProperties::DlgBrokerProperties(QWidget *parent) :
 		cbx->addItem(Socket::schemeToString(Scheme::WebSocketSecure), static_cast<int>(Scheme::WebSocketSecure));
 		cbx->addItem(Socket::schemeToString(Scheme::SerialPort), static_cast<int>(Scheme::SerialPort));
 		cbx->addItem(Socket::schemeToString(Scheme::LocalSocket), static_cast<int>(Scheme::LocalSocket));
+		cbx->addItem(Socket::schemeToString(Scheme::LocalSocketSerial), static_cast<int>(Scheme::LocalSocketSerial));
 		cbx->setCurrentIndex(0);
 	}
 	connect(ui->cbxScheme, qOverload<int>(&QComboBox::currentIndexChanged), this, [this] (int ix) {
@@ -49,8 +50,8 @@ DlgBrokerProperties::DlgBrokerProperties(QWidget *parent) :
 	ui->cbxConnectionType->setCurrentIndex(0);
 
 	ui->rpc_protocolType->addItem(Rpc::protocolTypeToString(Rpc::ProtocolType::ChainPack), static_cast<int>(Rpc::ProtocolType::ChainPack));
-	ui->rpc_protocolType->addItem(Rpc::protocolTypeToString(Rpc::ProtocolType::Cpon), static_cast<int>(Rpc::ProtocolType::Cpon));
-	ui->rpc_protocolType->addItem(Rpc::protocolTypeToString(Rpc::ProtocolType::JsonRpc), static_cast<int>(Rpc::ProtocolType::JsonRpc));
+	//ui->rpc_protocolType->addItem(Rpc::protocolTypeToString(Rpc::ProtocolType::Cpon), static_cast<int>(Rpc::ProtocolType::Cpon));
+	//ui->rpc_protocolType->addItem(Rpc::protocolTypeToString(Rpc::ProtocolType::JsonRpc), static_cast<int>(Rpc::ProtocolType::JsonRpc));
 	ui->rpc_protocolType->setCurrentIndex(0);
 
 	using shv::iotqt::rpc::ClientConnection;

diff --git a/shvspy/src/servertreemodel/shvbrokernodeitem.cpp b/shvspy/src/servertreemodel/shvbrokernodeitem.cpp
@@ -241,14 +241,20 @@ void ShvBrokerNodeItem::open()
 	auto host = m_brokerPropeties.value(brokerProperty::HOST).toString().toStdString();
 	auto port = m_brokerPropeties.value(brokerProperty::PORT).toInt();
 	std::string pwd = m_brokerPropeties.value(brokerProperty::PASSWORD).toString().toStdString();
-	if(scheme_enum == shv::iotqt::rpc::Socket::Scheme::LocalSocket || scheme_enum == shv::iotqt::rpc::Socket::Scheme::SerialPort) {
+	if(scheme_enum == shv::iotqt::rpc::Socket::Scheme::LocalSocket || scheme_enum == shv::iotqt::rpc::Socket::Scheme::LocalSocketSerial || scheme_enum == shv::iotqt::rpc::Socket::Scheme::SerialPort) {
 		host = scheme + ":" + host;
-		cli->setLoginType(shv::iotqt::rpc::ClientConnection::LoginType::None);
 	}
 	else {
 		host = scheme + "://" + host;
-		if(port > 0)
+		if(port > 0) {
 			host += ':' + QString::number(port).toStdString();
+		}
+	}
+	bool skip_login = m_brokerPropeties.value(brokerProperty::SKIPLOGINPHASE).toBool();
+	if (skip_login) {
+		cli->setLoginType(shv::iotqt::rpc::ClientConnection::LoginType::None);
+	}
+	else {
 		//cli->setLoginType(pwd.size() == 40? cp::IRpcConnection::LoginType::Sha1: cp::IRpcConnection::LoginType::Plain);
 		if(scheme_enum == shv::iotqt::rpc::Socket::Scheme::Ssl) {
 			// SSL encryption is enough
@@ -330,15 +336,15 @@ shv::iotqt::rpc::ClientConnection *ShvBrokerNodeItem::clientConnection()
 		QString conn_type = m_brokerPropeties.value(brokerProperty::CONNECTIONTYPE).toString();
 
 		shv::iotqt::rpc::DeviceAppCliOptions opts;
-		{
-			int proto_type = m_brokerPropeties.value(brokerProperty::RPC_PROTOCOLTYPE).toInt();
-			if(proto_type == static_cast<int>(cp::Rpc::ProtocolType::JsonRpc))
-				opts.setProtocolType("jsonrpc");
-			else if(proto_type == static_cast<int>(cp::Rpc::ProtocolType::Cpon))
-				opts.setProtocolType("cpon");
-			else
-				opts.setProtocolType("chainpack");
-		}
+		//{
+		//	int proto_type = m_brokerPropeties.value(brokerProperty::RPC_PROTOCOLTYPE).toInt();
+		//	if(proto_type == static_cast<int>(cp::Rpc::ProtocolType::JsonRpc))
+		//		opts.setProtocolType("jsonrpc");
+		//	else if(proto_type == static_cast<int>(cp::Rpc::ProtocolType::Cpon))
+		//		opts.setProtocolType("cpon");
+		//	else
+		//		opts.setProtocolType("chainpack");
+		//}
 		{
 			QVariant v = m_brokerPropeties.value(brokerProperty::RPC_RECONNECTINTERVAL);
 			if(v.isValid())
@@ -536,7 +542,7 @@ void ShvBrokerNodeItem::onRpcMessageReceived(const shv::chainpack::RpcMessage &m
 		catch (shv::core::Exception &e) {
 			resp.setError(cp::RpcResponse::Error::create(cp::RpcResponse::Error::MethodCallException, e.message()));
 		}
-		m_rpcConnection->sendMessage(resp);
+		m_rpcConnection->sendRpcMessage(resp);
 	}
 	else if(msg.isSignal()) {
 		shvDebug() << msg.toCpon();