Feature/wasm remote 2 #1288

Toine-ddt · 2021-08-19T08:02:14Z

No description provided.

jcelerier · 2021-08-19T08:03:23Z

.gitmodules

@@ -44,3 +44,6 @@
 [submodule "3rdparty/hap"]
 	path = 3rdparty/hap
 	url = https://github.com/Vidvox/hap
+[submodule "3rdparty/qml-remote"]
+	path = 3rdparty/qml-remote
+	url = https://github.com/ossia/qml-remote.git


let's remove that part, we don't want this as a submodule

jcelerier · 2021-08-19T08:03:35Z

src/plugins/score-plugin-remotecontrol/CMakeLists.txt

@@ -25,6 +25,7 @@ set(HDRS
  "RemoteControl/DocumentPlugin.hpp"
  "i-score-remote/RemoteApplication.hpp"
  "score_plugin_remotecontrol.hpp"
+  "RemoteControl/Http_server.hpp"


Can you name that file HttpServer in line with the rest of score ?

jcelerier · 2021-08-19T08:04:20Z

src/plugins/score-plugin-remotecontrol/CMakeLists.txt

 "${CMAKE_CURRENT_SOURCE_DIR}/score_plugin_remotecontrol.cpp"
 )

+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/RemoteControl/build-wasm/ DESTINATION ${CMAKE_BINARY_DIR}/src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/)


we won't need that: the remote's .wasm file is not supposed to be built as part of score but in a different repo which will be in the package manager

jcelerier · 2021-08-19T08:04:48Z

src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.hpp

@@ -10,5 +11,6 @@ class ApplicationPlugin final : public score::GUIApplicationPlugin

 protected:
  void on_createdDocument(score::Document& doc) override;
+  Http_server m_server;


jcelerier · 2021-08-19T08:05:46Z

src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp

+    {
+        auto const address2 = net::ip::make_address("0.0.0.0");
+        auto const port = static_cast<unsigned short>(std::atoi("8080"));
+        auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");


this line only works on the build computer.
instead we have to look for it in the user library which is where it will be installed on the user's computer:

#include <Library/LibrarySettings.hpp> #include <score/application/ApplicationContext.hpp> QString chemin_vers_dossier_packages = score::AppContext().settings<Library::Settings::Model>().getPackagesPath();

jcelerier · 2021-08-19T09:59:26Z

src/plugins/score-plugin-remotecontrol/RemoteControl/HttpServer.cpp

 {
    try
    {
        auto const address2 = net::ip::make_address("0.0.0.0");
        auto const port = static_cast<unsigned short>(std::atoi("8080"));
-        auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
+        // auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
+        std::string packagesPath = score::AppContext().settings<Library::Settings::Model>().getPackagesPath().toUtf8().constData();


getPackagesPath().toStdString() :-)

jcelerier · 2021-08-19T09:59:44Z

src/plugins/score-plugin-remotecontrol/RemoteControl/HttpServer.cpp

-        auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
+        // auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
+        std::string packagesPath = score::AppContext().settings<Library::Settings::Model>().getPackagesPath().toUtf8().constData();
+        QDebug << "packagesPath :" << packagesPath;


No need for the QDebug anymore (.. does that compile ? it's supposed to be qDebug())

jcelerier · 2021-08-19T09:59:57Z

src/plugins/score-plugin-remotecontrol/RemoteControl/HttpServer.cpp

 {
    try
    {
        auto const address2 = net::ip::make_address("0.0.0.0");
        auto const port = static_cast<unsigned short>(std::atoi("8080"));
-        auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
+        // auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");


the comment can go

jcelerier · 2021-08-19T10:00:12Z

src/plugins/score-plugin-remotecontrol/RemoteControl/HttpServer.hpp

@@ -148,5 +150,6 @@ class Http_server

    std::thread m_serverThread;
    int m_listenSocket{};
+    std::string buildWasmPath;


m_ prefix for members

Toine-ddt · 2021-08-19T14:45:34Z

done @jcelerier

jcelerier · 2021-08-19T15:39:27Z

src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.cpp

+ApplicationPlugin::~ApplicationPlugin()
+{
+    std::remove((m_server.m_buildWasmPath + "remote.html").c_str());
+    std::rename((m_server.m_buildWasmPath + "remote.html~").c_str(), (m_server.m_buildWasmPath + "remote.html").c_str());


... what is happening here ?

thibaudk and others added 13 commits August 19, 2021 09:49

add httpserver to the remote cotrol

74023d8

try to add a thread for the web socket connection

c035986

Update .gitignore

e2d4b35

Do not block score with the http server for the remotecontrol

e6028a2

rm some useless include

b9f71f6

modify some variable and path

de1831f

clean code

c43b2aa

get ip address and set in remote.html

2304b1a

add comments and clean code

703d9b7

detect ip address which start with 172.

ed8d1aa

detect ip address with socket / set keep_alive = false

0d54c99

clean code

49bb138

add qml-remote submodule

c231ef0

jcelerier requested changes Aug 19, 2021

View reviewed changes

changes from the review

0fd3ef5

jcelerier requested changes Aug 19, 2021

View reviewed changes

changes from the review

c8b914c

jcelerier reviewed Aug 19, 2021

View reviewed changes

Toine-ddt added 5 commits August 20, 2021 22:09

load remote.html, read and write ip address

819619e

Update CMakeLists.txt

48f0036

Update ApplicationPlugin.cpp

be79bdb

Update ApplicationPlugin.hpp

b1914f3

clean code

ab4893e

jcelerier force-pushed the master branch from e423691 to de2407f Compare February 13, 2022 18:28

jcelerier force-pushed the master branch 5 times, most recently from 1d961e8 to 919e08a Compare July 31, 2022 10:11

jcelerier force-pushed the master branch 2 times, most recently from 66a7ad0 to 5dc8d48 Compare July 31, 2022 13:27

jcelerier force-pushed the master branch 9 times, most recently from 9a9b382 to 28c6d0a Compare August 30, 2022 14:30

jcelerier force-pushed the master branch from 701ec91 to 0d81a6a Compare May 9, 2024 00:05

jcelerier force-pushed the master branch 2 times, most recently from ac5bf9a to fd8efed Compare June 9, 2024 00:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/wasm remote 2 #1288

Feature/wasm remote 2 #1288

Toine-ddt commented Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

jcelerier Aug 19, 2021

Toine-ddt commented Aug 19, 2021

jcelerier Aug 19, 2021

Feature/wasm remote 2 #1288

Are you sure you want to change the base?

Feature/wasm remote 2 #1288

Conversation

Toine-ddt commented Aug 19, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Toine-ddt commented Aug 19, 2021

Choose a reason for hiding this comment