improve: wasm build

build/Dockerfile

@@ -1,18 +1,25 @@
-FROM node:21-alpine@sha256:6d0f18a1c67dc218c4af50c21256616286a53c09e500fadf025b6d342e1c90ae
+FROM node:21-alpine3.19@sha256:ad255c65652e8e99ce0b9d9fc52eee3eae85f445b192f6f9e49a1305c77b2ba6
 
 ARG UID=1000
 ARG GID=1000
+ARG BINARYEN_VERSION=116
 
 RUN apk add -U clang lld wasi-sdk
 RUN mkdir /home/node/undici
 
 WORKDIR /home/node/undici
 
+RUN wget https://github.com/WebAssembly/binaryen/releases/download/version_$BINARYEN_VERSION/binaryen-version_$BINARYEN_VERSION-x86_64-linux.tar.gz && \
+    tar -zxvf binaryen-version_$BINARYEN_VERSION-x86_64-linux.tar.gz binaryen-version_$BINARYEN_VERSION/bin/wasm-opt && \
+    mv binaryen-version_$BINARYEN_VERSION/bin/wasm-opt ./ && \
+    rm binaryen-version_$BINARYEN_VERSION-x86_64-linux.tar.gz && \
+    rm -rf binaryen-version_$BINARYEN_VERSION && \
+    chmod +x ./wasm-opt
+
 COPY package.json .
+
 COPY build build
 COPY deps deps
 COPY lib lib
 
-RUN npm i
-
 USER node

build/wasm.js

@@ -2,7 +2,7 @@
 
 const { execSync } = require('node:child_process')
 const { writeFileSync, readFileSync } = require('node:fs')
-const { join, resolve, basename } = require('node:path')
+const { join, resolve } = require('node:path')
 
 const ROOT = resolve(__dirname, '../')
 const WASM_SRC = resolve(__dirname, '../deps/llhttp')
@@ -15,19 +15,40 @@ let WASM_CFLAGS = process.env.WASM_CFLAGS || '--sysroot=/usr/share/wasi-sysroot
 let WASM_LDFLAGS = process.env.WASM_LDFLAGS || ''
 const WASM_LDLIBS = process.env.WASM_LDLIBS || ''
 
-const EXTERNAL_PATH = process.env.EXTERNAL_PATH
-
 // These are relevant for undici and should not be overridden
 WASM_CFLAGS += ' -Ofast -fno-exceptions -fvisibility=hidden -mexec-model=reactor'
 WASM_LDFLAGS += ' -Wl,-error-limit=0 -Wl,-O3 -Wl,--lto-O3 -Wl,--strip-all'
 WASM_LDFLAGS += ' -Wl,--allow-undefined -Wl,--export-dynamic -Wl,--export-table'
 WASM_LDFLAGS += ' -Wl,--export=malloc -Wl,--export=free -Wl,--no-entry'
 
+const WASM_OPT_FLAGS = '-O4 --converge --strip-debug --strip-dwarf --strip-producers'
+
+const writeWasmChunk = (path, dest) => {
+  const base64 = readFileSync(join(WASM_OUT, path)).toString('base64')
+  writeFileSync(join(WASM_OUT, dest), `'use strict'
+
+const { Buffer } = require('node:buffer')
+
+module.exports = Buffer.from('${base64}', 'base64')
+`)
+}
+
 let platform = process.env.WASM_PLATFORM
 if (!platform && process.argv[2]) {
   platform = execSync('docker info -f "{{.OSType}}/{{.Architecture}}"').toString().trim()
 }
 
+if (process.argv[2] === '--rm') {
+  const cmd = 'docker image rm llhttp_wasm_builder'
+
+  console.log(`> ${cmd}\n\n`)
+  try {
+    execSync(cmd, { stdio: 'inherit' })
+  } catch (e) {}
+
+  process.exit(0)
+}
+
 if (process.argv[2] === '--prebuild') {
   const cmd = `docker build --platform=${platform.toString().trim()} -t llhttp_wasm_builder -f ${DOCKERFILE} ${ROOT}`
 
@@ -59,50 +80,25 @@ if (hasApk) {
     console.log('Failed to generate build environment information')
     process.exit(-1)
   }
-  writeFileSync(join(WASM_OUT, 'wasm_build_env.txt'), buildInfo)
-}
-
-const writeWasmChunk = EXTERNAL_PATH
-  ? (path, dest) => {
-      const base64 = readFileSync(join(WASM_OUT, path)).toString('base64')
-      writeFileSync(join(WASM_OUT, dest), `
-const { Buffer } = require('node:buffer')
-
-module.exports = Buffer.from('${base64}', 'base64')
-`)
-    }
-  : (path, dest) => {
-      writeFileSync(join(WASM_OUT, dest), `
-const { fs } = require('node:fs')
-
-module.exports = fs.readFileSync(require.resolve('./${basename(path)}'))
-`)
-    }
-
-// Build wasm binary
-execSync(`${WASM_CC} ${WASM_CFLAGS} ${WASM_LDFLAGS} \
- ${join(WASM_SRC, 'src')}/*.c \
- -I${join(WASM_SRC, 'include')} \
- -o ${join(WASM_OUT, 'llhttp.wasm')} \
- ${WASM_LDLIBS}`, { stdio: 'inherit' })
-
-writeWasmChunk('llhttp.wasm', 'llhttp-wasm.js')
-
-// Build wasm simd binary
-execSync(`${WASM_CC} ${WASM_CFLAGS} -msimd128 ${WASM_LDFLAGS} \
- ${join(WASM_SRC, 'src')}/*.c \
- -I${join(WASM_SRC, 'include')} \
- -o ${join(WASM_OUT, 'llhttp_simd.wasm')} \
- ${WASM_LDLIBS}`, { stdio: 'inherit' })
-
-writeWasmChunk('llhttp_simd.wasm', 'llhttp_simd-wasm.js')
-
-if (EXTERNAL_PATH) {
-  writeFileSync(join(ROOT, 'loader.js'), `
-'use strict'
-
-globalThis.__UNDICI_IS_NODE__ = true
-module.exports = require('node:module').createRequire('${EXTERNAL_PATH}/loader.js')('./index-fetch.js')
-delete globalThis.__UNDICI_IS_NODE__
-`)
+  console.log(buildInfo)
+
+  // Build wasm binary
+  execSync(`${WASM_CC} ${WASM_CFLAGS} ${WASM_LDFLAGS} \
+  ${join(WASM_SRC, 'src')}/*.c \
+  -I${join(WASM_SRC, 'include')} \
+  -o ${join(WASM_OUT, 'llhttp.wasm')} \
+  ${WASM_LDLIBS}`, { stdio: 'inherit' })
+
+  execSync(`./wasm-opt ${WASM_OPT_FLAGS} -o ${join(WASM_OUT, 'llhttp.wasm')} ${join(WASM_OUT, 'llhttp.wasm')}`, { stdio: 'inherit' })
+  writeWasmChunk('llhttp.wasm', 'llhttp-wasm.js')
+
+  // Build wasm simd binary
+  execSync(`${WASM_CC} ${WASM_CFLAGS} -msimd128 ${WASM_LDFLAGS} \
+  ${join(WASM_SRC, 'src')}/*.c \
+  -I${join(WASM_SRC, 'include')} \
+  -o ${join(WASM_OUT, 'llhttp_simd.wasm')} \
+  ${WASM_LDLIBS}`, { stdio: 'inherit' })
+
+  execSync(`./wasm-opt ${WASM_OPT_FLAGS} --enable-simd -o ${join(WASM_OUT, 'llhttp_simd.wasm')} ${join(WASM_OUT, 'llhttp_simd.wasm')}`, { stdio: 'inherit' })
+  writeWasmChunk('llhttp_simd.wasm', 'llhttp_simd-wasm.js')
 }