Merge branch 'v0.4.4-dev'

Author: basiliscos

.sourcecraft/ci.yaml

@@ -0,0 +1,78 @@
+on:
+  push:
+    - workflows: build-package-workflow
+
+# tasks:
+#   - name: compile-san-n-test
+#   - name: make-app-image
+
+workflows:
+  build-package-workflow:
+    settings:
+        max_cube_duration: 120m
+    tasks:
+      #- [compile-san-n-test, make-app-image]
+      - make-app-image
+
+tasks:
+  - name: compile-san-n-test
+    cubes:
+      - name: configure
+        script:
+          - sudo apt update
+          - sudo apt install software-properties-common
+          - sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          - sudo apt update
+          - sudo apt install -y gcc-13 g++-13
+          - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 60
+          - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 60
+          - sudo update-alternatives --config gcc
+          - sudo update-alternatives --config g++
+          - g++ --version
+          - gcc --version
+          - sudo apt install -y cmake python3-venv pkgconf mold
+          - sudo apt install -y libgl1-mesa-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxxf86vm-dev libxcb-glx0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-dri3-dev uuid-dev libxcb-cursor-dev libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev libxcb-composite0-dev libxcb-ewmh-dev libxcb-res0-dev libxcb-util-dev libxcb-util0-dev libglu1-mesa-dev
+          - sudo apt install -y libxft-dev
+          - python3 -m venv myenv
+          - source myenv/bin/activate
+          - pip install conan
+          - conan profile detect
+          - cp .sourcecraft/conan-profile-linux-native /root/.conan2/profiles/linux-native
+          - mkdir build.ci && cd build.ci
+          - conan install --build=missing --profile=linux-native --output-folder . -s build_type=Debug -o '&:shared=True' ..
+          - source ./conanbuild.sh
+          - cmake .. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-fuse-ld=mold -fsanitize=undefined -fsanitize=address -fno-omit-frame-pointer"  -DSYNCSPIRIT_BUILD_TESTS=on
+      - name: compile
+        script:
+          - cd build.ci
+          - make -j`nproc`
+      - name: test
+        script:
+          - cd build.ci
+          - ctest --rerun-failed --output-on-failure .
+  - name: make-app-image
+    cubes:
+      - name: prepare
+        image: ubuntu:focal
+        script:
+         - export PATH=$HOME/my-gcc/bin:$HOME/.local/bin:$PATH
+         - apt update
+         - apt install -y software-properties-common
+         - apt update
+         - apt-get install -y g++9 gcc-9 wget libxft-dev build-essential python3-pip make cmake git fuse libfuse2 libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmuu-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxtst-dev libxv-dev libxxf86vm-dev libxcb-glx0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-dri3-dev uuid-dev libxcb-cursor-dev libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev libxcb-composite0-dev libxcb-ewmh-dev libxcb-res0-dev libxcb-util0-dev libxcb-util-dev libglu1-mesa-dev pkgconf file
+         - pip3 install --user conan
+         - pip3 install conan
+         - conan profile detect
+         - cp .sourcecraft/conan-profile-linux-appimage /root/.conan2/profiles/default
+         - wget https://ftp.gnu.org/gnu/gcc/gcc-14.3.0/gcc-14.3.0.tar.xz
+         - tar -xf gcc-14.3.0.tar.xz
+         - cd gcc-14.3.0
+         - ./contrib/download_prerequisites
+         - ./configure --prefix=/$HOME/my-gcc --enable-languages=c,c++ --disable-multilib --enable-bootstrap
+         - make -j`nproc`
+         - make install
+      - name: setup
+        script:
+        - export PATH=$HOME/my-gcc/bin:$HOME/.local/bin:$PATH
+          - mkdir build.chroot
+          - conan install -u --build=missing --output-folder . -s build_type=Release  -o '&:shared=True' ..

.sourcecraft/conan-profile-linux-appimage

@@ -0,0 +1,36 @@
+[settings]
+arch=x86_64
+build_type=Release
+os=Linux
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=10
+os=Linux
+[buildenv]
+CC=/home/c/my-gcc/bin/x86_64-pc-linux-gnu-gcc
+CXX=/home/c/my-gcc/bin/x86_64-pc-linux-gnu-g++
+
+[options]
+*/*:shared=True
+fltk/*:with_xft=True
+fltk/*:with_gl=False
+boost/*:magic_autolink=False
+boost/*:visibility=hidden
+boost/*:header_only=False
+boost/*:without_serialization=True
+boost/*:without_cobalt=True
+boost/*:without_graph=True
+boost/*:without_fiber=True
+boost/*:without_log=True
+boost/*:without_math=True
+boost/*:without_process=True
+boost/*:without_stacktrace=True
+boost/*:without_test=True
+boost/*:without_wave=True
+protobuf/*:with_zlib=False
+pugixml/*:no_exceptions=True
+rotor/*:enable_asio=True
+rotor/*:enable_thread=True
+rotor/*:enable_fltk=True
+

.sourcecraft/conan-profile-linux-native

@@ -0,0 +1,35 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=11
+os=Linux
+
+[options]
+*/*:shared=True
+#fltk/*:with_xft=True
+fltk/*:with_xft=False
+fltk/*:with_gl=False
+boost/*:magic_autolink=False
+boost/*:visibility=hidden
+boost/*:header_only=False
+boost/*:without_serialization=True
+boost/*:without_graph=True
+boost/*:without_fiber=True
+boost/*:without_log=True
+boost/*:without_math=True
+boost/*:without_process=True
+boost/*:without_stacktrace=True
+boost/*:without_test=True
+boost/*:without_wave=True
+boost/*:without_cobalt=True
+boost/*:without_contract=True
+boost/*:without_coroutine=True
+boost/*:without_json=True
+pugixml/*:no_exceptions=True
+rotor/*:enable_asio=True
+rotor/*:enable_thread=True
+rotor/*:enable_fltk=True
+

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.19)
-project (syncspirit VERSION 0.4.3)
+project (syncspirit VERSION 0.4.4)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -99,18 +99,19 @@ add_library(syncspirit_core
     src/db/prefix.cpp
     src/db/transaction.cpp
     src/db/utils.cpp
-    src/fs/chunk_iterator.cpp
     src/fs/file.cpp
     src/fs/file_actor.cpp
     src/fs/file_cache.cpp
     src/fs/fs_supervisor.cpp
-    src/fs/new_chunk_iterator.cpp
-    src/fs/scan_actor.cpp
-    src/fs/scan_scheduler.cpp
-    src/fs/scan_task.cpp
+    src/fs/fs_slave.cpp
     src/fs/utils.cpp
+    src/fs/task/noop.cpp
+    src/fs/task/remove_file.cpp
+    src/fs/task/rename_file.cpp
+    src/fs/task/segment_iterator.cpp
+    src/fs/task/scan_dir.cpp
     src/hasher/hasher_actor.cpp
-    src/hasher/hasher_proxy_actor.cpp
+    src/hasher/hasher_plugin.cpp
     src/hasher/hasher_supervisor.cpp
     src/model/diff/apply_controller.cpp
     src/model/diff/block_diff.cpp
@@ -142,7 +143,6 @@ add_library(syncspirit_core
     src/model/diff/load/pending_folders.cpp
     src/model/diff/load/remove_corrupted_files.cpp
     src/model/diff/local/blocks_availability.cpp
-    src/model/diff/local/custom.cpp
     src/model/diff/local/file_availability.cpp
     src/model/diff/local/io_failure.cpp
     src/model/diff/local/scan_finish.cpp
@@ -151,16 +151,11 @@ add_library(syncspirit_core
     src/model/diff/local/synchronization_finish.cpp
     src/model/diff/local/synchronization_start.cpp
     src/model/diff/modify/add_blocks.cpp
-    src/model/diff/modify/add_remote_folder_infos.cpp
     src/model/diff/modify/add_ignored_device.cpp
     src/model/diff/modify/add_pending_device.cpp
     src/model/diff/modify/add_pending_folders.cpp
-    src/model/diff/modify/append_block.cpp
     src/model/diff/modify/block_ack.cpp
-    src/model/diff/modify/block_rej.cpp
     src/model/diff/modify/block_transaction.cpp
-    src/model/diff/modify/clone_block.cpp
-    src/model/diff/modify/finish_file.cpp
     src/model/diff/modify/generic_remove.cpp
     src/model/diff/modify/mark_reachable.cpp
     src/model/diff/modify/remove_blocks.cpp
@@ -181,6 +176,7 @@ add_library(syncspirit_core
     src/model/diff/peer/cluster_update.cpp
     src/model/diff/peer/rx_tx.cpp
     src/model/diff/peer/update_folder.cpp
+    src/model/diff/peer/update_remote_views.cpp
     src/model/misc/augmentation.cpp
     src/model/misc/block_iterator.cpp
     src/model/misc/error_code.cpp
@@ -206,7 +202,7 @@ add_library(syncspirit_core
     src/model/ignored_folder.cpp
     src/model/pending_device.cpp
     src/model/pending_folder.cpp
-    src/model/remote_folder_info.cpp
+    src/model/remote_view.cpp
     src/model/some_device.cpp
     src/model/version.cpp
     src/net/acceptor_actor.cpp
@@ -218,15 +214,21 @@ add_library(syncspirit_core
     src/net/http_actor.cpp
     src/net/initiator_actor.cpp
     src/net/local_discovery_actor.cpp
-    src/net/messages.cpp
+    src/net/local_keeper.cpp
     src/net/net_supervisor.cpp
     src/net/peer_actor.cpp
     src/net/peer_supervisor.cpp
     src/net/relay_actor.cpp
     src/net/resolver_actor.cpp
     src/net/names.cpp
+    src/net/scheduler.cpp
     src/net/ssdp_actor.cpp
     src/net/upnp_actor.cpp
+    src/net/local_keeper/child_info.cpp
+    src/net/local_keeper/hash_base.cpp
+    src/net/local_keeper/folder_slave.cpp
+    src/net/local_keeper/stack_context.cpp
+    src/net/local_keeper/stack.cpp
     src/presentation/entity.cpp
     src/presentation/cluster_file_presence.cpp
     src/presentation/file_entity.cpp

README.md

@@ -96,6 +96,16 @@ after the core completion.
 
 # changes
 
+## 0.4.4 (08-Jan-2026)
+ - [fltk] allow to regenereate certificate/key pair and soft restart
+ - [core] reduce memory consumption to ~30%
+ - [core] do not consume CPU when idle
+ - [core] govern file system operations (scan, read, write, delete etc.) from
+control thread
+ - [core, bugfix] use system/default ssl root CAs to connect to syncthing infrastructure
+(might require to delete configuration from previous installation).
+ - [fltk, bugfix] fogetting to insert deleted folder into pending list
+
 ## 0.4.3 (04-Oct-2025)
  - [core] fix compatibility with syncthing v2.0 (i.e. tolerate directory with 
          non-zero size and without blocks)

conanfile.py

@@ -17,7 +17,7 @@ def requirements(self):
         self.requires("openssl/3.5.2")
         self.requires("protopuf/3.0.0")
         self.requires("pugixml/1.15")
-        self.requires("rotor/0.34")
+        self.requires("rotor/0.40")
         self.requires("spdlog/1.15.3")
         self.requires("tomlplusplus/3.4.0")
         self.requires("zlib/1.3.1")

docs/building.md

@@ -17,18 +17,16 @@
  - [pugixml](https://github.com/zeux/pugixml)
  - [tomlplusplus](https://github.com/marzer/tomlplusplus)
  - [c-ares](https://c-ares.org/)
- - [fltk](https://www.fltk.org/) (for fltk-ui)
+ - [fltk][] (for fltk-ui)
 
-The [conan](https://conan.io/) package manager (v2.0+) is used with
-[cmake](https://cmake.org/) build system.
+The [conan][] package manager (v2.0+) is used with [cmake][] build system.
 
-`syncspririt` can be build with [conan](https://conan.io/) or just with bare
-[cmake](https://cmake.org/) build system. [conan](https://conan.io/) is
-responsible for installing and building dependencies, with bare [cmake](https://cmake.org/)
-it should be done manually (e.g. use system-provided libraries).
+`syncspirit` can be build with [conan][] or just with bare [cmake][] build
+system. [conan][] is responsible for installing and building dependencies, with
+bare [cmake][] it should be done manually (e.g. use system-provided libraries).
 
-Please note, that [fltk](https://www.fltk.org/) library should be build as
-shared library; otherwise applications will not work correctly.
+Please note, that [fltk][] library should be build as shared library; otherwise
+applications will not work correctly.
 
 ## generic build
 
@@ -70,7 +68,7 @@ rotor/*:enable_fltk=True
 
 If static build is planned, than `*/*:shared=True` should be `False`.
 
-If the defult conan profile is missing, than create it via:
+If the default conan profile is missing, than create it via:
 ```
 conan profile detect
 ```
@@ -174,7 +172,7 @@ make -j`nproc`
 
 ### mxe
 
-Download [mxe](https://mxe.cc); make sure all requirements are met.
+Download [mxe][]; make sure all requirements are met.
 
 Your `settings.mk` should contain something like:
 
@@ -190,7 +188,7 @@ make zip
 ```
 
 
-Add $mxe_dir/uer/bin to your `PATH`, and make sure something like that works:
+Add $mxe_dir/usr/bin to your `PATH`, and make sure something like that works:
 
 ```
 export PATH=`pwd`/usr/bin:$PATH
@@ -256,7 +254,7 @@ make -j`nproc`
 
 ### mxe & windows xp
 
-Download [mxe](https://mxe.cc); make sure all requirements are met.
+Download [mxe][]; make sure all requirements are met.
 
 Your `settings.mk` should contain something like:
 
@@ -276,7 +274,7 @@ Copy the resulting `zip.exe` to windows xp host and launch, i.e. make sure
 everything is ok with the toolchain.
 
 
-Add $mxe_dir/uer/bin to your `PATH`, and make sure something like that works:
+Add $mxe\_dir/usr/bin to your `PATH`, and make sure something like that works:
 
 ```
 export PATH=`pwd`/usr/bin:$PATH
@@ -492,3 +490,8 @@ conan install --build=missing --output-folder . -s build_type=Debug \
 cmake  .. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake \
     -DCMAKE_BUILD_TYPE=Debug -DSYNCSPIRIT_BUILD_TESTS=on \
     -DCMAKE_CXX_FLAGS="-fuse-ld=mold"
+
+[cmake]: https://cmake.org/
+[conan]: https://conan.io/
+[fltk]: https://www.fltk.org/
+[mxe]: https://mxe.cc

src/config/bep.h

@@ -11,9 +11,7 @@ struct bep_config_t {
     std::uint32_t rx_buff_size;
     std::uint32_t tx_buff_limit;
     std::uint32_t connect_timeout;
-    std::uint32_t request_timeout;
-    std::uint32_t tx_timeout;
-    std::uint32_t rx_timeout;
+    std::uint32_t ping_timeout;
     std::uint32_t blocks_max_requested;
     std::uint32_t blocks_simultaneous_write;
     std::uint32_t advances_per_iteration;

src/config/fs.h

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileCopyrightText: 2019-2024 Ivan Baidakou
+// SPDX-FileCopyrightText: 2019-2026 Ivan Baidakou
 
 #pragma once
 #include <cstdint>
@@ -8,7 +8,6 @@ namespace syncspirit::config {
 
 struct fs_config_t {
     std::uint32_t temporally_timeout;
-    std::uint32_t mru_size;
     std::int64_t bytes_scan_iteration_limit;
     std::int64_t files_scan_iteration_limit;
 };

src/config/main.h

@@ -22,7 +22,7 @@ namespace bfs = std::filesystem;
 struct main_t {
     bfs::path config_path;
     bfs::path default_location;
-    bfs::path root_ca_file;
+    std::string ssl_verify_store;
     bfs::path cert_file;
     bfs::path key_file;
 
@@ -40,6 +40,7 @@ struct main_t {
     std::uint32_t timeout;
     std::string device_name;
     std::uint32_t hasher_threads;
+    std::uint32_t poll_timeout; // in microseconds
 };
 
 } // namespace syncspirit::config