Merge pull request #70 from Faless/bump/beta5

Update to Godot 4.0-beta5
2026-01-03 14:09:58 +03:00 · 2022-11-19 11:08:34 +01:00 · 2022-11-19 01:43:24 +01:00 · 2022-11-15 00:41:01 +01:00 · 2022-11-14 22:48:46 +01:00 · 2022-10-17 22:42:33 +02:00
16 changed files with 247 additions and 150 deletions
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -1,13 +1,17 @@
 name: 🔧 Build -> Package 📦
 on: [push, pull_request]

+env:
+  # Only used for the cache key. Increment version to force clean build.
+  GODOT_BASE_BRANCH: master
+
 jobs:
  static-checks:
    name: 📊 Static Checks (clang-format, black format, file format)
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Install dependencies
        run: |
@@ -37,39 +41,32 @@ jobs:
      matrix:
        include:
          # Android
-          - platform: android
-            arch: 'x86_32'
-            gdnative_flags: 'android_arch=x86'
-            sconsflags: ''
-            os: 'ubuntu-20.04'
          - platform: android
            arch: 'x86_64'
            gdnative_flags: 'android_arch=x86_64'
            sconsflags: ''
            os: 'ubuntu-20.04'
-          - platform: android
-            arch: 'arm32'
-            gdnative_flags: 'android_arch=armv7'
-            sconsflags: ''
-            os: 'ubuntu-20.04'
+            cache-name: android-x86_64
          - platform: android
            arch: 'arm64'
            gdnative_flags: 'android_arch=arm64v8'
            sconsflags: ''
            os: 'ubuntu-20.04'
+            cache-name: android-arm64

          # iOS
          - platform: ios
            arch: 'x86_64'
            gdnative_flags: 'ios_arch=x86_64'
            sconsflags: 'ios_simulator=true'
-            os: 'macos-latest'
+            os: 'macos-11'
+            cache-name: ios-x86_64-simulator
          - platform: ios
            arch: 'arm64'
            gdnative_flags: 'ios_arch=arm64'
            sconsflags: ''
            os: 'macos-11'
-
+            cache-name: ios-arm64

          # Linux
          - platform: linux
@@ -77,23 +74,27 @@ jobs:
            gdnative_flags: 'bits=32'
            sconsflags: ''
            os: 'ubuntu-20.04'
+            cache-name: linux-x86_32
          - platform: linux
            arch: 'x86_64'
            gdnative_flags: 'bits=64'
            sconsflags: ''
            os: 'ubuntu-20.04'
+            cache-name: linux-x86_64

          # macOS
-          - platform: osx
+          - platform: macos
            arch: 'x86_64'
            gdnative_flags: 'macos_arch=x86_64 bits=64'
            sconsflags: ''
            os: 'macos-11'
-          - platform: osx
+            cache-name: macos-x86_64
+          - platform: macos
            gdnative_flags: 'macos_arch=arm64 bits=64'
            arch: 'arm64'
            sconsflags: ''
            os: 'macos-11'
+            cache-name: macos-arm64

          # Windows
          - platform: windows
@@ -102,14 +103,17 @@ jobs:
            sconsflags: 'use_mingw=yes'
            os: 'ubuntu-20.04'
            msvc_arch: amd64_x86
+            cache-name: win-x86_32
          - platform: windows
            arch: 'x86_64'
            gdnative_flags: 'bits=64'
            sconsflags: 'use_mingw=yes'
            os: 'ubuntu-20.04'
            msvc_arch: amd64
+            cache-name: win-x86_64

    env:
+      SCONS_CACHE: ${{ github.workspace }}/.scons-cache/
      SCONSFLAGS: ${{ matrix.sconsflags }} platform=${{ matrix.platform }} arch=${{ matrix.arch }} --jobs=2

    defaults:
@@ -117,10 +121,16 @@ jobs:
        shell: bash

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          submodules: recursive

+      - name: Setup Godot build cache
+        uses: ./godot-cpp/.github/actions/godot-cache
+        with:
+          cache-name: ${{ matrix.cache-name }}
+        continue-on-error: true
+
      - name: Install Windows build dependencies
        if: ${{ matrix.platform == 'windows' }}
        run: |
@@ -139,7 +149,7 @@ jobs:
          sudo apt-get install build-essential gcc-multilib g++-multilib

      - name: Set up Python 3.x
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: '3.x'
          architecture: 'x64'
@@ -152,21 +162,17 @@ jobs:
          scons --version
          cmake --version

-      - name: Compile Extension - debug - ${{ matrix.platform }} - ${{ matrix.arch }}
+      - name: Compile Extension - template_debug - ${{ matrix.platform }} - ${{ matrix.arch }}
        run: |
-          scons target=debug generate_bindings=yes
+          scons target=template_debug generate_bindings=yes

-      - name: Compile GDNative - debug - ${{ matrix.platform }} - ${{ matrix.arch }}
+      - name: Compile Extension - template_release - ${{ matrix.platform }} - ${{ matrix.arch }}
        run: |
-          scons target=debug generate_bindings=yes ${{ matrix.gdnative_flags }} godot_version=3
-
-      - name: Compile Extension - release - ${{ matrix.platform }} - ${{ matrix.arch }}
-        run: |
-          scons target=release
+          scons target=template_release

      - name: Compile GDNative - release ${{ matrix.platform }} - ${{ matrix.arch }}
        run: |
-          scons target=release ${{ matrix.gdnative_flags }} godot_version=3
+          scons target=release generate_bindings=yes ${{ matrix.gdnative_flags }} godot_version=3

      - uses: actions/upload-artifact@v3
        with:
@@ -178,7 +184,7 @@ jobs:
    needs: build
    runs-on: "ubuntu-latest"
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          submodules: recursive

@@ -198,28 +204,15 @@ jobs:
          cp deps/libdatachannel/deps/plog/LICENSE artifacts/LICENSE.plog

      - name: Package artifacts for release
+        env:
+          DESTINATION: "release"
        run: |
          mkdir release
-          cd release

-          ls -R
+          VERSION="extension" TYPE="webrtc" ./misc/scripts/package_release.sh
+          VERSION="gdnative" TYPE="webrtc" ./misc/scripts/package_release.sh

-          for version in extension gdnative
-          do
-            for name in webrtc webrtc_debug
-            do
-              destdir="${version}/${name}"
-              mkdir -p ${destdir}/lib
-              find ../artifacts -wholename "*/${destdir}/lib/*" | xargs cp -t ${destdir}/lib/
-              find ../artifacts -wholename "*/${destdir}/${name}.tres" -or -wholename "*/${destdir}/${name}.gdextension" | head -n 1 | xargs cp -t ${destdir}/
-              find ../artifacts -wholename "*/LICENSE*" | xargs cp -t ${destdir}/
-              cd ${version}
-              zip -r ../godot-${version}-${name}.zip ${name}
-              cd ..
-            done
-          done
-
-          ls -R
+          ls -R release

      - uses: actions/upload-artifact@v3
        with:
--- a/52
+++ b/52
@@ -23,6 +23,14 @@ opts.Add(EnumVariable("godot_version", "The Godot target version", "4", ["3", "4
 opts.Update(env)

 if env["godot_version"] == "3":
+    if "platform" in ARGUMENTS and ARGUMENTS["platform"] == "macos":
+        ARGUMENTS["platform"] = "osx"  # compatibility with old osx name
+
+    scons_cache_path = os.environ.get("SCONS_CACHE")
+    if scons_cache_path is not None:
+        CacheDir(scons_cache_path)
+        Decider("MD5")
+
    env = SConscript("godot-cpp-3.x/SConstruct")

    # Patch base env
@@ -41,11 +49,15 @@ if env["godot_version"] == "3":
    if env["platform"] == "windows" and env["use_mingw"]:
        env.Append(LINKFLAGS=["-static-libgcc"])

+    if env["platform"] == "osx":
+        env["platform"] = "macos"  # compatibility with old osx name
+        ARGUMENTS["platform"] = "macos"
+
    # Normalize suffix
    if env["platform"] in ["windows", "linux"]:
        env["arch"] = "x86_32" if env["bits"] == "32" else "x86_64"
        env["arch_suffix"] = env["arch"]
-    elif env["platform"] == "osx":
+    elif env["platform"] == "macos":
        env["arch"] = env["macos_arch"]
        env["arch_suffix"] = env["arch"]
    elif env["platform"] == "ios":
@@ -59,13 +71,13 @@ if env["godot_version"] == "3":
            "x86_64": "x86_64",
        }[env["android_arch"]]
        env["arch_suffix"] = env["arch"]
+
+    target_compat = "template_" + env["target"]
+    env["suffix"] = ".{}.{}.{}".format(env["platform"], target_compat, env["arch_suffix"])
+    env["debug_symbols"] = False
 else:
-    env = SConscript("godot-cpp/SConstruct")
-    replace_flags(env["CCFLAGS"], {
-        "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=11.0",
-        "-miphoneos-version-min=10.0": "-miphoneos-version-min=11.0",
-    })
-    env = env.Clone()
+    ARGUMENTS["ios_min_version"] = "11.0"
+    env = SConscript("godot-cpp/SConstruct").Clone()

 # Patch mingw SHLIBSUFFIX.
 if env["platform"] == "windows" and env["use_mingw"]:
@@ -74,7 +86,10 @@ if env["platform"] == "windows" and env["use_mingw"]:
 opts.Update(env)

 target = env["target"]
-result_path = os.path.join("bin", "gdnative" if env["godot_version"] == "3" else "extension", "webrtc" if env["target"] == "release" else "webrtc_debug")
+if env["godot_version"] == "3":
+    result_path = os.path.join("bin", "gdnative", "webrtc" if env["target"] == "release" else "webrtc_debug")
+else:
+    result_path = os.path.join("bin", "extension", "webrtc")

 # Dependencies
 deps_source_dir = "deps"
@@ -85,6 +100,7 @@ env.Append(BUILDERS={

 # SSL
 ssl = env.BuildOpenSSL(env.Dir(builders.get_ssl_build_dir(env)), env.Dir(builders.get_ssl_source_dir(env)))
+env.Depends(ssl, env.File("builders.py"))

 env.Prepend(CPPPATH=[builders.get_ssl_include_dir(env)])
 env.Prepend(LIBPATH=[builders.get_ssl_build_dir(env)])
@@ -92,6 +108,7 @@ env.Append(LIBS=[ssl])

 # RTC
 rtc = env.BuildLibDataChannel(env.Dir(builders.get_rtc_build_dir(env)), [env.Dir(builders.get_rtc_source_dir(env))] + ssl)
+env.Depends(rtc, env.File("builders.py"))

 env.Append(LIBPATH=[builders.get_rtc_build_dir(env)])
 env.Append(CPPPATH=[builders.get_rtc_include_dir(env)])
@@ -116,7 +133,7 @@ else:
 env.Depends(sources, [ssl, rtc])

 # Make the shared library
-result_name = "webrtc_native.{}.{}.{}{}".format(env["platform"], env["target"], env["arch_suffix"], env["SHLIBSUFFIX"])
+result_name = "webrtc_native{}{}".format(env["suffix"], env["SHLIBSUFFIX"])
 env.Depends(sources, ssl)

 if env["platform"] == "windows" and env["use_mingw"]:
@@ -126,12 +143,13 @@ library = env.SharedLibrary(target=os.path.join(result_path, "lib", result_name)
 Default(library)

 # GDNativeLibrary
-gdnlib = "webrtc"
-if target != "release":
-    gdnlib += "_debug"
-ext = ".tres" if env["godot_version"] == "3" else ".gdextension"
-extfile = env.Substfile(os.path.join(result_path, gdnlib + ext), "misc/webrtc" + ext, SUBST_DICT={
-    "{GDNATIVE_PATH}": gdnlib,
-    "{TARGET}": env["target"],
-})
+if env["godot_version"] == "3":
+    gdnlib = "webrtc" if target != "debug" else "webrtc_debug"
+    ext = ".tres"
+    extfile = env.Substfile(os.path.join(result_path, gdnlib + ext), "misc/webrtc" + ext, SUBST_DICT={
+        "{GDNATIVE_PATH}": gdnlib,
+        "{TARGET}": "template_" + env["target"],
+    })
+else:
+    extfile = env.InstallAs(os.path.join(result_path, "webrtc.gdextension"), "misc/webrtc.gdextension")
 Default(extfile)
--- a/builders.py
+++ b/builders.py
@@ -11,7 +11,7 @@ def get_deps_dir(env):


 def get_deps_build_dir(env):
-    return get_deps_dir(env) + "/build/{}.{}.{}.dir".format(env["platform"], env["target"], env["arch_suffix"])
+    return get_deps_dir(env) + "/build/build{}.{}.dir".format(env["suffix"], "RelWithDebInfo" if env["debug_symbols"] else "Release")


 def get_rtc_source_dir(env):
@@ -63,7 +63,7 @@ def ssl_action(target, source, env):
        "--prefix=%s" % install_dir,
        "--openssldir=%s" % install_dir,
    ]
-    if env["target"] == "debug":
+    if env["debug_symbols"]:
        args.append("-d")

    if env["platform"] != "windows":
@@ -88,7 +88,7 @@ def ssl_action(target, source, env):
        ssl_env.PrependENVPath("PATH", os.path.dirname(env["CC"]))
        ssl_env["ENV"]["ANDROID_NDK_ROOT"] = os.environ.get("ANDROID_NDK_ROOT", "")

-    elif env["platform"] == "osx":
+    elif env["platform"] == "macos":
        if env["arch"] == "x86_64":
            args.extend(["darwin64-x86_64"])
        elif env["arch"] == "arm64":
@@ -163,7 +163,7 @@ def rtc_action(target, source, env):
        "-DOPENSSL_INCLUDE_DIR=%s" % get_ssl_include_dir(env),
        "-DOPENSSL_SSL_LIBRARY=%s/libssl.a" % get_ssl_build_dir(env),
        "-DOPENSSL_CRYPTO_LIBRARY=%s/libcrypto.a" % get_ssl_build_dir(env),
-        "-DCMAKE_BUILD_TYPE=%s" % ("Release" if env["target"] == "release" else "Debug"),
+        "-DCMAKE_BUILD_TYPE=%s" % ("RelWithDebInfo" if env["debug_symbols"] else "Release"),
    ]
    if env["platform"] == "android":
        abi = {
@@ -191,7 +191,7 @@ def rtc_action(target, source, env):
                "-DCMAKE_C_FLAGS=-m64",
                "-DCMAKE_CXX_FLAGS=-m64"
            ])
-    elif env["platform"] == "osx":
+    elif env["platform"] == "macos":
        if env["macos_deployment_target"] != "default":
            args.extend(["-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % env["macos_deployment_target"]])
        if env["arch"] == "x86_64":
--- a/deps/libdatachannel
+++ b/deps/libdatachannel
--- a/deps/openssl
+++ b/deps/openssl
--- a/2
+++ b/2
--- a/misc/scripts/package_release.sh
+++ b/misc/scripts/package_release.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+set -x
+
+ARTIFACTS=${ARTIFACTS:-"artifacts"}
+DESTINATION=${DESTIONATION:-"release"}
+VERSION=${VERSION:-"extension"}
+TYPE=${TYPE:-"webrtc"}
+
+mkdir -p ${DESTINATION}
+ls -R ${DESTINATION}
+
+DESTDIR="${DESTINATION}/${VERSION}/${TYPE}"
+
+mkdir -p ${DESTDIR}/lib
+
+find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/lib/*" | xargs cp -t "${DESTDIR}/lib/"
+find "${ARTIFACTS}" -wholename "*/LICENSE*" | xargs cp -t "${DESTDIR}/"
+
+if [ $VERSION = "extension" ]; then
+    find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/${TYPE}.gdextension" | head -n 1 | xargs cp -t "${DESTDIR}/"
+else
+    find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/${TYPE}.tres" | head -n 1 | xargs cp -t "${DESTDIR}/"
+fi
+
+CURDIR=$(pwd)
+cd "${DESTINATION}/${VERSION}"
+zip -r ../godot-${VERSION}-${TYPE}.zip ${TYPE}
+cd "$CURDIR"
+
+ls -R ${DESTINATION}
--- a/misc/webrtc.gdextension
+++ b/misc/webrtc.gdextension
@@ -4,15 +4,24 @@ entry_symbol = "webrtc_extension_init"

 [libraries]

-linux.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64.so"
-linux.x86_32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_32.so"
-osx.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.osx.{TARGET}.x86_64.dylib"
-osx.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.osx.{TARGET}.arm64.dylib"
-windows.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.windows.{TARGET}.x86_64.dll"
-windows.x86_32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.windows.{TARGET}.x86_32.dll"
-android.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.arm64.so"
-android.arm32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.arm32.so"
-android.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.x86_64.so"
-android.x86_32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.x86_32.so"
-ios.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.arm64.dylib"
-ios.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.x86_64.simulator.dylib"
+linux.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.linux.template_debug.x86_64.so"
+linux.debug.x86_32 = "res://webrtc/lib/libwebrtc_native.linux.template_debug.x86_32.so"
+osx.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.osx.template_debug.x86_64.dylib"
+osx.debug.arm64 = "res://webrtc/lib/libwebrtc_native.osx.template_debug.arm64.dylib"
+windows.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.windows.template_debug.x86_64.dll"
+windows.debug.x86_32 = "res://webrtc/lib/libwebrtc_native.windows.template_debug.x86_32.dll"
+android.debug.arm64 = "res://webrtc/lib/libwebrtc_native.android.template_debug.arm64.so"
+android.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.android.template_debug.x86_64.so"
+ios.debug.arm64 = "res://webrtc/lib/libwebrtc_native.ios.template_debug.arm64.dylib"
+ios.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.ios.template_debug.x86_64.simulator.dylib"
+
+linux.release.x86_64 = "res://webrtc/lib/libwebrtc_native.linux.template_release.x86_64.so"
+linux.release.x86_32 = "res://webrtc/lib/libwebrtc_native.linux.template_release.x86_32.so"
+osx.release.x86_64 = "res://webrtc/lib/libwebrtc_native.osx.template_release.x86_64.dylib"
+osx.release.arm64 = "res://webrtc/lib/libwebrtc_native.osx.template_release.arm64.dylib"
+windows.release.x86_64 = "res://webrtc/lib/libwebrtc_native.windows.template_release.x86_64.dll"
+windows.release.x86_32 = "res://webrtc/lib/libwebrtc_native.windows.template_release.x86_32.dll"
+android.release.arm64 = "res://webrtc/lib/libwebrtc_native.android.template_release.arm64.so"
+android.release.x86_64 = "res://webrtc/lib/libwebrtc_native.android.template_release.x86_64.so"
+ios.release.arm64 = "res://webrtc/lib/libwebrtc_native.ios.template_release.arm64.dylib"
+ios.release.x86_64 = "res://webrtc/lib/libwebrtc_native.ios.template_release.x86_64.simulator.dylib"
--- a/misc/webrtc.tres
+++ b/misc/webrtc.tres
@@ -11,10 +11,8 @@ entry/X11.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64
 entry/X11.32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_32.so"
 entry/Server.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64.so"
 entry/Server.32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_32.so"
-entry/Android.armeabi-v7a = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.arm32.so"
 entry/Android.arm64-v8a = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.arm64.so"
 entry/Android.x64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.x86_64.so"
-entry/Android.x86 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}.x86_32.so"
 entry/iOS.armv7 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.armv32.dylib"
 entry/iOS.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.arm64.dylib"
 entry/iOS.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.x86_64.simulator.dylib"
--- a/src/WebRTCLibDataChannel.cpp
+++ b/src/WebRTCLibDataChannel.cpp
@@ -33,10 +33,10 @@
 #ifdef GDNATIVE_WEBRTC
 #include "GDNativeLibrary.hpp"
 #include "NativeScript.hpp"
-#define ERR_UNAVAILABLE GODOT_ERR_UNAVAILABLE
-#define FAILED GODOT_FAILED
-#define ERR_INVALID_PARAMETER GODOT_ERR_INVALID_PARAMETER
-#define OK GODOT_OK
+#define ERR_UNAVAILABLE Error::ERR_UNAVAILABLE
+#define FAILED Error::FAILED
+#define ERR_INVALID_PARAMETER Error::ERR_INVALID_PARAMETER
+#define OK Error::OK
 #endif

 #include <stdio.h>
@@ -108,12 +108,12 @@ void WebRTCLibDataChannel::queue_packet(const uint8_t *data, uint32_t size, bool
 	mutex->unlock();
 }

-void WebRTCLibDataChannel::_set_write_mode(int64_t p_mode) {
+void WebRTCLibDataChannel::_set_write_mode(WriteMode p_mode) {
 	ERR_FAIL_COND(p_mode != WRITE_MODE_TEXT && p_mode != WRITE_MODE_BINARY);
-	write_mode = (WriteMode)p_mode;
+	write_mode = p_mode;
 }

-int64_t WebRTCLibDataChannel::_get_write_mode() const {
+WebRTCDataChannel::WriteMode WebRTCLibDataChannel::_get_write_mode() const {
 	return write_mode;
 }

@@ -121,7 +121,7 @@ bool WebRTCLibDataChannel::_was_string_packet() const {
 	return current_packet.second;
 }

-int64_t WebRTCLibDataChannel::_get_ready_state() const {
+WebRTCDataChannel::ChannelState WebRTCLibDataChannel::_get_ready_state() const {
 	ERR_FAIL_COND_V(!channel, STATE_CLOSED);
 	return channel_state;
 }
@@ -166,7 +166,7 @@ int64_t WebRTCLibDataChannel::_get_buffered_amount() const {
 	return channel->bufferedAmount();
 }

-int64_t WebRTCLibDataChannel::_poll() {
+Error WebRTCLibDataChannel::_poll() {
 	return OK;
 }

@@ -177,7 +177,7 @@ void WebRTCLibDataChannel::_close() try {
 } catch (...) {
 }

-int64_t WebRTCLibDataChannel::_get_packet(const uint8_t **r_buffer, int32_t *r_len) {
+Error WebRTCLibDataChannel::_get_packet(const uint8_t **r_buffer, int32_t *r_len) {
 	ERR_FAIL_COND_V(packet_queue.empty(), ERR_UNAVAILABLE);

 	mutex->lock();
@@ -191,10 +191,10 @@ int64_t WebRTCLibDataChannel::_get_packet(const uint8_t **r_buffer, int32_t *r_l

 	mutex->unlock();

-	return 0;
+	return OK;
 }

-int64_t WebRTCLibDataChannel::_put_packet(const uint8_t *p_buffer, int64_t p_len) try {
+Error WebRTCLibDataChannel::_put_packet(const uint8_t *p_buffer, int64_t p_len) try {
 	ERR_FAIL_COND_V(!channel, FAILED);
 	ERR_FAIL_COND_V(channel->isClosed(), FAILED);
 	if (write_mode == WRITE_MODE_TEXT) {
--- a/src/WebRTCLibDataChannel.hpp
+++ b/src/WebRTCLibDataChannel.hpp
@@ -40,6 +40,9 @@
 #define GDCLASS(arg1, arg2) GODOT_CLASS(arg1, arg2)
 #endif
 #else
+#include <godot_cpp/core/binder_common.hpp>
+
+#include <godot_cpp/classes/global_constants_binds.hpp>
 #include <godot_cpp/classes/web_rtc_data_channel_extension.hpp>
 #endif

@@ -61,7 +64,7 @@ private:
 	QueuedPacket current_packet;
 	std::shared_ptr<rtc::DataChannel> channel = nullptr;

-	WriteMode write_mode = WRITE_MODE_TEXT;
+	WriteMode write_mode = WRITE_MODE_BINARY;
 	ChannelState channel_state = STATE_CONNECTING;
 	bool negotiated = false;

@@ -75,20 +78,20 @@ public:
 	static WebRTCLibDataChannel *new_data_channel(std::shared_ptr<rtc::DataChannel> p_channel, bool p_negotiated);

 	/* PacketPeer */
-	virtual int64_t _get_packet(const uint8_t **r_buffer, int32_t *r_len) override;
-	virtual int64_t _put_packet(const uint8_t *p_buffer, int64_t p_len) override;
+	virtual godot::Error _get_packet(const uint8_t **r_buffer, int32_t *r_len) override;
+	virtual godot::Error _put_packet(const uint8_t *p_buffer, int64_t p_len) override;
 	virtual int64_t _get_available_packet_count() const override;
 	virtual int64_t _get_max_packet_size() const override;

 	/* WebRTCDataChannel */
-	int64_t _poll() override;
+	godot::Error _poll() override;
 	void _close() override;

-	void _set_write_mode(int64_t p_mode) override;
-	int64_t _get_write_mode() const override;
+	void _set_write_mode(WriteMode p_mode) override;
+	WriteMode _get_write_mode() const override;
 	bool _was_string_packet() const override;

-	int64_t _get_ready_state() const override;
+	ChannelState _get_ready_state() const override;
 	godot::String _get_label() const override;
 	bool _is_ordered() const override;
 	int64_t _get_id() const override;
--- a/src/WebRTCLibPeerConnection.cpp
+++ b/src/WebRTCLibPeerConnection.cpp
@@ -35,24 +35,10 @@ using namespace godot;
 using namespace godot_webrtc;

 #ifdef GDNATIVE_WEBRTC
-struct CastableError {
-	godot::Error err_enum;
-	int64_t err_int;
-
-	operator int64_t() { return err_int; }
-	operator godot::Error() { return err_enum; }
-	CastableError(godot::Error p_enum, int64_t p_int) {
-		err_enum = p_enum;
-		err_int = p_int;
-	}
-};
-#define MKERR(m_err) CastableError(godot::Error::m_err, GODOT_##m_err)
-#define OK MKERR(OK)
-#define FAILED MKERR(FAILED)
-#define ERR_UNCONFIGURED MKERR(ERR_UNCONFIGURED)
-#define ERR_UNAVAILABLE MKERR(ERR_UNAVAILABLE)
-#define ERR_INVALID_PARAMETER MKERR(ERR_INVALID_PARAMETER)
-#define ERR_BUG MKERR(ERR_BUG)
+#define OK Error::OK
+#define FAILED Error::FAILED
+#define ERR_UNCONFIGURED Error::ERR_UNCONFIGURED
+#define ERR_INVALID_PARAMETER Error::ERR_INVALID_PARAMETER
 #endif

 void WebRTCLibPeerConnection::initialize_signaling() {
@@ -124,7 +110,7 @@ Error WebRTCLibPeerConnection::_parse_channel_config(rtc::DataChannelInit &r_con
 	return OK;
 }

-int64_t WebRTCLibPeerConnection::_get_connection_state() const {
+WebRTCPeerConnection::ConnectionState WebRTCLibPeerConnection::_get_connection_state() const {
 	ERR_FAIL_COND_V(peer_connection == nullptr, STATE_CLOSED);

 	rtc::PeerConnection::State state = peer_connection->state();
@@ -144,7 +130,43 @@ int64_t WebRTCLibPeerConnection::_get_connection_state() const {
 	}
 }

-int64_t WebRTCLibPeerConnection::_initialize(const Dictionary &p_config) {
+WebRTCLibPeerConnection::GatheringState WebRTCLibPeerConnection::_get_gathering_state() const {
+	ERR_FAIL_COND_V(peer_connection == nullptr, GATHERING_STATE_NEW);
+
+	rtc::PeerConnection::GatheringState state = peer_connection->gatheringState();
+	switch (state) {
+		case rtc::PeerConnection::GatheringState::New:
+			return GATHERING_STATE_NEW;
+		case rtc::PeerConnection::GatheringState::InProgress:
+			return GATHERING_STATE_GATHERING;
+		case rtc::PeerConnection::GatheringState::Complete:
+			return GATHERING_STATE_COMPLETE;
+		default:
+			return GATHERING_STATE_NEW;
+	}
+}
+
+WebRTCLibPeerConnection::SignalingState WebRTCLibPeerConnection::_get_signaling_state() const {
+	ERR_FAIL_COND_V(peer_connection == nullptr, SIGNALING_STATE_CLOSED);
+
+	rtc::PeerConnection::SignalingState state = peer_connection->signalingState();
+	switch (state) {
+		case rtc::PeerConnection::SignalingState::Stable:
+			return SIGNALING_STATE_STABLE;
+		case rtc::PeerConnection::SignalingState::HaveLocalOffer:
+			return SIGNALING_STATE_HAVE_LOCAL_OFFER;
+		case rtc::PeerConnection::SignalingState::HaveRemoteOffer:
+			return SIGNALING_STATE_HAVE_REMOTE_OFFER;
+		case rtc::PeerConnection::SignalingState::HaveLocalPranswer:
+			return SIGNALING_STATE_HAVE_LOCAL_PRANSWER;
+		case rtc::PeerConnection::SignalingState::HaveRemotePranswer:
+			return SIGNALING_STATE_HAVE_REMOTE_PRANSWER;
+		default:
+			return SIGNALING_STATE_CLOSED;
+	}
+}
+
+Error WebRTCLibPeerConnection::_initialize(const Dictionary &p_config) {
 	rtc::Configuration config = {};
 	if (p_config.has("iceServers") && p_config["iceServers"].get_type() == Variant::ARRAY) {
 		Array servers = p_config["iceServers"];
@@ -155,7 +177,7 @@ int64_t WebRTCLibPeerConnection::_initialize(const Dictionary &p_config) {
 			ERR_FAIL_COND_V(err != OK, FAILED);
 		}
 	}
-	return (int64_t)_create_pc(config);
+	return _create_pc(config);
 }

 Object *WebRTCLibPeerConnection::_create_data_channel(const String &p_channel, const Dictionary &p_channel_config) try {
@@ -178,7 +200,7 @@ Object *WebRTCLibPeerConnection::_create_data_channel(const String &p_channel, c
 	ERR_FAIL_V(nullptr);
 }

-int64_t WebRTCLibPeerConnection::_create_offer() try {
+Error WebRTCLibPeerConnection::_create_offer() try {
 	ERR_FAIL_COND_V(!peer_connection, ERR_UNCONFIGURED);
 	ERR_FAIL_COND_V(_get_connection_state() != STATE_NEW, FAILED);
 	peer_connection->setLocalDescription(rtc::Description::Type::Offer);
@@ -188,7 +210,7 @@ int64_t WebRTCLibPeerConnection::_create_offer() try {
 	ERR_FAIL_V(FAILED);
 }

-int64_t WebRTCLibPeerConnection::_set_remote_description(const String &p_type, const String &p_sdp) try {
+Error WebRTCLibPeerConnection::_set_remote_description(const String &p_type, const String &p_sdp) try {
 	ERR_FAIL_COND_V(!peer_connection, ERR_UNCONFIGURED);
 	std::string sdp(p_sdp.utf8().get_data());
 	std::string type(p_type.utf8().get_data());
@@ -204,7 +226,7 @@ int64_t WebRTCLibPeerConnection::_set_remote_description(const String &p_type, c
 	ERR_FAIL_V(FAILED);
 }

-int64_t WebRTCLibPeerConnection::_set_local_description(const String &p_type, const String &p_sdp) {
+Error WebRTCLibPeerConnection::_set_local_description(const String &p_type, const String &p_sdp) {
 	ERR_FAIL_COND_V(!peer_connection, ERR_UNCONFIGURED);
 	// XXX Library quirk. It doesn't seem possible to create offers/answers without setting the local description.
 	// Ignore this call for now to avoid crash (it's already set automatically!).
@@ -212,7 +234,7 @@ int64_t WebRTCLibPeerConnection::_set_local_description(const String &p_type, co
 	return OK;
 }

-int64_t WebRTCLibPeerConnection::_add_ice_candidate(const String &sdpMidName, int64_t sdpMlineIndexName, const String &sdpName) try {
+Error WebRTCLibPeerConnection::_add_ice_candidate(const String &sdpMidName, int64_t sdpMlineIndexName, const String &sdpName) try {
 	ERR_FAIL_COND_V(!peer_connection, ERR_UNCONFIGURED);
 	rtc::Candidate candidate(sdpName.utf8().get_data(), sdpMidName.utf8().get_data());
 	peer_connection->addRemoteCandidate(candidate);
@@ -222,7 +244,7 @@ int64_t WebRTCLibPeerConnection::_add_ice_candidate(const String &sdpMidName, in
 	ERR_FAIL_V(FAILED);
 }

-int64_t WebRTCLibPeerConnection::_poll() {
+Error WebRTCLibPeerConnection::_poll() {
 	ERR_FAIL_COND_V(!peer_connection, ERR_UNCONFIGURED);

 	while (!signal_queue.empty()) {
--- a/src/WebRTCLibPeerConnection.hpp
+++ b/src/WebRTCLibPeerConnection.hpp
@@ -40,6 +40,9 @@
 #define GDCLASS(arg1, arg2) GODOT_CLASS(arg1, arg2)
 #endif
 #else
+#include <godot_cpp/core/binder_common.hpp>
+
+#include <godot_cpp/classes/global_constants_binds.hpp>
 #include <godot_cpp/classes/web_rtc_peer_connection_extension.hpp>
 #endif

@@ -71,15 +74,17 @@ public:

 	void _init();

-	int64_t _get_connection_state() const override;
+	ConnectionState _get_connection_state() const override;
+	GatheringState _get_gathering_state() const override;
+	SignalingState _get_signaling_state() const override;

-	int64_t _initialize(const godot::Dictionary &p_config) override;
+	godot::Error _initialize(const godot::Dictionary &p_config) override;
 	godot::Object *_create_data_channel(const godot::String &p_channel, const godot::Dictionary &p_channel_config) override;
-	int64_t _create_offer() override;
-	int64_t _set_remote_description(const godot::String &type, const godot::String &sdp) override;
-	int64_t _set_local_description(const godot::String &type, const godot::String &sdp) override;
-	int64_t _add_ice_candidate(const godot::String &sdpMidName, int64_t sdpMlineIndexName, const godot::String &sdpName) override;
-	int64_t _poll() override;
+	godot::Error _create_offer() override;
+	godot::Error _set_remote_description(const godot::String &type, const godot::String &sdp) override;
+	godot::Error _set_local_description(const godot::String &type, const godot::String &sdp) override;
+	godot::Error _add_ice_candidate(const godot::String &sdpMidName, int64_t sdpMlineIndexName, const godot::String &sdpName) override;
+	godot::Error _poll() override;
 	void _close() override;

 	WebRTCLibPeerConnection();
--- a/src/net/WebRTCDataChannelNative.cpp
+++ b/src/net/WebRTCDataChannelNative.cpp
@@ -72,7 +72,7 @@ godot_int get_max_packet_size_wdc(const void *user) {
 }

 void set_write_mode_wdc(void *user, godot_int write_mode) {
-	((WebRTCDataChannelNative *)user)->_set_write_mode(write_mode);
+	((WebRTCDataChannelNative *)user)->_set_write_mode((godot::WebRTCDataChannel::WriteMode)write_mode);
 }

 godot_int get_write_mode_wdc(const void *user) {
--- a/src/net/WebRTCDataChannelNative.hpp
+++ b/src/net/WebRTCDataChannelNative.hpp
@@ -112,11 +112,11 @@ public:
 	void _init();
 	void register_interface(const godot_net_webrtc_data_channel *interface);

-	virtual void _set_write_mode(int64_t mode) = 0;
-	virtual int64_t _get_write_mode() const = 0;
+	virtual void _set_write_mode(WriteMode mode) = 0;
+	virtual WriteMode _get_write_mode() const = 0;
 	virtual bool _was_string_packet() const = 0;

-	virtual int64_t _get_ready_state() const = 0;
+	virtual ChannelState _get_ready_state() const = 0;
 	virtual godot::String _get_label() const = 0;
 	virtual bool _is_ordered() const = 0;
 	virtual int64_t _get_id() const = 0;
@@ -126,12 +126,12 @@ public:
 	virtual bool _is_negotiated() const = 0;
 	virtual int64_t _get_buffered_amount() const = 0;

-	virtual int64_t _poll() = 0;
+	virtual godot::Error _poll() = 0;
 	virtual void _close() = 0;

 	/* PacketPeer */
-	virtual int64_t _get_packet(const uint8_t **r_buffer, int32_t *r_len) = 0;
-	virtual int64_t _put_packet(const uint8_t *p_buffer, int64_t p_len) = 0;
+	virtual godot::Error _get_packet(const uint8_t **r_buffer, int32_t *r_len) = 0;
+	virtual godot::Error _put_packet(const uint8_t *p_buffer, int64_t p_len) = 0;
 	virtual int64_t _get_available_packet_count() const = 0;
 	virtual int64_t _get_max_packet_size() const = 0;

--- a/src/net/WebRTCPeerConnectionNative.hpp
+++ b/src/net/WebRTCPeerConnectionNative.hpp
@@ -75,21 +75,38 @@ protected:
 	};

 public:
+	enum GatheringState {
+		GATHERING_STATE_NEW,
+		GATHERING_STATE_GATHERING,
+		GATHERING_STATE_COMPLETE,
+	};
+
+	enum SignalingState {
+		SIGNALING_STATE_STABLE,
+		SIGNALING_STATE_HAVE_LOCAL_OFFER,
+		SIGNALING_STATE_HAVE_REMOTE_OFFER,
+		SIGNALING_STATE_HAVE_LOCAL_PRANSWER,
+		SIGNALING_STATE_HAVE_REMOTE_PRANSWER,
+		SIGNALING_STATE_CLOSED,
+	};
+
 	static void _register_methods();
 	static const godot_gdnative_ext_net_3_2_api_struct *_net_api;

 	void _init();
 	void register_interface(const godot_net_webrtc_peer_connection *interface);

-	virtual int64_t _get_connection_state() const = 0;
+	virtual ConnectionState _get_connection_state() const = 0;
+	virtual GatheringState _get_gathering_state() const = 0;
+	virtual SignalingState _get_signaling_state() const = 0;

-	virtual int64_t _initialize(const godot::Dictionary &p_config) = 0;
+	virtual godot::Error _initialize(const godot::Dictionary &p_config) = 0;
 	virtual godot::Object *_create_data_channel(const godot::String &p_channel, const godot::Dictionary &p_channel_config) = 0;
-	virtual int64_t _create_offer() = 0;
-	virtual int64_t _set_remote_description(const godot::String &type, const godot::String &sdp) = 0;
-	virtual int64_t _set_local_description(const godot::String &type, const godot::String &sdp) = 0;
-	virtual int64_t _add_ice_candidate(const godot::String &sdpMidName, int64_t sdpMlineIndexName, const godot::String &sdpName) = 0;
-	virtual int64_t _poll() = 0;
+	virtual godot::Error _create_offer() = 0;
+	virtual godot::Error _set_remote_description(const godot::String &type, const godot::String &sdp) = 0;
+	virtual godot::Error _set_local_description(const godot::String &type, const godot::String &sdp) = 0;
+	virtual godot::Error _add_ice_candidate(const godot::String &sdpMidName, int64_t sdpMlineIndexName, const godot::String &sdpName) = 0;
+	virtual godot::Error _poll() = 0;
 	virtual void _close() = 0;

 	~WebRTCPeerConnectionNative();
Author	SHA1	Message	Date
Fabio Alessandrelli	d697901f81	Merge pull request #70 from Faless/bump/beta5 Update to Godot 4.0-beta5	2022-11-19 11:08:34 +01:00
Fabio Alessandrelli	3eb7d0aa3b	Update to Godot 4.0-beta5	2022-11-19 01:43:24 +01:00
Fabio Alessandrelli	ecec40f59e	Merge pull request #68 from Faless/bump/beta4 Update to Godot 4.0-beta4.	2022-11-15 00:41:01 +01:00
Fabio Alessandrelli	37a289addf	Update to Godot 4.0-beta4.	2022-11-14 22:48:46 +01:00
Fabio Alessandrelli	1436024f59	Merge pull request #65 from Faless/bump/beta3 [Upstream] Update to Godot Beta 3	2022-10-17 22:42:33 +02:00
Fabio Alessandrelli	690b31e7dd	[Upstream] Update to Godot beta 3. Update build targets. Move release script out of CI yaml. Disable debug CI builds for Godot 3.x since they are mostly used for debugging the extension itself.	2022-10-17 20:59:33 +02:00
Fabio Alessandrelli	9b0a5d8b46	[CI] Update actions, add cache for faster builds.	2022-10-16 16:15:42 +02:00
Fabio Alessandrelli	1769730ef0	Merge pull request #63 from Faless/bump/beta2 [CPP] Bump godot-cpp to beta2 headers.	2022-10-10 11:49:36 +02:00
Fabio Alessandrelli	04898f2714	[CPP] Bump godot-cpp to beta2 headers.	2022-10-09 19:42:31 +02:00
Fabio Alessandrelli	d7fc6cde3b	Merge pull request #61 from Faless/bump/beta1 [Extension] Update to Godot 4.0 beta 1	2022-09-16 14:39:41 +02:00
Fabio Alessandrelli	1009e8bb1c	Add methods to get gathering and signaling state.	2022-09-16 13:07:06 +02:00
Fabio Alessandrelli	5fd359f674	Bump godot-cpp to Godot 4.0 beta1.	2022-09-16 13:07:06 +02:00
Fabio Alessandrelli	822e0532c2	Merge pull request #60 from Faless/bump/alpha16 Update to Godot alpha16	2022-09-11 18:26:08 +02:00
Fabio Alessandrelli	d8cbd14a28	Disable android 32 bits builds.	2022-09-11 15:34:08 +02:00
Fabio Alessandrelli	6e52fce986	Update sources to alpha16	2022-09-11 15:34:08 +02:00
Fabio Alessandrelli	a93af67d75	[godot-cpp] Bump to alpha16.	2022-09-11 14:48:51 +02:00
Fabio Alessandrelli	22ee6435a1	Update to libdatachannel 0.17.10+git.	2022-09-11 14:48:51 +02:00
Fabio Alessandrelli	b5d8a72ef8	Update to OpenSSL 3.0.5	2022-09-11 14:48:51 +02:00
Fabio Alessandrelli	2ad1bf1716	Merge pull request #57 from Faless/bump/4.0_alpha11 Bump godot-cpp to alpha11.	2022-07-06 13:24:04 +02:00
Fabio Alessandrelli	e683c79938	Bump godot-cpp to alpha11.	2022-07-06 11:45:03 +02:00
Fabio Alessandrelli	426ca6cc8e	Merge pull request #56 from Faless/fix/write_mode Fix default data channel write mode to binary.	2022-06-19 13:48:20 +02:00
Fabio Alessandrelli	9b53ef3325	Fix default data channel write mode to binary. It's the engine expected default, and the least surprising for the users since it allows any data to be sent, while text mode requires valid UTF.	2022-06-19 12:18:49 +02:00