@jsonjoy.com/json-pack 1.20.0 → 1.21.0

package/lib/json/JsonEncoder.js

@@ -133,7 +133,8 @@ class JsonEncoder {
         const length = str.length;
         writer.ensureCapacity(length * 4 + 2);
         if (length < 256) {
-            let x = writer.x;
+            const startX = writer.x;
+            let x = startX;
             const uint8 = writer.uint8;
             uint8[x++] = 0x22;
             for (let i = 0; i < length; i++) {
@@ -145,7 +146,10 @@ class JsonEncoder {
                         break;
                 }
                 if (code < 32 || code > 126) {
-                    writer.utf8(JSON.stringify(str));
+                    writer.x = startX;
+                    const jsonStr = JSON.stringify(str);
+                    writer.ensureCapacity(jsonStr.length * 4 + 4);
+                    writer.utf8(jsonStr);
                     return;
                 }
                 else
@@ -155,7 +159,9 @@ class JsonEncoder {
             writer.x = x;
             return;
         }
-        writer.utf8(JSON.stringify(str));
+        const jsonStr = JSON.stringify(str);
+        writer.ensureCapacity(jsonStr.length * 4 + 4);
+        writer.utf8(jsonStr);
     }
     writeAsciiStr(str) {
         const length = str.length;

package/lib/json/JsonEncoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonEncoder.js","sourceRoot":"","sources":["../../src/json/JsonEncoder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonEncoder.js","sourceRoot":"","sources":["../../src/json/JsonEncoder.ts"],"names":[],"mappings":"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"}

package/lib/nfs/v4/Nfsv4Decoder.d.ts

@@ -5,13 +5,12 @@ export declare class Nfsv4Decoder {
     protected readonly xdr: XdrDecoder;
     constructor(reader?: Reader);
     decodeCompound(reader: Reader, isRequest: boolean): msg.Nfsv4CompoundRequest | msg.Nfsv4CompoundResponse | undefined;
-    private decodeCompoundRequest;
-    private decodeCompoundResponse;
+    decodeCompoundRequest(reader: Reader): msg.Nfsv4CompoundRequest;
+    decodeCompoundResponse(reader: Reader): msg.Nfsv4CompoundResponse;
     private decodeRequest;
     private decodeResponse;
     private readFh;
     private readVerifier;
-    private readTime;
     private readStateid;
     private readBitmap;
     private readFattr;
@@ -24,20 +23,17 @@ export declare class Nfsv4Decoder {
     private readOpenToLockOwner;
     private readLockOwnerInfo;
     private readOpenClaim;
+    private readOpenHow;
     private readOpenDelegation;
     private readAce;
     private readSecInfoFlavor;
-    private decodeAccessRequest;
     private decodeAccessResponse;
     private decodeCloseRequest;
     private decodeCloseResponse;
-    private decodeCommitRequest;
     private decodeCommitResponse;
     private decodeCreateRequest;
     private decodeCreateResponse;
-    private decodeDelegpurgeRequest;
     private decodeDelegpurgeResponse;
-    private decodeDelegreturnRequest;
     private decodeDelegreturnResponse;
     private decodeGetattrRequest;
     private decodeGetattrResponse;
@@ -67,9 +63,6 @@ export declare class Nfsv4Decoder {
     private decodeOpenDowngradeResponse;
     private decodePutfhRequest;
     private decodePutfhResponse;
-    private decodePutpubfhRequest;
-    private decodePutpubfhResponse;
-    private decodePutrootfhRequest;
     private decodePutrootfhResponse;
     private decodeReadRequest;
     private decodeReadResponse;
@@ -103,4 +96,15 @@ export declare class Nfsv4Decoder {
     private decodeReleaseLockOwnerResponse;
     private decodeIllegalRequest;
     private decodeIllegalResponse;
+    decodeCbCompound(reader: Reader, isRequest: boolean): msg.Nfsv4CbCompoundRequest | msg.Nfsv4CbCompoundResponse | undefined;
+    private decodeCbCompoundRequest;
+    private decodeCbCompoundResponse;
+    private decodeCbRequest;
+    private decodeCbResponse;
+    private decodeCbGetattrRequest;
+    private decodeCbGetattrResponse;
+    private decodeCbRecallRequest;
+    private decodeCbRecallResponse;
+    private decodeCbIllegalRequest;
+    private decodeCbIllegalResponse;
 }

package/lib/nfs/v4/Nfsv4Decoder.js

@@ -12,26 +12,16 @@ class Nfsv4Decoder {
         this.xdr = new XdrDecoder_1.XdrDecoder(reader);
     }
     decodeCompound(reader, isRequest) {
-        this.xdr.reader = reader;
-        const startPos = reader.x;
-        try {
-            if (isRequest) {
-                return this.decodeCompoundRequest();
-            }
-            else {
-                return this.decodeCompoundResponse();
-            }
+        if (isRequest) {
+            return this.decodeCompoundRequest(reader);
         }
-        catch (err) {
-            if (err instanceof RangeError) {
-                reader.x = startPos;
-                return undefined;
-            }
-            throw err;
+        else {
+            return this.decodeCompoundResponse(reader);
         }
     }
-    decodeCompoundRequest() {
+    decodeCompoundRequest(reader) {
         const xdr = this.xdr;
+        xdr.reader = reader;
         const tag = xdr.readString();
         const minorversion = xdr.readUnsignedInt();
         const argarray = [];
@@ -44,8 +34,9 @@ class Nfsv4Decoder {
         }
         return new msg.Nfsv4CompoundRequest(tag, minorversion, argarray);
     }
-    decodeCompoundResponse() {
+    decodeCompoundResponse(reader) {
         const xdr = this.xdr;
+        xdr.reader = reader;
         const status = xdr.readUnsignedInt();
         const tag = xdr.readString();
         const resarray = [];
@@ -59,19 +50,20 @@ class Nfsv4Decoder {
         return new msg.Nfsv4CompoundResponse(status, tag, resarray);
     }
     decodeRequest(op) {
+        const xdr = this.xdr;
         switch (op) {
             case 3:
-                return this.decodeAccessRequest();
+                return msg.Nfsv4AccessRequest.decode(xdr);
             case 4:
-                return this.decodeCloseRequest();
+                return msg.Nfsv4CloseRequest.decode(xdr);
             case 5:
-                return this.decodeCommitRequest();
+                return msg.Nfsv4CommitRequest.decode(xdr);
             case 6:
                 return this.decodeCreateRequest();
             case 7:
-                return this.decodeDelegpurgeRequest();
+                return msg.Nfsv4DelegpurgeRequest.decode(xdr);
             case 8:
-                return this.decodeDelegreturnRequest();
+                return msg.Nfsv4DelegreturnRequest.decode(xdr);
             case 9:
                 return this.decodeGetattrRequest();
             case 10:
@@ -101,9 +93,9 @@ class Nfsv4Decoder {
             case 22:
                 return this.decodePutfhRequest();
             case 23:
-                return this.decodePutpubfhRequest();
+                return new msg.Nfsv4PutpubfhRequest();
             case 24:
-                return this.decodePutrootfhRequest();
+                return new msg.Nfsv4PutrootfhRequest();
             case 25:
                 return this.decodeReadRequest();
             case 26:
@@ -119,7 +111,7 @@ class Nfsv4Decoder {
             case 31:
                 return this.decodeRestorefhRequest();
             case 32:
-                return this.decodeSavefhRequest();
+                return new msg.Nfsv4SavefhRequest();
             case 33:
                 return this.decodeSecinfoRequest();
             case 34:
@@ -137,10 +129,11 @@ class Nfsv4Decoder {
             case 10044:
                 return this.decodeIllegalRequest();
             default:
-                throw new errors_1.Nfsv4DecodingError(`Unknown operation: ${op}`);
+                return this.decodeIllegalRequest();
         }
     }
     decodeResponse(op) {
+        const xdr = this.xdr;
         switch (op) {
             case 3:
                 return this.decodeAccessResponse();
@@ -183,7 +176,7 @@ class Nfsv4Decoder {
             case 22:
                 return this.decodePutfhResponse();
             case 23:
-                return this.decodePutpubfhResponse();
+                return msg.Nfsv4PutpubfhResponse.decode(xdr);
             case 24:
                 return this.decodePutrootfhResponse();
             case 25:
@@ -219,7 +212,7 @@ class Nfsv4Decoder {
             case 10044:
                 return this.decodeIllegalResponse();
             default:
-                throw new errors_1.Nfsv4DecodingError(`Unknown operation: ${op}`);
+                return this.decodeIllegalResponse();
         }
     }
     readFh() {
@@ -230,21 +223,14 @@ class Nfsv4Decoder {
         const data = this.xdr.readOpaque(8);
         return new structs.Nfsv4Verifier(data);
     }
-    readTime() {
-        const xdr = this.xdr;
-        const seconds = xdr.readHyper();
-        const nseconds = xdr.readUnsignedInt();
-        return new structs.Nfsv4Time(seconds, nseconds);
-    }
     readStateid() {
-        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);
     }
     readBitmap() {
         const xdr = this.xdr;
         const count = xdr.readUnsignedInt();
+        if (count > 8)
+            throw 10036;
         const mask = [];
         for (let i = 0; i < count; i++)
             mask.push(xdr.readUnsignedInt());
@@ -336,6 +322,26 @@ class Nfsv4Decoder {
                 throw new errors_1.Nfsv4DecodingError(`Unknown open claim type: ${claimType}`);
         }
     }
+    readOpenHow() {
+        const xdr = this.xdr;
+        const opentype = xdr.readUnsignedInt();
+        if (opentype === 0)
+            return new structs.Nfsv4OpenHow(opentype);
+        const mode = xdr.readUnsignedInt();
+        switch (mode) {
+            case 0:
+            case 1: {
+                const createattrs = this.readFattr();
+                return new structs.Nfsv4OpenHow(opentype, new structs.Nfsv4CreateHow(mode, new structs.Nfsv4CreateAttrs(createattrs)));
+            }
+            case 2: {
+                const createverf = this.readVerifier();
+                return new structs.Nfsv4OpenHow(opentype, new structs.Nfsv4CreateHow(mode, new structs.Nfsv4CreateVerf(createverf)));
+            }
+            default:
+                throw new errors_1.Nfsv4DecodingError(`Unknown create mode: ${mode}`);
+        }
+    }
     readOpenDelegation() {
         const xdr = this.xdr;
         const delegationType = xdr.readUnsignedInt();
@@ -387,10 +393,6 @@ class Nfsv4Decoder {
         }
         return new structs.Nfsv4SecInfoFlavor(flavor);
     }
-    decodeAccessRequest() {
-        const access = this.xdr.readUnsignedInt();
-        return new msg.Nfsv4AccessRequest(access);
-    }
     decodeAccessResponse() {
         const xdr = this.xdr;
         const status = xdr.readUnsignedInt();
@@ -415,12 +417,6 @@ class Nfsv4Decoder {
         }
         return new msg.Nfsv4CloseResponse(status);
     }
-    decodeCommitRequest() {
-        const xdr = this.xdr;
-        const offset = xdr.readUnsignedHyper();
-        const count = xdr.readUnsignedInt();
-        return new msg.Nfsv4CommitRequest(offset, count);
-    }
     decodeCommitResponse() {
         const status = this.xdr.readUnsignedInt();
         if (status === 0) {
@@ -433,12 +429,10 @@ class Nfsv4Decoder {
         const xdr = this.xdr;
         const type = xdr.readUnsignedInt();
         let objtype;
-        const objname = xdr.readString();
-        const createattrs = this.readFattr();
         switch (type) {
             case 5: {
                 const linkdata = xdr.readString();
-                objtype = new structs.Nfsv4CreateType(type, new structs.Nfsv4CreateTypeLink(linkdata, createattrs));
+                objtype = new structs.Nfsv4CreateType(type, new structs.Nfsv4CreateTypeLink(linkdata));
                 break;
             }
             case 3:
@@ -446,13 +440,17 @@ class Nfsv4Decoder {
                 const specdata1 = xdr.readUnsignedInt();
                 const specdata2 = xdr.readUnsignedInt();
                 const devdata = new structs.Nfsv4SpecData(specdata1, specdata2);
-                objtype = new structs.Nfsv4CreateType(type, new structs.Nfsv4CreateTypeDevice(devdata, createattrs));
+                objtype = new structs.Nfsv4CreateType(type, new structs.Nfsv4CreateTypeDevice(devdata));
+                break;
+            }
+            default: {
+                objtype = new structs.Nfsv4CreateType(type, new structs.Nfsv4CreateTypeVoid());
                 break;
             }
-            default:
-                objtype = new structs.Nfsv4CreateType(type, new structs.Nfsv4CreateTypeOther(createattrs));
         }
-        return new msg.Nfsv4CreateRequest(objtype, objname);
+        const objname = xdr.readString();
+        const createattrs = this.readFattr();
+        return new msg.Nfsv4CreateRequest(objtype, objname, createattrs);
     }
     decodeCreateResponse() {
         const status = this.xdr.readUnsignedInt();
@@ -463,18 +461,10 @@ class Nfsv4Decoder {
         }
         return new msg.Nfsv4CreateResponse(status);
     }
-    decodeDelegpurgeRequest() {
-        const clientid = this.xdr.readUnsignedHyper();
-        return new msg.Nfsv4DelegpurgeRequest(clientid);
-    }
     decodeDelegpurgeResponse() {
         const status = this.xdr.readUnsignedInt();
         return new msg.Nfsv4DelegpurgeResponse(status);
     }
-    decodeDelegreturnRequest() {
-        const delegStateid = this.readStateid();
-        return new msg.Nfsv4DelegreturnRequest(delegStateid);
-    }
     decodeDelegreturnResponse() {
         const status = this.xdr.readUnsignedInt();
         return new msg.Nfsv4DelegreturnResponse(status);
@@ -605,7 +595,7 @@ class Nfsv4Decoder {
         const shareAccess = xdr.readUnsignedInt();
         const shareDeny = xdr.readUnsignedInt();
         const owner = this.readOpenOwner();
-        const openhow = xdr.readUnsignedInt();
+        const openhow = this.readOpenHow();
         const claim = this.readOpenClaim();
         return new msg.Nfsv4OpenRequest(seqid, shareAccess, shareDeny, owner, openhow, claim);
     }
@@ -667,16 +657,6 @@ class Nfsv4Decoder {
         const status = this.xdr.readUnsignedInt();
         return new msg.Nfsv4PutfhResponse(status);
     }
-    decodePutpubfhRequest() {
-        return new msg.Nfsv4PutpubfhRequest();
-    }
-    decodePutpubfhResponse() {
-        const status = this.xdr.readUnsignedInt();
-        return new msg.Nfsv4PutpubfhResponse(status);
-    }
-    decodePutrootfhRequest() {
-        return new msg.Nfsv4PutrootfhRequest();
-    }
     decodePutrootfhResponse() {
         const status = this.xdr.readUnsignedInt();
         return new msg.Nfsv4PutrootfhResponse(status);
@@ -879,6 +859,108 @@ class Nfsv4Decoder {
         const status = this.xdr.readUnsignedInt();
         return new msg.Nfsv4IllegalResponse(status);
     }
+    decodeCbCompound(reader, isRequest) {
+        this.xdr.reader = reader;
+        const startPos = reader.x;
+        try {
+            if (isRequest) {
+                return this.decodeCbCompoundRequest();
+            }
+            else {
+                return this.decodeCbCompoundResponse();
+            }
+        }
+        catch (err) {
+            if (err instanceof RangeError) {
+                reader.x = startPos;
+                return undefined;
+            }
+            throw err;
+        }
+    }
+    decodeCbCompoundRequest() {
+        const xdr = this.xdr;
+        const tag = xdr.readString();
+        const minorversion = xdr.readUnsignedInt();
+        const callbackIdent = xdr.readUnsignedInt();
+        const argarray = [];
+        const count = xdr.readUnsignedInt();
+        for (let i = 0; i < count; i++) {
+            const op = xdr.readUnsignedInt();
+            const request = this.decodeCbRequest(op);
+            if (request)
+                argarray.push(request);
+        }
+        return new msg.Nfsv4CbCompoundRequest(tag, minorversion, callbackIdent, argarray);
+    }
+    decodeCbCompoundResponse() {
+        const xdr = this.xdr;
+        const status = xdr.readUnsignedInt();
+        const tag = xdr.readString();
+        const resarray = [];
+        const count = xdr.readUnsignedInt();
+        for (let i = 0; i < count; i++) {
+            const op = xdr.readUnsignedInt();
+            const response = this.decodeCbResponse(op);
+            if (response)
+                resarray.push(response);
+        }
+        return new msg.Nfsv4CbCompoundResponse(status, tag, resarray);
+    }
+    decodeCbRequest(op) {
+        switch (op) {
+            case 3:
+                return this.decodeCbGetattrRequest();
+            case 4:
+                return this.decodeCbRecallRequest();
+            case 10044:
+                return this.decodeCbIllegalRequest();
+            default:
+                throw new errors_1.Nfsv4DecodingError(`Unknown callback operation: ${op}`);
+        }
+    }
+    decodeCbResponse(op) {
+        switch (op) {
+            case 3:
+                return this.decodeCbGetattrResponse();
+            case 4:
+                return this.decodeCbRecallResponse();
+            case 10044:
+                return this.decodeCbIllegalResponse();
+            default:
+                throw new errors_1.Nfsv4DecodingError(`Unknown callback operation: ${op}`);
+        }
+    }
+    decodeCbGetattrRequest() {
+        const fh = this.readFh();
+        const attrRequest = this.readBitmap();
+        return new msg.Nfsv4CbGetattrRequest(fh, attrRequest);
+    }
+    decodeCbGetattrResponse() {
+        const status = this.xdr.readUnsignedInt();
+        if (status === 0) {
+            const objAttributes = this.readFattr();
+            return new msg.Nfsv4CbGetattrResponse(status, new msg.Nfsv4CbGetattrResOk(objAttributes));
+        }
+        return new msg.Nfsv4CbGetattrResponse(status);
+    }
+    decodeCbRecallRequest() {
+        const stateid = this.readStateid();
+        const truncate = this.xdr.readBoolean();
+        const fh = this.readFh();
+        return new msg.Nfsv4CbRecallRequest(stateid, truncate, fh);
+    }
+    decodeCbRecallResponse() {
+        const status = this.xdr.readUnsignedInt();
+        return new msg.Nfsv4CbRecallResponse(status);
+    }
+    decodeCbIllegalRequest() {
+        return new msg.Nfsv4CbIllegalRequest();
+    }
+    decodeCbIllegalResponse() {
+        const status = this.xdr.readUnsignedInt();
+        return new msg.Nfsv4CbIllegalResponse(status);
+    }
 }
 exports.Nfsv4Decoder = Nfsv4Decoder;
 //# sourceMappingURL=Nfsv4Decoder.js.map