@nmshd/crypto 1.0.8 → 1.0.9

package/dist/exchange/CryptoExchangePrivateKey.d.ts

@@ -1,4 +1,4 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
 import { CryptoPrivateKey } from "../CryptoPrivateKey";
 import { CryptoExchangeAlgorithm } from "./CryptoExchange";
@@ -7,7 +7,7 @@ export interface ICryptoExchangePrivateKeySerialized extends ISerialized {
     alg: number;
     prv: string;
 }
-export interface ICryptoExchangePrivateKey extends ISerializableAsync {
+export interface ICryptoExchangePrivateKey extends ISerializable {
     algorithm: CryptoExchangeAlgorithm;
     privateKey: ICoreBuffer;
 }
@@ -20,8 +20,8 @@ export declare class CryptoExchangePrivateKey extends CryptoPrivateKey implement
     serialize(verbose?: boolean): string;
     toBase64(verbose?: boolean): string;
     toPublicKey(): Promise<CryptoExchangePublicKey>;
-    static from(value: CryptoExchangePrivateKey | ICryptoExchangePrivateKey): Promise<CryptoExchangePrivateKey>;
-    static fromJSON(value: ICryptoExchangePrivateKeySerialized): Promise<CryptoExchangePrivateKey>;
-    static fromBase64(value: string): Promise<CryptoExchangePrivateKey>;
-    static deserialize(value: string): Promise<CryptoExchangePrivateKey>;
+    static from(value: CryptoExchangePrivateKey | ICryptoExchangePrivateKey): CryptoExchangePrivateKey;
+    static fromJSON(value: ICryptoExchangePrivateKeySerialized): CryptoExchangePrivateKey;
+    static fromBase64(value: string): CryptoExchangePrivateKey;
+    static deserialize(value: string): CryptoExchangePrivateKey;
 }

package/dist/exchange/CryptoExchangePrivateKey.js

@@ -47,19 +47,19 @@ let CryptoExchangePrivateKey = CryptoExchangePrivateKey_1 = class CryptoExchange
         return await CryptoExchange_1.CryptoExchange.privateKeyToPublicKey(this);
     }
     static from(value) {
-        return Promise.resolve(new CryptoExchangePrivateKey_1(value.algorithm, CoreBuffer_1.CoreBuffer.from(value.privateKey)));
+        return new CryptoExchangePrivateKey_1(value.algorithm, CoreBuffer_1.CoreBuffer.from(value.privateKey));
     }
     static fromJSON(value) {
         CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(value.alg);
         CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePrivateKeyAsNumber(value.prv, value.alg, "privateKey");
         const buffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.prv);
-        return Promise.resolve(new CryptoExchangePrivateKey_1(value.alg, buffer));
+        return new CryptoExchangePrivateKey_1(value.alg, buffer);
     }
     static fromBase64(value) {
         return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static deserialize(value) {
+        return this.fromJSON(JSON.parse(value));
     }
 };
 CryptoExchangePrivateKey = CryptoExchangePrivateKey_1 = __decorate([

package/dist/exchange/CryptoExchangePrivateKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchangePrivateKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePrivateKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA2E;AAC3E,8CAAoE;AACpE,0DAAuD;AACvD,qDAA2E;AAE3E,yEAAsE;AAatE,IAAa,wBAAwB,gCAArC,MAAa,wBAAyB,SAAQ,mCAAgB;IAI1D,YAAmB,SAAkC,EAAE,UAAsB;QACzE,mDAAwB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEhF,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAE7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAAwC;YAC7C,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;YAClC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,0BAA0B,CAAC;SAC7C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAEM,SAAS,CAAC,OAAO,GAAG,IAAI;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAChD,CAAC;IAEM,QAAQ,CAAC,OAAO,GAAG,IAAI;QAC1B,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,OAAO,MAAM,+BAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAA2D;QAC1E,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,0BAAwB,CAAC,KAAK,CAAC,SAAS,EAAE,uBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7G,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAA0C;QAC7D,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CACpD,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,GAA8B,EACpC,YAAY,CACf,CAAC;QAEF,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,0BAAwB,CAAC,KAAK,CAAC,GAA8B,EAAE,MAAM,CAAC,CAAC,CAAC;IACvG,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,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;AAhEY,wBAAwB;IADpC,IAAA,gBAAI,EAAC,0BAA0B,CAAC;6CAKsC,uBAAU;GAJpE,wBAAwB,CAgEpC;AAhEY,4DAAwB"}
+{"version":3,"file":"CryptoExchangePrivateKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePrivateKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAsE;AACtE,8CAAoE;AACpE,0DAAuD;AACvD,qDAA2E;AAE3E,yEAAsE;AAatE,IAAa,wBAAwB,gCAArC,MAAa,wBAAyB,SAAQ,mCAAgB;IAI1D,YAAmB,SAAkC,EAAE,UAAsB;QACzE,mDAAwB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEhF,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAE7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAAwC;YAC7C,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;YAClC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,0BAA0B,CAAC;SAC7C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAEM,SAAS,CAAC,OAAO,GAAG,IAAI;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAChD,CAAC;IAEM,QAAQ,CAAC,OAAO,GAAG,IAAI;QAC1B,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,OAAO,MAAM,+BAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAA2D;QAC1E,OAAO,IAAI,0BAAwB,CAAC,KAAK,CAAC,SAAS,EAAE,uBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAC5F,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAA0C;QAC7D,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CACpD,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,GAA8B,EACpC,YAAY,CACf,CAAC;QAEF,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAI,0BAAwB,CAAC,KAAK,CAAC,GAA8B,EAAE,MAAM,CAAC,CAAC;IACtF,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa;QACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAA;AAhEY,wBAAwB;IADpC,IAAA,gBAAI,EAAC,0BAA0B,CAAC;6CAKsC,uBAAU;GAJpE,wBAAwB,CAgEpC;AAhEY,4DAAwB"}

package/dist/exchange/CryptoExchangePublicKey.d.ts

@@ -16,8 +16,8 @@ export declare class CryptoExchangePublicKey extends CryptoPublicKey implements
     constructor(algorithm: CryptoExchangeAlgorithm, publicKey: CoreBuffer);
     toJSON(verbose?: boolean): ICryptoExchangePublicKeySerialized;
     clear(): void;
-    static from(value: CryptoExchangePublicKey | ICryptoExchangePublicKey): Promise<CryptoExchangePublicKey>;
-    static fromJSON(value: ICryptoExchangePublicKeySerialized): Promise<CryptoExchangePublicKey>;
-    static fromBase64(value: string): Promise<CryptoExchangePublicKey>;
-    static deserialize(value: string): Promise<CryptoExchangePublicKey>;
+    static from(value: CryptoExchangePublicKey | ICryptoExchangePublicKey): CryptoExchangePublicKey;
+    static fromJSON(value: ICryptoExchangePublicKeySerialized): CryptoExchangePublicKey;
+    static fromBase64(value: string): CryptoExchangePublicKey;
+    static deserialize(value: string): CryptoExchangePublicKey;
 }

package/dist/exchange/CryptoExchangePublicKey.js

@@ -37,23 +37,23 @@ let CryptoExchangePublicKey = CryptoExchangePublicKey_1 = class CryptoExchangePu
         this.publicKey.clear();
     }
     static from(value) {
-        return Promise.resolve(new CryptoExchangePublicKey_1(value.algorithm, value.publicKey));
+        return new CryptoExchangePublicKey_1(value.algorithm, value.publicKey);
     }
-    static async fromJSON(value) {
+    static fromJSON(value) {
         CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(value.alg);
         CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePrivateKeyAsNumber(value.pub, value.alg, "publicKey");
         const buffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.pub);
-        return await this.from({
+        return this.from({
             algorithm: value.alg,
             publicKey: buffer
         });
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
+    static deserialize(value) {
         const obj = JSON.parse(value);
-        return await this.fromJSON(obj);
+        return this.fromJSON(obj);
     }
 };
 CryptoExchangePublicKey = CryptoExchangePublicKey_1 = __decorate([

package/dist/exchange/CryptoExchangePublicKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchangePublicKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePublicKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAuD;AACvD,8CAAuD;AACvD,wDAAqD;AAErD,yEAAsE;AAatE,IAAa,uBAAuB,+BAApC,MAAa,uBAAwB,SAAQ,iCAAe;IAIxD,YAAmB,SAAkC,EAAE,SAAqB;QACxE,mDAAwB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC3D,mDAAwB,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE9E,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAAuC;YAC5C,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YACjC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,yBAAyB,CAAC;SAC5C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyD;QACxE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,yBAAuB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1F,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAyC;QAClE,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CACpD,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,GAA8B,EACpC,WAAW,CACd,CAAC;QAEF,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,KAAK,CAAC,GAA8B;YAC/C,SAAS,EAAE,MAAM;SACpB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAa;QACxC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,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,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAxDY,uBAAuB;IADnC,IAAA,gBAAI,EAAC,yBAAyB,CAAC;6CAKsC,uBAAU;GAJnE,uBAAuB,CAwDnC;AAxDY,0DAAuB"}
+{"version":3,"file":"CryptoExchangePublicKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePublicKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAuD;AACvD,8CAAuD;AACvD,wDAAqD;AAErD,yEAAsE;AAatE,IAAa,uBAAuB,+BAApC,MAAa,uBAAwB,SAAQ,iCAAe;IAIxD,YAAmB,SAAkC,EAAE,SAAqB;QACxE,mDAAwB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC3D,mDAAwB,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE9E,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAAuC;YAC5C,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YACjC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,yBAAyB,CAAC;SAC5C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyD;QACxE,OAAO,IAAI,yBAAuB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACzE,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAyC;QAC5D,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CACpD,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,GAA8B,EACpC,WAAW,CACd,CAAC;QAEF,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,SAAS,EAAE,KAAK,CAAC,GAA8B;YAC/C,SAAS,EAAE,MAAM;SACpB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa;QACnC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AAxDY,uBAAuB;IADnC,IAAA,gBAAI,EAAC,yBAAyB,CAAC;6CAKsC,uBAAU;GAJnE,uBAAuB,CAwDnC;AAxDY,0DAAuB"}

package/dist/exchange/CryptoExchangeSecrets.d.ts

@@ -1,18 +1,18 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoEncryptionAlgorithm } from "../encryption/CryptoEncryption";
 export interface ICryptoExchangeSecretsSerialized extends ISerialized {
     alg: CryptoEncryptionAlgorithm;
     rx: string;
     tx: string;
 }
-export interface ICryptoExchangeSecrets extends ISerializableAsync {
+export interface ICryptoExchangeSecrets extends ISerializable {
     algorithm: CryptoEncryptionAlgorithm;
     receivingKey: ICoreBuffer;
     transmissionKey: ICoreBuffer;
 }
-export declare class CryptoExchangeSecrets extends CryptoSerializableAsync implements ICryptoExchangeSecrets, IClearable {
+export declare class CryptoExchangeSecrets extends CryptoSerializable implements ICryptoExchangeSecrets, IClearable {
     readonly algorithm: CryptoEncryptionAlgorithm;
     readonly receivingKey: CoreBuffer;
     readonly transmissionKey: CoreBuffer;
@@ -21,8 +21,8 @@ export declare class CryptoExchangeSecrets extends CryptoSerializableAsync imple
     clear(): void;
     serialize(verbose?: boolean): string;
     toBase64(verbose?: boolean): string;
-    static from(value: CryptoExchangeSecrets | ICryptoExchangeSecrets): Promise<CryptoExchangeSecrets>;
-    static fromJSON(value: ICryptoExchangeSecretsSerialized): Promise<CryptoExchangeSecrets>;
+    static from(value: CryptoExchangeSecrets | ICryptoExchangeSecrets): CryptoExchangeSecrets;
+    static fromJSON(value: ICryptoExchangeSecretsSerialized): CryptoExchangeSecrets;
     static fromBase64(value: string): Promise<CryptoExchangeSecrets>;
-    static deserialize(value: string): Promise<CryptoExchangeSecrets>;
+    static deserialize(value: string): CryptoExchangeSecrets;
 }

package/dist/exchange/CryptoExchangeSecrets.js

@@ -13,8 +13,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoExchangeSecrets = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
-let CryptoExchangeSecrets = CryptoExchangeSecrets_1 = class CryptoExchangeSecrets extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+const CryptoSerializable_1 = require("../CryptoSerializable");
+let CryptoExchangeSecrets = CryptoExchangeSecrets_1 = class CryptoExchangeSecrets extends CryptoSerializable_1.CryptoSerializable {
     constructor(receivingKey, transmissionKey, algorithm) {
         super();
         this.receivingKey = receivingKey;
@@ -49,7 +49,7 @@ let CryptoExchangeSecrets = CryptoExchangeSecrets_1 = class CryptoExchangeSecret
         }
         const receivingKey = CoreBuffer_1.CoreBuffer.from(value.receivingKey);
         const transmissionKey = CoreBuffer_1.CoreBuffer.from(value.transmissionKey);
-        return Promise.resolve(new CryptoExchangeSecrets_1(receivingKey, transmissionKey, value.algorithm));
+        return new CryptoExchangeSecrets_1(receivingKey, transmissionKey, value.algorithm);
     }
     static fromJSON(value) {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -58,14 +58,14 @@ let CryptoExchangeSecrets = CryptoExchangeSecrets_1 = class CryptoExchangeSecret
         }
         const receivingKey = CoreBuffer_1.CoreBuffer.fromBase64URL(value.rx);
         const transmissionKey = CoreBuffer_1.CoreBuffer.fromBase64URL(value.tx);
-        return Promise.resolve(new CryptoExchangeSecrets_1(receivingKey, transmissionKey, value.alg));
+        return new CryptoExchangeSecrets_1(receivingKey, transmissionKey, value.alg);
     }
     static fromBase64(value) {
         return Promise.resolve(this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value)));
     }
-    static async deserialize(value) {
+    static deserialize(value) {
         const obj = JSON.parse(value);
-        return await this.fromJSON(obj);
+        return this.fromJSON(obj);
     }
 };
 CryptoExchangeSecrets = CryptoExchangeSecrets_1 = __decorate([

package/dist/exchange/CryptoExchangeSecrets.js.map

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

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,qDAAmC;AACnC,+CAA6B;AAC7B,qDAAmC;AACnC,gDAA8B;AAC9B,oDAAkC;AAClC,qDAAmC;AACnC,oDAAkC;AAClC,qDAAmC;AACnC,4DAA0C;AAC1C,gEAA8C;AAC9C,+DAA6C;AAC7C,4DAA0C;AAC1C,mEAAiD;AACjD,sEAAoD;AACpD,qEAAmD;AACnD,mEAAiD;AACjD,sEAAoD;AACpD,oDAAkC;AAClC,mEAAiD;AACjD,wDAAsC;AACtC,iFAA+D;AAC/D,kFAAgE;AAChE,kFAAgE;AAChE,2EAAyD;AACzD,wEAAsD;AACtD,8DAA4C;AAC5C,qEAAmD;AACnD,wEAAsD;AACtD,uEAAqD;AACrD,+DAA6C;AAC7C,wEAAsD;AACtD,kDAAgC;AAChC,6DAA2C;AAC3C,oEAAkD;AAClD,qEAAmD;AACnD,4DAA0C;AAC1C,0DAAwC;AACxC,wDAAsC;AACtC,+DAA6C;AAC7C,6DAA2C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qDAAmC;AACnC,+CAA6B;AAC7B,qDAAmC;AACnC,gDAA8B;AAC9B,oDAAkC;AAClC,qDAAmC;AACnC,oDAAkC;AAClC,qDAAmC;AACnC,4DAA0C;AAC1C,gEAA8C;AAC9C,+DAA6C;AAC7C,4DAA0C;AAC1C,mEAAiD;AACjD,sEAAoD;AACpD,qEAAmD;AACnD,mEAAiD;AACjD,sEAAoD;AACpD,oDAAkC;AAClC,mEAAiD;AACjD,wDAAsC;AACtC,iFAA+D;AAC/D,kFAAgE;AAChE,kFAAgE;AAChE,2EAAyD;AACzD,wEAAsD;AACtD,8DAA4C;AAC5C,qEAAmD;AACnD,wEAAsD;AACtD,uEAAqD;AACrD,+DAA6C;AAC7C,wEAAsD;AACtD,kDAAgC;AAChC,6DAA2C;AAC3C,oEAAkD;AAClD,qEAAmD;AACnD,4DAA0C;AAC1C,0DAAwC;AACxC,wDAAsC;AACtC,+DAA6C;AAC7C,6DAA2C"}

package/dist/relationship/CryptoRelationshipPublicRequest.d.ts

@@ -1,6 +1,6 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoExchangePublicKey, ICryptoExchangePublicKey, ICryptoExchangePublicKeySerialized } from "../exchange/CryptoExchangePublicKey";
 import { CryptoSignaturePublicKey, ICryptoSignaturePublicKey, ICryptoSignaturePublicKeySerialized } from "../signature/CryptoSignaturePublicKey";
 export interface ICryptoRelationshipPublicRequestSerialized extends ISerialized {
@@ -10,14 +10,14 @@ export interface ICryptoRelationshipPublicRequestSerialized extends ISerialized
     eph: ICryptoExchangePublicKeySerialized;
     nnc: string;
 }
-export interface ICryptoRelationshipPublicRequest extends ISerializableAsync {
+export interface ICryptoRelationshipPublicRequest extends ISerializable {
     id?: string;
     exchangeKey: ICryptoExchangePublicKey;
     signatureKey: ICryptoSignaturePublicKey;
     ephemeralKey: ICryptoExchangePublicKey;
     nonce: ICoreBuffer;
 }
-export declare class CryptoRelationshipPublicRequest extends CryptoSerializableAsync implements ICryptoRelationshipPublicRequest, IClearable {
+export declare class CryptoRelationshipPublicRequest extends CryptoSerializable implements ICryptoRelationshipPublicRequest, IClearable {
     id?: string;
     signatureKey: CryptoSignaturePublicKey;
     exchangeKey: CryptoExchangePublicKey;
@@ -26,8 +26,8 @@ export declare class CryptoRelationshipPublicRequest extends CryptoSerializableA
     constructor(signatureKey: CryptoSignaturePublicKey, exchangeKey: CryptoExchangePublicKey, ephemeralKey: CryptoExchangePublicKey, nonce: CoreBuffer);
     toJSON(verbose?: boolean): ICryptoRelationshipPublicRequestSerialized;
     clear(): void;
-    static from(value: CryptoRelationshipPublicRequest | ICryptoRelationshipPublicRequest): Promise<CryptoRelationshipPublicRequest>;
-    static fromJSON(value: ICryptoRelationshipPublicRequestSerialized): Promise<CryptoRelationshipPublicRequest>;
-    static fromBase64(value: string): Promise<CryptoRelationshipPublicRequest>;
-    static deserialize(value: string): Promise<CryptoRelationshipPublicRequest>;
+    static from(value: CryptoRelationshipPublicRequest | ICryptoRelationshipPublicRequest): CryptoRelationshipPublicRequest;
+    static fromJSON(value: ICryptoRelationshipPublicRequestSerialized): CryptoRelationshipPublicRequest;
+    static fromBase64(value: string): CryptoRelationshipPublicRequest;
+    static deserialize(value: string): CryptoRelationshipPublicRequest;
 }

package/dist/relationship/CryptoRelationshipPublicRequest.js

@@ -13,10 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoRelationshipPublicRequest = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoExchangePublicKey_1 = require("../exchange/CryptoExchangePublicKey");
 const CryptoSignaturePublicKey_1 = require("../signature/CryptoSignaturePublicKey");
-let CryptoRelationshipPublicRequest = CryptoRelationshipPublicRequest_1 = class CryptoRelationshipPublicRequest extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+let CryptoRelationshipPublicRequest = CryptoRelationshipPublicRequest_1 = class CryptoRelationshipPublicRequest extends CryptoSerializable_1.CryptoSerializable {
     constructor(signatureKey, exchangeKey, ephemeralKey, nonce) {
         super();
         this.signatureKey = signatureKey;
@@ -42,29 +42,25 @@ let CryptoRelationshipPublicRequest = CryptoRelationshipPublicRequest_1 = class
         this.ephemeralKey.clear();
         this.nonce.clear();
     }
-    static async from(value) {
-        const [signatureKey, exchangeKey, ephemeralKey, nonce] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.from(value.signatureKey),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.exchangeKey),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.ephemeralKey),
-            CoreBuffer_1.CoreBuffer.from(value.nonce)
-        ]);
+    static from(value) {
+        const signatureKey = CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.from(value.signatureKey);
+        const exchangeKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.exchangeKey);
+        const ephemeralKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.ephemeralKey);
+        const nonce = CoreBuffer_1.CoreBuffer.from(value.nonce);
         return new CryptoRelationshipPublicRequest_1(signatureKey, exchangeKey, ephemeralKey, nonce);
     }
-    static async fromJSON(value) {
-        const [signatureKey, exchangeKey, ephemeralKey, nonce] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.fromJSON(value.sig),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.exc),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.eph),
-            CoreBuffer_1.CoreBuffer.fromBase64URL(value.nnc)
-        ]);
+    static fromJSON(value) {
+        const signatureKey = CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.fromJSON(value.sig);
+        const exchangeKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.exc);
+        const ephemeralKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.eph);
+        const nonce = CoreBuffer_1.CoreBuffer.fromBase64URL(value.nnc);
         return new CryptoRelationshipPublicRequest_1(signatureKey, exchangeKey, ephemeralKey, nonce);
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static deserialize(value) {
+        return this.fromJSON(JSON.parse(value));
     }
 };
 __decorate([

package/dist/relationship/CryptoRelationshipPublicRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoRelationshipPublicRequest.js","sourceRoot":"","sources":["../../src/relationship/CryptoRelationshipPublicRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CryptoRelationshipPublicRequest.js","sourceRoot":"","sources":["../../src/relationship/CryptoRelationshipPublicRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA2F;AAC3F,8CAAoE;AACpE,8DAA2D;AAC3D,iFAI6C;AAC7C,oFAI+C;AAmB/C,IAAa,+BAA+B,uCAA5C,MAAa,+BACT,SAAQ,uCAAkB;IAuB1B,YACI,YAAsC,EACtC,WAAoC,EACpC,YAAqC,EACrC,KAAiB;QAEjB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAA+C;YACpD,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;YACpC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;YACpC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;SAChC,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,iCAAiC,CAAC;SACpD;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,IAAI,CACd,KAAyE;QAEzE,MAAM,YAAY,GAAG,mDAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,iDAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,YAAY,GAAG,iDAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,uBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAE3C,OAAO,IAAI,iCAA+B,CAAC,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IAC/F,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAiD;QACpE,MAAM,YAAY,GAAG,mDAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,iDAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,iDAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAElD,OAAO,IAAI,iCAA+B,CAAC,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IAC/F,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa;QACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAA;AA/EG;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;2DACO;AAInB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACS,mDAAwB;qEAAC;AAI9C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACQ,iDAAuB;oEAAC;AAI5C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACS,iDAAuB;qEAAC;AAI7C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACE,uBAAU;8DAAC;AAtBhB,+BAA+B;IAD3C,IAAA,gBAAI,EAAC,iCAAiC,CAAC;qCA0BlB,mDAAwB;QACzB,iDAAuB;QACtB,iDAAuB;QAC9B,uBAAU;GA5BZ,+BAA+B,CAqF3C;AArFY,0EAA+B"}

package/dist/relationship/CryptoRelationshipPublicResponse.d.ts

@@ -1,6 +1,6 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoExchangePublicKey, ICryptoExchangePublicKey, ICryptoExchangePublicKeySerialized } from "../exchange/CryptoExchangePublicKey";
 import { CryptoSignature } from "../signature/CryptoSignature";
 import { CryptoSignaturePublicKey, ICryptoSignaturePublicKey, ICryptoSignaturePublicKeySerialized } from "../signature/CryptoSignaturePublicKey";
@@ -11,13 +11,13 @@ export interface ICryptoRelationshipPublicResponseSerialized extends ISerialized
     sig: ICryptoSignaturePublicKeySerialized;
     sta: ICryptoPublicStateSerialized;
 }
-export interface ICryptoRelationshipPublicResponse extends ISerializableAsync {
+export interface ICryptoRelationshipPublicResponse extends ISerializable {
     id?: string;
     exchangeKey: ICryptoExchangePublicKey;
     signatureKey: ICryptoSignaturePublicKey;
     state: ICryptoPublicState;
 }
-export declare class CryptoRelationshipPublicResponse extends CryptoSerializableAsync implements ICryptoRelationshipPublicResponse, IClearable {
+export declare class CryptoRelationshipPublicResponse extends CryptoSerializable implements ICryptoRelationshipPublicResponse, IClearable {
     id?: string;
     signatureKey: CryptoSignaturePublicKey;
     exchangeKey: CryptoExchangePublicKey;
@@ -26,8 +26,8 @@ export declare class CryptoRelationshipPublicResponse extends CryptoSerializable
     toJSON(verbose?: boolean): ICryptoRelationshipPublicResponseSerialized;
     clear(): void;
     verify(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
-    static from(value: CryptoRelationshipPublicResponse | ICryptoRelationshipPublicResponse): Promise<CryptoRelationshipPublicResponse>;
-    static fromJSON(value: ICryptoRelationshipPublicResponseSerialized): Promise<CryptoRelationshipPublicResponse>;
-    static fromBase64(value: string): Promise<CryptoRelationshipPublicResponse>;
-    static deserialize(value: string): Promise<CryptoRelationshipPublicResponse>;
+    static from(value: CryptoRelationshipPublicResponse | ICryptoRelationshipPublicResponse): CryptoRelationshipPublicResponse;
+    static fromJSON(value: ICryptoRelationshipPublicResponseSerialized): CryptoRelationshipPublicResponse;
+    static fromBase64(value: string): CryptoRelationshipPublicResponse;
+    static deserialize(value: string): CryptoRelationshipPublicResponse;
 }

package/dist/relationship/CryptoRelationshipPublicResponse.js

@@ -13,12 +13,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoRelationshipPublicResponse = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoExchangePublicKey_1 = require("../exchange/CryptoExchangePublicKey");
 const CryptoSignaturePublicKey_1 = require("../signature/CryptoSignaturePublicKey");
 const CryptoSignatures_1 = require("../signature/CryptoSignatures");
 const CryptoPublicState_1 = require("../state/CryptoPublicState");
-let CryptoRelationshipPublicResponse = CryptoRelationshipPublicResponse_1 = class CryptoRelationshipPublicResponse extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+let CryptoRelationshipPublicResponse = CryptoRelationshipPublicResponse_1 = class CryptoRelationshipPublicResponse extends CryptoSerializable_1.CryptoSerializable {
     constructor(signatureKey, exchangeKey, state) {
         super();
         this.signatureKey = signatureKey;
@@ -44,27 +44,23 @@ let CryptoRelationshipPublicResponse = CryptoRelationshipPublicResponse_1 = clas
     async verify(content, signature) {
         return await CryptoSignatures_1.CryptoSignatures.verify(content, signature, this.signatureKey);
     }
-    static async from(value) {
-        const [signatureKey, exchangeKey, state] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.from(value.signatureKey),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.exchangeKey),
-            CryptoPublicState_1.CryptoPublicState.from(value.state)
-        ]);
+    static from(value) {
+        const signatureKey = CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.from(value.signatureKey);
+        const exchangeKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.exchangeKey);
+        const state = CryptoPublicState_1.CryptoPublicState.from(value.state);
         return new CryptoRelationshipPublicResponse_1(signatureKey, exchangeKey, state);
     }
-    static async fromJSON(value) {
-        const [signatureKey, exchangeKey, state] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.fromJSON(value.sig),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.exc),
-            CryptoPublicState_1.CryptoPublicState.fromJSON(value.sta)
-        ]);
+    static fromJSON(value) {
+        const signatureKey = CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.fromJSON(value.sig);
+        const exchangeKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.exc);
+        const state = CryptoPublicState_1.CryptoPublicState.fromJSON(value.sta);
         return new CryptoRelationshipPublicResponse_1(signatureKey, exchangeKey, state);
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static deserialize(value) {
+        return this.fromJSON(JSON.parse(value));
     }
 };
 __decorate([

package/dist/relationship/CryptoRelationshipPublicResponse.js.map

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

package/dist/relationship/CryptoRelationshipRequestSecrets.d.ts

@@ -1,6 +1,6 @@
-import { ISerializableAsync } from "@js-soft/ts-serval";
+import { ISerializable } from "@js-soft/ts-serval";
 import { CoreBuffer, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoCipher } from "../encryption/CryptoCipher";
 import { CryptoSecretKey, ICryptoSecretKey } from "../encryption/CryptoSecretKey";
 import { CryptoExchangeKeypair, ICryptoExchangeKeypair } from "../exchange/CryptoExchangeKeypair";
@@ -10,7 +10,7 @@ import { CryptoSignature } from "../signature/CryptoSignature";
 import { CryptoSignatureKeypair, ICryptoSignatureKeypair } from "../signature/CryptoSignatureKeypair";
 import { CryptoSignaturePublicKey, ICryptoSignaturePublicKey } from "../signature/CryptoSignaturePublicKey";
 import { CryptoRelationshipPublicRequest } from "./CryptoRelationshipPublicRequest";
-export interface ICryptoRelationshipRequestSecrets extends ISerializableAsync {
+export interface ICryptoRelationshipRequestSecrets extends ISerializable {
     id?: string;
     exchangeKeypair: ICryptoExchangeKeypair;
     signatureKeypair: ICryptoSignatureKeypair;
@@ -20,7 +20,7 @@ export interface ICryptoRelationshipRequestSecrets extends ISerializableAsync {
     secretKey: ICryptoSecretKey;
     nonce: ICoreBuffer;
 }
-export declare class CryptoRelationshipRequestSecrets extends CryptoSerializableAsync implements ICryptoRelationshipRequestSecrets {
+export declare class CryptoRelationshipRequestSecrets extends CryptoSerializable implements ICryptoRelationshipRequestSecrets {
     id?: string;
     exchangeKeypair: CryptoExchangeKeypair;
     ephemeralKeypair: CryptoExchangeKeypair;
@@ -29,13 +29,13 @@ export declare class CryptoRelationshipRequestSecrets extends CryptoSerializable
     peerExchangeKey: CryptoExchangePublicKey;
     secretKey: CryptoSecretKey;
     nonce: CoreBuffer;
-    static from(value: ICryptoRelationshipRequestSecrets): Promise<CryptoRelationshipRequestSecrets>;
-    static deserialize(value: string): Promise<CryptoRelationshipRequestSecrets>;
+    static from(value: ICryptoRelationshipRequestSecrets): CryptoRelationshipRequestSecrets;
+    static deserialize(value: string): CryptoRelationshipRequestSecrets;
     sign(content: CoreBuffer, algorithm?: CryptoHashAlgorithm): Promise<CryptoSignature>;
     verifyOwn(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
     verifyPeerIdentity(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
     encryptRequest(content: CoreBuffer): Promise<CryptoCipher>;
     decryptRequest(cipher: CryptoCipher): Promise<CoreBuffer>;
-    toPublicRequest(): Promise<CryptoRelationshipPublicRequest>;
+    toPublicRequest(): CryptoRelationshipPublicRequest;
     static fromPeer(peerExchangeKey: CryptoExchangePublicKey, peerIdentityKey: CryptoSignaturePublicKey): Promise<CryptoRelationshipRequestSecrets>;
 }

package/dist/relationship/CryptoRelationshipRequestSecrets.js

@@ -14,7 +14,7 @@ exports.CryptoRelationshipRequestSecrets = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoDerivation_1 = require("../CryptoDerivation");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoEncryption_1 = require("../encryption/CryptoEncryption");
 const CryptoSecretKey_1 = require("../encryption/CryptoSecretKey");
 const CryptoExchange_1 = require("../exchange/CryptoExchange");
@@ -25,12 +25,12 @@ const CryptoSignatureKeypair_1 = require("../signature/CryptoSignatureKeypair");
 const CryptoSignaturePublicKey_1 = require("../signature/CryptoSignaturePublicKey");
 const CryptoSignatures_1 = require("../signature/CryptoSignatures");
 const CryptoRelationshipPublicRequest_1 = require("./CryptoRelationshipPublicRequest");
-let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = class CryptoRelationshipRequestSecrets extends CryptoSerializableAsync_1.CryptoSerializableAsync {
-    static async from(value) {
-        return (await super.from(value, CryptoRelationshipRequestSecrets_1));
+let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = class CryptoRelationshipRequestSecrets extends CryptoSerializable_1.CryptoSerializable {
+    static from(value) {
+        return super.from(value, CryptoRelationshipRequestSecrets_1);
     }
-    static async deserialize(value) {
-        return (await super.deserialize(value, CryptoRelationshipRequestSecrets_1));
+    static deserialize(value) {
+        return super.deserialize(value, CryptoRelationshipRequestSecrets_1);
     }
     async sign(content, algorithm = 1 /* SHA256 */) {
         return await CryptoSignatures_1.CryptoSignatures.sign(content, this.signatureKeypair.privateKey, algorithm);
@@ -47,8 +47,8 @@ let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = clas
     async decryptRequest(cipher) {
         return await CryptoEncryption_1.CryptoEncryption.decrypt(cipher, this.secretKey);
     }
-    async toPublicRequest() {
-        return await CryptoRelationshipPublicRequest_1.CryptoRelationshipPublicRequest.from({
+    toPublicRequest() {
+        return CryptoRelationshipPublicRequest_1.CryptoRelationshipPublicRequest.from({
             id: this.id,
             exchangeKey: this.exchangeKeypair.publicKey,
             signatureKey: this.signatureKeypair.publicKey,
@@ -65,7 +65,7 @@ let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = clas
         ]);
         const masterKey = await CryptoExchange_1.CryptoExchange.deriveRequestor(ephemeralKeypair, peerExchangeKey);
         const secretKey = await CryptoDerivation_1.CryptoDerivation.deriveKeyFromBase(masterKey.transmissionKey, 1, "REQTMP01");
-        return await CryptoRelationshipRequestSecrets_1.from({
+        return CryptoRelationshipRequestSecrets_1.from({
             exchangeKeypair: exchangeKeypair,
             ephemeralKeypair: ephemeralKeypair,
             signatureKeypair: signatureKeypair,

package/dist/relationship/CryptoRelationshipRequestSecrets.js.map

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