Update dependencies

.eslintrc.yml

@@ -1,6 +1,9 @@
-extends: seegno
+extends: uphold
 
 rules:
   no-console: 0
   no-sync: 0
   prefer-spread: 0
+
+  # Disable prettier.
+  prettier/prettier: 0

.github/workflows/release.yaml

@@ -0,0 +1,50 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      VERSION_BUMP:
+        description: 'The version bump'
+        type: choice
+        options:
+        - major
+        - minor
+        - patch
+        default: minor
+        required: true
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    concurrency: 1
+    environment: release
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+
+    - name: Setup Node.js version
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20
+
+    - name: Enable yarn
+      run: corepack enable
+
+    - name: Install dependencies
+      run: yarn install --frozen-lockfile
+
+    - name: Configure git
+      run: |
+        git config user.name "Uphold"
+        git config user.email "[email protected]"
+
+    - name: Generate release
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+        NPM_TOKEN: ${{ secrets.RELEASE_NPM_TOKEN }}
+      run: |
+        echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
+        npm run release -- --increment "${{ github.event.inputs.VERSION_BUMP }}" -V

.github/workflows/test.yaml

@@ -0,0 +1,19 @@
+name: Test
+
+on: [push]
+
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: ['18', '20']
+
+    container:
+      image: node:${{ matrix.node }}-alpine
+
+    steps:
+    - uses: actions/checkout@v4
+    - run: yarn install --frozen-lockfile
+    - run: yarn lint
+    - run: yarn test

.release-it.js

@@ -0,0 +1,22 @@
+module.exports = {
+  git: {
+    changelog: 'echo "## Changelog\\n\\n$(npx @uphold/github-changelog-generator -f unreleased | tail -n +4 -f)"',
+    commitMessage: 'Release ${version}',
+    requireBranch: 'master',
+    requireCommits: true,
+    tagName: 'v${version}'
+  },
+  github: {
+    release: true,
+    releaseName: 'v${version}'
+  },
+  hooks: {
+    'after:bump': `
+      echo "$(npx @uphold/github-changelog-generator -f v\${version})\n$(tail -n +2 CHANGELOG.md)" > CHANGELOG.md &&
+      git add CHANGELOG.md --all
+    `
+  },
+  npm: {
+    publish: true
+  }
+};

README.md

@@ -1,6 +1,6 @@
 # request-logger
 
-A wrapper for the [request](https://github.com/request/request) module that logs all request events.
+A wrapper for the [request](https://github.com/cypress-io/request) module that logs all request events.
 
 ## Status
 
@@ -26,7 +26,7 @@ Wrap the `request` module using `@uphold/request-logger`. By default, all events
 
 ```javascript
 const logger = require('@uphold/request-logger');
-const request = logger(require('request'));
+const request = logger(require('@cypress/request'));
 
 request.get('https://www.github.com');
 
@@ -56,7 +56,7 @@ You can optionally define a custom logging function which receives the request o
 
 ```javascript
 const logger = require('@uphold/request-logger');
-const request = logger(require('request'), data => console.log(`${data.id} ${data.type}: ${data.uri}${data.statusCode ? ` (${data.statusCode})` : ''} ${(data.body ? `${data.body}` : '').length} bytes`));
+const request = logger(require('@cypress/request'), data => console.log(`${data.id} ${data.type}: ${data.uri}${data.statusCode ? ` (${data.statusCode})` : ''} ${(data.body ? `${data.body}` : '').length} bytes`));
 
 request.get('https://www.github.com', () => {});
 
@@ -86,11 +86,10 @@ The recommended node.js version is `>= 6` as it ships with native [ES2015 Proxy]
 
 The minimum required `request` version is `2.27.0`, although `2.54.0` is a particularly troubled version which is best avoided.
 
-## Release
+## Release process
 
-```shell
-❯ npm version [<newversion> | major | minor | patch] -m "Release %s"`
-```
+The release of a version is automated via the [release](https://github.com/uphold/request-logger/.github/workflows/release.yaml) GitHub workflow.
+Run it by clicking the "Run workflow" button.
 
 ## License
 

package.json

@@ -21,30 +21,29 @@
   "main": "src",
   "repository": "https://github.com/uphold/request-logger.git",
   "scripts": {
-    "changelog": "github_changelog_generator --no-issues --header-label='# Changelog' --future-release=v$npm_config_future_release && sed -i '' -e :a -e '$d;N;2,4ba' -e 'P;D' CHANGELOG.md",
     "lint": "eslint src test",
-    "test": "jest --coverage --verbose",
-    "version": "npm run changelog --future-release=$npm_package_version && git add -A CHANGELOG.md"
-  },
-  "dependencies": {
-    "uuid": "^3.0.1"
+    "release": "release-it",
+    "test": "jest --coverage --verbose"
   },
+  "dependencies": {},
   "devDependencies": {
-    "eslint": "^3.12.2",
-    "eslint-config-seegno": "^8.0.1",
-    "jest": "^18.1.0",
-    "nock": "^9.0.2",
-    "request": "^2.79.0"
+    "@cypress/request": "^3.0.1",
+    "eslint": "^8.57.0",
+    "eslint-config-uphold": "^6.0.0",
+    "jest": "^29.7.0",
+    "nock": "^13.5.4",
+    "release-it": "^17.1.1"
   },
   "peerDependencies": {
-    "request": ">=2.27.0"
+    "@cypress/request": ">=3.0.1"
   },
   "engines": {
     "node": ">=4"
   },
   "jest": {
     "coveragePathIgnorePatterns": [
       "/src/proxy.js"
-    ]
+    ],
+    "restoreMocks": true
   }
 }

src/index.js

@@ -4,8 +4,8 @@
  * Module dependencies.
  */
 
+const { randomUUID } = require('node:crypto');
 const Proxy = require('./proxy');
-const uuid = require('uuid/v4');
 
 /**
  * Exports
@@ -21,44 +21,57 @@ module.exports = function logger(request, log) {
   }
 
   function apply(target, caller, args) {
-    const id = uuid();
+    const id = randomUUID();
     const startTime = Date.now();
 
-    return target.apply(undefined, args)
-      .on('complete', function(response) {
+    return target
+      .apply(undefined, args)
+      .on('complete', function (response) {
         if (!this.callback) {
           return;
         }
 
-        log({
-          body: response.body,
-          duration: Date.now() - startTime,
-          headers: response.headers,
-          id,
-          statusCode: response.statusCode,
-          type: 'response',
-          uri: this.uri.href
-        }, this);
-      }).on('error', function(error) {
-        log({
-          duration: Date.now() - startTime,
-          error,
-          headers: this.headers,
-          id,
-          method: this.method.toUpperCase(),
-          type: 'error',
-          uri: this.uri.href
-        }, this);
-      }).on('redirect', function() {
-        log({
-          duration: Date.now() - startTime,
-          headers: this.response.headers,
-          id,
-          statusCode: this.response.statusCode,
-          type: 'redirect',
-          uri: this.uri.href
-        }, this);
-      }).on('request', function() {
+        log(
+          {
+            body: response.body,
+            duration: Date.now() - startTime,
+            headers: response.headers,
+            id,
+            statusCode: response.statusCode,
+            type: 'response',
+            uri: this.uri.href
+          },
+          this
+        );
+      })
+      .on('error', function (error) {
+        log(
+          {
+            duration: Date.now() - startTime,
+            error,
+            headers: this.headers,
+            id,
+            method: this.method.toUpperCase(),
+            type: 'error',
+            uri: this.uri.href
+          },
+          this
+        );
+      })
+      .on('redirect', function () {
+        log(
+          {
+            duration: Date.now() - startTime,
+            headers: this.response.headers,
+            id,
+            statusCode: this.response.statusCode,
+            type: 'redirect',
+            uri: this.uri.href
+          },
+          this
+        );
+      })
+      .on('request', function () {
         const data = {
           headers: this.headers,
           id,
@@ -72,19 +85,23 @@ module.exports = function logger(request, log) {
         }
 
         log(data, this);
-      }).on('response', function(response) {
+      })
+      .on('response', function (response) {
         if (this.callback) {
           return;
         }
 
-        log({
-          duration: Date.now() - startTime,
-          headers: response.headers,
-          id,
-          statusCode: response.statusCode,
-          type: 'response',
-          uri: this.uri.href
-        }, this);
+        log(
+          {
+            duration: Date.now() - startTime,
+            headers: response.headers,
+            id,
+            statusCode: response.statusCode,
+            type: 'response',
+            uri: this.uri.href
+          },
+          this
+        );
       });
   }
 

src/proxy.js

@@ -4,14 +4,14 @@
  * Module dependencies.
  */
 
-const fs = require('fs');
-const vm = require('vm');
+const fs = require('node:fs');
+const vm = require('node:vm');
 
 /**
  * Proxy reference.
  */
 
-let Proxy = global.Proxy;
+let { Proxy } = global;
 
 /**
  * Workaround to avoid mutating `global.Proxy`.

test/.eslintrc.yml

@@ -1,3 +1,2 @@
 env:
   jest: true
-  jasmine: true