Update got to latest version (Release 5.2.0)

Author: anvitamishra

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [5.2.0] - 2023-04-18
+
+- Update dependency `got` to latest version
+
 # [5.1.1] - 2023-04-11
 
 - Update dependency `serialize-error` to latest version

README.md

@@ -106,7 +106,7 @@ const response = await client.put('/scooters/123',
 const response = await client.delete('/scooters/123', { type: 'UNU2' })
 ```
 
-NOTE: Passing in `options` with a `query` option does overwrite any passed url query arguments:
+NOTE: Passing in `options` with a `query` or `searchParams` option does overwrite any passed url query arguments:
 ```
 // This will NOT pass `page`
 client.get(`/?page=2`, { query: { type: 'UNU2' }})

lib/components/client.js

@@ -42,12 +42,15 @@ class Client {
   }
 
   async get(path, options = {}) {
+    if (options?.query) {
+      options.searchParams = options.query
+      delete options.query
+    }
     try {
       const response = await got.get(this.makePath(path), {
         headers,
         retry,
         responseType: 'json',
-        json: true,
         ...options,
       })
       return response.body
@@ -63,7 +66,6 @@ class Client {
         headers,
         retry,
         responseType: 'json',
-        json: true,
       })
       return response.body
     } catch (error) {
@@ -72,13 +74,16 @@ class Client {
   }
 
   async post(path, payload, options = {}) {
+    if (options?.query) {
+      options.searchParams = options.query
+      delete options.query
+    }
     try {
       const response = await got.post(this.makePath(path), {
         headers,
         retry,
-        body: payload,
+        json: payload,
         responseType: 'json',
-        json: true,
         ...options,
       })
 
@@ -89,13 +94,16 @@ class Client {
   }
 
   async put(path, payload, options = {}) {
+    if (options?.query) {
+      options.searchParams = options.query
+      delete options.query
+    }
     try {
       const response = await got.put(this.makePath(path), {
         headers,
         retry,
-        body: payload,
+        json: payload,
         responseType: 'json',
-        json: true,
         ...options,
       })
 
@@ -106,12 +114,15 @@ class Client {
   }
 
   async delete(path, options = {}) {
+    if (options?.query) {
+      options.searchParams = options.query
+      delete options.query
+    }
     try {
       const response = await got.delete(this.makePath(path), {
         headers,
         retry,
         responseType: 'json',
-        json: true,
         ...options,
       })
 

lib/components/errors.js

@@ -56,24 +56,21 @@ const errors = populateConstructorExports(statusCodes)
 export const convertToTaubeError = (error) => {
   // Detect celebrate errors (joy)
   // Ref: https://github.com/arb/celebrate/blob/master/lib/celebrate.js#L180
-  if (error.body
-    && error.body.statusCode == 400
-    && error.body.validation) {
-    return new errors.BadRequest(error.message, error.body.validation)
+  if (error.response?.body?.statusCode == 400
+    && error.response?.body?.validation) {
+    return new errors.BadRequest(error.message, error.response.body.validation)
   }
   // Wrap known taube errors in taube error
-  if (error.body
-      && error.body.statusCode
-      && errors[error.body.statusCode]) {
-    return new errors[error.body.statusCode](error.body.message)
+  if (error.response?.body?.statusCode
+    && errors[error.response.body.statusCode]) {
+    return new errors[error.response.body.statusCode](error.response.body.message)
   }
 
   // Wrap known gotjs HTTP errors in taube error
   // see https://github.com/sindresorhus/got/blob/29ffb44f6be951e1103bb076dadf2b0e5cbd62f1/source/errors.js#L75
-  if (error.body
-    && error.statusCode
-    && errors[error.statusCode]) {
-    return new errors[error.statusCode](error.message, error.body)
+  if (error.response?.statusCode
+    && errors[error.response.statusCode]) {
+    return new errors[error.response.statusCode](error.message, error.response.body)
   }
 
   // Otherwise we can't deal with this

lib/components/sockend.js

@@ -116,8 +116,8 @@ class Namespace {
           // Deal with got and other non got errors
           .catch((err) => {
             debug(err)
-            if (err && err.statusCode && err.statusMessage) {
-              return next(new errors[err.statusCode](err.statusMessage))
+            if (err?.response?.statusCode && err?.response?.statusMessage) {
+              return next(new errors[err.response.statusCode](err.response.statusMessage))
             }
             next(new Error('Internal Server Error'))
           })