Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"form-data": "^4.0.0",
"glob": "^7.1.7",
"glob-promise": "^4.2.0",
"got": "^11.8.2",
"got": "^12.6.0",
"helmet": "^4.6.0",
"lodash": "^4.17.21",
"moment": "^2.29.1",
Expand All @@ -99,7 +99,7 @@
"@commitlint/cli": "^16.2.3",
"@neo9/n9-coding-style": "^4.0.0",
"@neo9/n9-mongo-client": "^0.29.1",
"@release-it/conventional-changelog": "^4.3.0",
"@release-it/conventional-changelog": "^5.1.1",
"@types/app-root-dir": "^0.1.0",
"@types/async": "^3.2.6",
"@types/cls-hooked": "^4.3.3",
Expand Down Expand Up @@ -127,13 +127,13 @@
"nodemon": "^2.0.7",
"nyc": "^15.1.0",
"prettier": "^2.3.1",
"release-it": "^14.14.2",
"release-it": "^15.10.3",
"std-mocks": "^1.0.1",
"tmp-promise": "^3.0.3",
"ts-node": "^10.9.1",
"type-fest": "^3.3.0",
"types-package-json": "^2.0.39",
"typescript": "^4.9.3"
"typescript": "^4.9.5"
},
"ava": {
"files": [
Expand Down
2 changes: 1 addition & 1 deletion src/models/routing/options-http-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
IsString,
ValidateNested,
} from 'class-validator';
import { Options as GotOptions } from 'got';
import { ExtendOptions as GotOptions } from 'got';

export type HttpClientGotOptions = Omit<GotOptions, 'method'>;

Expand Down
15 changes: 8 additions & 7 deletions src/utils/http-client-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ import { N9Log } from '@neo9/n9-node-log';
import { N9Error } from '@neo9/n9-node-utils';
import { getNamespace } from 'cls-hooked';
import fastSafeStringify from 'fast-safe-stringify';
import got, { Method, Options as GotOptions } from 'got';
import { RequestError } from 'got/dist/source/core';
import got, { ExtendOptions as GotOptions, Method, RequestError } from 'got';
import { IncomingMessage } from 'http';
import * as QueryString from 'query-string';
import * as shortid from 'shortid';
import { PassThrough } from 'stream';
import urlJoin = require('url-join');

import urlJoin = require('url-join');
import {
HttpClientGotOptions,
HttpClientOptions,
Expand Down Expand Up @@ -268,8 +267,8 @@ export class N9HttpClient {
let durationMsTTFB: number;
try {
incomingMessage = await new Promise<IncomingMessage>((resolve, reject) => {
requestResponse.on('error', (err) => reject(err));
requestResponse.on('response', (response) => {
requestResponse.response.on('error', (err) => reject(err));
requestResponse.response.on('response', (response) => {
response.on('end', () => {
const durationMsTTLB = Date.now() - startTime;
if (durationMsTTFB !== null && durationMsTTFB !== undefined) {
Expand Down Expand Up @@ -338,7 +337,7 @@ export class N9HttpClient {
resolveBodyOnly: false,
hooks: {
beforeRetry: [
(options, error?: RequestError, retryCount?: number): void => {
(error: RequestError, retryCount?: number): void => {
let level: N9Log.Level;
if (error?.response?.statusCode && error.response.statusCode < 500) {
level = 'info';
Expand All @@ -347,7 +346,9 @@ export class N9HttpClient {
}
if (logger.isLevelEnabled(level)) {
logger[level](
`Retry call [${options.method} ${options.url?.toString()}] n°${retryCount} due to ${
`Retry call [${
error.options.method
} ${error.options.url?.toString()}] n°${retryCount} due to ${
error?.code ?? error?.name
} ${error?.message}`,
{
Expand Down
Loading