Revert "disable windows wheel for now"

This reverts commit fc6edb4d20.
build: bump version to 4.4.1
2026-11-09 12:57:03 +00:00 · 2026-09-23 14:42:57 -04:00 · 2026-09-23 14:38:36 -04:00 · 2026-09-22 11:31:45 -04:00 · 2026-09-22 11:31:45 -04:00 · 2026-09-22 11:31:45 -04:00
25 changed files with 634 additions and 107 deletions
@@ -7,7 +7,7 @@ env:
  UBUNTU_FULL_DEPS: "libncurses5-dev libreadline-dev nettle-dev libasio-dev libgnutls28-dev libuv1-dev python3-pip python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev libfmt-dev libmsgpack-dev libargon2-dev"
  UBUNTU_MESON_DEPS: "ninja-build libncurses5-dev libreadline-dev nettle-dev libasio-dev libgnutls28-dev libuv1-dev python3-dev python3-setuptools python3-pip libcppunit-dev libjsoncpp-dev libfmt-dev libmsgpack-dev libargon2-dev"
  UBUNTU_MINIMAL_DEPS: "libncurses5-dev libreadline-dev nettle-dev libfmt-dev libgnutls28-dev libcppunit-dev libmsgpack-dev libargon2-dev"
-  DEBIAN13_DEPS: "git libtool pkg-config wget cmake libncurses5-dev libreadline-dev nettle-dev libasio-dev libgnutls28-dev libuv1-dev python3-pip python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev libfmt-dev libmsgpack-dev libargon2-dev"
+  DEBIAN13_DEPS: "git libtool pkg-config wget cmake libncurses5-dev libreadline-dev nettle-dev libasio-dev libgnutls28-dev libuv1-dev python3-pip python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev libfmt-dev libmsgpack-cxx-dev libargon2-dev"

 on: [push, pull_request]

@@ -36,7 +36,6 @@ jobs:
    name: Build wheels on Windows
    runs-on: windows-latest
    env:
-      VCPKG_VERSION: "2026.06.01"
      VCPKG_INSTALLATION_ROOT: "C:\\vcpkg"
      VCPKG_DISABLE_METRICS: "1"
      VCPKG_DEFAULT_TRIPLET: x64-windows-release
@@ -53,7 +52,10 @@ jobs:
          path: |
            ${{ env.VCPKG_INSTALLED_DIR }}
            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
-          key: ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ env.VCPKG_DEFAULT_TRIPLET }}-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/windows-build.yml') }}
+          key: ${{ runner.os }}-vcpkg-${{ env.VCPKG_DEFAULT_TRIPLET }}-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/python-wheels.yml') }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-${{ env.VCPKG_DEFAULT_TRIPLET }}-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
+            ${{ runner.os }}-vcpkg-${{ env.VCPKG_DEFAULT_TRIPLET }}-

      - name: Setup vcpkg and install dependencies
        if: steps.cache-vcpkg.outputs.cache-hit != 'true'
@@ -309,7 +309,6 @@ jobs:
    name: Build Windows MSI Installer
    runs-on: windows-latest
    env:
-      VCPKG_VERSION: "2026.06.01"
      VCPKG_INSTALLATION_ROOT: "C:\\vcpkg"
      VCPKG_DISABLE_METRICS: "1"
      VCPKG_DEFAULT_TRIPLET: x64-windows
@@ -339,7 +338,10 @@ jobs:
          path: |
            ${{ env.VCPKG_INSTALLED_DIR }}
            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
-          key: ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-x64-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/windows-build.yml') }}
+          key: ${{ runner.os }}-vcpkg-x64-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/release-package.yml') }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-x64-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
+            ${{ runner.os }}-vcpkg-x64-shared-

      - name: Setup vcpkg and install dependencies
        if: steps.cache-vcpkg.outputs.cache-hit != 'true'
@@ -413,7 +415,6 @@ jobs:
    name: Build Windows dhtnode
    runs-on: windows-latest
    env:
-      VCPKG_VERSION: "2026.06.01"
      VCPKG_INSTALLATION_ROOT: "C:\\vcpkg"
      VCPKG_DISABLE_METRICS: "1"
      VCPKG_DEFAULT_TRIPLET: x64-windows-static-release
@@ -437,10 +438,10 @@ jobs:
          path: |
            ${{ env.VCPKG_INSTALLED_DIR }}
            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
-          key: ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-x64-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/windows-build.yml') }}
+          key: ${{ runner.os }}-vcpkg-x64-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/release-package.yml') }}
          restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-x64-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-x64-static-
+            ${{ runner.os }}-vcpkg-x64-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
+            ${{ runner.os }}-vcpkg-x64-static-

      - name: Setup vcpkg and install static dependencies
        if: steps.cache-vcpkg-static.outputs.cache-hit != 'true'
@@ -9,7 +9,6 @@ on:
    branches: [ main, master ]

 env:
-  VCPKG_VERSION: "2026.06.01"
  VCPKG_INSTALLATION_ROOT: "C:\\vcpkg"
  VCPKG_DISABLE_METRICS: "1"
  VCPKG_INSTALLED_DIR: ${{ github.workspace }}\vcpkg_installed
@@ -36,7 +35,7 @@ jobs:
        id: generate_cache_key
        shell: pwsh
        run: |
-          $key_value = "${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/windows-build.yml') }}"
+          $key_value = "${{ runner.os }}-vcpkg-${{ matrix.arch }}-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/windows-build.yml') }}"
          echo "key=$key_value" >> $env:GITHUB_OUTPUT

      - name: Cache vcpkg installed packages
@@ -48,8 +47,8 @@ jobs:
            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
          key: ${{ steps.generate_cache_key.outputs.key }}
          restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-shared-
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-shared-

      - name: Setup vcpkg and install dependencies
        if: steps.cache-vcpkg.outputs.cache-hit != 'true'
@@ -84,7 +83,7 @@ jobs:
        id: generate_static_cache_key
        shell: pwsh
        run: |
-          $key_value = "${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/windows-build.yml') }}"
+          $key_value = "${{ runner.os }}-vcpkg-${{ matrix.arch }}-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}-${{ hashFiles('.github/workflows/windows-build.yml') }}"
          echo "key=$key_value" >> $env:GITHUB_OUTPUT

      - name: Cache vcpkg static installed packages
@@ -96,8 +95,8 @@ jobs:
            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
          key: ${{ steps.generate_static_cache_key.outputs.key }}
          restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-static-
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-static-

      - name: Setup vcpkg and install static dependencies
        if: steps.cache-vcpkg-static.outputs.cache-hit != 'true'
@@ -139,8 +138,8 @@ jobs:
            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
          key: ${{ needs.prepare-dependencies.outputs.vcpkg_cache_key }}
          restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-shared-
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-shared-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-shared-

      - name: Configure CMake
        shell: pwsh
@@ -216,8 +215,8 @@ jobs:
            ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
          key: ${{ needs.prepare-static-dependencies.outputs.vcpkg_static_cache_key }}
          restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
-            ${{ runner.os }}-vcpkg-${{ env.VCPKG_VERSION }}-${{ matrix.arch }}-static-
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-static-${{ hashFiles('**/vcpkg.json', '**/vcpkg-configuration.json') }}
+            ${{ runner.os }}-vcpkg-${{ matrix.arch }}-static-
      
      - name: Configure CMake for Static Build
        shell: pwsh
@@ -10,7 +10,7 @@ if(POLICY CMP0167)
 endif()

 set (opendht_VERSION_MAJOR 4)
-set (opendht_VERSION_MINOR 3.0)
+set (opendht_VERSION_MINOR 4.1)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -532,6 +532,8 @@ public:

    /**
     * Insert a push notification to process for OpenDHT
+     * Returns an immediately ready future with IgnoredStopped if the runner is idle,
+     * or IgnoredDisabled if push notification support is disabled at build time.
     */
    std::future<PushNotificationResult> pushNotificationReceived(const std::map<std::string, std::string>& data);

@@ -5,7 +5,7 @@ project(
    'cython',
    license: 'MIT',
    license_files: 'LICENSE',
-    version: '4.3.0',
+    version: '4.4.1',
    meson_version: '>=1.1.0',
    default_options: ['cpp_std=c++20', 'warning_level=3'],
 )
@@ -292,6 +292,24 @@ if get_option('tests').enabled()
    )
    test('NetworkEngine', test_networkengine)

+    test_opcache = executable(
+        'test_opcache',
+        'tests/test_opcache.cpp',
+        'tests/tests_runner.cpp',
+        include_directories: opendht_inc,
+        dependencies: [opendht_dep, cppunit, jsoncpp, fmt, openssl, msgpack],
+    )
+    test('OpCache', test_opcache)
+
+    test_valuecache = executable(
+        'test_valuecache',
+        'tests/test_valuecache.cpp',
+        'tests/tests_runner.cpp',
+        include_directories: opendht_inc,
+        dependencies: [opendht_dep, cppunit, jsoncpp, fmt, openssl, msgpack],
+    )
+    test('ValueCache', test_valuecache)
+
    test_crypto = executable(
        'test_crypto',
        'tests/test_crypto.cpp',
@@ -0,0 +1,118 @@
+diff --git a/SMP/libgnutls.vcxproj.filters b/SMP/libgnutls.vcxproj.filters
+index b182189..91ee160 100644
+--- a/SMP/libgnutls.vcxproj.filters
+++ b/SMP/libgnutls.vcxproj.filters
+@@ -103,9 +103,6 @@
+     <Filter Include="Header Files\lib\inih">
+       <UniqueIdentifier>{ae0c3eeb-53df-4c72-a85a-6b46de35e7ba}</UniqueIdentifier>
+     </Filter>
+-    <Filter Include="Source Files\libtasn1">
+-      <UniqueIdentifier>{32be60b7-8c65-486e-9df5-7e529443cf07}</UniqueIdentifier>
+-    </Filter>
+     <Filter Include="Source Files\lib\nettle\gost">
+       <UniqueIdentifier>{1f3549a8-3c3d-475f-8fd6-20451d336464}</UniqueIdentifier>
+     </Filter>
+@@ -1553,30 +1550,6 @@
+     <ClCompile Include="..\lib\nettle\sysrng-bcrypt.c">
+       <Filter>Source Files\lib\nettle</Filter>
+     </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\coding.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\decoding.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\element.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\errors.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\gstr.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\parser_aux.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\structure.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\version.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+     <ClCompile Include="..\lib\nettle\gost\acpkm.c">
+       <Filter>Source Files\lib\nettle\gost</Filter>
+     </ClCompile>
+diff --git a/SMP/libgnutls_files.props b/SMP/libgnutls_files.props
+index adcb074..2317c2a 100644
+--- a/SMP/libgnutls_files.props
+++ b/SMP/libgnutls_files.props
+@@ -179,13 +179,6 @@
+   <ItemGroup>
+     <ClCompile Include="lib\gnutls_asn1_tab.c" />
+     <ClCompile Include="lib\pkix_asn1_tab.c" />
+-    <ClCompile Include="..\devel\libtasn1\lib\coding.c" />
+-    <ClCompile Include="..\devel\libtasn1\lib\decoding.c" />
+-    <ClCompile Include="..\devel\libtasn1\lib\element.c" />
+-    <ClCompile Include="..\devel\libtasn1\lib\gstr.c" />
+-    <ClCompile Include="..\devel\libtasn1\lib\parser_aux.c" />
+-    <ClCompile Include="..\devel\libtasn1\lib\structure.c" />
+-    <ClCompile Include="..\devel\libtasn1\lib\version.c" />
+     <ClCompile Include="..\gnulib\lib\c-strcasecmp.c" />
+     <ClCompile Include="..\gnulib\lib\c-strncasecmp.c" />
+     <ClCompile Include="..\gnulib\lib\cloexec.c" />
+@@ -572,9 +565,6 @@
+     <ClCompile Include="..\gnulib\lib\readdir.c">
+       <ForcedIncludeFiles>dirent-private.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+     </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\errors.c">
+-      <ObjectFileName>$(IntDir)\tasn1_$(filename).obj</ObjectFileName>
+-    </ClCompile>
+     <ClCompile Include="..\lib\algorithms\ecc.c">
+       <ObjectFileName>$(IntDir)\alg_%(Filename).obj</ObjectFileName>
+     </ClCompile>
+diff --git a/SMP/libgnutls_winrt.vcxproj.filters b/SMP/libgnutls_winrt.vcxproj.filters
+index 014a408..ae5ecff 100644
+--- a/SMP/libgnutls_winrt.vcxproj.filters
+++ b/SMP/libgnutls_winrt.vcxproj.filters
+@@ -103,9 +103,6 @@
+     <Filter Include="Header Files\lib\inih">
+       <UniqueIdentifier>{ae0c3eeb-53df-4c72-a85a-6b46de35e7ba}</UniqueIdentifier>
+     </Filter>
+-    <Filter Include="Source Files\libtasn1">
+-      <UniqueIdentifier>{32be60b7-8c65-486e-9df5-7e529443cf07}</UniqueIdentifier>
+-    </Filter>
+     <Filter Include="Header Files\lib\nettle\gost">
+       <UniqueIdentifier>{4fada990-3138-4089-a6c7-ae722a0e7fe9}</UniqueIdentifier>
+     </Filter>
+@@ -1553,30 +1550,6 @@
+     <ClCompile Include="..\lib\nettle\sysrng-bcrypt.c">
+       <Filter>Source Files\lib\nettle</Filter>
+     </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\coding.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\decoding.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\element.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\errors.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\gstr.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\parser_aux.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\structure.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+-    <ClCompile Include="..\devel\libtasn1\lib\version.c">
+-      <Filter>Source Files\libtasn1</Filter>
+-    </ClCompile>
+     <ClCompile Include="..\lib\accelerated\afalg.c">
+       <Filter>Source Files\lib\accelerated</Filter>
+     </ClCompile>
@@ -0,0 +1,12 @@
+--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
+@@ -18,7 +18,7 @@
+ Name: GnuTLS
+ Description: Transport Security Layer implementation for the GNU system
+ URL: https://www.gnutls.org/
+ Version: @VERSION@
+-Libs: -L${libdir} -lgnutls
+Libs: -L${libdir} @GNUTLS_LIBS@
+ Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
@@ -0,0 +1,187 @@
+set(GNULIB_REF "1cc0125a28cba4e8503d853bf99b854fe4dd454c")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO savoirfairelinux/gnutls
+    REF 300b0c721fc1809f3d191b7f9e289c0267eabd01
+    SHA512 8a74fbf0343e658f6321da0f28bcc05c580fb7b950f6edfb6a8fdaad6d814456ed2dbf94e8dd330c7740c836f01e04552e649d529ee29424c3641861c41344bf
+    HEAD_REF fix/ci-msvc
+    PATCHES
+        external-libtasn1.patch
+        pkgconfig.patch
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/devel/perlasm")
+
+vcpkg_download_distfile(
+    GNULIB_SNAPSHOT
+    URLS "https://gitlab.com/libidn/gnulib-mirror/-/archive/${GNULIB_REF}/gnulib-mirror-${GNULIB_REF}.tar.gz"
+    FILENAME "gnulib-mirror-${GNULIB_REF}.tar.gz"
+    SHA512 340539bd7b8e30b1e0f81a15fb207960e9ae3c4ef515f39f1d1bdb43ed52ad94a29c6a6ce8bbca3484ba5392e1dae7447c2f6b58124209614e884345e13914f5
+)
+
+vcpkg_extract_source_archive(
+    GNULIB_SOURCE_PATH
+    ARCHIVE "${GNULIB_SNAPSHOT}"
+    SOURCE_BASE ${GNULIB_REF}
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/gnulib")
+file(RENAME "${GNULIB_SOURCE_PATH}" "${SOURCE_PATH}/gnulib")
+
+include("${CURRENT_HOST_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake")
+yasm_tool_helper(OUT_VAR YASM)
+file(TO_NATIVE_PATH "${YASM}" YASM)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    set(CONFIGURATION_RELEASE ReleaseDLL)
+    set(CONFIGURATION_DEBUG DebugDLL)
+else()
+    set(CONFIGURATION_RELEASE Release)
+    set(CONFIGURATION_DEBUG Debug)
+endif()
+
+if(VCPKG_TARGET_IS_UWP)
+    string(APPEND CONFIGURATION_RELEASE WinRT)
+    string(APPEND CONFIGURATION_DEBUG WinRT)
+endif()
+
+set(_gnutlsproject "${SOURCE_PATH}/SMP/libgnutls.vcxproj")
+file(READ "${_gnutlsproject}" _contents)
+string(REPLACE  [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />]]
+                    "<Import Project=\"${CURRENT_HOST_INSTALLED_DIR}/share/vs-yasm/yasm.props\" />"
+                _contents "${_contents}")
+string(REPLACE  [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />]]
+                    "<Import Project=\"${CURRENT_HOST_INSTALLED_DIR}/share/vs-yasm/yasm.targets\" />"
+                _contents "${_contents}")
+string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_HOST_INSTALLED_DIR}/share" _contents "${_contents}") # Above already
+file(WRITE "${_gnutlsproject}" "${_contents}")
+
+if(VCPKG_CRT_LINKAGE STREQUAL "static")
+    set(RuntimeLibraryExt "")
+else()
+    set(RuntimeLibraryExt "DLL")
+endif()
+
+# patch output library file path and name
+foreach(PROPS IN ITEMS
+"${SOURCE_PATH}/SMP/smp_deps.props"
+"${SOURCE_PATH}/SMP/smp_winrt_deps.props")
+vcpkg_replace_string(
+    "${PROPS}"
+    [=[_winrt</TargetName>]=]
+    [=[</TargetName>]=]
+    IGNORE_UNCHANGED
+)
+vcpkg_replace_string(
+    "${PROPS}"
+    [=[<TargetName>lib$(RootNamespace)]=]
+    [=[<TargetName>$(RootNamespace)]=]
+)
+endforeach()
+
+# patch hogweed, gmp, nettle, zlib libraries file names; inject RuntimeLibrary property to control CRT linkage 
+foreach(VCXPROJ IN ITEMS
+"${SOURCE_PATH}/SMP/libgnutls.vcxproj"
+"${SOURCE_PATH}/SMP/libgnutls_winrt.vcxproj")
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "_winrt.lib"
+    ".lib"
+    IGNORE_UNCHANGED
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "libhogweed"
+    "hogweed"
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "hogweedd"
+    "hogweed"
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "libgmp"
+    "gmp"
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "gmpd"
+    "gmp"
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "libnettle"
+    "nettle"
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "nettled"
+    "nettle"
+)
+set(zlib_basename "zlib")
+if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/zs.lib")
+    set(zlib_basename "zs")
+elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/z.lib")
+    set(zlib_basename "z")
+endif()
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "libzlib"
+    "${zlib_basename}"
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    "zlib"
+    "${zlib_basename}"
+)
+vcpkg_replace_string(
+    "${VCXPROJ}"
+    [=[</DisableSpecificWarnings>]=]
+    [=[</DisableSpecificWarnings><ForcedIncludeFiles>gnutls_msvc_fixes.h;%(ForcedIncludeFiles)</ForcedIncludeFiles><RuntimeLibrary>$(RuntimeLibrary)</RuntimeLibrary>]=]
+)
+endforeach()
+
+vcpkg_install_msbuild(
+    USE_VCPKG_INTEGRATION
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH SMP/libgnutls.sln
+    PLATFORM ${TRIPLET_SYSTEM_ARCH}
+    LICENSE_SUBPATH LICENSE
+    RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE}
+    DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG}
+    SKIP_CLEAN
+    OPTIONS /p:YasmPath="${YASM}" /p:OutDir=..\\msvc
+    OPTIONS_DEBUG /p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}
+    OPTIONS_RELEASE /p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}
+)
+
+get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
+if(VCPKG_TARGET_IS_UWP)
+    set(WINRT_SUBFOLDER libgnutls_winrt)
+endif()
+file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/${WINRT_SUBFOLDER}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
+
+set(GNUTLS_REQUIRES_PRIVATE "Requires.private: gmp, nettle, hogweed, libtasn1, zlib")
+set(GNUTLS_LIBS_PRIVATE "-lcrypt32 -lws2_32 -lkernel32 -lncrypt")
+
+set(prefix "${CURRENT_INSTALLED_DIR}")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+set(GNUTLS_LIBS "-lgnutls")
+configure_file("${SOURCE_PATH}/lib/gnutls.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gnutls.pc" @ONLY)
+
+if(NOT VCPKG_BUILD_TYPE)
+  set(prefix "${CURRENT_INSTALLED_DIR}/debug")
+  set(exec_prefix "\${prefix}")
+  set(libdir "\${prefix}/lib")
+  set(includedir "\${prefix}/../include")
+  set(GNUTLS_LIBS "-lgnutlsd")
+  configure_file("${SOURCE_PATH}/lib/gnutls.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gnutls.pc" @ONLY)
+endif()
+
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+file(COPY "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gnutls")
@@ -0,0 +1,2 @@
+find_library(GNUTLS_LIBRARY NAMES gnutls gnutlsd NAMES_PER_DIR)
+_find_package(${ARGS})
@@ -0,0 +1,23 @@
+{
+    "name": "shiftmedia-libgnutls",
+    "version": "3.8.13",
+    "port-version": 0,
+    "description": "GnuTLS fork maintained by Savoir-faire Linux with native Visual Studio project build tools.",
+    "homepage": "https://github.com/savoirfairelinux/gnutls",
+    "license": "LGPL-2.1-only",
+    "supports": "windows & !arm & !mingw & !xbox",
+    "dependencies": [
+        "gmp",
+        "libtasn1",
+        "nettle",
+        {
+            "name": "vs-yasm",
+            "host": true
+        },
+        {
+            "name": "yasm-tool-helper",
+            "host": true
+        },
+        "zlib"
+    ]
+}
@@ -1659,24 +1659,8 @@ OcspResponse::toString(const bool compact) const
 gnutls_ocsp_cert_status_t
 OcspResponse::getCertificateStatus() const
 {
-    int ret;
    unsigned int status;
-    // MSVC/vcpkg GnuTLS cast workaround
-#if _WIN32 && (GNUTLS_VERSION_NUMBER == 0x030807)
-    ret = gnutls_ocsp_resp_get_single(response,
-                                      0,
-                                      NULL,
-                                      NULL,
-                                      NULL,
-                                      NULL,
-                                      reinterpret_cast<gnutls_ocsp_cert_status_t*>(&status),
-                                      NULL,
-                                      NULL,
-                                      NULL,
-                                      NULL);
-#else
-    ret = gnutls_ocsp_resp_get_single(response, 0, NULL, NULL, NULL, NULL, &status, NULL, NULL, NULL, NULL);
-#endif
+    int ret = gnutls_ocsp_resp_get_single(response, 0, NULL, NULL, NULL, NULL, &status, NULL, NULL, NULL, NULL);
    if (ret < 0)
        throw CryptoException(gnutls_strerror(ret));
    return (gnutls_ocsp_cert_status_t) status;
@@ -1735,22 +1719,7 @@ OcspResponse::verifyDirect(const Certificate& crt, const Blob& nonce)

    // Check certificate revocation status
    unsigned int status_ocsp;
-    // MSVC/vcpkg GnuTLS cast workaround
-#if _WIN32 && (GNUTLS_VERSION_NUMBER == 0x030807)
-    ret = gnutls_ocsp_resp_get_single(response,
-                                      0,
-                                      NULL,
-                                      NULL,
-                                      NULL,
-                                      NULL,
-                                      reinterpret_cast<gnutls_ocsp_cert_status_t*>(&status_ocsp),
-                                      NULL,
-                                      NULL,
-                                      NULL,
-                                      NULL);
-#else
    ret = gnutls_ocsp_resp_get_single(response, 0, NULL, NULL, NULL, NULL, &status_ocsp, NULL, NULL, NULL, NULL);
-#endif
    if (ret < 0)
        throw CryptoException(gnutls_strerror(ret));
    return (gnutls_ocsp_cert_status_t) status_ocsp;
@@ -1239,6 +1239,10 @@ DhtRunner::pushNotificationReceived([[maybe_unused]] const std::map<std::string,
    auto ret_token = std::make_shared<std::promise<PushNotificationResult>>();
    auto future = ret_token->get_future();
    std::lock_guard lck(storage_mtx);
+    if (running == State::Idle) {
+        ret_token->set_value(PushNotificationResult::IgnoredStopped);
+        return future;
+    }
    pending_ops_prio.emplace([ret_token, this, data](SecureDht&) {
        if (dht_)
            ret_token->set_value(dht_->pushNotificationReceived(data));
@@ -39,8 +39,10 @@ OpValueCache::onValuesExpired(const std::vector<Sp<Value>>& vals, const system_c
        if (vit != values.end()) {
            if (vit->second.updated > t)
                continue;
-            if (v->seq < vit->second.data->seq)
-                continue; // source held an older version, not counted
+            // Mirror onValuesAdded: a version that was never counted (different
+            // content, not a newer seq) must not decrement the refcount
+            if (*v != *vit->second.data and v->seq <= vit->second.data->seq)
+                continue;

            vit->second.updated = t;
            vit->second.refCount--;
@@ -189,7 +189,7 @@ private:
                v->second.created = now;
                v->second.expiration = now + te;
                v->second.typeExpiration = te;
-                if (value->seq > v->second.data->seq) {
+                if (*value != *v->second.data and value->seq > v->second.data->seq) {
                    // edited value (same rule as OpValueCache): emit as add
                    v->second.data = value;
                    nvals.emplace_back(value);
@@ -16,6 +16,21 @@ using namespace std::chrono_literals;
 namespace test {
 CPPUNIT_TEST_SUITE_REGISTRATION(DhtProxyTester);

+#ifdef OPENDHT_PUSH_NOTIFICATIONS
+namespace {
+// The result is produced on the DHT thread, which may be blocked in a listen
+// callback waiting for the same mutex: never hold it while waiting.
+dht::PushNotificationResult
+sendPush(dht::DhtRunner& node, const std::map<std::string, std::string>& data, std::unique_lock<std::mutex>& lk)
+{
+    lk.unlock();
+    auto ret = node.pushNotificationReceived(data).get();
+    lk.lock();
+    return ret;
+}
+} // namespace
+#endif
+
 void
 DhtProxyTester::setUp()
 {
@@ -332,7 +347,7 @@ DhtProxyTester::testPushListenValueEdit()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    nodeClient.pushNotificationReceived(push_data).get();
+    sendPush(nodeClient, push_data, lk);

    // Wait for first add callback
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] {
@@ -357,7 +372,7 @@ DhtProxyTester::testPushListenValueEdit()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    nodeClient.pushNotificationReceived(push_data).get();
+    sendPush(nodeClient, push_data, lk);

    // Wait for the second add
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] {
@@ -389,7 +404,7 @@ DhtProxyTester::testPushListenValueEdit()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    CPPUNIT_ASSERT(nodeClient.pushNotificationReceived(push_data).get() == dht::PushNotificationResult::ValuesExpired);
+    CPPUNIT_ASSERT(sendPush(nodeClient, push_data, lk) == dht::PushNotificationResult::ValuesExpired);

    // Wait for the expire callback
    CPPUNIT_ASSERT_MESSAGE("Should receive expire callback via push", cv.wait_for(lk, 10s, [&] {
@@ -541,7 +556,7 @@ DhtProxyTester::testPushNotification()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    CPPUNIT_ASSERT(nodeClient.pushNotificationReceived(push_data).get() == dht::PushNotificationResult::Values);
+    CPPUNIT_ASSERT(sendPush(nodeClient, push_data, lk) == dht::PushNotificationResult::Values);

    // Wait for client to receive the value
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] { return gotValues; }));
@@ -570,7 +585,7 @@ DhtProxyTester::testPushNotification()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    CPPUNIT_ASSERT(nodeClient.pushNotificationReceived(push_data).get() == dht::PushNotificationResult::Values);
+    CPPUNIT_ASSERT(sendPush(nodeClient, push_data, lk) == dht::PushNotificationResult::Values);

    // Wait for client to receive the edited value
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] { return gotValues; }));
@@ -587,7 +602,7 @@ DhtProxyTester::testPushNotification()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    CPPUNIT_ASSERT(nodeClient.pushNotificationReceived(push_data).get() == dht::PushNotificationResult::ValuesExpired);
+    CPPUNIT_ASSERT(sendPush(nodeClient, push_data, lk) == dht::PushNotificationResult::ValuesExpired);

    cv.wait_for(lk, 500ms, [&] { return gotExpiredValues; });

@@ -1118,7 +1133,8 @@ DhtProxyTester::testPushMultiValueEditExpire()
    auto key = dht::InfoHash::get("pushMultiEditExpire");
    auto identity = dht::crypto::generateIdentity("MultiEditAuthor");

-    struct Event {
+    struct Event
+    {
        dht::Value::Id id;
        uint16_t seq;
        bool expired;
@@ -1176,7 +1192,7 @@ DhtProxyTester::testPushMultiValueEditExpire()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    nodeClient.pushNotificationReceived(push_data).get();
+    sendPush(nodeClient, push_data, lk);

    // Wait for both values to arrive
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] {
@@ -1209,7 +1225,7 @@ DhtProxyTester::testPushMultiValueEditExpire()
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
    push_data.erase("exp");
-    nodeClient.pushNotificationReceived(push_data).get();
+    sendPush(nodeClient, push_data, lk);

    // Wait for the edited value (id=100, seq=2) to arrive
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] {
@@ -1232,13 +1248,11 @@ DhtProxyTester::testPushMultiValueEditExpire()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    CPPUNIT_ASSERT(nodeClient.pushNotificationReceived(push_data).get() == dht::PushNotificationResult::ValuesExpired);
+    CPPUNIT_ASSERT(sendPush(nodeClient, push_data, lk) == dht::PushNotificationResult::ValuesExpired);

    // Wait for expire callback for value B
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] {
-        return std::any_of(events.begin(), events.end(), [](const Event& e) {
-            return e.id == 200 && e.expired;
-        });
+        return std::any_of(events.begin(), events.end(), [](const Event& e) { return e.id == 200 && e.expired; });
    }));

    // Verify: value A (edited) should NOT have been expired
@@ -1288,7 +1302,8 @@ DhtProxyTester::testPushRefreshNoSpuriousExpire()
    auto key = dht::InfoHash::get("pushRefreshNoExpire");
    auto identity = dht::crypto::generateIdentity("RefreshAuthor");

-    struct Event {
+    struct Event
+    {
        dht::Value::Id id;
        bool expired;
    };
@@ -1328,7 +1343,7 @@ DhtProxyTester::testPushRefreshNoSpuriousExpire()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    nodeClient.pushNotificationReceived(push_data).get();
+    sendPush(nodeClient, push_data, lk);

    // Wait for all 3 values to arrive
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] {
@@ -1354,7 +1369,7 @@ DhtProxyTester::testPushRefreshNoSpuriousExpire()
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
    push_data.erase("exp");
-    nodeClient.pushNotificationReceived(push_data).get();
+    sendPush(nodeClient, push_data, lk);

    // Wait a bit for any callbacks
    cv.wait_for(lk, 1s);
@@ -1375,13 +1390,11 @@ DhtProxyTester::testPushRefreshNoSpuriousExpire()
    push_data["t"] = std::to_string(
        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
            .count());
-    nodeClient.pushNotificationReceived(push_data).get();
+    sendPush(nodeClient, push_data, lk);

    // Wait for expire callback
    CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&] {
-        return std::any_of(events.begin(), events.end(), [](const Event& e) {
-            return e.id == 20 && e.expired;
-        });
+        return std::any_of(events.begin(), events.end(), [](const Event& e) { return e.id == 20 && e.expired; });
    }));

    // Verify only value 20 expired, not 10 or 30
@@ -1426,7 +1439,12 @@ DhtProxyTester::testProxyListenEditChain()
    auto key = dht::InfoHash::get("proxyEditChain");
    auto identity = dht::crypto::generateIdentity("ProxyChainEditTester");

-    struct Event { dht::Value::Id id; uint16_t seq; bool expired; };
+    struct Event
+    {
+        dht::Value::Id id;
+        uint16_t seq;
+        bool expired;
+    };
    std::vector<Event> events;

    auto ftoken = nodeClient.listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>& vals, bool expired) {
@@ -1493,8 +1511,7 @@ DhtProxyTester::testProxyListenEditChain()
        for (const auto& e : events)
            if (!e.expired && e.seq > maxSeq)
                maxSeq = e.seq;
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Latest add should be the final version",
-                                     (uint16_t) NUM_EDITS, maxSeq);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Latest add should be the final version", (uint16_t) NUM_EDITS, maxSeq);
    }

    // Wait for natural expiration
@@ -1518,8 +1535,7 @@ DhtProxyTester::testProxyListenEditChain()
            }
        }
        CPPUNIT_ASSERT_EQUAL_MESSAGE("Should have exactly 1 expire via proxy", 1, expireCount);
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("Expired value should be the latest",
-                                     (uint16_t) NUM_EDITS, expiredSeq);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Expired value should be the latest", (uint16_t) NUM_EDITS, expiredSeq);
    }

    nodeClient.cancelListen(key, ftoken.get());
@@ -1557,7 +1573,12 @@ DhtProxyTester::testPushRapidEditsNoPhantom()
    auto key = dht::InfoHash::get("pushRapidEdits");
    auto identity = dht::crypto::generateIdentity("RapidEditAuthor");

-    struct Event { dht::Value::Id id; uint16_t seq; bool expired; };
+    struct Event
+    {
+        dht::Value::Id id;
+        uint16_t seq;
+        bool expired;
+    };
    std::vector<Event> events;

    auto ftoken = nodeClient.listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>& vals, bool expired) {
@@ -1593,12 +1614,9 @@ DhtProxyTester::testPushRapidEditsNoPhantom()
        std::map<std::string, std::string> push_data;
        push_data["key"] = key.toString();
        push_data["t"] = std::to_string(
-            std::chrono::duration_cast<std::chrono::milliseconds>(
-                std::chrono::system_clock::now().time_since_epoch())
+            std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
                .count());
-        lk.unlock();
-        nodeClient.pushNotificationReceived(push_data).get();
-        lk.lock();
+        sendPush(nodeClient, push_data, lk);
    }

    // Wait for edits to arrive (at least 2: initial + latest)
@@ -1669,7 +1687,12 @@ DhtProxyTester::testPushRefreshAfterEditKeepsLatest()
    auto key = dht::InfoHash::get("pushRefreshAfterEdit");
    auto identity = dht::crypto::generateIdentity("RefreshEditAuthor");

-    struct Event { dht::Value::Id id; uint16_t seq; bool expired; };
+    struct Event
+    {
+        dht::Value::Id id;
+        uint16_t seq;
+        bool expired;
+    };
    std::vector<Event> events;

    auto ftoken = nodeClient.listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>& vals, bool expired) {
@@ -1705,12 +1728,9 @@ DhtProxyTester::testPushRefreshAfterEditKeepsLatest()
        std::map<std::string, std::string> push_data;
        push_data["key"] = key.toString();
        push_data["t"] = std::to_string(
-            std::chrono::duration_cast<std::chrono::milliseconds>(
-                std::chrono::system_clock::now().time_since_epoch())
+            std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
                .count());
-        lk.unlock();
-        nodeClient.pushNotificationReceived(push_data).get();
-        lk.lock();
+        sendPush(nodeClient, push_data, lk);
    }

    // Wait for initial add
@@ -1742,12 +1762,9 @@ DhtProxyTester::testPushRefreshAfterEditKeepsLatest()
        std::map<std::string, std::string> push_data;
        push_data["key"] = key.toString();
        push_data["t"] = std::to_string(
-            std::chrono::duration_cast<std::chrono::milliseconds>(
-                std::chrono::system_clock::now().time_since_epoch())
+            std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
                .count());
-        lk.unlock();
-        nodeClient.pushNotificationReceived(push_data).get();
-        lk.lock();
+        sendPush(nodeClient, push_data, lk);
    }

    // Wait for the edit add (seq=3)
@@ -1765,12 +1782,9 @@ DhtProxyTester::testPushRefreshAfterEditKeepsLatest()
        std::map<std::string, std::string> push_data;
        push_data["key"] = key.toString();
        push_data["t"] = std::to_string(
-            std::chrono::duration_cast<std::chrono::milliseconds>(
-                std::chrono::system_clock::now().time_since_epoch())
+            std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
                .count());
-        lk.unlock();
-        nodeClient.pushNotificationReceived(push_data).get();
-        lk.lock();
+        sendPush(nodeClient, push_data, lk);
    }

    // Wait a bit for any callbacks
@@ -16,6 +16,58 @@ using namespace std::literals;

 namespace test {
 CPPUNIT_TEST_SUITE_REGISTRATION(DhtRunnerTester);
+CPPUNIT_TEST_SUITE_REGISTRATION(DhtRunnerPushTester);
+
+namespace {
+#if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
+constexpr auto stoppedPushResult = dht::PushNotificationResult::IgnoredStopped;
+#else
+constexpr auto stoppedPushResult = dht::PushNotificationResult::IgnoredDisabled;
+#endif
+}
+
+void
+DhtRunnerPushTester::testPushBeforeRun()
+{
+    dht::DhtRunner node;
+    auto result = node.pushNotificationReceived({});
+    CPPUNIT_ASSERT(result.wait_for(0s) == std::future_status::ready);
+    CPPUNIT_ASSERT(result.get() == stoppedPushResult);
+}
+
+void
+DhtRunnerPushTester::testPushAfterJoin()
+{
+    dht::DhtRunner node;
+    node.run(0);
+    node.join();
+    auto result = node.pushNotificationReceived({});
+    CPPUNIT_ASSERT(result.wait_for(0s) == std::future_status::ready);
+    CPPUNIT_ASSERT(result.get() == stoppedPushResult);
+}
+
+void
+DhtRunnerPushTester::testPushBurstAfterJoin()
+{
+    dht::DhtRunner node;
+    node.run(0);
+    node.join();
+    for (unsigned i = 0; i < 32; ++i) {
+        auto result = node.pushNotificationReceived({});
+        CPPUNIT_ASSERT(result.wait_for(0s) == std::future_status::ready);
+        CPPUNIT_ASSERT(result.get() == stoppedPushResult);
+    }
+}
+
+void
+DhtRunnerPushTester::testPushWhileRunning()
+{
+    dht::DhtRunner node;
+    node.run(0);
+    auto result = node.pushNotificationReceived({});
+    CPPUNIT_ASSERT(result.wait_for(5s) == std::future_status::ready);
+    CPPUNIT_ASSERT(result.get() != dht::PushNotificationResult::IgnoredStopped);
+}

 template<typename T>
 T
@@ -10,6 +10,22 @@

 namespace test {

+class DhtRunnerPushTester : public CppUnit::TestFixture
+{
+    CPPUNIT_TEST_SUITE(DhtRunnerPushTester);
+    CPPUNIT_TEST(testPushBeforeRun);
+    CPPUNIT_TEST(testPushAfterJoin);
+    CPPUNIT_TEST(testPushBurstAfterJoin);
+    CPPUNIT_TEST(testPushWhileRunning);
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void testPushBeforeRun();
+    void testPushAfterJoin();
+    void testPushBurstAfterJoin();
+    void testPushWhileRunning();
+};
+
 class DhtRunnerTester : public CppUnit::TestFixture
 {
    CPPUNIT_TEST_SUITE(DhtRunnerTester);
@@ -210,6 +210,32 @@ OpCacheTester::testStaleExpireIgnored()
    CPPUNIT_ASSERT_EQUAL((uint16_t) 2, events.back().seq);
 }

+void
+OpCacheTester::testSameSeqConflictExpireIgnored()
+{
+    // A different payload with the same seq (e.g. the same signed content
+    // re-signed with a randomized signature) is ignored on add and not
+    // counted: its expiration must be ignored too.
+    std::vector<Event> events;
+    dht::OpValueCache cache(recordEvents(events));
+
+    auto x = makeValue(60, 0, "x");
+    auto y = makeValue(60, 0, "y");
+
+    cache.onValuesAdded({x}); // A
+    cache.onValuesAdded({y}); // B: same seq, different content
+    CPPUNIT_ASSERT_EQUAL(1u, count(events, false));
+    CPPUNIT_ASSERT(cache.get(60)->data == x->data);
+
+    cache.onValuesExpired({y}); // B
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("An uncounted version must not expire the value", (size_t) 1, cache.size());
+    CPPUNIT_ASSERT_EQUAL(0u, count(events, true));
+
+    cache.onValuesExpired({x}); // A
+    CPPUNIT_ASSERT_EQUAL((size_t) 0, cache.size());
+    CPPUNIT_ASSERT_EQUAL(1u, count(events, true));
+}
+
 void
 OpCacheTester::testCallbacks()
 {
@@ -543,6 +569,29 @@ OpCacheTester::testSourceDropKeepsValue()
    CPPUNIT_ASSERT_EQUAL((size_t) 0, searchCache.get(dht::Value::Filter {}).size());
 }

+void
+OpCacheTester::testSeqOnlyRefreshNotCounted()
+{
+    // A node re-announcing the same content with a bumped seq must not be
+    // counted as an additional source by the OpValueCache above it, or the
+    // value would survive the node's departure.
+    std::vector<Event> events;
+    dht::OpValueCache parent(recordEvents(events));
+    dht::TypeStore types;
+    auto now = dht::clock::now();
+
+    auto v = makeValue(42, 0, "same");
+    auto vBumped = makeValue(42, 1, "same");
+    {
+        dht::ValueCache node([&](const Values& vals, bool expired) { parent.onValue(vals, expired); });
+        node.onValues({v}, {}, {}, types, now);
+        node.onValues({vBumped}, {}, {}, types, now);
+        CPPUNIT_ASSERT_EQUAL(1u, count(events, false));
+    }
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Node gone: its value must be expired once", 1u, count(events, true));
+    CPPUNIT_ASSERT_EQUAL((size_t) 0, parent.size());
+}
+
 void
 OpCacheTester::testHighChurnRefCountConsistency()
 {
@@ -16,6 +16,7 @@ class OpCacheTester : public CppUnit::TestFixture
    CPPUNIT_TEST(testEditChainMultiSource);
    CPPUNIT_TEST(testStaleAddIgnored);
    CPPUNIT_TEST(testStaleExpireIgnored);
+    CPPUNIT_TEST(testSameSeqConflictExpireIgnored);
    CPPUNIT_TEST(testCallbacks);
    CPPUNIT_TEST(testFilters);
    CPPUNIT_TEST(testSyncStatus);
@@ -26,6 +27,7 @@ class OpCacheTester : public CppUnit::TestFixture
    CPPUNIT_TEST(testGetCallbackReturnsFalse);
    CPPUNIT_TEST(testTimestampOrdering);
    CPPUNIT_TEST(testSourceDropKeepsValue);
+    CPPUNIT_TEST(testSeqOnlyRefreshNotCounted);
    CPPUNIT_TEST(testHighChurnRefCountConsistency);
    CPPUNIT_TEST(testValueUpdateSingleSourcePhantom);
    CPPUNIT_TEST(testExpireAfterUpdate);
@@ -43,6 +45,7 @@ public:
    void testEditChainMultiSource();
    void testStaleAddIgnored();
    void testStaleExpireIgnored();
+    void testSameSeqConflictExpireIgnored();
    void testCallbacks();
    void testFilters();
    void testSyncStatus();
@@ -53,6 +56,7 @@ public:
    void testGetCallbackReturnsFalse();
    void testTimestampOrdering();
    void testSourceDropKeepsValue();
+    void testSeqOnlyRefreshNotCounted();
    void testHighChurnRefCountConsistency();
    void testValueUpdateSingleSourcePhantom();
    void testExpireAfterUpdate();
@@ -353,6 +353,47 @@ ValueCacheTester::testSameSeqEditIgnored()
    CPPUNIT_ASSERT_EQUAL(2, addCount);
 }

+void
+ValueCacheTester::testSameContentHigherSeqIsRefresh()
+{
+    // Value::operator== ignores seq: identical content with a bumped seq is
+    // the same value re-announced, not an edition. Re-emitting it would make
+    // a source-counting OpValueCache count this node twice.
+    int addCount = 0;
+    dht::ValueCache cache([&](const std::vector<std::shared_ptr<dht::Value>>& vals, bool expired) {
+        if (!expired)
+            addCount += vals.size();
+    });
+    dht::TypeStore types;
+    auto now = std::chrono::steady_clock::now();
+
+    auto v1 = std::make_shared<dht::Value>();
+    v1->id = 1;
+    v1->seq = 0;
+    v1->data = {'A'};
+    cache.onValues({v1}, {}, {}, types, now);
+    CPPUNIT_ASSERT_EQUAL(1, addCount);
+
+    auto sameContent = std::make_shared<dht::Value>();
+    sameContent->id = 1;
+    sameContent->seq = 1;
+    sameContent->data = {'A'};
+    auto later = now + std::chrono::minutes(5);
+    cache.onValues({sameContent}, {}, {}, types, later);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Same content with a higher seq is a refresh, not an edit", 1, addCount);
+
+    // The refresh still extends the expiration (default type: 10 minutes)
+    cache.expireValues(now + std::chrono::minutes(11));
+    CPPUNIT_ASSERT_EQUAL((size_t) 1, cache.size());
+
+    auto edited = std::make_shared<dht::Value>();
+    edited->id = 1;
+    edited->seq = 2;
+    edited->data = {'B'};
+    cache.onValues({edited}, {}, {}, types, later);
+    CPPUNIT_ASSERT_EQUAL(2, addCount);
+}
+
 void
 ValueCacheTester::testShortExpirationRefreshLost()
 {
@@ -20,6 +20,7 @@ class ValueCacheTester : public CppUnit::TestFixture
    CPPUNIT_TEST(testMaxValues);
    CPPUNIT_TEST(testUpdateTypeExpiration);
    CPPUNIT_TEST(testSameSeqEditIgnored);
+    CPPUNIT_TEST(testSameContentHigherSeqIsRefresh);
    CPPUNIT_TEST(testShortExpirationRefreshLost);
    CPPUNIT_TEST(testShortExpirationHighChurn);
    CPPUNIT_TEST(testGracePeriodWhileSynced);
@@ -40,6 +41,7 @@ public:
    void testMaxValues();
    void testUpdateTypeExpiration();
    void testSameSeqEditIgnored();
+    void testSameContentHigherSeqIsRefresh();
    void testShortExpirationRefreshLost();
    void testShortExpirationHighChurn();
    void testGracePeriodWhileSynced();
@@ -1,9 +1,12 @@
 {
  "default-registry": {
    "kind": "git",
-    "baseline": "f3e10653cc27d62a37a3763cd84b38bca07c6075",
+    "baseline": "319504a5326aa870edde46438c5455fa76305a56",
    "repository": "https://github.com/microsoft/vcpkg"
  },
+  "overlay-ports": [
+    "ports"
+  ],
  "registries": [
    {
      "kind": "artifact",
@@ -1,6 +1,6 @@
 {
  "name": "opendht",
-  "version-string": "4.3.0",
+  "version-string": "4.4.1",
  "port-version": 1,
  "description": "OpenDHT: A lightweight C++17 Distributed Hash Table library.",
  "homepage": "https://opendht.net",
@@ -16,7 +16,14 @@
    },
    "fmt",
    "nettle",
-    "shiftmedia-libgnutls",
+    {
+      "name": "shiftmedia-libgnutls",
+      "platform": "windows & !mingw"
+    },
+    {
+      "name": "libgnutls",
+      "platform": "!windows | mingw"
+    },
    "msgpack",
    "jsoncpp",
    "asio",
Author	SHA1	Message	Date
Adrien Beraud	621b44c8e8	Revert "disable windows wheel for now" This reverts commit `fc6edb4d20`.	2026-09-23 14:42:57 -04:00
Adrien Beraud	e1c088f2e4	build: bump version to 4.4.1	2026-09-23 14:38:36 -04:00
Adrien Beraud	a6e0e441ac	crypto: use standard unsigned int* for gnutls_ocsp_resp_get_single	2026-09-22 11:31:45 -04:00
Adrien Beraud	dcc2ba3492	crypto: use gnutls_ocsp_cert_status_t* in gnutls_ocsp_resp_get_single	2026-09-22 11:31:45 -04:00
Adrien Beraud	ccf00d6b09	ports: update shiftmedia-libgnutls to f76d780a6	2026-09-22 11:31:45 -04:00
Adrien Beraud	d8250574fc	ports: use ForcedIncludeFiles for gnutls_msvc_fixes.h in shiftmedia-libgnutls	2026-09-22 11:31:45 -04:00
Adrien Beraud	0d698c76e8	ports: update shiftmedia-libgnutls to 9ebeb826d	2026-09-22 11:31:45 -04:00
Adrien Beraud	e4e3b4e73b	ports: set LanguageStandard_C to stdc11 in shiftmedia-libgnutls	2026-09-22 11:31:45 -04:00
Adrien Beraud	b26d622f5d	ports: update shiftmedia-libgnutls to 37840cfa5	2026-09-22 11:31:45 -04:00
Adrien Beraud	78694751bd	ports: update shiftmedia-libgnutls to 4ab78d57e	2026-09-22 11:31:45 -04:00
Adrien Beraud	f9b90c5c1c	ports: update shiftmedia-libgnutls to 5a5a9dd95	2026-09-22 11:31:45 -04:00
Adrien Beraud	56b848bf47	ports: fix savoirfairelinux/gnutls commit hash and SHA512 in shiftmedia-libgnutls	2026-09-22 11:31:45 -04:00
Adrien Beraud	dd875230c3	ports: update shiftmedia-libgnutls to 90eb686e8	2026-09-22 11:31:45 -04:00
Adrien Beraud	de1d428e63	ports: use gitlab gnulib mirror archive in shiftmedia-libgnutls	2026-09-22 11:31:45 -04:00
Adrien Beraud	55e3a6514f	ports: fix gnulib snapshot SHA512 hash in shiftmedia-libgnutls	2026-09-22 11:31:45 -04:00
Adrien Beraud	f4bbef210c	ports: fix savoirfairelinux/gnutls archive SHA512 hash in shiftmedia-libgnutls	2026-09-22 11:31:45 -04:00
Adrien Beraud	2c1470cef6	vcpkg: add overlay port for savoirfairelinux/gnutls on Windows MSVC	2026-09-22 11:31:45 -04:00
Adrien Beraud	adb6aa57e6	update vcpkg	2026-09-22 11:31:45 -04:00
Adrien Beraud	acd0abdb70	ci: fix vcpkg cache keys across workflows and remove manual version string	2026-09-22 11:31:45 -04:00
Cyrille BéraudandCopilot	b9c8f5e0fd	runner: complete pushes received while stopped Resolve idle-runner push futures immediately under the operation queue lock. A stopped runner has no loop left to execute the queued promise, otherwise consumers can wait indefinitely. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>	2026-09-21 16:02:47 -04:00
Cyrille BéraudandCopilot	18fedf431f	tests: cover pushes received by stopped runners Require immediate completion before run and after join, including a burst of notifications. Keep active-runner coverage. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>	2026-09-21 16:02:47 -04:00
Adrien Beraud	fc6edb4d20	disable windows wheel for now	2026-09-19 22:09:44 -04:00
Adrien Beraud	d1093c77a3	ci: use libmsgpack-cxx-dev on Debian 13	2026-09-19 21:56:06 -04:00
Adrien Beraud	b543f1e3cb	update vcpkg to 2026.06.01	2026-09-19 21:10:44 -04:00
Adrien Beraud	be210e27da	update version to 4.4.0	2026-09-04 16:46:41 -04:00
Adrien Beraud	f7243fca37	value_cache: only emit an edition when the content actually changed ValueCache re-emitted a known value as an edition on a higher seq alone, while OpValueCache requires the content to differ as well. Since Value::operator== ignores seq, identical content re-announced with a bumped seq was re-emitted as an add: a source-counting OpValueCache then counted the same node twice and kept the value after the node expired or left the search. Apply the same rule at both levels.	2026-09-04 15:44:35 -04:00
Adrien Beraud	1f6efd5736	tests: cover same-content higher-seq re-announce in ValueCache Value::operator== ignores seq, so a node re-announcing identical content with a bumped seq is the same value refreshed, not an edition. ValueCache must not re-emit it: a source-counting OpValueCache above would count the node twice and keep the value after the node is gone.	2026-09-04 15:44:35 -04:00
Adrien Beraud	54fbad3a7e	op_cache: ignore expiry of versions that were never counted onValuesAdded ignores a different payload that does not carry a higher seq (e.g. the same signed content re-signed with a randomized signature), but onValuesExpired only skipped strictly older versions. The uncounted source could therefore decrement the refcount and expire a value still held by others. Apply the same rule on both sides.	2026-09-04 15:18:35 -04:00
Adrien Beraud	1315489a7b	tests: cover expiry of an uncounted same-seq version in OpValueCache A source reporting a different payload with the same seq is ignored on add and not counted; its later expiration must not release the value still held by the counted sources.	2026-09-04 15:18:35 -04:00
Adrien Beraud	c189fa0e82	proxy_server: detach pending push requests before destruction ~DhtProxyServer destroyed requests_ whose ~http::Request notifies DONE; the handler registered by sendPushNotification then erased from the map being destroyed, corrupting the heap (double free under ASan) whenever a push request was still pending, e.g. an unreachable push server. Detach the state-change callbacks and release the requests before the members are destroyed.	2026-09-04 15:18:24 -04:00
Adrien Beraud	3eae03289e	storage: re-storing identical content is a refresh, not an edition Storage::store reported edited_values=1 whenever the stored Sp<Value> differed from the incoming one, even with equal content. A local put() of an already-stored value was therefore announced to local listeners as a new value a second time, unbalancing listen caches that count how many sources hold a value. Only report an edition when the content actually changed; the expiration is still refreshed.	2026-09-04 15:18:24 -04:00
Adrien Béraud	e5e5a45b91	op_cache, proxy_client: guard SearchCache::get and push refresh expiry SearchCache::get called the GetCallback unconditionally; Dht::query passes none, which threw bad_function_call as soon as a listen cache existed for the key. Return false without a callback so the network path runs. A callback returning false means the consumer has enough values, not a failure: report done(true) as the network path does. DhtProxyClient push refresh expired every previously cached value once the refresh get completed, including values that were just re-delivered or edited, producing phantom expire callbacks. Track the ids received by the get and only expire cached values missing from it, and skip the reconciliation when the get failed so a transient error does not expire values still present on the DHT.	2026-09-04 15:18:24 -04:00
Adrien Beraud	7a71beb892	value_cache: detect editions by increasing seq, like OpValueCache ValueCache emitted any content change of a known value as an edition while OpValueCache only accepts a higher seq. A node reporting an older version made ValueCache replace its copy and re-emit versions that were then dropped or, with source counting, double counted downstream. Use the same rule at both levels.	2026-09-04 15:18:24 -04:00
Adrien Béraud	74a894229f	value_cache, op_cache: fix value accounting after edition and re-delivery OpValueCache counted every re-delivery of an identical value as a new source, but the proxy client is a single logical source that re-sends values on push refresh or listen restart: the refcount grew unbounded and expirations were never propagated. Add a countSources flag to OpValueCache, OpCache and SearchCache; the proxy client disables it. When a value is edited (same id, higher seq), only the reporting source is known to hold the new version: replace it in place, reset the refcount to 1 and emit a single add. Ignore older versions from lagging sources on add, and ignore their expiration so they cannot release a newer version still held by others. ValueCache emits an edited value as an add instead of silently refreshing its old copy, and applies a grace period of one type expiration while the listen is synced so that a single lost refresh notification does not drop a value the remote node still holds. SearchCache::get only answers from the cache once the listen is synced, so a get never returns a partial view that the network would complete. Add the single-source OpCacheTester cases enabled by countSources.	2026-09-04 15:18:13 -04:00
Adrien Beraud	c81c1f70c8	tests: add listen cache tests for OpValueCache, ValueCache, DhtRunner and proxy OpCacheTester and ValueCacheTester exercise the listen caches in isolation: add/edit/expire flows, per-source refcounting, stale versions, sync status, SearchCache::get and node drop. DhtRunnerTester and DhtProxyTester gain end-to-end listen tests for value edition, duplicate puts, multi-source and partial expiration, get after a synced listen, and the push refresh/expire paths. The proxy fixture joins the proxy DhtRunner before destroying the DhtProxyServer so no DHT callback can reach a destroyed server, and push notifications are never awaited while holding the mutex taken by listen callbacks: the result is produced on the DHT thread. Register the new executables in CMake and Meson.	2026-09-04 15:17:34 -04:00