tools: standardize update-llhttp.sh

PR-URL: #47198
Refs: nodejs/security-wg#828
Reviewed-By: Rafael Gonzaga <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Paolo Insogna <[email protected]>
Reviewed-By: Tierney Cyren <[email protected]>

Author: marco-ippolito

.github/workflows/tools.yml

@@ -142,15 +142,10 @@ jobs:
             subsystem: deps
             label: dependencies
             run: |
-              NEW_VERSION=$(gh api repos/nodejs/llhttp/releases/latest -q '.tag_name|ltrimstr("release/v")')
-              CURRENT_MAJOR_VERSION=$(grep "#define LLHTTP_VERSION_MAJOR" ./deps/llhttp/include/llhttp.h | sed -n "s/^.*MAJOR \(.*\)/\1/p")
-              CURRENT_MINOR_VERSION=$(grep "#define LLHTTP_VERSION_MINOR" ./deps/llhttp/include/llhttp.h | sed -n "s/^.*MINOR \(.*\)/\1/p")
-              CURRENT_PATCH_VERSION=$(grep "#define LLHTTP_VERSION_PATCH" ./deps/llhttp/include/llhttp.h | sed -n "s/^.*PATCH \(.*\)/\1/p")
-              CURRENT_VERSION="$CURRENT_MAJOR_VERSION.$CURRENT_MINOR_VERSION.$CURRENT_PATCH_VERSION"
-              if [ "$NEW_VERSION" != "$CURRENT_VERSION" ]; then
-                echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
-                ./tools/update-llhttp.sh "$NEW_VERSION"
-              fi
+              ./tools/dep_updaters/update-llhttp.sh > temp-output
+              cat temp-output
+              tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
+              rm temp-output
           - id: c-ares
             subsystem: deps
             label: dependencies

doc/contributing/maintaining-http.md

@@ -79,7 +79,7 @@ repository. Updates are pulled into Node.js under
 [deps/llhttp](https://github.com/nodejs/node/tree/HEAD/deps/llhttp).
 
 In order to update Node.js with a new version of llhttp you can use the
-`tools/update-llhttp.sh` script.
+`tools/dep_updaters/update-llhttp.sh` script.
 
 The contents of the `deps/llhttp` folder should look like the following:
 

tools/dep_updaters/update-llhttp.sh

@@ -0,0 +1,83 @@
+#!/bin/sh
+set -e
+
+# Shell script to update llhttp in the source tree to specific version
+
+BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)
+DEPS_DIR="${BASE_DIR}/deps"
+
+[ -z "$NODE" ] && NODE="$BASE_DIR/out/Release/node"
+[ -x "$NODE" ] || NODE=$(command -v node)
+
+NEW_VERSION="$("$NODE" --input-type=module <<'EOF'
+const res = await fetch('https://api.github.com/repos/nodejs/llhttp/releases/latest');
+if (!res.ok) throw new Error(`FetchError: ${res.status} ${res.statusText}`, { cause: res });
+const { tag_name } = await res.json();
+console.log(tag_name.replace('release/v', ''));
+EOF
+)"
+
+CURRENT_MAJOR_VERSION=$(grep "#define LLHTTP_VERSION_MAJOR" ./deps/llhttp/include/llhttp.h | sed -n "s/^.*MAJOR \(.*\)/\1/p")
+CURRENT_MINOR_VERSION=$(grep "#define LLHTTP_VERSION_MINOR" ./deps/llhttp/include/llhttp.h | sed -n "s/^.*MINOR \(.*\)/\1/p")
+CURRENT_PATCH_VERSION=$(grep "#define LLHTTP_VERSION_PATCH" ./deps/llhttp/include/llhttp.h | sed -n "s/^.*PATCH \(.*\)/\1/p")
+CURRENT_VERSION="$CURRENT_MAJOR_VERSION.$CURRENT_MINOR_VERSION.$CURRENT_PATCH_VERSION"
+
+echo "Comparing $NEW_VERSION with $CURRENT_VERSION"
+
+if [ "$NEW_VERSION" = "$CURRENT_VERSION" ]; then
+  echo "Skipped because llhttp is on the latest version."
+  exit 0
+fi
+
+cleanup () {
+  EXIT_CODE=$?
+  [ -d "$WORKSPACE" ] && rm -rf "$WORKSPACE"
+  exit $EXIT_CODE
+}
+
+echo "Making temporary workspace ..."
+WORKSPACE=$(mktemp -d 2> /dev/null || mktemp -d -t 'tmp')
+trap cleanup INT TERM EXIT
+
+cd "$WORKSPACE"
+
+if echo "$NEW_VERSION" | grep -qs "/" ; then # Download a release
+  REPO="[email protected]:$NEW_VERSION.git"
+  BRANCH=$2
+  [ -z "$BRANCH" ] && BRANCH=main
+
+  echo "Cloning llhttp source archive $REPO ..."
+  git clone "$REPO" llhttp
+  cd llhttp
+  echo "Checking out branch $BRANCH ..."
+  git checkout "$BRANCH"
+
+  echo "Building llhtttp ..."
+  npm install
+  make release
+
+  echo "Copying llhtttp release ..."
+  rm -rf "$DEPS_DIR/llhttp"
+  cp -a release "$DEPS_DIR/llhttp"
+else
+  echo "Download llhttp release $NEW_VERSION ..."
+  curl -sL -o llhttp.tar.gz "https://github.com/nodejs/llhttp/archive/refs/tags/release/v$NEW_VERSION.tar.gz"
+  gzip -dc llhttp.tar.gz | tar xf -
+
+  echo "Copying llhtttp release ..."
+  rm -rf "$DEPS_DIR/llhttp"
+  cp -a "llhttp-release-v$NEW_VERSION" "$DEPS_DIR/llhttp"
+fi
+
+echo ""
+echo "All done!"
+echo ""
+echo "Please git add llhttp, commit the new version:"
+echo ""
+echo "$ git add -A deps/llhttp"
+echo "$ git commit -m \"deps: update llhttp to $NEW_VERSION\""
+echo ""
+
+# The last line of the script should always print the new version,
+# as we need to add it to $GITHUB_ENV variable.
+echo "NEW_VERSION=$NEW_VERSION"

tools/lint-md/package-lock.json

@@ -16,7 +16,7 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "rollup": "^3.19.1",
+    "rollup": "^3.20.2",
     "rollup-plugin-cleanup": "^3.2.1"
   }
 }