Release 1.2.0

.clang-format

@@ -28,7 +28,7 @@ SpacesInAngles: 'false'
 SpacesInContainerLiterals: 'false'
 SpacesInParentheses: 'false'
 SpacesInSquareBrackets: 'false'
-Standard: c++17
+Standard: c++20
 UseTab: Never
 SortIncludes: true
 ColumnLimit: 100

.gitignore

@@ -1,3 +1,5 @@
 /build*/
 /compile_commands.json
 /.cache/
+/.vscode/
+.DS_STORE

.gitmodules

@@ -1,9 +1,6 @@
-[submodule "external/oxen-encoding"]
-	path = external/oxen-encoding
-	url = https://github.com/oxen-io/oxen-encoding.git
 [submodule "external/libsodium-internal"]
     path = external/libsodium-internal
-    url = https://github.com/jagerman/libsodium-internal.git
+    url = https://github.com/session-foundation/libsodium-internal.git
 [submodule "tests/Catch2"]
 	path = tests/Catch2
 	url = https://github.com/catchorg/Catch2
@@ -13,3 +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

CMakeLists.txt

@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.13...3.23)
+cmake_minimum_required(VERSION 3.14...3.23)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Has to be set before `project()`, and ignored on non-macos:
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13 CACHE STRING "macOS deployment target (Apple clang only)")
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "macOS deployment target (Apple clang only)")
 
 set(LANGS C CXX)
 find_program(CCACHE_PROGRAM ccache)
@@ -16,12 +16,16 @@ if(CCACHE_PROGRAM)
   endforeach()
 endif()
 
-
 project(libsession-util
-    VERSION 1.1.0
+    VERSION 1.4.0
     DESCRIPTION "Session client utility library"
     LANGUAGES ${LANGS})
 
+message(STATUS "${PROJECT_NAME} v${PROJECT_VERSION}")
+
+set(LIBSESSION_LIBVERSION ${PROJECT_VERSION})
+
+include(GNUInstallDirs)
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
@@ -36,29 +40,50 @@ else()
 endif()
 
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
 
 set(default_static_libstd OFF)
 if(WIN32)
     set(default_static_libstd ON)
 endif()
 
-if(MINGW OR ANDROID OR IOS OR STATIC_BUNDLE)
-  set(use_lto_default OFF)
+option(BUILD_SHARED_LIBS "Build as shared library" OFF)
+
+if(BUILD_SHARED_LIBS)
+    set(static_default OFF)
 else()
-  set(use_lto_default ON)
+    set(static_default ON)
 endif()
 
+option(BUILD_STATIC_DEPS "Build all dependencies statically rather than trying to link to them on the system" ${static_default})
+option(STATIC_BUNDLE "Build a single static .a containing everything (both code and dependencies)" ${static_default})
 
+if(BUILD_SHARED_LIBS OR libsession_IS_TOPLEVEL_PROJECT)
+    set(install_default ON)
+else()
+    set(install_default OFF)
+endif()
+
+option(LIBSESSION_INSTALL "Install libsession-util libraries and headers to cmake install target; defaults to ON if BUILD_SHARED_LIBS is enabled or when building the top-level project" ${install_default})
+
+if(MINGW OR ANDROID OR IOS) # OR STATIC_BUNDLE)
+  set(use_lto_default OFF)
+else()
+  set(use_lto_default ON)
+endif()
 
 option(WARNINGS_AS_ERRORS "Treat all compiler warnings as errors" OFF)
+
 option(STATIC_LIBSTD "Statically link libstdc++/libgcc" ${default_static_libstd})
-option(STATIC_BUNDLE "Build a single static .a containing everything (both code and dependencies)" OFF)
-option(BUILD_SHARED_LIBS "Build as shared library" OFF)
+
 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)
+
 if(USE_LTO)
   include(CheckIPOSupported)
   check_ipo_supported(RESULT IPO_ENABLED OUTPUT ipo_error)
@@ -86,23 +111,40 @@ if(STATIC_LIBSTD)
     endif()
 endif()
 
+include(AddStaticBundleLib)
 
 # Always build PIC
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 
 add_subdirectory(external)
+
+if(ENABLE_ONIONREQ)
+    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")
+        else()
+            find_package(PkgConfig REQUIRED)
+            pkg_check_modules(NETTLE REQUIRED IMPORTED_TARGET nettle)
+            add_library(nettle INTERFACE)
+            target_link_libraries(nettle INTERFACE PkgConfig::NETTLE)
+            add_library(nettle::nettle ALIAS nettle)
+        endif()
+    endif()
+endif()
+
 add_subdirectory(src)
+add_subdirectory(proto)
+
+if (BUILD_STATIC_DEPS)
+    include(StaticBuild)
+endif()
 
 if(STATIC_BUNDLE)
+
     include(combine_archives)
 
-    combine_archives(session-util
-        crypto
-        config
-        version
-        libsodium::sodium-internal
-        libzstd_static)
+    combine_archives(session-util libsession-static-bundle "${LIBSESSION_STATIC_BUNDLE_LIBS}")
     set(lib_folder lib)
     if(IOS)
         set(lib_folder "${lib_folder}-${ARCH}")
@@ -117,3 +159,26 @@ option(WITH_TESTS "Enable unit tests" ${libsession_IS_TOPLEVEL_PROJECT})
 if(WITH_TESTS)
     add_subdirectory(tests)
 endif()
+
+
+if(LIBSESSION_INSTALL)
+
+    install(
+        TARGETS ${libsession_export_targets}
+        EXPORT libsessionConfig
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )
+
+    install(DIRECTORY include/session DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+        PATTERN *.h PATTERN *.hpp)
+
+    set(libsession_target_links)
+    foreach(tgt ${libsession_export_targets})
+        set(libsession_target_links "${libsession_target_links} -lsession-${tgt}")
+    endforeach()
+    configure_file(libsession-util.pc.in libsession-util.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libsession-util.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    )
+
+endif()

cmake/AddStaticBundleLib.cmake

@@ -0,0 +1,36 @@
+
+set(LIBSESSION_STATIC_BUNDLE_LIBS "" CACHE INTERNAL "list of libs to go into the static bundle lib")
+
+function(_libsession_static_bundle_append tgt)
+    list(APPEND LIBSESSION_STATIC_BUNDLE_LIBS "${tgt}")
+    set(LIBSESSION_STATIC_BUNDLE_LIBS "${LIBSESSION_STATIC_BUNDLE_LIBS}" CACHE INTERNAL "")
+endfunction()
+
+# Call as:
+#
+#     libsession_static_bundle(target [target2 ...])
+#
+# to append the given target(s) to the list of libraries that will be combined to make the static
+# bundled libsession-util.a.
+function(libsession_static_bundle)
+    foreach(tgt IN LISTS ARGN)
+        if(TARGET "${tgt}" AND NOT "${tgt}" IN_LIST LIBSESSION_STATIC_BUNDLE_LIBS)
+            get_target_property(tgt_type ${tgt} TYPE)
+
+            if(tgt_type STREQUAL STATIC_LIBRARY)
+                message(STATUS "Adding ${tgt} to libsession-util bundled library list")
+                _libsession_static_bundle_append("${tgt}")
+            endif()
+
+            if(tgt_type STREQUAL INTERFACE_LIBRARY)
+                get_target_property(tgt_link_deps ${tgt} INTERFACE_LINK_LIBRARIES)
+            else()
+                get_target_property(tgt_link_deps ${tgt} LINK_LIBRARIES)
+            endif()
+
+            if(tgt_link_deps)
+                libsession_static_bundle(${tgt_link_deps})
+            endif()
+        endif()
+    endforeach()
+endfunction()

cmake/GenVersion.cmake

@@ -41,14 +41,17 @@ else()
         OUTPUT_VARIABLE git_tag
         OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    if(git_tag)
+    if(git_tag AND git_tag MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+$")
         message(STATUS "${git_commit} is tagged (${git_tag}); tagging version as 'release'")
         set(vfull "v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
         set(PROJECT_VERSION_TAG "release")
 
         if (NOT git_tag STREQUAL "${vfull}")
             message(FATAL_ERROR "This commit is tagged, but the tag (${git_tag}) does not match the project version (${vfull})!")
         endif()
+    elseif(git_tag)
+        message(WARNING "Did not recognize git tag (${git_tag}) for ${git_commit}; tagging with commit hash")
+        set(PROJECT_VERSION_TAG "${git_commit}")
     else()
         message(STATUS "Did not find a git tag for ${git_commit}; tagging version with the commit hash")
         set(PROJECT_VERSION_TAG "${git_commit}")