feat: 🎸 update decoding for some XDR structures

Author: streamich

src/nfs/v4/Nfsv4Decoder.ts

@@ -54,19 +54,20 @@ export class Nfsv4Decoder {
   }
 
   private decodeRequest(op: Nfsv4Op): msg.Nfsv4Request | undefined {
+    const xdr = this.xdr;
     switch (op) {
       case Nfsv4Op.ACCESS:
-        return this.decodeAccessRequest();
+        return msg.Nfsv4AccessRequest.decode(xdr);
       case Nfsv4Op.CLOSE:
-        return this.decodeCloseRequest();
+        return msg.Nfsv4CloseRequest.decode(xdr);
       case Nfsv4Op.COMMIT:
-        return this.decodeCommitRequest();
+        return msg.Nfsv4CommitRequest.decode(xdr);
       case Nfsv4Op.CREATE:
         return this.decodeCreateRequest();
       case Nfsv4Op.DELEGPURGE:
-        return this.decodeDelegpurgeRequest();
+        return msg.Nfsv4DelegpurgeRequest.decode(xdr);
       case Nfsv4Op.DELEGRETURN:
-        return this.decodeDelegreturnRequest();
+        return msg.Nfsv4DelegreturnRequest.decode(xdr);
       case Nfsv4Op.GETATTR:
         return this.decodeGetattrRequest();
       case Nfsv4Op.GETFH:
@@ -96,9 +97,9 @@ export class Nfsv4Decoder {
       case Nfsv4Op.PUTFH:
         return this.decodePutfhRequest();
       case Nfsv4Op.PUTPUBFH:
-        return this.decodePutpubfhRequest();
+        return new msg.Nfsv4PutpubfhRequest();
       case Nfsv4Op.PUTROOTFH:
-        return this.decodePutrootfhRequest();
+        return new msg.Nfsv4PutrootfhRequest();
       case Nfsv4Op.READ:
         return this.decodeReadRequest();
       case Nfsv4Op.READDIR:
@@ -114,7 +115,7 @@ export class Nfsv4Decoder {
       case Nfsv4Op.RESTOREFH:
         return this.decodeRestorefhRequest();
       case Nfsv4Op.SAVEFH:
-        return this.decodeSavefhRequest();
+        return new msg.Nfsv4SavefhRequest();
       case Nfsv4Op.SECINFO:
         return this.decodeSecinfoRequest();
       case Nfsv4Op.SETATTR:
@@ -139,6 +140,7 @@ export class Nfsv4Decoder {
   }
 
   private decodeResponse(op: Nfsv4Op): msg.Nfsv4Response | undefined {
+    const xdr = this.xdr;
     switch (op) {
       case Nfsv4Op.ACCESS:
         return this.decodeAccessResponse();
@@ -181,7 +183,7 @@ export class Nfsv4Decoder {
       case Nfsv4Op.PUTFH:
         return this.decodePutfhResponse();
       case Nfsv4Op.PUTPUBFH:
-        return this.decodePutpubfhResponse();
+        return msg.Nfsv4PutpubfhResponse.decode(xdr);
       case Nfsv4Op.PUTROOTFH:
         return this.decodePutrootfhResponse();
       case Nfsv4Op.READ:
@@ -233,10 +235,7 @@ export class Nfsv4Decoder {
   }
 
   private readStateid(): structs.Nfsv4Stateid {
-    const xdr = this.xdr;
-    const seqid = xdr.readUnsignedInt();
-    const other = xdr.readOpaque(12);
-    return new structs.Nfsv4Stateid(seqid, other);
+    return structs.Nfsv4Stateid.decode(this.xdr);
   }
 
   private readBitmap(): structs.Nfsv4Bitmap {
@@ -429,11 +428,6 @@ export class Nfsv4Decoder {
     return new structs.Nfsv4SecInfoFlavor(flavor);
   }
 
-  private decodeAccessRequest(): msg.Nfsv4AccessRequest {
-    const access = this.xdr.readUnsignedInt();
-    return new msg.Nfsv4AccessRequest(access);
-  }
-
   private decodeAccessResponse(): msg.Nfsv4AccessResponse {
     const xdr = this.xdr;
     const status = xdr.readUnsignedInt();
@@ -461,13 +455,6 @@ export class Nfsv4Decoder {
     return new msg.Nfsv4CloseResponse(status);
   }
 
-  private decodeCommitRequest(): msg.Nfsv4CommitRequest {
-    const xdr = this.xdr;
-    const offset = xdr.readUnsignedHyper();
-    const count = xdr.readUnsignedInt();
-    return new msg.Nfsv4CommitRequest(offset, count);
-  }
-
   private decodeCommitResponse(): msg.Nfsv4CommitResponse {
     const status = this.xdr.readUnsignedInt();
     if (status === 0) {
@@ -515,21 +502,11 @@ export class Nfsv4Decoder {
     return new msg.Nfsv4CreateResponse(status);
   }
 
-  private decodeDelegpurgeRequest(): msg.Nfsv4DelegpurgeRequest {
-    const clientid = this.xdr.readUnsignedHyper();
-    return new msg.Nfsv4DelegpurgeRequest(clientid);
-  }
-
   private decodeDelegpurgeResponse(): msg.Nfsv4DelegpurgeResponse {
     const status = this.xdr.readUnsignedInt();
     return new msg.Nfsv4DelegpurgeResponse(status);
   }
 
-  private decodeDelegreturnRequest(): msg.Nfsv4DelegreturnRequest {
-    const delegStateid = this.readStateid();
-    return new msg.Nfsv4DelegreturnRequest(delegStateid);
-  }
-
   private decodeDelegreturnResponse(): msg.Nfsv4DelegreturnResponse {
     const status = this.xdr.readUnsignedInt();
     return new msg.Nfsv4DelegreturnResponse(status);
@@ -750,19 +727,6 @@ export class Nfsv4Decoder {
     return new msg.Nfsv4PutfhResponse(status);
   }
 
-  private decodePutpubfhRequest(): msg.Nfsv4PutpubfhRequest {
-    return new msg.Nfsv4PutpubfhRequest();
-  }
-
-  private decodePutpubfhResponse(): msg.Nfsv4PutpubfhResponse {
-    const status = this.xdr.readUnsignedInt();
-    return new msg.Nfsv4PutpubfhResponse(status);
-  }
-
-  private decodePutrootfhRequest(): msg.Nfsv4PutrootfhRequest {
-    return new msg.Nfsv4PutrootfhRequest();
-  }
-
   private decodePutrootfhResponse(): msg.Nfsv4PutrootfhResponse {
     const status = this.xdr.readUnsignedInt();
     return new msg.Nfsv4PutrootfhResponse(status);

src/nfs/v4/messages.ts

@@ -1,6 +1,6 @@
 import {Nfsv4Stat, type Nfsv4LockType, Nfsv4Op, Nfsv4CbOp} from './constants';
-import type {XdrEncoder, XdrType} from '../../xdr';
-import type * as structs from './structs';
+import * as structs from './structs';
+import type {XdrDecoder, XdrEncoder, XdrType} from '../../xdr';
 
 export type Nfsv4Operation = Nfsv4Request | Nfsv4Response;
 
@@ -85,6 +85,11 @@ export type Nfsv4Response =
   | Nfsv4IllegalResponse;
 
 export class Nfsv4AccessRequest implements XdrType {
+  static decode(xdr: XdrDecoder): Nfsv4AccessRequest {
+    const access = xdr.readUnsignedInt();
+    return new Nfsv4AccessRequest(access);
+  }
+
   constructor(public readonly access: number) {}
 
   encode(xdr: XdrEncoder): void {
@@ -119,6 +124,12 @@ export class Nfsv4AccessResponse implements XdrType {
 }
 
 export class Nfsv4CloseRequest {
+  static decode(xdr: XdrDecoder): Nfsv4CloseRequest {
+    const seqid = xdr.readUnsignedInt();
+    const openStateid = structs.Nfsv4Stateid.decode(xdr);
+    return new Nfsv4CloseRequest(seqid, openStateid);
+  }
+
   constructor(
     public readonly seqid: number,
     public readonly openStateid: structs.Nfsv4Stateid,
@@ -153,6 +164,12 @@ export class Nfsv4CloseResponse implements XdrType {
 }
 
 export class Nfsv4CommitRequest implements XdrType {
+  public static decode(xdr: XdrDecoder): Nfsv4CommitRequest {
+    const offset = xdr.readUnsignedHyper();
+    const count = xdr.readUnsignedInt();
+    return new Nfsv4CommitRequest(offset, count);
+  }
+
   constructor(
     public readonly offset: bigint,
     public readonly count: number,
@@ -227,6 +244,11 @@ export class Nfsv4CreateResponse implements XdrType {
 }
 
 export class Nfsv4DelegpurgeRequest implements XdrType {
+  static decode(xdr: XdrDecoder): Nfsv4DelegpurgeRequest {
+    const clientid = xdr.readUnsignedHyper();
+    return new Nfsv4DelegpurgeRequest(clientid);
+  }
+
   constructor(public readonly clientid: bigint) {}
 
   encode(xdr: XdrEncoder): void {
@@ -245,6 +267,11 @@ export class Nfsv4DelegpurgeResponse implements XdrType {
 }
 
 export class Nfsv4DelegreturnRequest implements XdrType {
+  static decode(xdr: XdrDecoder): Nfsv4DelegreturnRequest {
+    const delegStateid = structs.Nfsv4Stateid.decode(xdr);
+    return new Nfsv4DelegreturnRequest(delegStateid);
+  }
+
   constructor(public readonly delegStateid: structs.Nfsv4Stateid) {}
 
   encode(xdr: XdrEncoder): void {
@@ -720,6 +747,11 @@ export class Nfsv4PutpubfhRequest implements XdrType {
 }
 
 export class Nfsv4PutpubfhResponse implements XdrType {
+  static decode(xdr: XdrDecoder): Nfsv4PutpubfhResponse {
+    const status = xdr.readUnsignedInt();
+    return new Nfsv4PutpubfhResponse(status);
+  }
+
   constructor(public readonly status: Nfsv4Stat) {}
 
   encode(xdr: XdrEncoder): void {

src/nfs/v4/structs.ts

@@ -1,4 +1,4 @@
-import type {XdrEncoder, XdrType} from '../../xdr';
+import type {XdrDecoder, XdrEncoder, XdrType} from '../../xdr';
 import type {Nfsv4FType, Nfsv4TimeHow, Nfsv4DelegType} from './constants';
 
 /**
@@ -72,6 +72,12 @@ export class Nfsv4Fsid implements XdrType {
  * Stateid structure for state management
  */
 export class Nfsv4Stateid implements XdrType {
+  static decode(xdr: XdrDecoder): Nfsv4Stateid {
+    const seqid = xdr.readUnsignedInt();
+    const other = xdr.readOpaque(12);
+    return new Nfsv4Stateid(seqid, other);
+  }
+
   constructor(
     public readonly seqid: number,
     public readonly other: Uint8Array,