Skip to content

Commit 6c2bc59

Browse files
murgatroid99murgatroid99
committed
grpc-js: Run code formatter, fix one lint error
1 parent 513a61a commit 6c2bc59

19 files changed

+698
-354
lines changed

‎packages/grpc-js/src/backoff-timeout.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ export class BackoffTimeout {
106106

107107
private runTimer(delay: number) {
108108
this.endTime = this.startTime;
109-
this.endTime.setMilliseconds(this.endTime.getMilliseconds() + this.nextDelay);
109+
this.endTime.setMilliseconds(
110+
this.endTime.getMilliseconds() + this.nextDelay
111+
);
110112
clearTimeout(this.timerId);
111113
this.timerId = setTimeout(() => {
112114
this.callback();

‎packages/grpc-js/src/index.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export {
183183
ServiceDefinition,
184184
UntypedHandleCall,
185185
UntypedServiceImplementation,
186-
VerifyOptions
186+
VerifyOptions,
187187
};
188188

189189
/**** Server ****/
@@ -263,7 +263,12 @@ export { getChannelzServiceDefinition, getChannelzHandlers } from './channelz';
263263

264264
export { addAdminServicesToServer } from './admin';
265265

266-
export { ServiceConfig, LoadBalancingConfig, MethodConfig, RetryPolicy } from './service-config';
266+
export {
267+
ServiceConfig,
268+
LoadBalancingConfig,
269+
MethodConfig,
270+
RetryPolicy,
271+
} from './service-config';
267272

268273
export {
269274
ServerListener,
@@ -274,7 +279,7 @@ export {
274279
ResponderBuilder,
275280
ServerInterceptingCallInterface,
276281
ServerInterceptingCall,
277-
ServerInterceptor
282+
ServerInterceptor,
278283
} from './server-interceptors';
279284

280285
import * as experimental from './experimental';

‎packages/grpc-js/src/internal-channel.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,8 @@ export class InternalChannel {
583583
return;
584584
}
585585
const now = new Date();
586-
const timeSinceLastActivity = now.valueOf() - this.lastActivityTimestamp.valueOf();
586+
const timeSinceLastActivity =
587+
now.valueOf() - this.lastActivityTimestamp.valueOf();
587588
if (timeSinceLastActivity >= this.idleTimeoutMs) {
588589
this.trace(
589590
'Idle timer triggered after ' +
@@ -603,7 +604,10 @@ export class InternalChannel {
603604
}
604605

605606
private maybeStartIdleTimer() {
606-
if (this.connectivityState !== ConnectivityState.SHUTDOWN && !this.idleTimer) {
607+
if (
608+
this.connectivityState !== ConnectivityState.SHUTDOWN &&
609+
!this.idleTimer
610+
) {
607611
this.startIdleTimeout(this.idleTimeoutMs);
608612
}
609613
}

‎packages/grpc-js/src/load-balancer-pick-first.ts

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,12 @@ export class PickFirstLoadBalancer implements LoadBalancer {
198198
keepaliveTime,
199199
errorMessage
200200
) => {
201-
this.onSubchannelStateUpdate(subchannel, previousState, newState, errorMessage);
201+
this.onSubchannelStateUpdate(
202+
subchannel,
203+
previousState,
204+
newState,
205+
errorMessage
206+
);
202207
};
203208

204209
private pickedSubchannelHealthListener: HealthListener = () =>
@@ -275,7 +280,9 @@ export class PickFirstLoadBalancer implements LoadBalancer {
275280
if (this.stickyTransientFailureMode) {
276281
this.updateState(
277282
ConnectivityState.TRANSIENT_FAILURE,
278-
new UnavailablePicker({details: `No connection established. Last error: ${this.lastError}`})
283+
new UnavailablePicker({
284+
details: `No connection established. Last error: ${this.lastError}`,
285+
})
279286
);
280287
} else {
281288
this.updateState(ConnectivityState.CONNECTING, new QueuePicker(this));
@@ -441,7 +448,12 @@ export class PickFirstLoadBalancer implements LoadBalancer {
441448

442449
private resetSubchannelList() {
443450
for (const child of this.children) {
444-
if (!(this.currentPick && child.subchannel.realSubchannelEquals(this.currentPick))) {
451+
if (
452+
!(
453+
this.currentPick &&
454+
child.subchannel.realSubchannelEquals(this.currentPick)
455+
)
456+
) {
445457
/* The connectivity state listener is the same whether the subchannel
446458
* is in the list of children or it is the currentPick, so if it is in
447459
* both, removing it here would cause problems. In particular, that
@@ -523,7 +535,10 @@ export class PickFirstLoadBalancer implements LoadBalancer {
523535
}
524536

525537
exitIdle() {
526-
if (this.currentState === ConnectivityState.IDLE && this.latestAddressList) {
538+
if (
539+
this.currentState === ConnectivityState.IDLE &&
540+
this.latestAddressList
541+
) {
527542
this.connectToAddressList(this.latestAddressList);
528543
}
529544
}

‎packages/grpc-js/src/load-balancer-round-robin.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ export class RoundRobinLoadBalancer implements LoadBalancer {
156156
) {
157157
this.updateState(
158158
ConnectivityState.TRANSIENT_FAILURE,
159-
new UnavailablePicker({details: `No connection established. Last error: ${this.lastError}`})
159+
new UnavailablePicker({
160+
details: `No connection established. Last error: ${this.lastError}`,
161+
})
160162
);
161163
} else {
162164
this.updateState(ConnectivityState.IDLE, new QueuePicker(this));

‎packages/grpc-js/src/load-balancing-call.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@ export class LoadBalancingCall implements Call {
145145
* metadata generation finished, we shouldn't do anything with
146146
* it. */
147147
if (this.ended) {
148-
this.trace('Credentials metadata generation finished after call ended');
148+
this.trace(
149+
'Credentials metadata generation finished after call ended'
150+
);
149151
return;
150152
}
151153
finalMetadata.merge(credsMetadata);

‎packages/grpc-js/src/logging.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,18 @@ export function trace(
112112
text: string
113113
): void {
114114
if (isTracerEnabled(tracer)) {
115-
log(severity, new Date().toISOString() + ' | v' + clientVersion + ' ' + pid + ' | ' + tracer + ' | ' + text);
115+
log(
116+
severity,
117+
new Date().toISOString() +
118+
' | v' +
119+
clientVersion +
120+
' ' +
121+
pid +
122+
' | ' +
123+
tracer +
124+
' | ' +
125+
text
126+
);
116127
}
117128
}
118129

‎packages/grpc-js/src/resolver-dns.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,14 @@ class DnsResolver implements Resolver {
335335
if (this.pendingLookupPromise === null) {
336336
if (this.isNextResolutionTimerRunning || this.backoff.isRunning()) {
337337
if (this.isNextResolutionTimerRunning) {
338-
trace('resolution update delayed by "min time between resolutions" rate limit');
338+
trace(
339+
'resolution update delayed by "min time between resolutions" rate limit'
340+
);
339341
} else {
340-
trace('resolution update delayed by backoff timer until ' + this.backoff.getEndTime().toISOString());
342+
trace(
343+
'resolution update delayed by backoff timer until ' +
344+
this.backoff.getEndTime().toISOString()
345+
);
341346
}
342347
this.continueResolving = true;
343348
} else {

‎packages/grpc-js/src/resolving-load-balancer.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,11 @@ export class ResolvingLoadBalancer implements LoadBalancer {
223223
* In that case, the backoff timer callback will call
224224
* updateResolution */
225225
if (this.backoffTimeout.isRunning()) {
226-
trace('requestReresolution delayed by backoff timer until ' + this.backoffTimeout.getEndTime().toISOString());
227-
this.continueResolving = true;
226+
trace(
227+
'requestReresolution delayed by backoff timer until ' +
228+
this.backoffTimeout.getEndTime().toISOString()
229+
);
230+
this.continueResolving = true;
228231
} else {
229232
this.updateResolution();
230233
}

‎packages/grpc-js/src/server-call.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import { EventEmitter } from 'events';
1919
import { Duplex, Readable, Writable } from 'stream';
2020

21-
import {
22-
Status,
23-
} from './constants';
21+
import { Status } from './constants';
2422
import { Deserialize, Serialize } from './make-client';
2523
import { Metadata } from './metadata';
2624
import { ObjectReadable, ObjectWritable } from './object-stream';
@@ -56,11 +54,14 @@ export type ServerDuplexStream<RequestType, ResponseType> = ServerSurfaceCall &
5654
ObjectReadable<RequestType> &
5755
ObjectWritable<ResponseType> & { end: (metadata?: Metadata) => void };
5856

59-
export function serverErrorToStatus(error: ServerErrorResponse | ServerStatusResponse, overrideTrailers?: Metadata | undefined): PartialStatusObject {
57+
export function serverErrorToStatus(
58+
error: ServerErrorResponse | ServerStatusResponse,
59+
overrideTrailers?: Metadata | undefined
60+
): PartialStatusObject {
6061
const status: PartialStatusObject = {
6162
code: Status.UNKNOWN,
6263
details: 'message' in error ? error.message : 'Unknown Error',
63-
metadata: overrideTrailers ?? error.metadata ?? null
64+
metadata: overrideTrailers ?? error.metadata ?? null,
6465
};
6566

6667
if (
@@ -154,7 +155,7 @@ export class ServerWritableStreamImpl<RequestType, ResponseType>
154155
private trailingMetadata: Metadata;
155156
private pendingStatus: PartialStatusObject = {
156157
code: Status.OK,
157-
details: 'OK'
158+
details: 'OK',
158159
};
159160

160161
constructor(
@@ -224,7 +225,7 @@ export class ServerDuplexStreamImpl<RequestType, ResponseType>
224225
private trailingMetadata: Metadata;
225226
private pendingStatus: PartialStatusObject = {
226227
code: Status.OK,
227-
details: 'OK'
228+
details: 'OK',
228229
};
229230

230231
constructor(

0 commit comments

Comments
 (0)