small update

ElementAstro · Nov 11, 2023 · ada15df · ada15df
1 parent b0fdf49
commit ada15df
Show file tree

Hide file tree

Showing 21 changed files with 19,660 additions and 202 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,8 @@ endif()
 # root directory of the project
 set(Lithium_PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR})
 set(lithium_src_dir ${Lithium_PROJECT_ROOT_DIR}/src)
-set(lithium_module_dir ${Lithium_PROJECT_ROOT_DIR}/src/modules)
+set(lithium_module_dir ${Lithium_PROJECT_ROOT_DIR}/src/atom)
+set(lithium_client_dir ${Lithium_PROJECT_ROOT_DIR}/src/client)
 
 add_custom_target(CmakeAdditionalFiles
 	SOURCES
@@ -110,26 +111,26 @@ elseif(LINUX)
 endif()
 
 set(api_module
-	${lithium_src_dir}/client/astap.cpp
-	${lithium_src_dir}/client/astrometry.cpp
-    ${lithium_src_dir}/client/phd2client.cpp
-    ${lithium_module_dir}/client/hydrogenclient.cpp
-    ${lithium_src_dir}/client/hydrogen/hydrogencamera.cpp
-    ${lithium_src_dir}/client/hydrogen/hydrogenfilterwheel.cpp
-    ${lithium_src_dir}/client/hydrogen/hydrogentelescope.cpp
-    ${lithium_src_dir}/client/hydrogen/hydrogenfocuser.cpp
+	${lithium_client_dir}/platesolve/astap.cpp
+	${lithium_client_dir}/platesolve/astrometry.cpp
+    ${lithium_client_dir}/phd2/phd2client.cpp
+    ${lithium_client_dir}/hydrogen/hydrogenclient.cpp
+    ${lithium_client_dir}/hydrogen/hydrogencamera.cpp
+    ${lithium_client_dir}/hydrogen/hydrogenfilterwheel.cpp
+    ${lithium_client_dir}/hydrogen/hydrogentelescope.cpp
+    ${lithium_client_dir}/hydrogen/hydrogenfocuser.cpp
 )
 
 set(config_module
-    ${lithium_module_dir}/config/configor.cpp
+    ${lithium_src_dir}/config/configor.cpp
 )
 
 set(device_module
-    ${lithium_module_dir}/device/device_manager.cpp
-    ${lithium_module_dir}/device/indidevice_manager.cpp
-    ${lithium_module_dir}/device/device_utils.cpp
-    ${lithium_module_dir}/device/indi_device.cpp
-    ${lithium_module_dir}/device/hydrogen_device.cpp
+    ${lithium_src_dir}/device/device_manager.cpp
+    ${lithium_src_dir}/device/indidevice_manager.cpp
+    ${lithium_src_dir}/device/device_utils.cpp
+    ${lithium_src_dir}/device/indi_device.cpp
+    ${lithium_src_dir}/device/hydrogen_device.cpp
 )
 
 set(image_module
@@ -144,12 +145,9 @@ set(io_module
 )
 
 set(module_module
-    ${lithium_module_dir}/module/module_loader.cpp
-    ${lithium_module_dir}/plugin/plugin.cpp
-    ${lithium_module_dir}/plugin/exe_plugin.cpp
-    ${lithium_module_dir}/plugin/script_plugin.cpp
-    ${lithium_module_dir}/plugin/plugin_loader.cpp
-    ${lithium_module_dir}/module/compiler.cpp
+    ${lithium_module_dir}/plugin/module_loader.cpp
+    ${lithium_src_dir}/plugin/plugin_loader.cpp
+    ${lithium_module_dir}/plugin/compiler.cpp
 )
 
 set(web_module
@@ -165,6 +163,7 @@ set(server_module
     ${lithium_module_dir}/server/message_bus.hpp
     ${lithium_module_dir}/server/message_queue.hpp
     ${lithium_module_dir}/server/serialize.cpp
+    ${lithium_module_dir}/server/deserialize.cpp
 
     ${lithium_src_dir}/websocket/WebSocketServer.cpp
     ${lithium_src_dir}/websocket/WsDeviceComponent.cpp
@@ -182,13 +181,13 @@ set(server_module
 )
 
 set(script_module
-    ${lithium_module_dir}/script/script_manager.cpp
+    ${lithium_src_dir}/script/script_manager.cpp
 )
 
 set(task_module
-    ${lithium_module_dir}/task/task_manager.cpp
-    ${lithium_module_dir}/task/task_stack.cpp
-    ${lithium_module_dir}/task/task_generator.cpp
+    ${lithium_src_dir}/task/task_manager.cpp
+    ${lithium_src_dir}/task/task_stack.cpp
+    ${lithium_src_dir}/task/task_generator.cpp
 )
 
 set(thread_module
@@ -290,6 +289,7 @@ target_link_libraries(lithium_server loguru)
 target_link_libraries(lithium_server libzippp)
 
 target_link_libraries(lithium_server lithiumcorestatic)
+target_link_libraries(lithium_server lithiumpluginstatic)
 target_link_libraries(lithium_server hydrogencore)
 target_link_libraries(lithium_server hydrogenclientstatic)
 

diff --git a/libs/LICENSE.CATCH2 b/libs/LICENSE.CATCH2
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/libs/README.md b/libs/README.md
@@ -5,20 +5,14 @@
 | chaiscript          | -                                                                          |
 | CImg                | [https://github.com/GreycLab/CImg/releases/tag/v.3.2.3](https://github.com/GreycLab/CImg/releases/tag/v.3.2.3) |
 | cpp_httplib         | -                                                                          |
-| emhash              | -                                                                          |
-| expected            | -                                                                          |
-| imgui               | -                                                                          |
-| jwt-cpp             | [https://github.com/Thalhammer/jwt-cpp/](https://github.com/Thalhammer/jwt-cpp/) |
+| emhash              | -                                                                          |                                              |
 | libzippp            | -                                                                          |
 | loguru              | -                                                                          |
 | magic_enum          | -                                                                          |
 | nlohmann json       | [https://github.com/nlohmann/json/releases/tag/v3.11.2](https://github.com/nlohmann/json/releases/tag/v3.11.2) |
 | oatpp               | -                                                                          |
-| oatpp-curl          | -                                                                          |
 | oatpp-openssl       | -                                                                          |
-| oatpp-sqlite        | -                                                                          |
 | oatpp-swagger       | -                                                                          |
 | oatpp-websocket     | -                                                                          |
 | oatpp-zlib          | -                                                                          |
 | pugixml             | [https://github.com/zeux/pugixml/releases/tag/v1.13](https://github.com/zeux/pugixml/releases/tag/v1.13) |
-| toml++              | -                                                                          |