Skip to content

Commit f3e865d

Browse files
committed
feat: 🎸 change Reader to Uint8Array
1 parent 554069f commit f3e865d

File tree

4 files changed

+21
-25
lines changed

4 files changed

+21
-25
lines changed

src/nfs/v3/messages.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type {Reader} from '@jsonjoy.com/buffers/lib/Reader';
21
import type {Nfsv3Stat} from './constants';
32
import type * as stucts from './structs';
43

@@ -237,7 +236,7 @@ export class Nfsv3ReadResOk {
237236
public readonly fileAttributes: stucts.Nfsv3PostOpAttr,
238237
public readonly count: number,
239238
public readonly eof: boolean,
240-
public readonly data: Reader,
239+
public readonly data: Uint8Array,
241240
) {}
242241
}
243242

@@ -268,7 +267,7 @@ export class Nfsv3WriteRequest {
268267
public readonly offset: bigint,
269268
public readonly count: number,
270269
public readonly stable: number,
271-
public readonly data: Reader,
270+
public readonly data: Uint8Array,
272271
) {}
273272
}
274273

@@ -280,7 +279,7 @@ export class Nfsv3WriteResOk {
280279
public readonly fileWcc: stucts.Nfsv3WccData,
281280
public readonly count: number,
282281
public readonly committed: number,
283-
public readonly verf: Reader,
282+
public readonly verf: Uint8Array,
284283
) {}
285284
}
286285

@@ -612,7 +611,7 @@ export class Nfsv3ReaddirRequest {
612611
constructor(
613612
public readonly dir: stucts.Nfsv3Fh,
614613
public readonly cookie: bigint,
615-
public readonly cookieverf: Reader,
614+
public readonly cookieverf: Uint8Array,
616615
public readonly count: number,
617616
) {}
618617
}
@@ -623,7 +622,7 @@ export class Nfsv3ReaddirRequest {
623622
export class Nfsv3ReaddirResOk {
624623
constructor(
625624
public readonly dirAttributes: stucts.Nfsv3PostOpAttr,
626-
public readonly cookieverf: Reader,
625+
public readonly cookieverf: Uint8Array,
627626
public readonly reply: stucts.Nfsv3DirList,
628627
) {}
629628
}
@@ -653,7 +652,7 @@ export class Nfsv3ReaddirplusRequest {
653652
constructor(
654653
public readonly dir: stucts.Nfsv3Fh,
655654
public readonly cookie: bigint,
656-
public readonly cookieverf: Reader,
655+
public readonly cookieverf: Uint8Array,
657656
public readonly dircount: number,
658657
public readonly maxcount: number,
659658
) {}
@@ -665,7 +664,7 @@ export class Nfsv3ReaddirplusRequest {
665664
export class Nfsv3ReaddirplusResOk {
666665
constructor(
667666
public readonly dirAttributes: stucts.Nfsv3PostOpAttr,
668-
public readonly cookieverf: Reader,
667+
public readonly cookieverf: Uint8Array,
669668
public readonly reply: stucts.Nfsv3DirListPlus,
670669
) {}
671670
}
@@ -830,7 +829,7 @@ export class Nfsv3CommitRequest {
830829
export class Nfsv3CommitResOk {
831830
constructor(
832831
public readonly fileWcc: stucts.Nfsv3WccData,
833-
public readonly verf: Reader,
832+
public readonly verf: Uint8Array,
834833
) {}
835834
}
836835

src/nfs/v3/structs.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type {Reader} from '@jsonjoy.com/buffers/lib/Reader';
21
import type {Nfsv3FType, Nfsv3TimeHow, Nfsv3StableHow, Nfsv3CreateMode} from './constants';
32

43
/**
@@ -25,7 +24,7 @@ export class Nfsv3SpecData {
2524
* NFSv3 file handle
2625
*/
2726
export class Nfsv3Fh {
28-
constructor(public readonly data: Reader) {}
27+
constructor(public readonly data: Uint8Array) {}
2928
}
3029

3130
/**
@@ -224,7 +223,7 @@ export class Nfsv3CreateHow {
224223
constructor(
225224
public readonly mode: Nfsv3CreateMode,
226225
public readonly objAttributes?: Nfsv3Sattr,
227-
public readonly verf?: Reader,
226+
public readonly verf?: Uint8Array,
228227
) {}
229228
}
230229

src/nfs/v4/messages.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type {Reader} from '@jsonjoy.com/buffers/lib/Reader';
21
import type {Nfsv4Stat, Nfsv4LockType} from './constants';
32
import type * as structs from './structs';
43

@@ -422,7 +421,7 @@ export class Nfsv4ReadRequest {
422421
export class Nfsv4ReadResOk {
423422
constructor(
424423
public readonly eof: boolean,
425-
public readonly data: Reader,
424+
public readonly data: Uint8Array,
426425
) {}
427426
}
428427

@@ -606,7 +605,7 @@ export class Nfsv4WriteRequest {
606605
public readonly stateid: structs.Nfsv4Stateid,
607606
public readonly offset: bigint,
608607
public readonly stable: number,
609-
public readonly data: Reader,
608+
public readonly data: Uint8Array,
610609
) {}
611610
}
612611

src/nfs/v4/structs.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type {Reader} from '@jsonjoy.com/buffers/lib/Reader';
21
import type {Nfsv4FType, Nfsv4TimeHow, Nfsv4DelegType} from './constants';
32

43
/**
@@ -25,14 +24,14 @@ export class Nfsv4SpecData {
2524
* NFSv4 file handle
2625
*/
2726
export class Nfsv4Fh {
28-
constructor(public readonly data: Reader) {}
27+
constructor(public readonly data: Uint8Array) {}
2928
}
3029

3130
/**
3231
* NFSv4 verifier (8 bytes)
3332
*/
3433
export class Nfsv4Verifier {
35-
constructor(public readonly data: Reader) {}
34+
constructor(public readonly data: Uint8Array) {}
3635
}
3736

3837
/**
@@ -51,7 +50,7 @@ export class Nfsv4Fsid {
5150
export class Nfsv4Stateid {
5251
constructor(
5352
public readonly seqid: number,
54-
public readonly other: Reader,
53+
public readonly other: Uint8Array,
5554
) {}
5655
}
5756

@@ -89,7 +88,7 @@ export class Nfsv4Bitmap {
8988
export class Nfsv4Fattr {
9089
constructor(
9190
public readonly attrmask: Nfsv4Bitmap,
92-
public readonly attrVals: Reader,
91+
public readonly attrVals: Uint8Array,
9392
) {}
9493
}
9594

@@ -119,7 +118,7 @@ export class Nfsv4CbClient {
119118
export class Nfsv4ClientId {
120119
constructor(
121120
public readonly verifier: Nfsv4Verifier,
122-
public readonly id: Reader,
121+
public readonly id: Uint8Array,
123122
) {}
124123
}
125124

@@ -129,7 +128,7 @@ export class Nfsv4ClientId {
129128
export class Nfsv4OpenOwner {
130129
constructor(
131130
public readonly clientid: bigint,
132-
public readonly owner: Reader,
131+
public readonly owner: Uint8Array,
133132
) {}
134133
}
135134

@@ -139,7 +138,7 @@ export class Nfsv4OpenOwner {
139138
export class Nfsv4LockOwner {
140139
constructor(
141140
public readonly clientid: bigint,
142-
public readonly owner: Reader,
141+
public readonly owner: Uint8Array,
143142
) {}
144143
}
145144

@@ -200,7 +199,7 @@ export class Nfsv4Acl {
200199
export class Nfsv4SecInfo {
201200
constructor(
202201
public readonly flavor: number,
203-
public readonly flavorInfo?: Reader,
202+
public readonly flavorInfo?: Uint8Array,
204203
) {}
205204
}
206205

@@ -379,7 +378,7 @@ export const enum Nfsv4RpcSecGssService {
379378
*/
380379
export class Nfsv4RpcSecGssInfo {
381380
constructor(
382-
public readonly oid: Reader,
381+
public readonly oid: Uint8Array,
383382
public readonly qop: number,
384383
public readonly service: Nfsv4RpcSecGssService,
385384
) {}

0 commit comments

Comments
 (0)