File tree Expand file tree Collapse file tree 14 files changed +170
-190
lines changed
Expand file tree Collapse file tree 14 files changed +170
-190
lines changed Original file line number Diff line number Diff line change 3030 "node" : " >=12.9.0"
3131 },
3232 "dependencies" : {
33- "@msgpack/msgpack" : " ^2.7.0" ,
34- "p-defer" : " ^3.0.0"
33+ "@msgpack/msgpack" : " ^2.7.1"
3534 },
3635 "devDependencies" : {
37- "@types/chai" : " ^4.2.19 " ,
36+ "@types/chai" : " ^4.2.22 " ,
3837 "@types/chai-as-promised" : " ^7.1.4" ,
39- "@types/duplexer3" : " ^0.1.0 " ,
40- "@types/mocha" : " ^8.2.2 " ,
41- "@types/node" : " ^14 .11.2 " ,
42- "@types/sinon" : " ^10.0.2 " ,
38+ "@types/duplexer3" : " ^0.1.1 " ,
39+ "@types/mocha" : " ^9.0.0 " ,
40+ "@types/node" : " ^16 .11.10 " ,
41+ "@types/sinon" : " ^10.0.6 " ,
4342 "chai" : " ^4.3.4" ,
4443 "chai-as-promised" : " ^7.1.1" ,
4544 "duplexer3" : " ^0.1.4" ,
4645 "eslint" : " ^7.28.0" ,
4746 "gts" : " ^3.1.0" ,
48- "mocha" : " ^9.0.1 " ,
49- "sinon" : " ^11.1 .1" ,
50- "typedoc" : " ^0.21.0 " ,
47+ "mocha" : " ^9.1.3 " ,
48+ "sinon" : " ^12.0 .1" ,
49+ "typedoc" : " ^0.22.9 " ,
5150 "typescript" : " ^4.0.3"
5251 },
5352 "license" : " Apache-2.0" ,
Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ export class FluentAuthSocket extends FluentSocket {
161161 this . authState = FluentAuthState . AUTHENTICATED ;
162162 this . onEstablished ( ) ;
163163 } catch ( e ) {
164- return this . close ( CloseState . FATAL , e ) ;
164+ return this . close ( CloseState . FATAL , e as Error ) ;
165165 }
166166 }
167167}
Original file line number Diff line number Diff line change @@ -16,10 +16,14 @@ import {
1616 MessageQueue ,
1717 ForwardQueue ,
1818} from "./modes" ;
19- import { DeferredPromise } from "p-defer" ;
2019import * as crypto from "crypto" ;
2120import { EventRetrier , EventRetryOptions } from "./event_retrier" ;
22- import { awaitAtMost , awaitNextTick , awaitTimeout } from "./util" ;
21+ import {
22+ DeferredPromise ,
23+ awaitAtMost ,
24+ awaitNextTick ,
25+ awaitTimeout ,
26+ } from "./util" ;
2327
2428type AckData = {
2529 timeoutId : NodeJS . Timeout ;
Original file line number Diff line number Diff line change 1- import * as pDefer from "p-defer" ;
21import { DroppedError , RetryShutdownError } from "./error" ;
3- import { awaitAtMost } from "./util" ;
2+ import { awaitAtMost , pDefer , DeferredPromise } from "./util" ;
43
54/**
65 * Event retry settings
@@ -48,7 +47,7 @@ export type EventRetryOptions = {
4847 */
4948export class EventRetrier {
5049 private options : EventRetryOptions ;
51- private cancelWait : pDefer . DeferredPromise < void > ;
50+ private cancelWait : DeferredPromise < void > ;
5251 constructor ( opts : Partial < EventRetryOptions > = { } ) {
5352 this . options = {
5453 attempts : 4 ,
@@ -120,7 +119,7 @@ export class EventRetrier {
120119 throw e ;
121120 }
122121
123- this . options . onError ( e ) ;
122+ this . options . onError ( e as Error ) ;
124123
125124 const retryInterval = Math . min (
126125 this . options . maxDelay ,
Original file line number Diff line number Diff line change 1- import * as pDefer from "p-defer" ;
21import { Queue , PacketData } from "./queue" ;
32import * as protocol from "../protocol" ;
3+ import { pDefer , DeferredPromise } from "../util" ;
44
55type ForwardRecord = {
66 tag : protocol . Tag ;
77 entries : protocol . Entry [ ] ;
8- deferred : pDefer . DeferredPromise < void > ;
8+ deferred : DeferredPromise < void > ;
99} ;
1010
1111/**
Original file line number Diff line number Diff line change 1- import * as pDefer from "p-defer" ;
21import { Queue , PacketData } from "./queue" ;
32import * as protocol from "../protocol" ;
3+ import { pDefer , DeferredPromise } from "../util" ;
44
55type EventRecord = {
66 tag : protocol . Tag ;
77 time : protocol . Time ;
88 event : protocol . EventRecord ;
9- deferred : pDefer . DeferredPromise < void > ;
9+ deferred : DeferredPromise < void > ;
1010} ;
1111
1212/**
Original file line number Diff line number Diff line change 1- import * as pDefer from "p-defer" ;
21import { PacketData , Queue } from "./queue" ;
32import * as protocol from "../protocol" ;
3+ import { pDefer , DeferredPromise } from "../util" ;
44
55type PackedRecord = {
66 tag : protocol . Tag ;
@@ -11,7 +11,7 @@ type PackedRecord = {
1111 * Useful for concatenating them all together later
1212 */
1313 size : number ;
14- deferred : pDefer . DeferredPromise < void > ;
14+ deferred : DeferredPromise < void > ;
1515} ;
1616
1717/**
Original file line number Diff line number Diff line change 11import * as protocol from "../protocol" ;
2- import { DeferredPromise } from "p-defer" ;
32import { DroppedError , QueueShutdownError } from "../error" ;
3+ import { DeferredPromise } from "../util" ;
44
55/**
66 * Every queue must have this type of data
Original file line number Diff line number Diff line change 11import * as net from "net" ;
22import * as tls from "tls" ;
33import * as crypto from "crypto" ;
4- import * as EventEmitter from "events" ;
4+ import { EventEmitter } from "events" ;
55import * as protocol from "./protocol" ;
66import { UnexpectedMessageError } from "./error" ;
77
@@ -190,7 +190,7 @@ export class FluentServer extends EventEmitter {
190190 const pong = protocol . generatePong (
191191 this . security . serverHostname ,
192192 false ,
193- e . message ,
193+ ( e as Error ) . message ,
194194 clientInfo . sharedKeyInfo
195195 ) ;
196196 socket . write ( protocol . encodeMessage ( pong ) ) ;
Original file line number Diff line number Diff line change 11import * as net from "net" ;
22import * as tls from "tls" ;
3- import * as EventEmitter from "events" ;
3+ import { EventEmitter } from "events" ;
44import {
55 SocketTimeoutError ,
66 UnexpectedMessageError ,
You can’t perform that action at this time.
0 commit comments