Skip to content

Commit 15a9243

Browse files
streamichstreamich
committed
style: 💄 fix linter issues
1 parent 2f4371b commit 15a9243

File tree

9 files changed

+60
-68
lines changed

9 files changed

+60
-68
lines changed

‎src/rm/RmRecordEncoder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export class RmRecordEncoder<W extends IWriter & IWriterGrowable = IWriter & IWr
88
this.writeHdr(fin, length);
99
return this.writer.flush();
1010
}
11-
11+
1212
public encodeRecord(record: Uint8Array): Uint8Array {
1313
this.writeRecord(record);
1414
return this.writer.flush();

‎src/rpc/RpcMessageDecoder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class RpcMessageDecoder {
2525
const vers = reader.u32();
2626
const proc = reader.u32();
2727
const cred = this.readOpaqueAuth(reader);
28-
if (!cred) return (reader.x = startPos, undefined);
28+
if (!cred) return (reader.x = startPos), undefined;
2929
const verf = this.readOpaqueAuth(reader);
3030
if (!verf) return (reader.x = startPos), undefined;
3131
const params = reader.size() > 0 ? reader.cut(reader.size()) : undefined;

‎src/rpc/RpcMessageEncoder.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@ import {Writer} from '@jsonjoy.com/util/lib/buffers/Writer';
22
import {Reader} from '@jsonjoy.com/buffers/lib/Reader';
33
import {RpcMsgType, RpcReplyStat, RPC_VERSION} from './constants';
44
import {RpcEncodingError} from './errors';
5-
import {
6-
RpcOpaqueAuth,
7-
RpcCallMessage,
8-
RpcAcceptedReplyMessage,
9-
RpcRejectedReplyMessage,
10-
RpcMessage,
11-
} from './messages';
5+
import {RpcOpaqueAuth, RpcCallMessage, RpcAcceptedReplyMessage, RpcRejectedReplyMessage, RpcMessage} from './messages';
126
import type {IWriter, IWriterGrowable} from '@jsonjoy.com/util/lib/buffers';
137

148
export class RpcMessageEncoder<W extends IWriter & IWriterGrowable = IWriter & IWriterGrowable> {

‎src/rpc/__tests__/decoder.spec.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ describe('RpcMessageDecoder', () => {
234234
0x00,
235235
0x2a, // results (example: 42)
236236
]);
237-
237+
238238
const reader = new Reader(payload);
239239
const msg = decoder.decodeMessage(reader)!;
240240
expect(msg).toBeDefined();
@@ -272,7 +272,7 @@ describe('RpcMessageDecoder', () => {
272272
0x00,
273273
0x01, // accept_stat = PROG_UNAVAIL
274274
]);
275-
275+
276276
const reader = new Reader(payload);
277277
const msg = decoder.decodeMessage(reader)!;
278278
expect(msg).toBeDefined();
@@ -317,7 +317,7 @@ describe('RpcMessageDecoder', () => {
317317
0x00,
318318
0x03, // high = 3
319319
]);
320-
320+
321321
const reader = new Reader(payload);
322322
const msg = decoder.decodeMessage(reader)!;
323323
expect(msg).toBeDefined();
@@ -357,7 +357,7 @@ describe('RpcMessageDecoder', () => {
357357
0x00,
358358
0x03, // accept_stat = PROC_UNAVAIL
359359
]);
360-
360+
361361
const reader = new Reader(payload);
362362
const msg = decoder.decodeMessage(reader)!;
363363
expect(msg).toBeDefined();
@@ -394,7 +394,7 @@ describe('RpcMessageDecoder', () => {
394394
0x00,
395395
0x04, // accept_stat = GARBAGE_ARGS
396396
]);
397-
397+
398398
const reader = new Reader(payload);
399399
const msg = decoder.decodeMessage(reader)!;
400400
expect(msg).toBeDefined();
@@ -433,7 +433,7 @@ describe('RpcMessageDecoder', () => {
433433
0x00,
434434
0x02, // high = 2
435435
]);
436-
436+
437437
const reader = new Reader(payload);
438438
const msg = decoder.decodeMessage(reader)!;
439439
expect(msg).toBeDefined();
@@ -470,7 +470,7 @@ describe('RpcMessageDecoder', () => {
470470
0x00,
471471
0x01, // auth_stat = AUTH_BADCRED
472472
]);
473-
473+
474474
const reader = new Reader(payload);
475475
const msg = decoder.decodeMessage(reader)!;
476476
expect(msg).toBeDefined();
@@ -568,13 +568,13 @@ describe('RpcMessageDecoder', () => {
568568
0x00,
569569
0x00, // verf.length = 0
570570
]);
571-
571+
572572
const reader1 = new Reader(payload1);
573573
const message1 = decoder.decodeMessage(reader1)!;
574574
expect(message1).toBeDefined();
575575
expect(message1.xid).toBe(1);
576576
expect((message1 as RpcCallMessage).prog).toBe(100);
577-
577+
578578
const reader2 = new Reader(payload2);
579579
const message2 = decoder.decodeMessage(reader2)!;
580580
expect(message2).toBeDefined();
@@ -630,7 +630,7 @@ describe('RpcMessageDecoder', () => {
630630
0x00, // verf.length = 0
631631
...params,
632632
]);
633-
633+
634634
const reader = new Reader(payload);
635635
const msg = decoder.decodeMessage(reader)!;
636636
expect(msg).toBeDefined();
@@ -671,7 +671,7 @@ describe('RpcMessageDecoder', () => {
671671
0x00, // accept_stat = SUCCESS
672672
...results,
673673
]);
674-
674+
675675
const reader = new Reader(payload);
676676
const msg = decoder.decodeMessage(reader)!;
677677
expect(msg).toBeDefined();
@@ -726,7 +726,7 @@ describe('RpcMessageDecoder', () => {
726726
0x00,
727727
0x00, // verf.length = 0
728728
]);
729-
729+
730730
const reader = new Reader(payload);
731731
const msg = decoder.decodeMessage(reader)!;
732732
expect(msg).toBeDefined();
@@ -762,7 +762,7 @@ describe('RpcMessageDecoder', () => {
762762
0x00,
763763
0x01, // accept_stat = PROG_UNAVAIL
764764
]);
765-
765+
766766
const reader = new Reader(payload);
767767
const msg = decoder.decodeMessage(reader)!;
768768
expect(msg).toBeDefined();
@@ -833,7 +833,7 @@ describe('RpcMessageDecoder', () => {
833833
0x00, // verf length: 0
834834
...params,
835835
]);
836-
836+
837837
const reader = new Reader(payload);
838838
const msg = decoder.decodeMessage(reader)!;
839839
expect(msg).toBeDefined();

‎src/rpc/__tests__/encoder.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ describe('RpcMessageEncoder', () => {
241241
const cred = new RpcOpaqueAuth(RpcAuthFlavor.AUTH_UNIX, new Reader(body));
242242
const encoded = encoder.encodeCall(xid, 100, 1, 0, cred, verf);
243243
const reader = new Reader(encoded);
244-
const msg = decoder.decodeMessage(reader)!;
244+
const msg = decoder.decodeMessage(reader)!;
245245
expect(msg.xid).toBe(xid);
246246
expect((msg as RpcCallMessage).cred.body.buf()).toEqual(body);
247247
};

‎src/rpc/__tests__/fixtures.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ describe('RPC Real-world Fixtures', () => {
186186
const decoder = new RpcMessageDecoder();
187187
const withRecordMarking = fixture.bytes;
188188
const reader = new Reader(withRecordMarking);
189-
const msg = decoder.decodeMessage(reader)!;
189+
const msg = decoder.decodeMessage(reader)!;
190190
expect(msg).toBeDefined();
191191
const call = msg as RpcCallMessage;
192192
expect(call.cred.body.buf().length).toBe(fixture.expected.credBodyLength);
@@ -357,7 +357,7 @@ describe('RPC Real-world Fixtures', () => {
357357
const start = Date.now();
358358
for (let i = 0; i < 1000; i++) {
359359
const reader = new Reader(withRecordMarking);
360-
const msg = decoder.decodeMessage(reader);
360+
const msg = decoder.decodeMessage(reader);
361361
expect(msg).toBeDefined();
362362
}
363363
const elapsed = Date.now() - start;

‎src/rpc/__tests__/real-traces.spec.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RmRecordDecoder } from "../../rm";
2-
import { RpcMessage } from "../messages";
3-
import { RpcMessageDecoder } from "../RpcMessageDecoder";
1+
import {RmRecordDecoder} from '../../rm';
2+
import {RpcMessage} from '../messages';
3+
import {RpcMessageDecoder} from '../RpcMessageDecoder';
44

55
const rmDecoder = new RmRecordDecoder();
66
const rpcDecoder = new RpcMessageDecoder();
@@ -17,8 +17,9 @@ const decode = (hex: string): RpcMessage | undefined => {
1717
};
1818

1919
test('RPC Call', () => {
20-
const hex = '80000090eb8a42cb0000000000000002000186a30000000300000003000000010000003c00490e680000001d455042594d494e573039333554312e6d696e736b2e6570616d2e636f6d000000000001f40000000a000000020000000a000001f400000000000000000000001c9725bb51046621880c000000a68c020078286c3e00000000000000000000000568656c6c6f000000';
20+
const hex =
21+
'80000090eb8a42cb0000000000000002000186a30000000300000003000000010000003c00490e680000001d455042594d494e573039333554312e6d696e736b2e6570616d2e636f6d000000000001f40000000a000000020000000a000001f400000000000000000000001c9725bb51046621880c000000a68c020078286c3e00000000000000000000000568656c6c6f000000';
2122
const msg = decode(hex)!;
2223
expect(msg.xid).toBe(0xeb8a42cb);
23-
console.log(msg);
24-
});
24+
// console.log(msg);
25+
});

‎src/rpc/constants.ts‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ export const enum RpcReplyStat {
3232
* @see RFC 5531 Section 9 (added SYSTEM_ERR = 5)
3333
*/
3434
export const enum RpcAcceptStat {
35-
SUCCESS = 0, // RFC 1057
36-
PROG_UNAVAIL = 1, // RFC 1057
37-
PROG_MISMATCH = 2, // RFC 1057
38-
PROC_UNAVAIL = 3, // RFC 1057
39-
GARBAGE_ARGS = 4, // RFC 1057
40-
SYSTEM_ERR = 5, // RFC 5531
35+
SUCCESS = 0, // RFC 1057
36+
PROG_UNAVAIL = 1, // RFC 1057
37+
PROG_MISMATCH = 2, // RFC 1057
38+
PROC_UNAVAIL = 3, // RFC 1057
39+
GARBAGE_ARGS = 4, // RFC 1057
40+
SYSTEM_ERR = 5, // RFC 5531
4141
}
4242

4343
/**
@@ -58,42 +58,42 @@ export const enum RpcRejectStat {
5858
* @see RFC 5531 Section 10 (expanded with values 0, 6-14 for RPCSEC_GSS support)
5959
*/
6060
export const enum RpcAuthStat {
61-
AUTH_OK = 0, // RFC 5531
62-
AUTH_BADCRED = 1, // RFC 1057
63-
AUTH_REJECTEDCRED = 2, // RFC 1057
64-
AUTH_BADVERF = 3, // RFC 1057
65-
AUTH_REJECTEDVERF = 4, // RFC 1057
66-
AUTH_TOOWEAK = 5, // RFC 1057
67-
AUTH_INVALIDRESP = 6, // RFC 5531
68-
AUTH_FAILED = 7, // RFC 5531
69-
AUTH_KERB_GENERIC = 8, // RFC 5531
70-
AUTH_TIMEEXPIRE = 9, // RFC 5531
71-
AUTH_TKT_FILE = 10, // RFC 5531
72-
AUTH_DECODE = 11, // RFC 5531
73-
AUTH_NET_ADDR = 12, // RFC 5531
74-
RPCSEC_GSS_CREDPROBLEM = 13, // RFC 5531
75-
RPCSEC_GSS_CTXPROBLEM = 14, // RFC 5531
61+
AUTH_OK = 0, // RFC 5531
62+
AUTH_BADCRED = 1, // RFC 1057
63+
AUTH_REJECTEDCRED = 2, // RFC 1057
64+
AUTH_BADVERF = 3, // RFC 1057
65+
AUTH_REJECTEDVERF = 4, // RFC 1057
66+
AUTH_TOOWEAK = 5, // RFC 1057
67+
AUTH_INVALIDRESP = 6, // RFC 5531
68+
AUTH_FAILED = 7, // RFC 5531
69+
AUTH_KERB_GENERIC = 8, // RFC 5531
70+
AUTH_TIMEEXPIRE = 9, // RFC 5531
71+
AUTH_TKT_FILE = 10, // RFC 5531
72+
AUTH_DECODE = 11, // RFC 5531
73+
AUTH_NET_ADDR = 12, // RFC 5531
74+
RPCSEC_GSS_CREDPROBLEM = 13, // RFC 5531
75+
RPCSEC_GSS_CTXPROBLEM = 14, // RFC 5531
7676
}
7777

7878
/**
7979
* Authentication flavor numbers
8080
* @see RFC 1057 Section 9 (AUTH_NULL, AUTH_UNIX, AUTH_SHORT, AUTH_DES)
8181
* @see RFC 1831 Section 9, Appendix A (renamed AUTH_NULL->AUTH_NONE, AUTH_UNIX->AUTH_SYS)
8282
* @see RFC 5531 Section 10, Appendix C (added AUTH_KERB, AUTH_RSA, RPCSEC_GSS)
83-
*
83+
*
8484
* Note: Old names (AUTH_NULL, AUTH_UNIX, AUTH_DES) maintained for backward compatibility
8585
*/
8686
export const enum RpcAuthFlavor {
87-
AUTH_NONE = 0, // RFC 1831 (renamed from AUTH_NULL in RFC 1057)
88-
AUTH_SYS = 1, // RFC 1831 (renamed from AUTH_UNIX in RFC 1057)
89-
AUTH_SHORT = 2, // RFC 1057
90-
AUTH_DH = 3, // RFC 5531 (obsolete, was AUTH_DES in RFC 1057)
91-
AUTH_KERB = 4, // RFC 5531
92-
AUTH_RSA = 5, // RFC 5531
93-
RPCSEC_GSS = 6, // RFC 5531 (RFC 2203, RFC 5403)
94-
AUTH_NULL = 0, // RFC 1057 (alias for AUTH_NONE)
95-
AUTH_UNIX = 1, // RFC 1057 (alias for AUTH_SYS)
96-
AUTH_DES = 3, // RFC 1057 (alias for AUTH_DH)
87+
AUTH_NONE = 0, // RFC 1831 (renamed from AUTH_NULL in RFC 1057)
88+
AUTH_SYS = 1, // RFC 1831 (renamed from AUTH_UNIX in RFC 1057)
89+
AUTH_SHORT = 2, // RFC 1057
90+
AUTH_DH = 3, // RFC 5531 (obsolete, was AUTH_DES in RFC 1057)
91+
AUTH_KERB = 4, // RFC 5531
92+
AUTH_RSA = 5, // RFC 5531
93+
RPCSEC_GSS = 6, // RFC 5531 (RFC 2203, RFC 5403)
94+
AUTH_NULL = 0, // RFC 1057 (alias for AUTH_NONE)
95+
AUTH_UNIX = 1, // RFC 1057 (alias for AUTH_SYS)
96+
AUTH_DES = 3, // RFC 1057 (alias for AUTH_DH)
9797
}
9898

9999
/**

‎src/rpc/messages.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,4 @@ export class RpcRejectedReplyMessage {
4949
) {}
5050
}
5151

52-
export type RpcMessage =
53-
| RpcCallMessage
54-
| RpcAcceptedReplyMessage
55-
| RpcRejectedReplyMessage;
52+
export type RpcMessage = RpcCallMessage | RpcAcceptedReplyMessage | RpcRejectedReplyMessage;

0 commit comments

Comments
 (0)