[ php-wasm ] Add xdebug dynamic extension to @php-wasm/node JSPI

.github/workflows/ci.yml

@@ -86,6 +86,24 @@ jobs:
                   MYSQL_DATABASE: test_db
                   MYSQL_USER: user
                   MYSQL_PASSWORD: password
+    test-unit-jspi:
+        runs-on: ubuntu-latest
+        needs: [lint-and-typecheck]
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - name: test-unit-jspi (1/1)
+                      target: test-php-dynamic-loading
+        name: ${{ matrix.name }}
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  submodules: true
+            - uses: ./.github/actions/prepare-playground
+              with:
+                  node-version: 23
+            - run: node --expose-gc node_modules/nx/bin/nx affected --target=${{ matrix.target }}
     # Most of these tests pass locally but the process is crashing
     # on the CI runner.
     #

packages/php-wasm/compile/Makefile

@@ -243,7 +243,6 @@ libintl/asyncify/dist/root/lib/lib/libintl.a: base-image
 	docker cp $$(docker create playground-php-wasm:libintl):/root/lib/include ./libintl/asyncify/dist/root/lib
 	docker cp $$(docker create playground-php-wasm:libintl):/root/lib/data/. ./libintl/
 
-
 libintl_jspi: libintl/jspi/dist/root/lib/lib/libintl.a
 libintl/jspi/dist/root/lib/lib/libintl.a: base-image
 	mkdir -p ./libintl/jspi/dist/root/lib

packages/php-wasm/compile/base-image/Dockerfile

@@ -67,6 +67,9 @@ RUN chmod a+x /root/replace.sh
 COPY ./replace-across-lines.sh /root/replace-across-lines.sh
 RUN chmod a+x /root/replace-across-lines.sh
 
+COPY ./emcc-for-php-wasm.sh /root/emcc-for-php-wasm.sh
+COPY ./print-wasm-imports-and-exports.c /root/print-wasm-imports-and-exports.c
+
 # Patch emcc to allow skipping flags and passing additional flags using environment variables.
 #
 # We're compiling libraries statically using emscripten's -sSIDE_MODULE. It differs from the usual unix
@@ -85,17 +88,11 @@ RUN chmod a+x /root/replace-across-lines.sh
 #    │  skip those flags when │   │  add these flags when  │
 #    │      calling emcc      │   │    calling emcc        │
 #    └────────────────────────┘   └────────────────────────┘
-RUN cp /root/emsdk/upstream/emscripten/emcc /root/emsdk/upstream/emscripten/emcc2 && \
-    cp /root/emsdk/upstream/emscripten/emcc.py /root/emsdk/upstream/emscripten/emcc2.py && \
-    echo $'#!/bin/bash\n\
-for arg do shift\n\
-    [[ " ${EMCC_SKIP[*]} " =~ " ${arg} " ]] && continue \n\
-    set -- "$@" "$arg" \n\
-done\n\
-# Passing extra flags breaks the version check \n\
-if [[ "$@" == "-v" ]]; then\n\
-    export EMCC_FLAGS=""\n\
-fi\n\
-/root/emsdk/upstream/emscripten/emcc2 "$@" $EMCC_FLAGS \n' > /root/emsdk/upstream/emscripten/emcc && \
+RUN <<EOF
+    set -euo pipefail
+    cp /root/emsdk/upstream/emscripten/emcc /root/emsdk/upstream/emscripten/emcc2
+    cp /root/emsdk/upstream/emscripten/emcc.py /root/emsdk/upstream/emscripten/emcc2.py
+    cp /root/emcc-for-php-wasm.sh /root/emsdk/upstream/emscripten/emcc
     chmod a+x /root/emsdk/upstream/emscripten/emcc
-
+    cc /root/print-wasm-imports-and-exports.c -o /root/print-wasm-imports-and-exports
+EOF

packages/php-wasm/compile/base-image/emcc-for-php-wasm.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Passing extra flags breaks the version check
+if [[ "$@" == "-v" ]]; then
+	export EMCC_FLAGS=""
+fi
+
+# Convert args to an array for filtering
+args=("${@}")
+
+# Remove flags that we do not want to pass to emcc
+if [[ -n "${EMCC_SKIP:-}" ]]; then
+    for ((i=0; i < ${#args[@]}; i++)); do
+		if [[ " ${EMCC_SKIP[*]} " =~ " ${args[$i]} " ]]; then
+			unset 'args[i]'
+		fi
+	done
+fi
+
+# Remove duplicate library references to avoid linking errors.
+# Begin at end because we generally want dependencies to come last,
+# and if two things depend on a lib, we want the lib to come after both.
+declare -A seen_libs
+for ((i=${#args[@]} - 1; i >= 0; i--)); do
+    # Skip empty args because array may be sparse
+    [[ -z "${args[$i]:-}" ]] && continue
+
+    arg=${args[i]}
+    if (
+        [[ "$arg" =~ ^-l([a-z]|[A-Z]|[0-9]|[\-_])+$ ]] ||
+        [[ "$arg" =~ (^|/)lib([a-z]|[A-Z]|[0-9]|[\-_])+\.a$ ]]
+    ); then
+        if [[ -v seen_libs["$arg"] ]]; then
+            unset 'args[i]'
+        else
+            seen_libs["$arg"]=1
+        fi
+    fi
+done
+
+/root/emsdk/upstream/emscripten/emcc2 "${args[@]}" ${EMCC_FLAGS:-}

packages/php-wasm/compile/base-image/print-wasm-imports-and-exports.c

@@ -0,0 +1,220 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define WASM_MAGIC 0x6D736100
+#define WASM_VERSION 0x1
+
+// Section IDs
+#define IMPORT_SECTION 2
+#define EXPORT_SECTION 7
+
+typedef struct {
+    uint32_t magic;
+    uint32_t version;
+} wasm_header_t;
+
+typedef struct {
+    uint8_t id;
+    uint32_t size;
+} section_header_t;
+
+// Read LEB128 encoded unsigned integer
+uint32_t read_leb128(FILE *fp) {
+    uint32_t result = 0;
+    uint32_t shift = 0;
+    uint8_t byte;
+
+    do {
+        byte = fgetc(fp);
+        result |= ((byte & 0x7f) << shift);
+        shift += 7;
+    } while (byte & 0x80);
+
+    return result;
+}
+
+// Read string from wasm binary
+char* read_string(FILE *fp) {
+    uint32_t len = read_leb128(fp);
+    char *str = malloc(len + 1);
+    fread(str, 1, len, fp);
+    str[len] = '\0';
+    return str;
+}
+
+void parse_imports(FILE *fp) {
+    uint32_t count = read_leb128(fp);
+    printf("[\n");
+
+    for (uint32_t i = 0; i < count; i++) {
+        char *module = read_string(fp);
+        char *name = read_string(fp);
+        uint8_t kind = fgetc(fp);
+
+        printf("    {\n");
+        printf("      \"module\": \"%s\",\n", module);
+        printf("      \"name\": \"%s\",\n", name);
+        printf("      \"kind\": \"0x%02x\",\n", kind);
+
+        // Parse import type based on kind
+        switch(kind) {
+            case 0x00: // Function
+                printf("      \"type\": \"function\",\n");
+                printf("      \"typeIndex\": %d\n", read_leb128(fp));
+                break;
+            case 0x01: { // Table
+                printf("      \"type\": \"table\",\n");
+                // Skip table type but include in JSON
+                uint8_t elemType = fgetc(fp);
+                uint8_t flags = fgetc(fp);
+                uint32_t initial = read_leb128(fp);
+                printf("      \"elementType\": \"0x%02x\",\n", elemType);
+                printf("      \"initial\": %d", initial);
+                if (flags & 0x01) {
+                    uint32_t max = read_leb128(fp);
+                    printf(",\n      \"maximum\": %d\n", max);
+                } else {
+                    printf("\n");
+                }
+                break;
+            }
+            case 0x02: { // Memory
+                printf("      \"type\": \"memory\",\n");
+                uint8_t flags = fgetc(fp);
+                uint32_t initial = read_leb128(fp);
+                printf("      \"initial\": %d", initial);
+                if (flags & 0x01) {
+                    uint32_t max = read_leb128(fp);
+                    printf(",\n      \"maximum\": %d\n", max);
+                } else {
+                    printf("\n");
+                }
+                break;
+            }
+            case 0x03: { // Global
+                printf("      \"type\": \"global\",\n");
+                uint8_t valueType = fgetc(fp);
+                uint8_t mutability = fgetc(fp);
+                printf("      \"valueType\": \"0x%02x\",\n", valueType);
+                printf("      \"mutable\": %s\n", mutability ? "true" : "false");
+                break;
+            }
+        }
+
+        free(module);
+        free(name);
+
+        if (i < count - 1) {
+            printf("    },\n");
+        } else {
+            printf("    }\n");
+        }
+    }
+
+    printf("  ]");
+}
+
+void parse_exports(FILE *fp) {
+	printf("[\n");
+
+	// Read number of exports
+	uint32_t count = read_leb128(fp);
+
+	for (uint32_t i = 0; i < count; i++) {
+		// Read export name
+		uint32_t name_len = read_leb128(fp);
+		char* name = malloc(name_len + 1);
+		fread(name, 1, name_len, fp);
+		name[name_len] = '\0';
+
+		// Read export kind and index
+		uint8_t kind = fgetc(fp);
+		uint32_t index = read_leb128(fp);
+
+		printf("    {\n");
+		printf("      \"name\": \"%s\",\n", name);
+		printf("      \"kind\": %d,\n", kind);
+		printf("      \"index\": %d\n", index);
+
+		if (i < count - 1) {
+			printf("    },\n");
+		} else {
+			printf("    }\n");
+		}
+
+		free(name);
+	}
+
+	printf("  ]");
+}
+
+int main(int argc, char *argv[]) {
+    if (argc != 2) {
+        fprintf(stderr, "Usage: %s <wasm file>\n", argv[0]);
+        return 1;
+    }
+
+    FILE *fp = fopen(argv[1], "rb");
+    if (!fp) {
+        perror("Failed to open file");
+        return 1;
+    }
+
+    // Read and verify header
+    wasm_header_t header;
+    fread(&header, sizeof(header), 1, fp);
+
+    if (header.magic != WASM_MAGIC || header.version != WASM_VERSION) {
+        fprintf(stderr, "Invalid WASM file\n");
+        fclose(fp);
+        return 1;
+    }
+
+    printf("{\n");
+
+    // Find imports and exports sections
+    int found_imports = 0;
+    int found_exports = 0;
+
+    while (!feof(fp) && (!found_imports || !found_exports)) {
+        section_header_t section;
+        section.id = fgetc(fp);
+        if (feof(fp)) break;
+
+        section.size = read_leb128(fp);
+
+        if (section.id == IMPORT_SECTION) {
+            printf("  \"imports\": ");
+            parse_imports(fp);
+            found_imports = 1;
+            if (!found_exports) {
+                printf(",");
+            }
+            printf("\n");
+        } else if (section.id == EXPORT_SECTION) {
+            printf("  \"exports\": ");
+            parse_exports(fp);
+            found_exports = 1;
+            if (!found_imports) {
+                printf(",");
+            }
+            printf("\n");
+        } else {
+            // Skip other sections
+            fseek(fp, section.size, SEEK_CUR);
+        }
+    }
+
+    if (!found_imports) {
+        printf("  \"imports\": []\n");
+    }
+    if (!found_exports) {
+        printf("  \"exports\": []\n");
+    }
+
+    printf("}\n");
+
+    fclose(fp);
+    return 0;
+}

packages/php-wasm/compile/libintl/Dockerfile

@@ -31,6 +31,8 @@ RUN set -euxo pipefail && \
     cd /root/icu/source && \
     mkdir -p /root/lib && \
     source /root/emsdk/emsdk_env.sh && \
+    export CFLAGS="-fPIC" && \
+    export CXXFLAGS="-fPIC" && \
     emconfigure ./configure \
         --build=i386-pc-linux-gnu \
         --target=wasm32-unknown-emscripten \
@@ -41,8 +43,8 @@ RUN set -euxo pipefail && \
         --disable-shared \
         --enable-static && \
     export JSPI_FLAGS=$(if [ "$JSPI" = "1" ]; then echo "-sSUPPORT_LONGJMP=wasm -fwasm-exceptions"; else echo ""; fi) && \
-    EMCC_FLAGS=" -D__x86_64__ -sSIDE_MODULE $JSPI_FLAGS " emmake make -j"$(nproc)" && \
-    EMCC_FLAGS=" -D__x86_64__ -sSIDE_MODULE $JSPI_FLAGS " emmake make install -i;
+    EMCC_FLAGS=" -D__x86_64__ -fPIC -sSIDE_MODULE $JSPI_FLAGS " emmake make -j"$(nproc)" && \
+    EMCC_FLAGS=" -D__x86_64__ -fPIC -sSIDE_MODULE $JSPI_FLAGS " emmake make install;
 
 
 RUN set -euxo pipefail && \

packages/php-wasm/compile/libintl/jspi/dist/root/lib/lib/icu/74.2/pkgdata.inc

@@ -4,9 +4,9 @@ SOBJ=so
 A=a
 LIBPREFIX=lib
 LIB_EXT_ORDER=.74.2
-COMPILE=/root/emsdk/upstream/emscripten/emcc -ffunction-sections -fdata-sections -D_REENTRANT  -DU_HAVE_ELF_H=1 -DU_HAVE_STRTOD_L=1 -DU_HAVE_XLOCALE_H=1 -DU_HAVE_STRING_VIEW=1  -DU_ATTRIBUTE_DEPRECATED= -O2 -std=c11 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings   -c
+COMPILE=/root/emsdk/upstream/emscripten/emcc -ffunction-sections -fdata-sections -D_REENTRANT  -DU_HAVE_ELF_H=1 -DU_HAVE_STRTOD_L=1 -DU_HAVE_XLOCALE_H=1 -DU_HAVE_STRING_VIEW=1  -DU_ATTRIBUTE_DEPRECATED= -fPIC -std=c11 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings   -c
 LIBFLAGS=-I/root/lib/include -DPIC -fPIC
-GENLIB=/root/emsdk/upstream/emscripten/emcc -O2 -std=c11 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings   -Wl,--gc-sections  -shared -Wl,-Bsymbolic
+GENLIB=/root/emsdk/upstream/emscripten/emcc -fPIC -std=c11 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings   -Wl,--gc-sections  -shared -Wl,-Bsymbolic
 LDICUDTFLAGS=-nodefaultlibs -nostdlib
 LD_SONAME=-Wl,-soname -Wl,
 RPATH_FLAGS=