Merge tag 'v1.3.6'

.eslintrc.yml

@@ -1,2 +1,19 @@
 root: true
-extends: standard
+extends:
+ - standard
+ - plugin:markdown/recommended
+plugins:
+ - markdown
+overrides:
+ - files: '**/*.md'
+ processor: 'markdown/markdown'
+rules:
+ eol-last: error
+ indent:
+ - error
+ - 2
+ - SwitchCase: 1
+ no-trailing-spaces: error
+ semi:
+ - error
+ - never

.github/workflows/ci.yml

@@ -0,0 +1,173 @@
+name: ci
+
+on:
+- pull_request
+- push
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ name:
+ - Node.js 0.10
+ - Node.js 0.12
+ - io.js 1.x
+ - io.js 2.x
+ - io.js 3.x
+ - Node.js 4.x
+ - Node.js 5.x
+ - Node.js 6.x
+ - Node.js 7.x
+ - Node.js 8.x
+ - Node.js 9.x
+ - Node.js 10.x
+ - Node.js 11.x
+ - Node.js 12.x
+ - Node.js 13.x
+ - Node.js 14.x
+ - Node.js 15.x
+ - Node.js 16.x
+ - Node.js 17.x
+
+ include:
+ - name: Node.js 0.10
+ node-version: "0.10"
+ npm-i: [email protected] [email protected] [email protected]
+
+ - name: Node.js 0.12
+ node-version: "0.12"
+ npm-i: [email protected] [email protected] [email protected]
+
+ - name: io.js 1.x
+ node-version: "1.8"
+ npm-i: [email protected] [email protected] [email protected]
+
+ - name: io.js 2.x
+ node-version: "2.5"
+ npm-i: [email protected] [email protected] [email protected]
+
+ - name: io.js 3.x
+ node-version: "3.3"
+ npm-i: [email protected] [email protected] [email protected]
+
+ - name: Node.js 4.x
+ node-version: "4.9"
+ npm-i: [email protected] [email protected] [email protected]
+
+ - name: Node.js 5.x
+ node-version: "5.12"
+ npm-i: [email protected] [email protected] [email protected]
+
+ - name: Node.js 6.x
+ node-version: "6.17"
+ npm-i: [email protected] [email protected]
+
+ - name: Node.js 7.x
+ node-version: "7.10"
+ npm-i: [email protected] [email protected]
+
+ - name: Node.js 8.x
+ node-version: "8.17"
+ npm-i: [email protected]
+
+ - name: Node.js 9.x
+ node-version: "9.11"
+ npm-i: [email protected]
+
+ - name: Node.js 10.x
+ node-version: "10.24"
+ npm-i: [email protected]
+
+ - name: Node.js 11.x
+ node-version: "11.15"
+ npm-i: [email protected]
+
+ - name: Node.js 12.x
+ node-version: "12.22"
+
+ - name: Node.js 13.x
+ node-version: "13.14"
+
+ - name: Node.js 14.x
+ node-version: "14.18"
+
+ - name: Node.js 15.x
+ node-version: "15.14"
+
+ - name: Node.js 16.x
+ node-version: "16.13"
+
+ - name: Node.js 17.x
+ node-version: "17.1"
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Install Node.js ${{ matrix.node-version }}
+ shell: bash -eo pipefail -l {0}
+ run: |
+ nvm install --default ${{ matrix.node-version }}
+ dirname "$(nvm which ${{ matrix.node-version }})" >> "$GITHUB_PATH"
+
+ - name: Configure npm
+ run: npm config set shrinkwrap false
+
+ - name: Install npm module(s) ${{ matrix.npm-i }}
+ run: npm install --save-dev ${{ matrix.npm-i }}
+ if: matrix.npm-i != ''
+
+ - name: Setup Node.js version-specific dependencies
+ shell: bash
+ run: |
+ # eslint for linting
+ # - remove on Node.js < 10
+ if [[ "$(cut -d. -f1 <<< "${{ matrix.node-version }}")" -lt 10 ]]; then
+ node -pe 'Object.keys(require("./package").devDependencies).join("\n")' | \
+ grep -E '^eslint(-|$)' | \
+ sort -r | \
+ xargs -n1 npm rm --silent --save-dev
+ fi
+
+ - name: Install Node.js dependencies
+ run: npm install
+
+ - name: List environment
+ id: list_env
+ shell: bash
+ run: |
+ echo "node@$(node -v)"
+ echo "npm@$(npm -v)"
+ npm -s ls ||:
+ (npm -s ls --depth=0 ||:) | awk -F'[ @]' 'NR>1 && $2 { print "::set-output name=" $2 "::" $3 }'
+
+ - name: Run tests
+ shell: bash
+ run: |
+ if npm -ps ls nyc | grep -q nyc; then
+ npm run test-ci
+ else
+ npm test
+ fi
+
+ - name: Lint code
+ if: steps.list_env.outputs.eslint != ''
+ run: npm run lint
+
+ - name: Collect code coverage
+ uses: coverallsapp/github-action@master
+ if: steps.list_env.outputs.nyc != ''
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ flag-name: run-${{ matrix.test_number }}
+ parallel: true
+
+ coverage:
+ needs: test
+ runs-on: ubuntu-latest
+ steps:
+ - name: Upload code coverage
+ uses: coverallsapp/github-action@master
+ with:
+ github-token: ${{ secrets.github_token }}
+ parallel-finished: true

HISTORY.md

@@ -1,3 +1,8 @@
+2.x
+===
+
+This incorporates all changes after 1.3.5 up to 1.3.6.
+
 2.0.0-beta.1 / 2020-03-29
 =========================
 
@@ -33,6 +38,12 @@ This incorporates all changes after 1.3.3 up to 1.3.5.
  - Remove `DEBUG_FD` environment variable support
  - Support 256 namespace colors
 
+1.3.6 / 2021-11-15
+==================
+
+ * Fix handling very large stacks of sync middleware
+ * deps: [email protected]
+
 1.3.5 / 2020-03-24
 ==================
 

README.md

@@ -3,7 +3,7 @@
 [![NPM Version][npm-image]][npm-url]
 [![NPM Downloads][downloads-image]][downloads-url]
 [![Node.js Version][node-version-image]][node-version-url]
-[![Build Status][travis-image]][travis-url]
+[![Build Status][ci-image]][ci-url]
 [![Test Coverage][coveralls-image]][coveralls-url]
 
 Simple middleware-style router
@@ -399,12 +399,12 @@ server.listen(8080)
 
 [MIT](LICENSE)
 
+[ci-image]: https://badgen.net/github/checks/pillarjs/router/master?label=ci
+[ci-url]: https://github.com/pillarjs/router/actions?query=workflow%3Aci
 [npm-image]: https://img.shields.io/npm/v/router.svg
 [npm-url]: https://npmjs.org/package/router
 [node-version-image]: https://img.shields.io/node/v/router.svg
 [node-version-url]: http://nodejs.org/download/
-[travis-image]: https://img.shields.io/travis/pillarjs/router/master.svg
-[travis-url]: https://travis-ci.org/pillarjs/router
 [coveralls-image]: https://img.shields.io/coveralls/pillarjs/router/master.svg
 [coveralls-url]: https://coveralls.io/r/pillarjs/router?branch=master
 [downloads-image]: https://img.shields.io/npm/dm/router.svg

index.js

@@ -155,6 +155,7 @@ Router.prototype.handle = function handle (req, res, callback) {
  var removed = ''
  var self = this
  var slashAdded = false
+ var sync = 0
  var paramcalled = {}
 
  // middleware and routes
@@ -210,6 +211,11 @@ Router.prototype.handle = function handle (req, res, callback) {
  return
  }
 
+ // max sync stack
+ if (++sync > 100) {
+ return setImmediate(next, err)
+ }
+
  // get pathname of request
  var path = getPathname(req)
 
@@ -329,6 +335,8 @@ Router.prototype.handle = function handle (req, res, callback) {
  } else {
  layer.handleRequest(req, res, next)
  }
+
+ sync = 0
  }
 }