Skip to content

Commit 03c56f9

Browse files
tegefaulkestegefaulkes
committed
syntax: fixed error names
[ci skip]
1 parent b5397f8 commit 03c56f9

5 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎src/rpc/RPCClient.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ class RPCClient<M extends ClientManifest> {
283283
if (ctx.timer == null) timer.cancel(Error('TMP Clean up reason'));
284284
signal.removeEventListener('abort', abortHandler);
285285
};
286-
const timeoutError = new rpcErrors.ErrorRpcTimedOut();
286+
const timeoutError = new rpcErrors.ErrorRPCTimedOut();
287287
void timer.then(
288288
() => {
289289
abortController.abort(timeoutError);
@@ -386,7 +386,7 @@ class RPCClient<M extends ClientManifest> {
386386
if (ctx.timer == null) timer.cancel(Error('TMP Clean up reason'));
387387
signal.removeEventListener('abort', abortHandler);
388388
};
389-
const timeoutError = new rpcErrors.ErrorRpcTimedOut();
389+
const timeoutError = new rpcErrors.ErrorRPCTimedOut();
390390
void timer.then(
391391
() => {
392392
abortController.abort(timeoutError);

‎src/rpc/RPCServer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ class RPCServer extends EventTarget {
415415
const timer = new Timer({
416416
delay: this.streamKeepAliveTimeoutTime,
417417
handler: (signal) => {
418-
abortController.abort(new rpcErrors.ErrorRpcTimedOut());
418+
abortController.abort(new rpcErrors.ErrorRPCTimedOut());
419419
if (signal.aborted) return;
420420
// Grace timer for force ending stream
421421
const graceTimer = new Timer({
@@ -516,7 +516,7 @@ class RPCServer extends EventTarget {
516516
await Promise.allSettled([inputStreamEndProm, outputStreamEndProm]);
517517
// Cleaning up abort and timer
518518
timer.cancel(cleanupReason);
519-
abortController.abort(new rpcErrors.ErrorRpcStreamEnded());
519+
abortController.abort(new rpcErrors.ErrorRPCStreamEnded());
520520
})();
521521
const handlerProm = PromiseCancellable.from(prom, abortController).finally(
522522
() => this.activeStreams.delete(handlerProm),

‎src/rpc/errors.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ class ErrorPolykeyRemote<T> extends ErrorPolykey<T> {
9494
}
9595
}
9696

97-
class ErrorRpcStreamEnded<T> extends ErrorRPC<T> {
97+
class ErrorRPCStreamEnded<T> extends ErrorRPC<T> {
9898
static description = 'Handled stream has ended';
9999
exitCode = sysexits.NOINPUT;
100100
}
101101

102-
class ErrorRpcTimedOut<T> extends ErrorRPC<T> {
102+
class ErrorRPCTimedOut<T> extends ErrorRPC<T> {
103103
static description = 'RPC handler has timed out';
104104
exitCode = sysexits.UNAVAILABLE;
105105
}
@@ -114,6 +114,6 @@ export {
114114
ErrorRPCMissingResponse,
115115
ErrorRPCOutputStreamError,
116116
ErrorPolykeyRemote,
117-
ErrorRpcStreamEnded,
118-
ErrorRpcTimedOut,
117+
ErrorRPCStreamEnded,
118+
ErrorRPCTimedOut,
119119
};

‎tests/rpc/RPCClient.test.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -696,10 +696,10 @@ describe(`${RPCClient.name}`, () => {
696696
const callerInterfaceProm = rpcClient.rawStreamCaller('testMethod', {});
697697
await expect(callerInterfaceProm).toReject();
698698
await expect(callerInterfaceProm).rejects.toThrow(
699-
rpcErrors.ErrorRpcTimedOut,
699+
rpcErrors.ErrorRPCTimedOut,
700700
);
701701
expect(ctx?.signal.aborted).toBeTrue();
702-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
702+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
703703
});
704704
test('raw caller times out when creating stream', async () => {
705705
const holdProm = promise();
@@ -722,10 +722,10 @@ describe(`${RPCClient.name}`, () => {
722722
);
723723
await expect(callerInterfaceProm).toReject();
724724
await expect(callerInterfaceProm).rejects.toThrow(
725-
rpcErrors.ErrorRpcTimedOut,
725+
rpcErrors.ErrorRPCTimedOut,
726726
);
727727
expect(ctx?.signal.aborted).toBeTrue();
728-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
728+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
729729
});
730730
test('raw caller handles abort when creating stream', async () => {
731731
const holdProm = promise();
@@ -787,7 +787,7 @@ describe(`${RPCClient.name}`, () => {
787787
]);
788788
await ctx?.timer;
789789
expect(ctx?.signal.aborted).toBeTrue();
790-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
790+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
791791
});
792792
test('raw caller times out awaiting stream', async () => {
793793
const forwardPassThroughStream = new TransformStream<
@@ -822,7 +822,7 @@ describe(`${RPCClient.name}`, () => {
822822
]);
823823
await ctx?.timer;
824824
expect(ctx?.signal.aborted).toBeTrue();
825-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
825+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
826826
});
827827
test('raw caller handles abort awaiting stream', async () => {
828828
const forwardPassThroughStream = new TransformStream<
@@ -889,10 +889,10 @@ describe(`${RPCClient.name}`, () => {
889889
const callerInterfaceProm = rpcClient.duplexStreamCaller('testMethod');
890890
await expect(callerInterfaceProm).toReject();
891891
await expect(callerInterfaceProm).rejects.toThrow(
892-
rpcErrors.ErrorRpcTimedOut,
892+
rpcErrors.ErrorRPCTimedOut,
893893
);
894894
expect(ctx?.signal.aborted).toBeTrue();
895-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
895+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
896896
});
897897
test('duplex caller times out when creating stream', async () => {
898898
const holdProm = promise();
@@ -913,10 +913,10 @@ describe(`${RPCClient.name}`, () => {
913913
});
914914
await expect(callerInterfaceProm).toReject();
915915
await expect(callerInterfaceProm).rejects.toThrow(
916-
rpcErrors.ErrorRpcTimedOut,
916+
rpcErrors.ErrorRPCTimedOut,
917917
);
918918
expect(ctx?.signal.aborted).toBeTrue();
919-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
919+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
920920
});
921921
test('duplex caller handles abort when creating stream', async () => {
922922
const holdProm = promise();
@@ -972,7 +972,7 @@ describe(`${RPCClient.name}`, () => {
972972
await rpcClient.duplexStreamCaller('testMethod');
973973
await ctx?.timer;
974974
expect(ctx?.signal.aborted).toBeTrue();
975-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
975+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
976976
});
977977
test('duplex caller times out awaiting stream', async () => {
978978
const forwardPassThroughStream = new TransformStream<
@@ -1003,7 +1003,7 @@ describe(`${RPCClient.name}`, () => {
10031003
});
10041004
await ctx?.timer;
10051005
expect(ctx?.signal.aborted).toBeTrue();
1006-
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
1006+
expect(ctx?.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
10071007
});
10081008
test('duplex caller handles abort awaiting stream', async () => {
10091009
const forwardPassThroughStream = new TransformStream<

‎tests/rpc/RPCServer.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ describe(`${RPCServer.name}`, () => {
787787
const ctx = await ctxProm.p;
788788
expect(ctx.timer.delay).toEqual(100);
789789
await ctx.timer;
790-
expect(ctx.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
790+
expect(ctx.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
791791
await expect(outputResult).toReject();
792792
await rpcServer.destroy();
793793
});
@@ -984,7 +984,7 @@ describe(`${RPCServer.name}`, () => {
984984
await outputResult;
985985
await rpcServer.destroy(false);
986986
expect(ctx.signal.aborted).toBeTrue();
987-
expect(ctx.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcStreamEnded);
987+
expect(ctx.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCStreamEnded);
988988
// If the timer has already resolved then it was cancelled
989989
await expect(ctx.timer).toReject();
990990
await rpcServer.destroy();
@@ -1027,7 +1027,7 @@ describe(`${RPCServer.name}`, () => {
10271027
const ctx = await ctxProm.p;
10281028
await ctx.timer;
10291029
const then = Date.now();
1030-
expect(ctx.signal.reason).toBeInstanceOf(rpcErrors.ErrorRpcTimedOut);
1030+
expect(ctx.signal.reason).toBeInstanceOf(rpcErrors.ErrorRPCTimedOut);
10311031
// Should end after grace period
10321032
await expect(outputResult).rejects.toThrow();
10331033
expect(Date.now() - then).toBeGreaterThanOrEqual(100);

0 commit comments

Comments
 (0)