Merge next into master (#147)

* update for v5 (#140)

* update for v5 (#140)

* update fastify deps

* Fix port parsing (#148)

---------

Co-authored-by: Gürgün Dayıoğlu <[email protected]>
Co-authored-by: Gürgün Dayıoğlu <[email protected]>

Author: jsumners

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   test:
-    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
+    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.0.0
     with:
       license-check: true
       lint: true

.gitignore

@@ -23,6 +23,9 @@ lib-cov
 coverage
 *.lcov
 
+# .tap output
+.tap
+
 # nyc test coverage
 .nyc_output
 

package.json

@@ -29,19 +29,19 @@
   },
   "homepage": "https://github.com/fastify/fastify-url-data#readme",
   "devDependencies": {
-    "@fastify/pre-commit": "^2.0.2",
-    "@types/node": "^20.1.0",
-    "fastify": "^4.0.0-rc.2",
+    "@fastify/pre-commit": "^2.1.0",
+    "@types/node": "^20.11.6",
+    "fastify": "^5.0.0-alpha.3",
     "h2url": "^0.2.0",
-    "semver": "^7.3.2",
+    "semver": "^7.5.4",
     "snazzy": "^9.0.0",
-    "standard": "^17.0.0",
-    "tap": "^16.0.0",
+    "standard": "^17.1.0",
+    "tap": "^18.6.1",
     "tsd": "~0.31.0"
   },
   "dependencies": {
     "fast-uri": "^3.0.0",
-    "fastify-plugin": "^4.0.0"
+    "fastify-plugin": "^4.5.1"
   },
   "publishConfig": {
     "access": "public"

plugin.js

@@ -1,14 +1,15 @@
 'use strict'
 
 const fp = require('fastify-plugin')
-const fastUri = require('fast-uri')
+const { parse } = require('fast-uri')
 
 function fastifyUrlData (fastify, options, next) {
   fastify.decorateRequest('urlData', function (key) {
     const scheme = this.headers[':scheme'] ? this.headers[':scheme'] : this.protocol
     const host = this.hostname
+    const port = this.port
     const path = this.headers[':path'] || this.raw.url
-    const urlData = fastUri.parse(scheme + '://' + host + path)
+    const urlData = parse(`${scheme}://${host}:${port}${path}`)
     if (key) return urlData[key]
     return urlData
   })