Final version of python.exe, node.exe, ... support

.github/workflows/benchmark.yml

@@ -56,12 +56,10 @@ jobs:
 
       - name: Build 
         working-directory: ./build
-        # TODO: Remove the disable option for fork safe once funchook problem is solved
         run: |
           if [ "$(uname)" == "Darwin" ]; then
             . .env
           fi
-          cmake -DOPTION_FORK_SAFE=OFF  ..
           bash ../tools/metacall-build.sh $METACALL_BUILD_OPTIONS
         env:
           METACALL_BUILD_OPTIONS: release benchmarks

.github/workflows/docker-hub.yml

@@ -19,22 +19,53 @@ env:
   IMAGE_NAME: core
   BUILDKIT_VERSION: 0.13.0
 
+  # TODO: Tests failing
+  # - linux/s390x
+  # TODO: Not tested or no hooking support
+  # - linux/mips64le
+  # - linux/mips64
+  # - linux/loong64
+  PLATFORM_LIST: >
+    [
+      "linux/amd64",
+      "linux/amd64/v2",
+      "linux/amd64/v3",
+      "linux/386",
+      "linux/arm64",
+      "linux/riscv64",
+      "linux/ppc64le",
+      "linux/arm/v7",
+      "linux/arm/v6"
+    ]
+
 jobs:
+  matrix:
+    name: Generate Platform List
+    runs-on: ubuntu-latest
+    outputs:
+      platform_list: ${{ steps.generate_platform_list.outputs.platform_list }}
+    steps:
+      - name: Generate platform list
+        id: generate_platform_list
+        run: |
+          set -exuo pipefail
+          PLATFORM_STRING=$(cat <<EOF
+          ${{ env.PLATFORM_LIST }}
+          EOF
+          )
+          PLATFORM_LIST=$(echo $PLATFORM_STRING | jq -c .)
+          echo "PLATFORM_LIST=$PLATFORM_LIST" >> $GITHUB_ENV
+          echo "::set-output name=platform_list::$PLATFORM_LIST"
+
   build:
     name: Build
     runs-on: ubuntu-latest
+    needs: matrix
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/386
-          - linux/arm64
-          - linux/riscv64
-          - linux/ppc64le
-          - linux/s390x
-          - linux/arm/v7
-          - linux/arm/v6
+        platform: ${{ fromJSON(needs.matrix.outputs.platform_list) }}
+
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -58,42 +89,44 @@ jobs:
       - name: Build MetaCall Docker Images
         env:
           METACALL_PLATFORM: ${{ matrix.platform }}
+          DOCKER_BUILDKIT: 1
         run: |
           ./docker-compose.sh platform
 
-      - name: Tag Platform Images
+      - name: Run Tests
+        env:
+          DOCKER_BUILDKIT: 1
         run: |
-          platform_tag=$(echo "${{ matrix.platform }}" | tr '/' '-')
-          echo "Platform Tag: ${platform_tag}"
-          for tag in "deps" "dev" "runtime" "cli"; do
-            docker tag metacall/${IMAGE_NAME}:${tag} \
-              ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform_tag}
-          done
+          set -exuo pipefail
+          docker image inspect ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:cli --format='{{.Os}}/{{.Architecture}}'
+          cat <<EOF > Dockerfile.test
+          FROM ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:cli
+          RUN apt-get update && apt-get install -y file
+          RUN file /usr/local/bin/metacallcli && ldd /usr/local/bin/metacallcli
+          RUN echo "console.log('0123456789abcdef')" > script.js
+          RUN metacallcli script.js | tee output.txt
+          RUN grep 0123456789abcdef output.txt
+          EOF
+
+          docker buildx build --progress=plain --platform ${{ matrix.platform }} -f Dockerfile.test -t test-image .
 
-      - name: Push Platform Images
+      - name: Tag & Push Platform Images
+        # Only run when master or when tagging a version
+        if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.event_name != 'pull_request'
         run: |
           platform_tag=$(echo "${{ matrix.platform }}" | tr '/' '-')
           for tag in "deps" "dev" "runtime" "cli"; do
+            docker tag \
+              ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag} \
+              ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform_tag}
+
             echo "Pushing image for tag: ${tag} with platform: ${platform_tag}"
             docker push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform_tag}
           done
 
-      - name: Run Tests
-        run: |
-          set -exuo pipefail
-          platform_tag=$(echo "${{ matrix.platform }}" | tr '/' '-')
-          cat <<EOF > Dockerfile.test
-          FROM ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:cli-${platform_tag}
-          RUN echo "console.log('abcde')" > script.js
-          RUN metacallcli script.js
-          EOF
-
-          docker build --platform ${{ matrix.platform }} -f Dockerfile.test -t test-image .
-          docker run --rm --platform=${{ matrix.platform }} test-image
-
   manifest:
     name: Create and Push Manifest Lists
-    needs: build
+    needs: [matrix, build]
     # Only run when master or when tagging a version
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.event_name != 'pull_request'
     runs-on: ubuntu-latest
@@ -106,8 +139,10 @@ jobs:
 
       - name: Create and Push Manifest Lists
         run: |
+          set -exuo pipefail
+
           tags=("deps" "dev" "runtime" "cli")
-          platforms=("linux/amd64" "linux/386" "linux/arm64" "linux/riscv64" "linux/ppc64le" "linux/s390x" "linux/arm/v7" "linux/arm/v6")
+          platforms=($(echo '${{ needs.matrix.outputs.platform_list }}' | jq -r '.[]'))
 
           echo "Create all the tags by platform"
 
@@ -151,14 +186,16 @@ jobs:
 
   cleanup:
     name: Cleanup Platform Specific Tags
-    needs: [build, manifest]
+    needs: [matrix, build, manifest]
     runs-on: ubuntu-latest
     if: always()
     steps:
       - name: Remove Platform-Specific Tags
         run: |
+          set -exuo pipefail
+
           tags=("deps" "dev" "runtime" "cli")
-          platforms=("linux/amd64" "linux/386" "linux/arm64" "linux/riscv64" "linux/ppc64le" "linux/s390x" "linux/arm/v7" "linux/arm/v6")
+          platforms=($(echo '${{ needs.matrix.outputs.platform_list }}' | jq -r '.[]'))
 
           for tag in "${tags[@]}"; do
             for platform in "${platforms[@]}"; do

.github/workflows/macos-test.yml

@@ -77,7 +77,7 @@ jobs:
       - name: Set up the environment
         run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS
         env:
-          METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol go backtrace #netcore5 c rust rapidjson funchook swig pack # clangformat v8rep51 coverage
+          METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol go backtrace #netcore5 c rust rapidjson swig pack # clangformat v8rep51 coverage
 
       - name: Configure
         run: |
@@ -89,10 +89,8 @@ jobs:
 
       - name: Build
         working-directory: ./build
-        # TODO: Remove the disable option for fork safe once funchook problem is solved
         run: |
           . .env
-          cmake -DOPTION_FORK_SAFE=OFF  ..
           bash ../tools/metacall-build.sh $METACALL_BUILD_OPTIONS
         env:
           METACALL_BUILD_OPTIONS: ${{ matrix.options.build }} tests

.github/workflows/windows-test.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Set up the environment
         run: cmd.exe /c "powershell .\tools\metacall-environment.ps1 $Env:METACALL_INSTALL_OPTIONS"
         env:
-          METACALL_INSTALL_OPTIONS: python nodejs java ruby typescript wasm rpc file # netcore5 java c cobol rust rapidjson funchook swig pack # clangformat v8rep51 coverage
+          METACALL_INSTALL_OPTIONS: python nodejs java ruby typescript wasm rpc file # netcore5 java c cobol rust rapidjson swig pack # clangformat v8rep51 coverage
 
       - name: Configure
         run: |

NOTICE

@@ -19,7 +19,7 @@ All external code and licenses used by **METACALL** are always wrapped into plug
     - [2. Serials](#2-serials)
         - [2.1 RapidJSON](#21-rapidjson)
     - [3. Detours](#3-detours)
-        - [3.1 FuncHook](#31-funchook)
+        - [3.1 PLTHook](#31-plthook)
     - [4. Ports](#4-ports)
         - [4.1 Swig](#41-swig)
 
@@ -80,11 +80,11 @@ All external code and licenses used by **METACALL** are always wrapped into plug
 
 ## 3. Detours
 
-### 3.1 FuncHook
+### 3.1 PLTHook
 
-| Software     | License                                                                                             |
-| :----------: | :-------------------------------------------------------------------------------------------------: |
-| **FuncHook** | [GPLv2 or later with a GPL linking exception](https://github.com/kubo/funchook/blob/master/LICENSE) |
+| Software     | License                                                                                      |
+| :----------: | :------------------------------------------------------------------------------------------: |
+| **PLTHook**  | [2-clause BSD-style license](https://github.com/metacall/plthook?tab=readme-ov-file#license) |
 
 ## 4. Ports
 

cmake/FindLibGit2.cmake

@@ -44,13 +44,13 @@ endif()
 
 if(NOT LibGit2_VERSION AND LibGit2_INCLUDE_DIR)
 	file(STRINGS "${LibGit2_INCLUDE_DIR}/git2/version.h" LibGit2_VERSION_MAJOR REGEX "^#define LIBGIT2_VER_MAJOR +([0-9]+)")
-	string(REGEX MATCH "([0-9]+)$" LibGit2_VERSION_MAJOR ${LibGit2_VERSION_MAJOR})
+	string(REGEX MATCH "([0-9]+)$" LibGit2_VERSION_MAJOR "${LibGit2_VERSION_MAJOR}")
 
 	file(STRINGS "${LibGit2_INCLUDE_DIR}/git2/version.h" LibGit2_VERSION_MINOR REGEX "^#define LIBGIT2_VER_MINOR +([0-9]+)")
-	string(REGEX MATCH "([0-9]+)$" LibGit2_VERSION_MINOR ${LibGit2_VERSION_MINOR})
+	string(REGEX MATCH "([0-9]+)$" LibGit2_VERSION_MINOR "${LibGit2_VERSION_MINOR}")
 
 	file(STRINGS "${LibGit2_INCLUDE_DIR}/git2/version.h" LibGit2_VERSION_REVISION REGEX "^#define LIBGIT2_VER_REVISION +([0-9]+)")
-	string(REGEX MATCH "([0-9]+)$" LibGit2_VERSION_REVISION ${LibGit2_VERSION_REVISION})
+	string(REGEX MATCH "([0-9]+)$" LibGit2_VERSION_REVISION "${LibGit2_VERSION_REVISION}")
 
 	set(LibGit2_VERSION "${LibGit2_VERSION_MAJOR}.${LibGit2_VERSION_MINOR}.${LibGit2_VERSION_REVISION}")
 endif()

cmake/InstallGTest.cmake

@@ -24,7 +24,7 @@
 
 if(NOT GTEST_FOUND OR USE_BUNDLED_GTEST)
 	if(NOT GTEST_VERSION OR USE_BUNDLED_GTEST)
-		set(GTEST_VERSION 1.11.0)
+		set(GTEST_VERSION 1.16.0)
 	endif()
 
 	find_package(Threads REQUIRED)
@@ -38,7 +38,7 @@ if(NOT GTEST_FOUND OR USE_BUNDLED_GTEST)
 	# Import Google Test Framework
 	ExternalProject_Add(google-test-depends
 		GIT_REPOSITORY https://github.com/google/googletest.git
-		GIT_TAG release-${GTEST_VERSION}
+		GIT_TAG v${GTEST_VERSION}
 		CMAKE_ARGS
 			-Dgtest_build_samples=OFF
 			-Dgtest_build_tests=OFF

cmake/InstallRapidJSON.cmake

@@ -24,7 +24,7 @@
 
 if(NOT RAPIDJSON_FOUND OR USE_BUNDLED_RAPIDJSON)
 	if(NOT RAPIDJSON_VERSION OR USE_BUNDLED_RAPIDJSON)
-		set(RAPIDJSON_VERSION ab1842a2dae061284c0a62dca1cc6d5e7e37e346)
+		set(RAPIDJSON_VERSION 24b5e7a8b27f42fa16b96fc70aade9106cf7102f)
 	endif()
 
 	ExternalProject_Add(rapid-json-depends

cmake/Portability.cmake

@@ -146,11 +146,10 @@ set(PROJECT_ARCH_NAME ${CMAKE_SYSTEM_PROCESSOR})
 
 # 32 or 64 bit Linux
 if(PROJECT_OS_LINUX)
-	if(${PROJECT_ARCH_NAME} STREQUAL "x86")
+	if (${PROJECT_ARCH_NAME} MATCHES "^(x86|i[3-6]86|x86_64)$" AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
 		set(PROJECT_ARCH_32BIT TRUE BOOL INTERNAL)
-	endif()
-
-	if(${PROJECT_ARCH_NAME} MATCHES "(x86_64)|(amd64)|(AMD64)")
+		set(PROJECT_ARCH_X86 TRUE BOOL INTERNAL)
+	elseif(${PROJECT_ARCH_NAME} MATCHES "(x86_64)|(amd64)|(AMD64)")
 		set(PROJECT_ARCH_64BIT TRUE BOOL INTERNAL)
 		set(PROJECT_ARCH_AMD64 TRUE BOOL INTERNAL)
 	elseif(${PROJECT_ARCH_NAME} STREQUAL "aarch64")
@@ -162,6 +161,7 @@ if(PROJECT_OS_LINUX)
 		set(PROJECT_ARCH_64BIT TRUE BOOL INTERNAL)
 	endif()
 
+	# Verify the architecture is correct
 	if(PROJECT_ARCH_32BIT)
 		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
 			message(STATUS "Linux ${PROJECT_ARCH_NAME} 32bit detected")
@@ -183,15 +183,15 @@ endif()
 if(NOT PROJECT_ARCH_32BIT AND NOT PROJECT_ARCH_64BIT)
 	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
 		message(STATUS "32bit architecture ${PROJECT_ARCH_NAME} detected")
-	set(PROJECT_ARCH_32BIT TRUE BOOL INTERNAL)
+		set(PROJECT_ARCH_32BIT TRUE BOOL INTERNAL)
 
 		if(PROJECT_OS_WIN)
 			set(WINXBITS Win32)
 		endif()
 
 	elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
 		message(STATUS "64bit architecture ${PROJECT_ARCH_NAME} detected")
-	set(PROJECT_ARCH_64BIT TRUE BOOL INTERNAL)
+		set(PROJECT_ARCH_64BIT TRUE BOOL INTERNAL)
 
 		if(PROJECT_OS_WIN)
 			set(WINXBITS Win64)

cmake/Warnings.cmake

@@ -46,6 +46,7 @@ if(WARNINGS_ENABLED)
 
 	# Define C compiler warning flags
 	if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
+		# TODO: Uncomment the rest of the warnings, enable Weverything for clang
 		add_compile_options(-Wall)
 		add_compile_options(-Wextra)
 		add_compile_options(-Wunused)
@@ -85,7 +86,7 @@ if(WARNINGS_ENABLED)
 		string(REPLACE "/W1" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 		string(REPLACE "/W2" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 		string(REPLACE "/W3" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /Wall")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") # /Wall
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CTR_NONSTDC_NO_WARNINGS=1")
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CTR_SECURE_NO_WARNINGS=1")
 		set(WARNINGS_C_AVAILABLE 1)
@@ -105,7 +106,7 @@ if(WARNINGS_ENABLED)
 		string(REPLACE "/W1" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 		string(REPLACE "/W2" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 		string(REPLACE "/W3" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /Wall")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") # /Wall
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CTR_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CTR_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CTR_NONSTDC_NO_WARNINGS=1")

docker-compose.test.yml

@@ -25,10 +25,10 @@ services:
     build:
       args:
         METACALL_BUILD_TYPE: ${METACALL_BUILD_TYPE}
-        METACALL_INSTALL_OPTIONS: base python ruby netcore7 nodejs typescript file rpc wasm java c cobol go rust rapidjson funchook swig pack backtrace sandbox ${METACALL_BUILD_COVERAGE} # clangformat v8rep51
+        METACALL_INSTALL_OPTIONS: base python ruby netcore8 nodejs typescript file rpc wasm java c cobol go rust rapidjson swig pack backtrace sandbox ${METACALL_BUILD_COVERAGE} # clangformat v8rep51
   dev:
     image: metacall/core:dev
     build:
       args:
         METACALL_BUILD_TYPE: ${METACALL_BUILD_TYPE}
-        METACALL_BUILD_OPTIONS: ${METACALL_BUILD_SANITIZER} python ruby netcore7 nodejs typescript file rpc wasm java c cobol go rust examples tests scripts ports install pack sandbox benchmarks ${METACALL_BUILD_COVERAGE} # v8
+        METACALL_BUILD_OPTIONS: ${METACALL_BUILD_SANITIZER} python ruby netcore8 nodejs typescript file rpc wasm java c cobol go rust examples tests scripts ports install pack sandbox benchmarks ${METACALL_BUILD_COVERAGE} # v8

docker-compose.yml

@@ -31,7 +31,7 @@ services:
         METACALL_PATH: $METACALL_PATH
         METACALL_TOOLS_PATH: $METACALL_PATH/tools
         METACALL_BUILD_TYPE: $METACALL_BUILD_TYPE
-        METACALL_INSTALL_OPTIONS: base python ruby nodejs typescript file rpc rapidjson funchook swig pack backtrace # clangformat v8rep51 coverage
+        METACALL_INSTALL_OPTIONS: base python ruby nodejs typescript file rpc rapidjson swig pack backtrace # clangformat v8rep51 coverage
     environment:
       DEBIAN_FRONTEND: noninteractive
       # Work around https://github.com/dotnet/cli/issues/1582 until Docker releases a

docs/README.md

@@ -66,7 +66,7 @@ Use the [installer](https://github.com/metacall/install) and try [some examples]
         - [5.3.2.1 MetaCall](#5321-metacall)
         - [5.3.2.2 RapidJSON](#5322-rapidjson)
       - [5.3.3 Detours](#533-detours)
-        - [5.3.3.1 FuncHook](#5331-funchook)
+        - [5.3.3.1 PLTHook](#5331-plthook)
     - [5.4 Ports](#54-ports)
     - [5.5 Serialization](#55-serialization)
     - [5.6 Memory Layout](#56-memory-layout)
@@ -251,7 +251,7 @@ The environment variables are optional, in case you want to modify default paths
 
 - [`detours`](/source/detours) implement the [`detour`](/source/detour) interface by using a plugin architecture. The current list of available detour plugins is the following one.
 
-  - [`funchook_detour`](/source/detours/funchook_detour) implemented by means of FuncHook library.
+  - [`plthook_detour`](/source/detours/plthook_detour) implemented by means of PLTHook library.
 
 - [`dynlink`](/source/dynlink) implements a cross-platform method to dynamically load libraries. It is used to dynamically load plugins into **METACALL**.
 
@@ -499,7 +499,7 @@ A loader must implement it to be considered a valid loader.
 
 #### 5.3.3 Detours
 
-##### 5.3.3.1 FuncHook
+##### 5.3.3.1 PLTHook
 
 ### 5.4 Ports
 
@@ -666,7 +666,7 @@ It is possible to enable or disable concrete loaders, script, ports, serials or
 | **OPTION*BUILD_LOADERS*** | `C` `JS` `CS` `MOCK` `PY` `JSM` `NODE` `RB` `FILE`                    |
 | **OPTION*BUILD_SCRIPTS*** | `C` `CS` `JS` `NODE` `PY` `RB` `JAVA`                                 |
 | **OPTION*BUILD_SERIALS*** | `METACALL` `RAPID_JSON`                                               |
-| **OPTION*BUILD_DETOURS*** | `FUNCHOOK`                                                            |
+| **OPTION*BUILD_DETOURS*** | `PLTHOOK`                                                            |
 |  **OPTION*BUILD_PORTS***  | `CS` `CXX` `D` `GO` `JAVA` `JS` `LUA` `NODE` `PHP` `PL` `PY` `R` `RB` |
 
 To format the entire C/C++ codebase use: