@nmshd/crypto 1.0.7 → 2.0.0

package/dist/state/CryptoPrivateStateReceive.js

@@ -5,14 +5,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var CryptoPrivateStateReceive_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoPrivateStateReceive = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
-const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoError_1 = require("../CryptoError");
 const CryptoErrorCode_1 = require("../CryptoErrorCode");
 const CryptoValidation_1 = require("../CryptoValidation");
@@ -20,9 +16,6 @@ const CryptoEncryption_1 = require("../encryption/CryptoEncryption");
 const CryptoPrivateState_1 = require("./CryptoPrivateState");
 const CryptoStateType_1 = require("./CryptoStateType");
 let CryptoPrivateStateReceive = CryptoPrivateStateReceive_1 = class CryptoPrivateStateReceive extends CryptoPrivateState_1.CryptoPrivateState {
-    constructor(nonce, counter, secretKey, algorithm, id) {
-        super(nonce, counter, secretKey, algorithm, CryptoStateType_1.CryptoStateType.Receive, id);
-    }
     toJSON() {
         const obj = super.toJSON();
         obj["@type"] = "CryptoPrivateStateReceive";
@@ -47,47 +40,42 @@ let CryptoPrivateStateReceive = CryptoPrivateStateReceive_1 = class CryptoPrivat
         return plaintext;
     }
     static fromNonce(nonce, secretKey, counter = 0) {
-        return new CryptoPrivateStateReceive_1(nonce.clone(), counter, secretKey, 3 /* XCHACHA20_POLY1305 */);
+        return CryptoPrivateStateReceive_1.from({
+            nonce: nonce.clone(),
+            counter,
+            secretKey,
+            algorithm: 3 /* XCHACHA20_POLY1305 */,
+            stateType: CryptoStateType_1.CryptoStateType.Receive
+        });
     }
     static fromPublicState(publicState, secretKey, counter = 0) {
-        return Promise.resolve(new CryptoPrivateStateReceive_1(publicState.nonce.clone(), counter, secretKey, publicState.algorithm, publicState.id));
+        return CryptoPrivateStateReceive_1.from({
+            nonce: publicState.nonce.clone(),
+            counter,
+            secretKey,
+            algorithm: publicState.algorithm,
+            id: publicState.id,
+            stateType: CryptoStateType_1.CryptoStateType.Receive
+        });
     }
-    static from(obj) {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (!obj.secretKey) {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongSecretKey, "No secretKey set.");
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (!obj.nonce) {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongNonce, "No nonce set.");
-        }
-        if (typeof obj.counter === "undefined") {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongCounter, "No counter.");
+    static preFrom(value) {
+        value = super.preFrom(value);
+        CryptoValidation_1.CryptoValidation.checkBufferAsStringOrBuffer(value.nonce, 0, 24, "nonce");
+        CryptoValidation_1.CryptoValidation.checkSecretKeyForAlgorithm(value.secretKey, value.algorithm);
+        if (value.stateType) {
+            CryptoValidation_1.CryptoValidation.checkStateType(value.stateType);
         }
-        if (obj.stateType !== CryptoStateType_1.CryptoStateType.Receive) {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongType, "The given object has a wrong state type.");
-        }
-        return Promise.resolve(new CryptoPrivateStateReceive_1(CoreBuffer_1.CoreBuffer.from(obj.nonce), obj.counter, CoreBuffer_1.CoreBuffer.from(obj.secretKey), obj.algorithm, obj.id));
+        return value;
     }
-    static fromJSON(value) {
-        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.alg);
-        CryptoValidation_1.CryptoValidation.checkCounter(value.cnt);
-        CryptoValidation_1.CryptoValidation.checkSerializedBuffer(value.nnc, 0, 24, "nnc");
-        CryptoValidation_1.CryptoValidation.checkSerializedSecretKeyForAlgorithm(value.key, value.alg);
-        if (value.typ) {
-            CryptoValidation_1.CryptoValidation.checkStateType(value.typ);
-        }
-        const nonceBuffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.nnc);
-        const secretKeyBuffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.key);
-        return Promise.resolve(new CryptoPrivateStateReceive_1(nonceBuffer, value.cnt, secretKeyBuffer, value.alg, value.id));
+    static from(obj) {
+        return this.fromAny(obj);
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static fromJSON(value) {
+        return this.fromAny(value);
     }
 };
 CryptoPrivateStateReceive = CryptoPrivateStateReceive_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoPrivateStateReceive"),
-    __metadata("design:paramtypes", [CoreBuffer_1.CoreBuffer, Number, CoreBuffer_1.CoreBuffer, Number, String])
+    (0, ts_serval_1.type)("CryptoPrivateStateReceive")
 ], CryptoPrivateStateReceive);
 exports.CryptoPrivateStateReceive = CryptoPrivateStateReceive;
 //# sourceMappingURL=CryptoPrivateStateReceive.js.map

package/dist/state/CryptoPrivateStateReceive.js.map

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

package/dist/state/CryptoPrivateStateTransmit.d.ts

@@ -3,12 +3,11 @@ import { CryptoCipher } from "../encryption/CryptoCipher";
 import { CryptoEncryptionAlgorithm } from "../encryption/CryptoEncryption";
 import { CryptoPrivateState, ICryptoPrivateState, ICryptoPrivateStateSerialized } from "./CryptoPrivateState";
 export declare class CryptoPrivateStateTransmit extends CryptoPrivateState {
-    constructor(nonce: CoreBuffer, counter: number, secretKey: CoreBuffer, algorithm?: CryptoEncryptionAlgorithm, id?: string);
     toJSON(): ICryptoPrivateStateSerialized;
     encrypt(plaintext: CoreBuffer): Promise<CryptoCipher>;
     decrypt(cipher: CryptoCipher): Promise<CoreBuffer>;
     static generate(secretKey?: CoreBuffer, id?: string, algorithm?: CryptoEncryptionAlgorithm): CryptoPrivateStateTransmit;
-    static from(obj: CryptoPrivateState | ICryptoPrivateState): Promise<CryptoPrivateStateTransmit>;
-    static fromJSON(value: ICryptoPrivateStateSerialized): Promise<CryptoPrivateStateTransmit>;
-    static deserialize(value: string): Promise<CryptoPrivateStateTransmit>;
+    static from(obj: CryptoPrivateState | ICryptoPrivateState): CryptoPrivateStateTransmit;
+    protected static preFrom(value: any): any;
+    static fromJSON(value: ICryptoPrivateStateSerialized): CryptoPrivateStateTransmit;
 }

package/dist/state/CryptoPrivateStateTransmit.js

@@ -5,24 +5,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var CryptoPrivateStateTransmit_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoPrivateStateTransmit = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
-const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoError_1 = require("../CryptoError");
 const CryptoErrorCode_1 = require("../CryptoErrorCode");
 const CryptoValidation_1 = require("../CryptoValidation");
 const CryptoEncryption_1 = require("../encryption/CryptoEncryption");
 const CryptoPrivateState_1 = require("./CryptoPrivateState");
 const CryptoStateType_1 = require("./CryptoStateType");
-let CryptoPrivateStateTransmit = CryptoPrivateStateTransmit_1 = class CryptoPrivateStateTransmit extends CryptoPrivateState_1.CryptoPrivateState {
-    constructor(nonce, counter, secretKey, algorithm = 3 /* XCHACHA20_POLY1305 */, id) {
-        super(nonce, counter, secretKey, algorithm, CryptoStateType_1.CryptoStateType.Transmit, id);
-    }
+let CryptoPrivateStateTransmit = class CryptoPrivateStateTransmit extends CryptoPrivateState_1.CryptoPrivateState {
     toJSON() {
         const obj = super.toJSON();
         obj["@type"] = "CryptoPrivateStateTransmit";
@@ -48,44 +40,26 @@ let CryptoPrivateStateTransmit = CryptoPrivateStateTransmit_1 = class CryptoPriv
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongCounter);
         const nonce = CryptoEncryption_1.CryptoEncryption.createNonce(algorithm);
         const counter = 0;
-        return new CryptoPrivateStateTransmit_1(nonce, counter, secretKey, algorithm, id);
+        return this.from({ nonce, counter, secretKey, algorithm, id, stateType: CryptoStateType_1.CryptoStateType.Transmit });
     }
     static from(obj) {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (!obj.secretKey) {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongSecretKey, "No secretKey property set.");
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (!obj.nonce) {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongNonce, "No nonce nor counter property set.");
-        }
-        if (typeof obj.counter === "undefined") {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongCounter, "Wrong counter.");
-        }
-        if (obj.stateType !== CryptoStateType_1.CryptoStateType.Transmit) {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.StateWrongType, "The given object has a wrong state type.");
-        }
-        return Promise.resolve(new CryptoPrivateStateTransmit_1(CoreBuffer_1.CoreBuffer.from(obj.nonce), obj.counter, CoreBuffer_1.CoreBuffer.from(obj.secretKey), obj.algorithm, obj.id));
+        return this.fromAny(obj);
     }
-    static fromJSON(value) {
-        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.alg);
-        CryptoValidation_1.CryptoValidation.checkCounter(value.cnt);
-        CryptoValidation_1.CryptoValidation.checkSerializedBuffer(value.nnc, 0, 24, "nonce");
-        CryptoValidation_1.CryptoValidation.checkSerializedSecretKeyForAlgorithm(value.key, value.alg);
-        if (value.typ) {
-            CryptoValidation_1.CryptoValidation.checkStateType(value.typ);
+    static preFrom(value) {
+        value = super.preFrom(value);
+        CryptoValidation_1.CryptoValidation.checkBufferAsStringOrBuffer(value.nonce, 0, 24, "nonce");
+        CryptoValidation_1.CryptoValidation.checkSecretKeyForAlgorithm(value.secretKey, value.algorithm);
+        if (value.stateType) {
+            CryptoValidation_1.CryptoValidation.checkStateType(value.stateType);
         }
-        const nonceBuffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.nnc);
-        const secretKeyBuffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.key);
-        return Promise.resolve(new CryptoPrivateStateTransmit_1(nonceBuffer, value.cnt, secretKeyBuffer, value.alg, value.id));
+        return value;
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static fromJSON(value) {
+        return this.fromAny(value);
     }
 };
-CryptoPrivateStateTransmit = CryptoPrivateStateTransmit_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoPrivateStateTransmit"),
-    __metadata("design:paramtypes", [CoreBuffer_1.CoreBuffer, Number, CoreBuffer_1.CoreBuffer, Number, String])
+CryptoPrivateStateTransmit = __decorate([
+    (0, ts_serval_1.type)("CryptoPrivateStateTransmit")
 ], CryptoPrivateStateTransmit);
 exports.CryptoPrivateStateTransmit = CryptoPrivateStateTransmit;
 //# sourceMappingURL=CryptoPrivateStateTransmit.js.map

package/dist/state/CryptoPrivateStateTransmit.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoPrivateStateTransmit.js","sourceRoot":"","sources":["../../src/state/CryptoPrivateStateTransmit.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA0C;AAC1C,8CAA2C;AAC3C,gDAA6C;AAC7C,wDAAqD;AACrD,0DAAuD;AAEvD,qEAA6F;AAC7F,6DAA8G;AAC9G,uDAAoD;AAGpD,IAAa,0BAA0B,kCAAvC,MAAa,0BAA2B,SAAQ,uCAAkB;IAC9D,YACI,KAAiB,EACjB,OAAe,EACf,SAAqB,EACrB,sCAAmF,EACnF,EAAW;QAEX,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,iCAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAEM,MAAM;QACT,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,4BAA4B,CAAC;QAC5C,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,SAAqB;QACtC,MAAM,MAAM,GAAG,MAAM,mCAAgB,CAAC,kBAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9G,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC5B,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,MAAoB;QACrC,mCAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,WAAW;YAAE,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,CAAC,CAAC;QAEpG,MAAM,SAAS,GAAG,MAAM,mCAAgB,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAEhH,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAClB,SAAsB,EACtB,EAAW,EACX,sCAAmF;QAEnF,mCAAgB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACrD,mCAAgB,CAAC,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,OAAO,SAAS,KAAK,WAAW;YAAE,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,CAAC,CAAC;QAE/F,MAAM,KAAK,GAAG,mCAAgB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,CAAC,CAAC;QAElB,OAAO,IAAI,4BAA0B,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IACpF,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,GAA6C;QAC5D,uEAAuE;QACvE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAChB,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;SAC5F;QACD,uEAAuE;QACvE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACZ,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,eAAe,EAAE,oCAAoC,CAAC,CAAC;SAChG;QACD,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,WAAW,EAAE;YACpC,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;SAC9E;QAED,IAAI,GAAG,CAAC,SAAS,KAAK,iCAAe,CAAC,QAAQ,EAAE;YAC5C,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,cAAc,EAAE,0CAA0C,CAAC,CAAC;SACrG;QAED,OAAO,OAAO,CAAC,OAAO,CAClB,IAAI,4BAA0B,CAC1B,uBAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAC1B,GAAG,CAAC,OAAO,EACX,uBAAU,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAC9B,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,EAAE,CACT,CACJ,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAoC;QACvD,mCAAgB,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,mCAAgB,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,mCAAgB,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAClE,mCAAgB,CAAC,oCAAoC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAgC,CAAC,CAAC;QACzG,IAAI,KAAK,CAAC,GAAG,EAAE;YACX,mCAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC9C;QACD,MAAM,WAAW,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5D,OAAO,OAAO,CAAC,OAAO,CAClB,IAAI,4BAA0B,CAC1B,WAAW,EACX,KAAK,CAAC,GAAG,EACT,eAAe,EACf,KAAK,CAAC,GAAgC,EACtC,KAAK,CAAC,EAAE,CACX,CACJ,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAClD,CAAC;CACJ,CAAA;AArGY,0BAA0B;IADtC,IAAA,gBAAI,EAAC,4BAA4B,CAAC;qCAGpB,uBAAU,UAEN,uBAAU;GAJhB,0BAA0B,CAqGtC;AArGY,gEAA0B"}
+{"version":3,"file":"CryptoPrivateStateTransmit.js","sourceRoot":"","sources":["../../src/state/CryptoPrivateStateTransmit.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAE1C,gDAA6C;AAC7C,wDAAqD;AACrD,0DAAuD;AAEvD,qEAA6F;AAC7F,6DAA8G;AAC9G,uDAAoD;AAGpD,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,uCAAkB;IAC9C,MAAM;QAClB,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,4BAA4B,CAAC;QAC5C,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,SAAqB;QACtC,MAAM,MAAM,GAAG,MAAM,mCAAgB,CAAC,kBAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9G,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC5B,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,MAAoB;QACrC,mCAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,WAAW;YAAE,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,CAAC,CAAC;QAEpG,MAAM,SAAS,GAAG,MAAM,mCAAgB,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAEhH,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAClB,SAAsB,EACtB,EAAW,EACX,sCAAmF;QAEnF,mCAAgB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACrD,mCAAgB,CAAC,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,OAAO,SAAS,KAAK,WAAW;YAAE,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,CAAC,CAAC;QAE/F,MAAM,KAAK,GAAG,mCAAgB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,CAAC,CAAC;QAElB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,iCAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxG,CAAC;IAEM,MAAM,CAAU,IAAI,CAAC,GAA6C;QACrE,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAES,MAAM,CAAU,OAAO,CAAC,KAAU;QACxC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE7B,mCAAgB,CAAC,2BAA2B,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1E,mCAAgB,CAAC,0BAA0B,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAE9E,IAAI,KAAK,CAAC,SAAS,EAAE;YACjB,mCAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SACpD;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAU,QAAQ,CAAC,KAAoC;QAChE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACJ,CAAA;AA3DY,0BAA0B;IADtC,IAAA,gBAAI,EAAC,4BAA4B,CAAC;GACtB,0BAA0B,CA2DtC;AA3DY,gEAA0B"}

package/dist/state/CryptoPublicState.d.ts

@@ -1,4 +1,4 @@
-import { ISerializableAsync, ISerialized, SerializableAsync } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized, Serializable } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable } from "../CoreBuffer";
 import { CryptoEncryptionAlgorithm } from "../encryption/CryptoEncryption";
 import { CryptoStateType } from "./CryptoStateType";
@@ -8,26 +8,21 @@ export interface ICryptoPublicStateSerialized extends ISerialized {
     id?: string;
     typ: number;
 }
-export interface ICryptoPublicState extends ISerializableAsync {
+export interface ICryptoPublicState extends ISerializable {
     nonce: CoreBuffer;
     algorithm: CryptoEncryptionAlgorithm;
     id?: string;
     stateType: CryptoStateType;
 }
-export declare class CryptoPublicState extends SerializableAsync implements ICryptoPublicState, IClearable {
-    private readonly _id?;
-    get id(): string | undefined;
-    private readonly _nonce;
-    get nonce(): CoreBuffer;
-    private readonly _algorithm;
-    get algorithm(): CryptoEncryptionAlgorithm;
-    private readonly _stateType;
-    get stateType(): CryptoStateType;
-    constructor(nonce: CoreBuffer, algorithm: CryptoEncryptionAlgorithm, stateType: CryptoStateType, id?: string);
+export declare class CryptoPublicState extends Serializable implements ICryptoPublicState, IClearable {
+    id?: string;
+    nonce: CoreBuffer;
+    algorithm: CryptoEncryptionAlgorithm;
+    stateType: CryptoStateType;
     clear(): void;
     toJSON(verbose?: boolean): ICryptoPublicStateSerialized;
-    static from(value: CryptoPublicState | ICryptoPublicState): Promise<CryptoPublicState>;
-    static fromJSON(value: ICryptoPublicStateSerialized): Promise<CryptoPublicState>;
-    static fromBase64(value: string): Promise<CryptoPublicState>;
-    static deserialize(value: string): Promise<CryptoPublicState>;
+    protected static preFrom(value: any): any;
+    static from(value: CryptoPublicState | ICryptoPublicState): CryptoPublicState;
+    static fromJSON(value: ICryptoPublicStateSerialized): CryptoPublicState;
+    static fromBase64(value: string): CryptoPublicState;
 }

package/dist/state/CryptoPublicState.js

@@ -8,80 +8,71 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var CryptoPublicState_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoPublicState = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoValidation_1 = require("../CryptoValidation");
 const CryptoStateType_1 = require("./CryptoStateType");
-let CryptoPublicState = CryptoPublicState_1 = class CryptoPublicState extends ts_serval_1.SerializableAsync {
-    constructor(nonce, algorithm, stateType, id) {
-        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(algorithm);
-        CryptoValidation_1.CryptoValidation.checkNonceForAlgorithm(nonce, algorithm);
-        CryptoValidation_1.CryptoValidation.checkStateType(stateType);
-        super();
-        this._nonce = nonce;
-        this._algorithm = algorithm;
-        this._id = id;
-        this._stateType = stateType;
-    }
-    get id() {
-        return this._id;
-    }
-    get nonce() {
-        return this._nonce;
-    }
-    get algorithm() {
-        return this._algorithm;
-    }
-    get stateType() {
-        return this._stateType;
-    }
+let CryptoPublicState = class CryptoPublicState extends ts_serval_1.Serializable {
     clear() {
         this.nonce.clear();
     }
     toJSON(verbose = true) {
-        const obj = {
+        return {
+            "@type": verbose ? "CryptoPublicState" : undefined,
             nnc: this.nonce.toBase64URL(),
             alg: this.algorithm,
-            typ: this.stateType
+            typ: this.stateType,
+            id: this.id
         };
-        if (this.id) {
-            obj.id = this.id;
-        }
-        if (verbose) {
-            obj["@type"] = "CryptoPublicState";
+    }
+    static preFrom(value) {
+        if (value.nnc) {
+            value = {
+                nonce: value.nnc,
+                algorithm: value.alg,
+                stateType: value.typ,
+                id: value.id
+            };
         }
-        return obj;
+        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.algorithm);
+        CryptoValidation_1.CryptoValidation.checkStateType(value.stateType);
+        CryptoValidation_1.CryptoValidation.checkNonce(value.nonce, value.algorithm);
+        return value;
     }
     static from(value) {
-        return Promise.resolve(new CryptoPublicState_1(value.nonce, value.algorithm, value.stateType, value.id));
+        return this.fromAny(value);
     }
     static fromJSON(value) {
-        let error;
-        error = CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.alg);
-        if (error)
-            throw error;
-        error = CryptoValidation_1.CryptoValidation.checkStateType(value.typ);
-        if (error)
-            throw error;
-        error = CryptoValidation_1.CryptoValidation.checkNonceAsString(value.nnc, value.alg);
-        if (error)
-            throw error;
-        const buffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.nnc);
-        return Promise.resolve(new CryptoPublicState_1(buffer, value.alg, value.typ, value.id));
-    }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+        return this.fromAny(value);
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
 };
-CryptoPublicState = CryptoPublicState_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoPublicState"),
-    __metadata("design:paramtypes", [CoreBuffer_1.CoreBuffer, Number, Number, String])
+__decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", String)
+], CryptoPublicState.prototype, "id", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoPublicState.prototype, "nonce", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoPublicState.prototype, "algorithm", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoPublicState.prototype, "stateType", void 0);
+CryptoPublicState = __decorate([
+    (0, ts_serval_1.type)("CryptoPublicState")
 ], CryptoPublicState);
 exports.CryptoPublicState = CryptoPublicState;
 //# sourceMappingURL=CryptoPublicState.js.map

package/dist/state/CryptoPublicState.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoPublicState.js","sourceRoot":"","sources":["../../src/state/CryptoPublicState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CryptoPublicState.js","sourceRoot":"","sources":["../../src/state/CryptoPublicState.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAyG;AACzG,8CAAuD;AACvD,0DAAuD;AAEvD,uDAAoD;AAiBpD,IAAa,iBAAiB,GAA9B,MAAa,iBAAkB,SAAQ,wBAAY;IAiBxC,KAAK;QACR,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAEe,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS;YAClD,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAC7B,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAC;IACN,CAAC;IAES,MAAM,CAAU,OAAO,CAAC,KAAU;QACxC,IAAI,KAAK,CAAC,GAAG,EAAE;YACX,KAAK,GAAG;gBACJ,KAAK,EAAE,KAAK,CAAC,GAAG;gBAChB,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,EAAE,EAAE,KAAK,CAAC,EAAE;aACf,CAAC;SACL;QAED,mCAAgB,CAAC,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3D,mCAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjD,mCAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAE1D,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAA6C;QAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAmC;QACtD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAxDG;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;6CACO;AAInB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACE,uBAAU;gDAAC;AAIzB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;oDACgC;AAI5C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;oDACsB;AAfzB,iBAAiB;IAD7B,IAAA,gBAAI,EAAC,mBAAmB,CAAC;GACb,iBAAiB,CA2D7B;AA3DY,8CAAiB"}

package/dist/stream/CryptoStream.js

@@ -33,12 +33,15 @@ let CryptoStream = class CryptoStream {
         const sodium = await SodiumWrapper_1.SodiumWrapper.ready();
         const stream = sodium.crypto_secretstream_xchacha20poly1305_init_push(key.buffer);
         const headerBuffer = CoreBuffer_1.CoreBuffer.from(stream.header);
-        return new CryptoStreamState_1.CryptoStreamState(new CryptoStreamAddress_1.CryptoStreamAddress(stream.state), new CryptoStreamHeader_1.CryptoStreamHeader(headerBuffer));
+        return CryptoStreamState_1.CryptoStreamState.from({
+            address: CryptoStreamAddress_1.CryptoStreamAddress.from(stream.state),
+            header: CryptoStreamHeader_1.CryptoStreamHeader.from(headerBuffer)
+        });
     }
     static async initClient(header, key) {
         const sodium = await SodiumWrapper_1.SodiumWrapper.ready();
         const stream = sodium.crypto_secretstream_xchacha20poly1305_init_pull(header.header.buffer, key.buffer);
-        return new CryptoStreamAddress_1.CryptoStreamAddress(stream);
+        return CryptoStreamAddress_1.CryptoStreamAddress.from(stream);
     }
     static async encrypt(message, stream) {
         const sodium = await SodiumWrapper_1.SodiumWrapper.ready();

package/dist/stream/CryptoStream.js.map

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

package/dist/stream/CryptoStreamAddress.d.ts

@@ -1,6 +1,6 @@
-import { ISerializableAsync, SerializableAsync } from "@js-soft/ts-serval";
-export interface ICryptoStreamAddress extends ISerializableAsync {
-    readonly address: string;
+import { ISerializable, Serializable } from "@js-soft/ts-serval";
+export interface ICryptoStreamAddress extends ISerializable {
+    address: string;
     toString(): string;
     serialize(): string;
 }
@@ -9,12 +9,9 @@ export interface ICryptoStreamAddressStatic {
     from(obj: ICryptoStreamAddress): Promise<ICryptoStreamAddress>;
     deserialize(content: string): Promise<ICryptoStreamAddress>;
 }
-export declare class CryptoStreamAddress extends SerializableAsync implements ICryptoStreamAddress {
-    readonly address: string;
-    constructor(address: string);
+export declare class CryptoStreamAddress extends Serializable implements ICryptoStreamAddress {
+    address: string;
     toString(): string;
-    serialize(): string;
-    toJSON(): Object;
-    static from(obj: any | string): Promise<CryptoStreamAddress>;
-    static deserialize(value: string): Promise<CryptoStreamAddress>;
+    protected static preFrom(obj: any): any;
+    static from(obj: any | string): CryptoStreamAddress;
 }

package/dist/stream/CryptoStreamAddress.js

@@ -8,46 +8,30 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var CryptoStreamAddress_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoStreamAddress = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
-let CryptoStreamAddress = CryptoStreamAddress_1 = class CryptoStreamAddress extends ts_serval_1.SerializableAsync {
-    constructor(address) {
-        super();
-        this.address = address;
-    }
+let CryptoStreamAddress = class CryptoStreamAddress extends ts_serval_1.Serializable {
     toString() {
         return this.serialize();
     }
-    serialize() {
-        const obj = this.toJSON();
-        return JSON.stringify(obj);
-    }
-    toJSON() {
-        const obj = {
-            "@type": "CryptoStreamAddress",
-            address: this.address
-        };
-        return obj;
-    }
-    static from(obj) {
+    static preFrom(obj) {
         if (typeof obj === "string") {
-            return Promise.resolve(new CryptoStreamAddress_1(obj));
-        }
-        if (!obj.address) {
-            throw new Error("No address property set.");
+            return { address: obj };
         }
-        return Promise.resolve(new CryptoStreamAddress_1(obj.address));
+        return obj;
     }
-    static async deserialize(value) {
-        const obj = JSON.parse(value);
-        return await this.from(obj);
+    static from(obj) {
+        return this.fromAny(obj);
     }
 };
-CryptoStreamAddress = CryptoStreamAddress_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoStreamAddress"),
-    __metadata("design:paramtypes", [String])
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", String)
+], CryptoStreamAddress.prototype, "address", void 0);
+CryptoStreamAddress = __decorate([
+    (0, ts_serval_1.type)("CryptoStreamAddress")
 ], CryptoStreamAddress);
 exports.CryptoStreamAddress = CryptoStreamAddress;
 //# sourceMappingURL=CryptoStreamAddress.js.map

package/dist/stream/CryptoStreamAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoStreamAddress.js","sourceRoot":"","sources":["../../src/stream/CryptoStreamAddress.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAiF;AAejF,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,6BAAiB;IAGtD,YAAmB,OAAe;QAC9B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAEM,SAAS;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM;QACT,MAAM,GAAG,GAAG;YACR,OAAO,EAAE,qBAAqB;YAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;SACxB,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,GAAiB;QAChC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,qBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;SACxD;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC/C;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,qBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACjE,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACJ,CAAA;AAxCY,mBAAmB;IAD/B,IAAA,gBAAI,EAAC,qBAAqB,CAAC;;GACf,mBAAmB,CAwC/B;AAxCY,kDAAmB"}
+{"version":3,"file":"CryptoStreamAddress.js","sourceRoot":"","sources":["../../src/stream/CryptoStreamAddress.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA4F;AAe5F,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,wBAAY;IAKjC,QAAQ;QACpB,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAES,MAAM,CAAU,OAAO,CAAC,GAAQ;QACtC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;SAC3B;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,GAAiB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CACJ,CAAA;AAjBG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;oDACW;AAHd,mBAAmB;IAD/B,IAAA,gBAAI,EAAC,qBAAqB,CAAC;GACf,mBAAmB,CAoB/B;AApBY,kDAAmB"}

package/dist/stream/CryptoStreamHeader.d.ts

@@ -1,23 +1,20 @@
-import { ISerializableAsync, SerializableAsync } from "@js-soft/ts-serval";
-import { ICoreBuffer } from "../CoreBuffer";
-export interface ICryptoStreamHeader extends ISerializableAsync {
-    readonly header: ICoreBuffer;
-    toString(): string;
-    serialize(): string;
+import { ISerializable, Serializable } from "@js-soft/ts-serval";
+import { CoreBuffer, ICoreBuffer } from "../CoreBuffer";
+export interface ICryptoStreamHeader extends ISerializable {
+    header: ICoreBuffer;
 }
 export interface ICryptoStreamHeaderStatic {
     new (): ICryptoStreamHeader;
     from(obj: ICryptoStreamHeader): Promise<ICryptoStreamHeader>;
     deserialize(content: string): Promise<ICryptoStreamHeader>;
 }
-export declare class CryptoStreamHeader extends SerializableAsync implements ICryptoStreamHeader {
-    readonly header: ICoreBuffer;
-    constructor(header: ICoreBuffer);
+export declare class CryptoStreamHeader extends Serializable implements ICryptoStreamHeader {
+    header: CoreBuffer;
     toString(): string;
     serialize(): string;
     toJSON(): Object;
     toBase64(): string;
-    static from(obj: any): Promise<CryptoStreamHeader>;
-    static deserialize(value: string): Promise<CryptoStreamHeader>;
-    static fromBase64(value: string): Promise<CryptoStreamHeader>;
+    protected static preFrom(value: any): any;
+    static from(obj: ICryptoStreamHeader | CoreBuffer): CryptoStreamHeader;
+    static fromBase64(value: string): CryptoStreamHeader;
 }