Python and Go wrappers for libstreamrproxyclient shared library

.github/workflows/reusable/cached-install/action.yml

@@ -63,4 +63,14 @@ runs:
         key: ${{ runner.arch }}-${{ runner.os }}-cache-vcpkg-installed1-${{ hashFiles('./vcpkg.json') }}
         path: |
           ./build/vcpkg_installed
+    #- name: Commit compiled binaries
+    #  run: |
+    #    git config --global user.name 'github-actions[bot]'
+    #    git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+    #    git add packages/streamr-libstreamrproxyclient/dist
+    #    git add packages/streamr-libstreamrproxyclient/wrappers/go
+    #    git commit -m "Automatically compiled binaries"
+    #    git pull --rebase --no-edit
+    #    git push --no-verify
+    #  shell: bash
 

.github/workflows/validate.yml

@@ -27,6 +27,8 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
+          submodules: true
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: install
         uses: ./.github/workflows/reusable/cached-install
       - name: lint

.gitmodules

@@ -9,3 +9,6 @@
 [submodule "packages/streamr-trackerless-network/test/integration/ts-integration"]
 	path = packages/streamr-trackerless-network/test/integration/ts-integration
 	url = https://github.com/streamr-dev/native-ts-integration.git
+[submodule "packages/streamr-libstreamrproxyclient/wrappers/go"]
+	path = packages/streamr-libstreamrproxyclient/wrappers/go
+	url = git@github.com:streamr-dev/goproxyclient.git

CMakeLists.txt

@@ -21,3 +21,4 @@ message(STATUS "Root project VCPKG_TARGET_TRIPLET: ${VCPKG_TARGET_TRIPLET}")
 foreach(package ${MonorepoPackages})
   add_subdirectory(packages/${package})
 endforeach()
+

overlayports/folly/fix-cursor.patch

@@ -0,0 +1,13 @@
+diff --git a/folly/io/Cursor.h b/folly/io/Cursor.h
+index 7a0abc9..710ba3e 100644
+--- a/folly/io/Cursor.h
++++ b/folly/io/Cursor.h
+@@ -683,7 +683,7 @@ class CursorBase {
+    *
+    * @methodset Accessors
+    */
+-  std::basic_string_view<uint8_t> peekView() {
++  std::basic_string_view<char> peekView() {
+     auto bytes = peekBytes();
+     return {bytes.data(), bytes.size()};
+   }

overlayports/folly/fix-range.patch

@@ -0,0 +1,13 @@
+diff --git a/folly/Range.h b/folly/Range.h
+index 42cd92d69..d87914a99 100644
+--- a/folly/Range.h
++++ b/folly/Range.h
+@@ -638,7 +638,7 @@ class Range {
+   template <typename ValueType>
+   struct StringViewType //
+       : std::conditional<
+-            std::is_trivial<ValueType>::value,
++            detail::range_is_char_type_v_<Iter>,
+             std::basic_string_view<ValueType>,
+             NotStringView> {};
+

overlayports/folly/portfile.cmake

@@ -21,6 +21,8 @@ vcpkg_from_github(
         disable-groupvarint.patch
         disable-cxa-init-primary-exception.patch
         fix-android-remainder.patch
+        fix-range.patch
+        fix-cursor.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")

overlayports/libdatachannel/dependencies.diff

@@ -0,0 +1,63 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a61757..b35e4b1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,7 +234,7 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ find_package(Threads REQUIRED)
+
+ if(USE_SYSTEM_PLOG)
+-	find_package(plog REQUIRED)
++	find_package(plog CONFIG REQUIRED)
+ else()
+ 	set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+ 	add_subdirectory(deps/plog EXCLUDE_FROM_ALL)
+@@ -245,7 +245,8 @@ if(SCTP_DEBUG)
+ endif()
+
+ if(USE_SYSTEM_USRSCTP)
+-	find_package(Usrsctp REQUIRED)
++	find_package(unofficial-usrsctp CONFIG REQUIRED)
++	add_library(Usrsctp::Usrsctp ALIAS unofficial::usrsctp::usrsctp)
+ else()
+ 	option(sctp_build_shared_lib OFF)
+ 	option(sctp_build_programs OFF)
+@@ -331,7 +332,7 @@ else()
+ 	target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=1)
+ 	target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=1)
+ 	if(USE_SYSTEM_SRTP)
+-		find_package(libSRTP REQUIRED)
++		find_package(libSRTP CONFIG REQUIRED)
+ 		if(NOT TARGET libSRTP::srtp2)
+ 			add_library(libSRTP::srtp2 UNKNOWN IMPORTED)
+ 			set_target_properties(libSRTP::srtp2 PROPERTIES
+@@ -475,8 +476,9 @@ install(
+ )
+
+ # Export config
++configure_file(cmake/LibDataChannelConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/LibDataChannelConfig.cmake @ONLY)
+ install(
+-	FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibDataChannelConfig.cmake
++	FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/LibDataChannelConfig.cmake
+ 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibDataChannel
+ )
+
+diff --git a/cmake/LibDataChannelConfig.cmake b/cmake/LibDataChannelConfig.cmake
+index cb2b884..d0b77ca 100644
+--- a/cmake/LibDataChannelConfig.cmake
++++ b/cmake/LibDataChannelConfig.cmake
+@@ -1,2 +1,15 @@
++if(NOT "@BUILD_SHARED_LIBS@")
++    include(CMakeFindDependencyMacro)
++    set(THREADS_PREFER_PTHREAD_FLAG ON)
++    find_dependency(Threads)
++    find_dependency(plog CONFIG)
++    find_dependency(unofficial-usrsctp CONFIG)
++    if(NOT "@NO_MEDIA@")
++        find_dependency(libSRTP CONFIG)
++    endif()
++    find_dependency(OpenSSL)
++    find_dependency(LibJuice)
++endif()
++
+ include("${CMAKE_CURRENT_LIST_DIR}/LibDataChannelTargets.cmake")
+

overlayports/libdatachannel/fix-cmakelists.patch

@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38e069e..0ada768 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,10 +260,20 @@ else()
+ 	add_library(Usrsctp::Usrsctp ALIAS usrsctp)
+ endif()
+
+-configure_file (
+-    ${PROJECT_SOURCE_DIR}/cmake/version.h.in
+-	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/version.h
++if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/version.h")
++    file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/version.h") 
++endif()
++
++file(COPY
++    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.h.in
++	DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc
+ )
++file(RENAME
++    ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/version.h.in
++    ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/version.h
++)
++
++
+
+ add_library(datachannel SHARED
+ 	${LIBDATACHANNEL_SOURCES}

overlayports/libdatachannel/library-linkage.diff

@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b35e4b1..b052d02 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,6 @@ endif()
+
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+-set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static
+
+ if(WIN32)
+ 	add_definitions(-DWIN32_LEAN_AND_MEAN)
+@@ -457,11 +456,17 @@ if(WARNINGS_AS_ERRORS)
+ 	endif()
+ endif()
+
++if(BUILD_SHARED_LIBS)
+ install(TARGETS datachannel EXPORT LibDataChannelTargets
+ 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
++else()
++	set_target_properties(datachannel PROPERTIES EXCLUDE_FROM_ALL 1)
++	set_target_properties(datachannel-static PROPERTIES EXCLUDE_FROM_ALL 0)
++	install(TARGETS datachannel-static EXPORT LibDataChannelTargets)
++endif()
+
+ install(FILES ${LIBDATACHANNEL_HEADERS}
+ 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rtc

overlayports/libdatachannel/portfile.cmake

@@ -0,0 +1,42 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO paullouisageneau/libdatachannel
+    REF "v${VERSION}"
+    SHA512 fd0d66bb932e29abc01e9f1a8b16ccb79012a7e3901e2e0f882f56ab2f090260945e1556c85ad07ef897b8c70fcdd44cdeead9955a9bca7afe1dda8900c473cc
+    HEAD_REF master
+    PATCHES 
+        dependencies.diff
+        library-linkage.diff
+        uwp-warnings.patch
+        fix-cmakelists.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        stdcall CAPI_STDCALL
+    INVERTED_FEATURES
+        ws      NO_WEBSOCKET
+        srtp    NO_MEDIA
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DPREFER_SYSTEM_LIB=ON
+        -DNO_EXAMPLES=ON
+        -DNO_TESTS=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/LibDataChannel)
+vcpkg_fixup_pkgconfig()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/rtc/common.hpp" "#ifdef RTC_STATIC" "#if 1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/rtc/rtc.h" "#ifdef RTC_STATIC" "#if 1")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

overlayports/libdatachannel/uwp-warnings.patch

@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b5190b..763b49e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -315,6 +315,10 @@ target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog)
+ if(WIN32)
+ 	target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
+ 	target_link_libraries(datachannel-static PUBLIC ws2_32) # winsock2
++	if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++		target_compile_options(datachannel PRIVATE /wd4996)
++		target_compile_options(datachannel-static PRIVATE /wd4996)
++	endif()
+ endif()
+
+ if (NO_WEBSOCKET)

overlayports/libdatachannel/vcpkg.json

@@ -0,0 +1,41 @@
+{
+  "name": "libdatachannel",
+  "version-semver": "0.21.2",
+  "port-version": 1,
+  "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
+  "homepage": "https://github.com/paullouisageneau/libdatachannel",
+  "license": "MPL-2.0",
+  "supports": "!xbox",
+  "dependencies": [
+    "libjuice",
+    "nlohmann-json",
+    "openssl",
+    "plog",
+    "usrsctp",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "ws"
+  ],
+  "features": {
+    "srtp": {
+      "description": "Use Cisco's libSRTP for media transport.",
+      "dependencies": [
+        "libsrtp"
+      ]
+    },
+    "stdcall": {
+      "description": "Use stdcall convention in callbacks"
+    },
+    "ws": {
+      "description": "Web Socket support"
+    }
+  }
+}

packages/streamr-dht/CMakeLists.txt

@@ -101,43 +101,43 @@ if(NOT IOS)
     )
 
     add_executable(streamr-dht-test-unit
-        test/unit/AddressToolsTest.cpp
+        test/unit/WebsocketClientConnectionTest.cpp
+        test/unit/WebsocketClientConnectorRpcLocalTest.cpp
         test/unit/CertificateHelperTest.cpp
-        test/unit/ConnectedEndpointStateTest.cpp
-        test/unit/ConnectingEndpointStateTest.cpp
-        test/unit/ConnectionLockRpcLocalTest.cpp
-        test/unit/ConnectionLockRpcRemoteTest.cpp
-        test/unit/ConnectionLockStatesTest.cpp
-        test/unit/ConnectionLockerTest.cpp
         test/unit/ConnectionManagerTest.cpp
-        test/unit/ConnectionsViewTest.cpp
-        test/unit/ConnectivityTest.cpp
+        test/unit/WebsocketClientConnectorRpcRemoteTest.cpp
+        test/unit/IdentifiersTest.cpp
+        test/unit/ConnectionLockRpcRemoteTest.cpp
         test/unit/ConnectorFacadeTest.cpp
+        test/unit/ConnectionsViewTest.cpp
+        test/unit/WebsocketServerConnectorTest.cpp
+        test/unit/OffererTest.cpp
         test/unit/DhtCallContextTest.cpp
-        test/unit/DisconnectedEndpointStateTest.cpp
-        test/unit/DuplicateDetectorTest.cpp
-        test/unit/EndpointStateInterfaceTest.cpp
-        test/unit/EndpointStateTest.cpp
+        test/unit/PendingConnectionTest.cpp
+        test/unit/ConnectionLockRpcLocalTest.cpp
         test/unit/EndpointTest.cpp
-        test/unit/FakeTransportTest.cpp
-        test/unit/HandshakerTest.cpp
-        test/unit/IPendingConnectionTest.cpp
-        test/unit/IdentifiersTest.cpp
-        test/unit/IncomingHandshakerTest.cpp
+        test/unit/ConnectingEndpointStateTest.cpp
+        test/unit/ConnectedEndpointStateTest.cpp
+        test/unit/DisconnectedEndpointStateTest.cpp
         test/unit/InitialEndpointStateTest.cpp
-        test/unit/OffererTest.cpp
+        test/unit/FakeTransportTest.cpp
+        test/unit/EndpointStateTest.cpp
         test/unit/OutgoingHandshakerTest.cpp
-        test/unit/PendingConnectionTest.cpp
-        test/unit/RoutingRpcCommunicatorTest.cpp
+        test/unit/IncomingHandshakerTest.cpp
+        test/unit/EndpointStateInterfaceTest.cpp
+        test/unit/WebsocketConnectionTest.cpp
         test/unit/TransportTest.cpp
+        test/unit/HandshakerTest.cpp
+        test/unit/RoutingRpcCommunicatorTest.cpp
+        test/unit/ConnectionLockerTest.cpp
+        test/unit/AddressToolsTest.cpp
+        test/unit/DuplicateDetectorTest.cpp
+        test/unit/ConnectionLockStatesTest.cpp
+        test/unit/ConnectivityTest.cpp
+        test/unit/IPendingConnectionTest.cpp
         test/unit/VersionTest.cpp
-        test/unit/WebsocketClientConnectionTest.cpp
-        test/unit/WebsocketClientConnectorRpcLocalTest.cpp
-        test/unit/WebsocketClientConnectorRpcRemoteTest.cpp
         test/unit/WebsocketClientConnectorTest.cpp
-        test/unit/WebsocketConnectionTest.cpp
         test/unit/WebsocketServerConnectionTest.cpp
-        test/unit/WebsocketServerConnectorTest.cpp
         test/unit/WebsocketServerTest.cpp
         test/unit/ListeningRpcCommunicatorTest.cpp
     )

packages/streamr-libstreamrproxyclient/.gitignore

@@ -4,7 +4,16 @@
 **/*.pyo
 **/*.pyd
 **/.pytest_cache/
+wrappers/python/dist
+wrappers/python/src/streamrproxyclient/libstreamrproxyclient.dylib
+wrappers/python/src/streamrproxyclient/libstreamrproxyclient.so
+dist/*
+**/**.dylib
+**/**.so
 **/wheelhouse/
 *.tgz
 *.so.*
 **/libstreamrproxyclient.[0-9].[0-9].[0-9].dylib
+dist/
+dist/**
+wrappers/python/src/streamrproxyclient/libstreamrproxyclient.dylib