Merge branch 'master' of github.com:seanmorris/php-wasm

.cloudflare/pages/functions/[[path]].js

@@ -31,12 +31,43 @@ export const onRequest = async (context) => {
     return new Response("Not found", { status: 404 });
   }
 
-  // return new Response(JSON.stringify({key, exists: !isMissing(obj), obj}));
-
-  return new Response(obj.body, {
-    headers: {
-      "Content-Type": obj.httpMetadata?.contentType || "application/octet-stream",
-      "Access-Control-Allow-Origin": "*",
-    },
-  });
+  // Preserve original content-type for use after negotiating compression
+  const originalContentType = obj.httpMetadata?.contentType || "application/octet-stream";
+
+  // Negotiate pre-compressed variants: Brotli preferred, then gzip
+  const acceptEncoding = context.request.headers.get("Accept-Encoding") || "";
+  let encoding;
+
+  if (acceptEncoding.includes("br")) {
+    const brKey = key + ".br";
+    const brObj = await context.env.NIGHTLY_BUILDS.get(brKey);
+    if (!isMissing(brObj)) {
+      obj = brObj;
+      encoding = "br";
+    }
+  }
+
+  // Fallback to gzip if supported
+  if (!encoding && acceptEncoding.includes("gzip")) {
+    const gzKey = key + ".gz";
+    const gzObj = await context.env.NIGHTLY_BUILDS.get(gzKey);
+    if (!isMissing(gzObj)) {
+      obj = gzObj;
+      encoding = "gzip";
+    }
+  }
+
+  console.log({originalContentType, encoding});
+
+  const headers = {
+    "Content-Type": originalContentType,
+    "Access-Control-Allow-Origin": "*",
+  };
+  if (encoding) {
+    headers["Content-Encoding"] = encoding;
+	headers["Cache-Control"] = "no-transform";
+    headers["Vary"] = "Accept-Encoding";
+  }
+
+  return new Response(obj.body, { headers, encodeBody: "manual" });
 };

.github/.env_8.0.dynamic.ci

@@ -6,5 +6,6 @@ ASSERTIONS=0
 OPTIMIZE=3
 SYMBOLS=0
 
+WITH_WAITLINE=1
 WITH_PDO_PGLITE=0
 WITH_VRZNO=0

.github/.env_8.0.shared.ci

@@ -38,5 +38,6 @@ WITH_ONIGURUMA=shared
 WITH_OPENSSL=shared
 WITH_INTL=shared
 
+WITH_WAITLINE=1
 WITH_PDO_PGLITE=0
 WITH_VRZNO=0

.github/.env_8.0.static.ci

@@ -38,5 +38,6 @@ WITH_ONIGURUMA=static
 WITH_OPENSSL=1
 WITH_INTL=static
 
+WITH_WAITLINE=1
 WITH_PDO_PGLITE=0
 WITH_VRZNO=0

.github/.env_8.1.dynamic.ci

@@ -5,3 +5,5 @@ WITH_SOURCEMAPS=0
 ASSERTIONS=0
 OPTIMIZE=3
 SYMBOLS=0
+
+WITH_WAITLINE=1

.github/.env_8.1.shared.ci

@@ -37,3 +37,5 @@ WITH_MBSTRING=static
 WITH_ONIGURUMA=shared
 WITH_OPENSSL=shared
 WITH_INTL=shared
+
+WITH_WAITLINE=1

.github/.env_8.1.static.ci

@@ -37,3 +37,5 @@ WITH_MBSTRING=static
 WITH_ONIGURUMA=static
 WITH_OPENSSL=1
 WITH_INTL=static
+
+WITH_WAITLINE=1

.github/.env_8.2.dynamic.ci

@@ -5,3 +5,5 @@ WITH_SOURCEMAPS=0
 ASSERTIONS=0
 OPTIMIZE=3
 SYMBOLS=0
+
+WITH_WAITLINE=1

.github/.env_8.2.shared.ci

@@ -37,3 +37,5 @@ WITH_MBSTRING=static
 WITH_ONIGURUMA=shared
 WITH_OPENSSL=shared
 WITH_INTL=shared
+
+WITH_WAITLINE=1

.github/.env_8.2.static.ci

@@ -37,3 +37,5 @@ WITH_MBSTRING=static
 WITH_ONIGURUMA=static
 WITH_OPENSSL=1
 WITH_INTL=static
+
+WITH_WAITLINE=1

.github/.env_8.3.dynamic.ci

@@ -5,3 +5,5 @@ WITH_SOURCEMAPS=0
 ASSERTIONS=0
 OPTIMIZE=3
 SYMBOLS=0
+
+WITH_WAITLINE=1

.github/.env_8.3.shared.ci

@@ -37,3 +37,5 @@ WITH_MBSTRING=static
 WITH_ONIGURUMA=shared
 WITH_OPENSSL=shared
 WITH_INTL=shared
+
+WITH_WAITLINE=1

.github/.env_8.3.static.ci

@@ -38,4 +38,4 @@ WITH_ONIGURUMA=static
 WITH_OPENSSL=1
 WITH_INTL=static
 
-
+WITH_WAITLINE=1

.github/.env_8.4.dynamic.ci

@@ -5,3 +5,5 @@ WITH_SOURCEMAPS=0
 ASSERTIONS=0
 OPTIMIZE=3
 SYMBOLS=0
+
+WITH_WAITLINE=1

.github/.env_8.4.shared.ci

@@ -37,3 +37,5 @@ WITH_MBSTRING=static
 WITH_ONIGURUMA=shared
 WITH_OPENSSL=shared
 WITH_INTL=shared
+
+WITH_WAITLINE=1

.github/.env_8.4.static.ci

@@ -37,3 +37,5 @@ WITH_MBSTRING=static
 WITH_ONIGURUMA=static
 WITH_OPENSSL=1
 WITH_INTL=static
+
+WITH_WAITLINE=1

.github/.env_8.5.dynamic.ci

@@ -0,0 +1,9 @@
+#!/usr/bin/env make
+PHP_VERSION=8.5
+
+WITH_SOURCEMAPS=0
+ASSERTIONS=0
+OPTIMIZE=3
+SYMBOLS=0
+
+WITH_WAITLINE=1

.github/.env_8.5.shared.ci

@@ -0,0 +1,41 @@
+#!/usr/bin/env make
+PHP_VERSION=8.5
+
+WITH_SOURCEMAPS=0
+ASSERTIONS=0
+OPTIMIZE=3
+SYMBOLS=0
+
+WITH_BCMATH=1
+WITH_CALENDAR=1
+WITH_CTYPE=1
+WITH_EXIF=1
+WITH_FILTER=1
+WITH_TOKENIZER=1
+
+WITH_PHAR=static
+
+WITH_LIBXML=shared
+WITH_DOM=dynamic
+WITH_XML=dynamic
+WITH_SIMPLEXML=dynamic
+WITH_TIDY=shared
+
+WITH_LIBZIP=shared
+WITH_ICONV=shared
+WITH_SQLITE=shared
+
+WITH_GD=static
+WITH_ZLIB=shared
+WITH_LIBPNG=shared
+WITH_FREETYPE=shared
+WITH_LIBJPEG=shared
+WITH_LIBWEBP=shared
+
+WITH_YAML=shared
+WITH_MBSTRING=static
+WITH_ONIGURUMA=shared
+WITH_OPENSSL=shared
+WITH_INTL=shared
+
+WITH_WAITLINE=1

.github/.env_8.5.static.ci

@@ -0,0 +1,41 @@
+#!/usr/bin/env make
+PHP_VERSION=8.5
+
+WITH_SOURCEMAPS=0
+ASSERTIONS=0
+OPTIMIZE=3
+SYMBOLS=0
+
+WITH_BCMATH=1
+WITH_CALENDAR=1
+WITH_CTYPE=1
+WITH_EXIF=1
+WITH_FILTER=1
+WITH_TOKENIZER=1
+
+WITH_PHAR=static
+
+WITH_LIBXML=static
+WITH_DOM=static
+WITH_XML=static
+WITH_SIMPLEXML=static
+WITH_TIDY=static
+
+WITH_LIBZIP=static
+WITH_ICONV=static
+WITH_SQLITE=static
+
+WITH_GD=static
+WITH_ZLIB=static
+WITH_LIBPNG=static
+WITH_FREETYPE=static
+WITH_LIBJPEG=static
+WITH_LIBWEBP=static
+
+WITH_YAML=static
+WITH_MBSTRING=static
+WITH_ONIGURUMA=static
+WITH_OPENSSL=1
+WITH_INTL=static
+
+WITH_WAITLINE=1

.github/bin/index-dirs.sh

@@ -9,10 +9,10 @@ TREE_FLAGS='-FCL 1'
 cd ${PACKAGES_DIR};
 
 find . -type d | while read DIR; do {
-	[[ "${DIR::-1}" == "pdo-cfd1" ]]   && continue;
-	[[ "${DIR::-1}" == "pdo-pglite" ]] && continue;
-	[[ "${DIR::-1}" == "vrzno" ]]      && continue;
-	[[ "${DIR::-1}" == "waitline" ]]   && continue;
+	[[ "${DIR:2}" == "pdo-cfd1" ]]   && continue;
+	[[ "${DIR:2}" == "pdo-pglite" ]] && continue;
+	[[ "${DIR:2}" == "vrzno" ]]      && continue;
+	[[ "${DIR:2}" == "waitline" ]]   && continue;
 
 	test -d ${DIR} || continue;
 	pushd ${DIR} > /dev/null;
@@ -21,6 +21,20 @@ find . -type d | while read DIR; do {
 	perl -pi -e "s#^</head>#<style> html { background-color: black; } body { filter: invert(1); } </style></head>#" index.html
 	perl -pi -e "s#^</p>#at $(date)</p>#" index.html
 	perl -pi -e "s#\t</p>#\t<br /><br />php-wasm © 2021-$(date +%Y) Sean Morris</p>#" index.html
+	shopt -s nullglob
+	for BINARY in *.wasm; do
+		brotli -kfZ ${BINARY}
+		gzip -k9 ${BINARY}
+	done;
+	for BINARY in *.so; do
+		brotli -kfZ ${BINARY}
+		gzip -k9 ${BINARY}
+	done;
+	for DAT in *.dat; do
+		brotli -kfZ ${DAT}
+		gzip -k9 ${DAT}
+	done;
+	shopt -u nullglob
 	popd > /dev/null;
 }; done;
 

.github/workflows/build-step.yaml

@@ -88,6 +88,9 @@ jobs:
       - name: Build PHP for Web & PHP-CGI for Worker
         run: time make --debug=basic web-mjs worker-cgi-mjs
 
+      - name: Build PHP CGI for Node
+        run: time make --debug=basic node-cgi-mjs
+
       - name: Build php${{ inputs.phpVersion }}-sdl.so
         run: time make --debug=basic packages/sdl/php${{ inputs.phpVersion }}-sdl.so packages/sdl/libGL.so PHP_VERSION=${{ inputs.phpVersion }}