Refactor networking

.drone.jsonnet

@@ -31,12 +31,19 @@ local debian_backports(distro, pkgs) = [
   'eatmydata ' + apt_get_quiet + ' install -y ' + std.join(' ', std.map(function(x) x + '/' + distro + '-backports', pkgs)),
 ];
 
+local add_stf_repo(image) = [
+  'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y lsb-release',
+  'cp utils/deb.session.foundation.gpg /etc/apt/trusted.gpg.d',
+  'echo deb http://deb.session.foundation ' + (if std.startsWith(image, docker_base + 'debian-sid') then 'sid' else '$$(lsb_release -sc)') + ' main >/etc/apt/sources.list.d/session.list',
+  'eatmydata ' + apt_get_quiet + ' update',
+];
+
 // Do something on a debian-like system
 local debian_pipeline(name,
                       image,
                       arch='amd64',
                       deps=default_deps,
-                      oxen_repo=true,
+                      stf_repo=true,
                       kitware_repo=''/* ubuntu codename, if wanted */,
                       allow_fail=false,
                       cmake_pkg='cmake',
@@ -62,12 +69,7 @@ local debian_pipeline(name,
         apt_get_quiet + ' update',
         apt_get_quiet + ' install -y eatmydata',
       ] + (
-        if oxen_repo then [
-          'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y lsb-release',
-          'cp utils/deb.oxen.io.gpg /etc/apt/trusted.gpg.d',
-          'echo deb http://deb.oxen.io $$(lsb_release -sc) main >/etc/apt/sources.list.d/oxen.list',
-          'eatmydata ' + apt_get_quiet + ' update',
-        ] else []
+        if stf_repo then add_stf_repo(image) else []
       ) + (
         if kitware_repo != '' then [
           'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y curl ca-certificates',
@@ -97,7 +99,7 @@ local debian_build(name,
                    shared_libs=true,
                    jobs=6,
                    tests=true,
-                   oxen_repo=true,
+                   stf_repo=true,
                    kitware_repo=''/* ubuntu codename, if wanted */,
                    extra_setup=[],
                    allow_fail=false)
@@ -106,7 +108,7 @@ local debian_build(name,
   image,
   arch=arch,
   deps=deps,
-  oxen_repo=oxen_repo,
+  stf_repo=stf_repo,
   kitware_repo=kitware_repo,
   allow_fail=allow_fail,
   build=[
@@ -116,6 +118,7 @@ local debian_build(name,
     (if werror then '-DWARNINGS_AS_ERRORS=ON ' else '') +
     (if shared_libs then '-DBUILD_SHARED_LIBS=ON ' else '') +
     '-DUSE_LTO=' + (if lto then 'ON ' else 'OFF ') +
+    '-DWITH_LTO=' + (if lto then 'ON ' else 'OFF ') +
     '-DWITH_TESTS=' + (if tests then 'ON ' else 'OFF ') +
     cmake_extra +
     ci_dep_mirror(local_mirror),
@@ -131,11 +134,7 @@ local debian_build(name,
                    commands:
                      [apt_get_quiet + ' install -y eatmydata'] + (
                        if std.length(test_deps) > 0 then (
-                         if oxen_repo then [
-                           'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y lsb-release',
-                           'cp utils/deb.oxen.io.gpg /etc/apt/trusted.gpg.d',
-                           'echo deb http://deb.oxen.io $$(lsb_release -sc) main >/etc/apt/sources.list.d/oxen.list',
-                         ] else []
+                         if stf_repo then add_stf_repo(image) else []
                        ) + [
                          'eatmydata ' + apt_get_quiet + ' update',
                          'eatmydata ' + apt_get_quiet + ' dist-upgrade -y',
@@ -287,7 +286,7 @@ local static_build(name,
                    build_type='Release',
                    lto=true,
                    deps=default_deps,
-                   oxen_repo=false,
+                   stf_repo=false,
                    kitware_repo=''/* ubuntu codename, if wanted */,
                    cmake_extra='',
                    local_mirror=true,
@@ -298,7 +297,7 @@ local static_build(name,
   image,
   arch=arch,
   deps=deps,
-  oxen_repo=oxen_repo,
+  stf_repo=stf_repo,
   allow_fail=allow_fail,
   build=[
     'export JOBS=' + jobs,
@@ -379,7 +378,7 @@ local static_build(name,
                docker_base + 'debian-win32-cross',
                'libsession-util-windows-x64-TAG.zip',
                deps=['g++-mingw-w64-x86-64-posix'],
-               cmake_extra='-DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw-x86-64-toolchain.cmake'),
+               cmake_extra='-DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw-x86-64-toolchain.cmake -DENABLE_NETWORKING_SROUTER=OFF'),
   /*  currently broken:
   static_build('Static Windows x86',
                docker_base + 'debian-win32-cross',

.gitmodules

@@ -10,18 +10,15 @@
 [submodule "external/zstd"]
 	path = external/zstd
 	url = https://github.com/facebook/zstd.git
-[submodule "external/nlohmann-json"]
-	path = external/nlohmann-json
-	url = https://github.com/nlohmann/json.git
-[submodule "external/oxen-libquic"]
-	path = external/oxen-libquic
-	url = https://github.com/oxen-io/oxen-libquic.git
 [submodule "external/protobuf"]
 	path = external/protobuf
 	url = https://github.com/protocolbuffers/protobuf.git
-[submodule "external/oxen-logging"]
-	path = external/oxen-logging
-	url = https://github.com/oxen-io/oxen-logging.git
+[submodule "external/session-router"]
+	path = external/session-router
+	url = https://github.com/session-foundation/session-router.git
 [submodule "external/simdutf"]
 	path = external/simdutf
 	url = https://github.com/simdutf/simdutf.git
+[submodule "external/date"]
+	path = external/date
+	url = https://github.com/HowardHinnant/date.git

CMakeLists.txt

@@ -17,7 +17,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 project(libsession-util
-    VERSION 1.5.10
+    VERSION 1.6.0
     DESCRIPTION "Session client utility library"
     LANGUAGES ${LANGS})
 
@@ -82,7 +82,8 @@ option(STATIC_LIBSTD "Statically link libstdc++/libgcc" ${default_static_libstd}
 option(USE_LTO "Use Link-Time Optimization" ${use_lto_default})
 
 # Provide this as an option for now because GMP and Desktop are sometimes unhappy with each other.
-option(ENABLE_ONIONREQ "Build with onion request functionality" ON)
+option(ENABLE_NETWORKING "Build with networking functionality" ON)
+option(ENABLE_NETWORKING_SROUTER "Build with session-router networking support (requires ENABLE_NETWORKING)" ON)
 
 if(USE_LTO)
   include(CheckIPOSupported)
@@ -119,7 +120,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_subdirectory(external)
 
-if(ENABLE_ONIONREQ)
+if(ENABLE_NETWORKING)
     if(NOT TARGET nettle::nettle)
         if(BUILD_STATIC_DEPS)
             message(FATAL_ERROR "Internal error: nettle::nettle target (expected via libquic BUILD_STATIC_DEPS) not found")

external/CMakeLists.txt

@@ -1,4 +1,5 @@
 option(SUBMODULE_CHECK "Enables checking that vendored library submodules are up to date" ON)
+
 if(SUBMODULE_CHECK)
   find_package(Git)
   if(GIT_FOUND)
@@ -26,39 +27,41 @@ if(SUBMODULE_CHECK)
     message(STATUS "Checking submodules")
     check_submodule(ios-cmake)
     check_submodule(libsodium-internal)
-    check_submodule(oxen-libquic external/oxen-logging external/oxen-encoding)
-    check_submodule(nlohmann-json)
     check_submodule(zstd)
     check_submodule(protobuf)
+    check_submodule(session-router)
+    check_submodule(date)
   endif()
 endif()
 
 if(NOT BUILD_STATIC_DEPS AND NOT FORCE_ALL_SUBMODULES)
   find_package(PkgConfig REQUIRED)
 endif()
 
-macro(libsession_system_or_submodule BIGNAME smallname pkgconf subdir)
-  option(FORCE_${BIGNAME}_SUBMODULE "force using ${smallname} submodule" OFF)
-  if(NOT BUILD_STATIC_DEPS AND NOT FORCE_${BIGNAME}_SUBMODULE AND NOT FORCE_ALL_SUBMODULES)
-    pkg_check_modules(${BIGNAME} ${pkgconf} IMPORTED_TARGET GLOBAL)
-  endif()
-  if(${BIGNAME}_FOUND)
-    add_library(${smallname} INTERFACE IMPORTED GLOBAL)
-    if(NOT TARGET PkgConfig::${BIGNAME} AND CMAKE_VERSION VERSION_LESS "3.21")
-      # Work around cmake bug 22180 (PkgConfig::THING not set if no flags needed)
+macro(libsession_system_or_submodule BIGNAME smallname target pkgconf subdir)
+  if(NOT TARGET ${target})
+    option(FORCE_${BIGNAME}_SUBMODULE "force using ${smallname} submodule" OFF)
+    if(NOT BUILD_STATIC_DEPS AND NOT FORCE_${BIGNAME}_SUBMODULE AND NOT FORCE_ALL_SUBMODULES)
+      pkg_check_modules(${BIGNAME} ${pkgconf} IMPORTED_TARGET GLOBAL)
+    endif()
+    if(${BIGNAME}_FOUND)
+      add_library(${smallname} INTERFACE IMPORTED GLOBAL)
+      if(NOT TARGET PkgConfig::${BIGNAME} AND CMAKE_VERSION VERSION_LESS "3.21")
+        # Work around cmake bug 22180 (PkgConfig::THING not set if no flags needed)
+      else()
+        target_link_libraries(${smallname} INTERFACE PkgConfig::${BIGNAME})
+      endif()
+      message(STATUS "Found system ${smallname} ${${BIGNAME}_VERSION}")
     else()
-      target_link_libraries(${smallname} INTERFACE PkgConfig::${BIGNAME})
+      message(STATUS "using ${smallname} submodule ${subdir}")
+      add_subdirectory(${subdir})
     endif()
-    message(STATUS "Found system ${smallname} ${${BIGNAME}_VERSION}")
-  else()
-    message(STATUS "using ${smallname} submodule")
-    add_subdirectory(${subdir})
-  endif()
-  if(TARGET ${smallname} AND NOT TARGET ${smallname}::${smallname})
-    add_library(${smallname}::${smallname} ALIAS ${smallname})
-  endif()
-  if(BUILD_STATIC_DEPS AND STATIC_BUNDLE)
+    if(NOT TARGET ${target})
+      add_library(${target} ALIAS ${smallname})
+    endif()
+    if(BUILD_STATIC_DEPS AND STATIC_BUNDLE)
       libsession_static_bundle(${smallname}::${smallname})
+    endif()
   endif()
 endmacro()
 
@@ -100,31 +103,27 @@ if(CMAKE_CROSSCOMPILING)
     endif()
 endif()
 
-set(LIBQUIC_BUILD_TESTS OFF CACHE BOOL "")
-if(ENABLE_ONIONREQ)
-  libsession_system_or_submodule(OXENQUIC quic liboxenquic>=1.3.0 oxen-libquic)
+if(ENABLE_NETWORKING)
+  set(LIBQUIC_BUILD_TESTS OFF CACHE BOOL "")
+  libsession_system_or_submodule(OXENQUIC quic oxen::quic liboxenquic>=1.8 session-router/external/oxen-libquic)
 endif()
 
-if(NOT TARGET oxenc::oxenc)
-    # The oxenc target will already exist if we load libquic above via submodule
-    set(OXENC_BUILD_TESTS OFF CACHE BOOL "")
-    set(OXENC_BUILD_DOCS OFF CACHE BOOL "")
-    libsession_system_or_submodule(OXENC oxenc liboxenc>=1.3.0 oxen-libquic/external/oxen-encoding)
-endif()
+libsession_system_or_submodule(OXENC oxenc oxenc::oxenc liboxenc>=1.5.0 session-router/external/oxen-libquic/external/oxen-encoding)
+
+libsession_system_or_submodule(OXENLOGGING oxenlogging oxen::logging liboxen-logging>=1.2.0 session-router/external/oxen-libquic/external/oxen-logging)
+if(OXENLOGGING_FOUND)
+    if(NOT TARGET oxen::logging)
+        # If we load oxen-logging via system lib then we won't necessarily have fmt/spdlog targets,
+        # but this script will give us them:
+        include(session-router/external/oxen-libquic/external/oxen-logging/cmake/load_fmt_spdlog.cmake)
 
-if(NOT TARGET oxen::logging)
-    add_subdirectory(oxen-libquic/external/oxen-logging)
+        add_library(oxen-logging-fmt-spdlog INTERFACE)
+        target_link_libraries(oxen-logging-fmt-spdlog INTERFACE oxenlogging::oxenlogging ${OXEN_LOGGING_FMT_TARGET} ${OXEN_LOGGING_SPDLOG_TARGET})
+        add_library(oxen::logging ALIAS oxen-logging-fmt-spdlog)
+    endif()
 endif()
 
-oxen_logging_add_source_dir("${PROJECT_SOURCE_DIR}")
 
-# Apple xcode 15 has a completely broken std::source_location; we can't fix it, but at least we can
-# hack up the source locations to hide the path that it uses (which is the useless path to
-# oxen/log.hpp where the info/critical/etc. bodies are).
-if(APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16)
-    message(WARNING "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} is broken: filenames in logging statements will not display properly")
-    oxen_logging_add_source_dir("${CMAKE_CURRENT_SOURCE_DIR}/oxen-libquic/external/oxen-logging/include/oxen")
-endif()
 
 if(CMAKE_C_COMPILER_LAUNCHER)
   set(deps_cc "${CMAKE_C_COMPILER_LAUNCHER} ${deps_cc}")
@@ -144,12 +143,12 @@ if(APPLE)
     endforeach()
 endif()
 
-
-function(libsodium_internal_subdir)
+function(add_static_subdirectory dir)
     set(BUILD_SHARED_LIBS OFF)
-    add_subdirectory(libsodium-internal)
+    add_subdirectory(${dir} ${ARGN})
 endfunction()
-libsodium_internal_subdir()
+
+add_static_subdirectory(libsodium-internal)
 libsession_static_bundle(libsodium::sodium-internal)
 
 
@@ -163,7 +162,7 @@ set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 set(protobuf_ABSL_PROVIDER "module" CACHE STRING "" FORCE)
 set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "")
 set(protobuf_BUILD_PROTOBUF_BINARIES ON CACHE BOOL "" FORCE)
-libsession_system_or_submodule(PROTOBUF_LITE protobuf_lite protobuf-lite>=3.21 protobuf)
+libsession_system_or_submodule(PROTOBUF_LITE protobuf_lite protobuf::libprotobuf-lite protobuf-lite>=3.21 protobuf)
 if(TARGET PkgConfig::PROTOBUF_LITE AND NOT TARGET protobuf::libprotobuf-lite)
     add_library(protobuf::libprotobuf-lite ALIAS PkgConfig::PROTOBUF_LITE)
 endif()
@@ -192,7 +191,19 @@ libsession_static_bundle(libzstd_static)
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
 set(JSON_Install ON CACHE INTERNAL "") # Required to export targets that we use
-libsession_system_or_submodule(NLOHMANN nlohmann_json nlohmann_json>=3.7.0 nlohmann-json)
+libsession_system_or_submodule(NLOHMANN nlohmann_json nlohmann_json::nlohmann_json nlohmann_json>=3.7.0 session-router/external/nlohmann)
+
+if(ENABLE_NETWORKING AND ENABLE_NETWORKING_SROUTER)
+    set(SROUTER_FULL OFF CACHE BOOL "")
+    set(SROUTER_DAEMON OFF CACHE BOOL "")
+    set(SROUTER_NATIVE_BUILD OFF CACHE BOOL "")
+    set(SROUTER_JEMALLOC OFF CACHE BOOL "")
+
+    add_library(sodium INTERFACE)
+    target_link_libraries(sodium INTERFACE libsodium::sodium-internal)
+    add_static_subdirectory(session-router EXCLUDE_FROM_ALL)
+    libsession_static_bundle(session-router::libsessionrouter)
+endif()
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
 set(JSON_Install ON CACHE INTERNAL "") # Required to export targets that we use
@@ -205,3 +216,13 @@ function(simdutf_subdir)
 endfunction()
 simdutf_subdir()
 libsession_static_bundle(simdutf)
+
+# We need Howard Hinnant's header-only date library for now because the STL implementation of
+# std::chrono::parse() is spotty or broken on:
+# - Apple.  libc++ date parsing is only available when on XCode 16.3+ *and* targetting macOS 15+.
+# - gcc before 13.
+# - clang+libc++ before llvm-19.  (Real 19, not Apple's idiotic PR renumbering).
+#
+# On the plus side, this is header-only so we don't actually compile anything extra if we don't
+# actually use it.
+add_subdirectory(date)

include/session/config/convo_info_volatile.hpp

@@ -91,7 +91,7 @@ namespace convo {
 
         /// Unix epoch timestamp to which this proof's entitlement to Session Pro features is valid
         /// to
-        std::chrono::sys_time<std::chrono::milliseconds> pro_expiry_unix_ts{};
+        sys_ms pro_expiry_unix_ts{};
 
       protected:
         using base::base;

include/session/config/user_profile.hpp

@@ -315,9 +315,9 @@ class UserProfile : public ConfigBase {
     /// Inputs:  None
     ///
     /// Outputs:
-    /// - `std::optional<std::chrono::sys_time<std::chrono::milliseconds>>` - The unix timestamp in
+    /// - `std::optional<sys_ms>` - The unix timestamp in
     /// milliseconds that the users pro access will expire, or nullopt if unset.
-    std::optional<std::chrono::sys_time<std::chrono::milliseconds>> get_pro_access_expiry() const;
+    std::optional<sys_ms> get_pro_access_expiry() const;
 
     /// API: user_profile/UserProfile::set_pro_access_expiry
     ///

include/session/file.hpp

@@ -3,6 +3,7 @@
 #include <iosfwd>
 #include <string>
 #include <string_view>
+#include <vector>
 
 // Utility functions for working with files
 
@@ -19,8 +20,8 @@ std::ofstream open_for_writing(const fs::path& filename);
 /// enabled for any failures.  This also throws if the file cannot be opened.
 std::ifstream open_for_reading(const fs::path& filename);
 
-/// Reads a (binary) file from disk into the string `contents`.
-std::string read_whole_file(const fs::path& filename);
+/// Reads a (binary) file from disk.
+std::vector<std::byte> read_whole_file(const fs::path& filename);
 
 /// Dumps (binary) string contents to disk. The file is overwritten if it already exists.
 void write_whole_file(const fs::path& filename, std::string_view contents = "");