@waku/message-encryption 0.0.6 → 0.0.8

package/CHANGELOG.md

@@ -7,7 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.0.5] - 2022-12-16
+## [0.0.8] - 2023-01-18
+
+### Changed
+
+- Export `Encoder` and `Decoder` types.
+- Moved `@chai` and `@fast-check` to `dependencies` list.
+- Added missing `@js-sha3` and `@debug` to `dependencies` list.
+
+## [0.0.7] - 2022-12-19
+
+### Fixed
+
+- Incorrect `proto` import.
+
+## [0.0.6] - 2022-12-16
 
 ### Fixed
 
@@ -34,7 +48,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Alpha version of `@waku/message-encryption`.
 
-[unreleased]: https://github.com/waku-org/js-waku/compare/@waku/message-encryption@0.0.6...HEAD
+[unreleased]: https://github.com/waku-org/js-waku/compare/@waku/message-encryption@0.0.8...HEAD
+[0.0.8]: https://github.com/waku-org/js-waku/compare/@waku/message-encryption@0.0.7...@waku/message-encryption@0.0.8
+[0.0.7]: https://github.com/waku-org/js-waku/compare/@waku/message-encryption@0.0.6...@waku/message-encryption@0.0.7
 [0.0.6]: https://github.com/waku-org/js-waku/compare/@waku/message-encryption@0.0.5...@waku/message-encryption@0.0.6
 [0.0.5]: https://github.com/waku-org/js-waku/compare/@waku/message-encryption@0.0.4...@waku/message-encryption@0.0.5
 [0.0.4]: https://github.com/waku-org/js-waku/compare/@waku/message-encryption@0.0.3...@waku/message-encryption@0.0.4

package/bundle/ecies.js

@@ -1 +1 @@
-export { D as DecodedMessage, b as createDecoder, c as createEncoder, g as generatePrivateKey, a as getPublicKey } from './index-80756c1f.js';
+export { D as DecodedMessage, b as Decoder, E as Encoder, d as createDecoder, c as createEncoder, g as generatePrivateKey, a as getPublicKey } from './index-fb7e6ca5.js';

package/bundle/{index-80756c1f.js → index-fb7e6ca5.js}

@@ -15047,7 +15047,7 @@ class Encoder$1 {
         const protoMessage = await this.toProtoObj(message);
         if (!protoMessage)
             return;
-        return WakuMessage$3.encode(protoMessage);
+        return WakuMessage$2.encode(protoMessage);
     }
     async toProtoObj(message) {
         const timestamp = message.timestamp ?? new Date();
@@ -15146,7 +15146,9 @@ var ecies = /*#__PURE__*/Object.freeze({
 	DecodedMessage: DecodedMessage,
 	generatePrivateKey: generatePrivateKey,
 	getPublicKey: getPublicKey,
+	Encoder: Encoder$1,
 	createEncoder: createEncoder$1,
+	Decoder: Decoder$1,
 	createDecoder: createDecoder$1
 });
 
@@ -15162,7 +15164,7 @@ class Encoder {
         const protoMessage = await this.toProtoObj(message);
         if (!protoMessage)
             return;
-        return WakuMessage$3.encode(protoMessage);
+        return WakuMessage$2.encode(protoMessage);
     }
     async toProtoObj(message) {
         const timestamp = message.timestamp ?? new Date();
@@ -15260,7 +15262,9 @@ var symmetric = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	DecodedMessage: DecodedMessage,
 	generateSymmetricKey: generateSymmetricKey,
+	Encoder: Encoder,
 	createEncoder: createEncoder,
+	Decoder: Decoder,
 	createDecoder: createDecoder
 });
 
@@ -15278,4 +15282,4 @@ class DecodedMessage extends DecodedMessage$1 {
     }
 }
 
-export { DecodedMessage as D, OneMillion as O, Version as V, getPublicKey as a, createDecoder$1 as b, createEncoder$1 as c, generateSymmetricKey as d, createEncoder as e, createDecoder as f, generatePrivateKey as g, ecies as h, symmetric as s };
+export { DecodedMessage as D, Encoder$1 as E, OneMillion as O, Version as V, getPublicKey as a, Decoder$1 as b, createEncoder$1 as c, createDecoder$1 as d, generateSymmetricKey as e, Encoder as f, generatePrivateKey as g, createEncoder as h, Decoder as i, createDecoder as j, ecies as k, symmetric as s };

package/bundle/index.js

@@ -1 +1 @@
-export { D as DecodedMessage, O as OneMillion, V as Version, h as ecies, g as generatePrivateKey, d as generateSymmetricKey, a as getPublicKey, s as symmetric } from './index-80756c1f.js';
+export { D as DecodedMessage, O as OneMillion, V as Version, k as ecies, g as generatePrivateKey, e as generateSymmetricKey, a as getPublicKey, s as symmetric } from './index-fb7e6ca5.js';

package/bundle/symmetric.js

@@ -1 +1 @@
-export { D as DecodedMessage, f as createDecoder, e as createEncoder, d as generateSymmetricKey } from './index-80756c1f.js';
+export { D as DecodedMessage, i as Decoder, f as Encoder, j as createDecoder, h as createEncoder, e as generateSymmetricKey } from './index-fb7e6ca5.js';

package/dist/ecies.d.ts

@@ -2,7 +2,7 @@ import { Decoder as DecoderV0 } from "@waku/core/lib/message/version_0";
 import type { IDecoder, IEncoder, IMessage, IProtoMessage } from "@waku/interfaces";
 import { DecodedMessage, generatePrivateKey, getPublicKey } from "./index.js";
 export { DecodedMessage, generatePrivateKey, getPublicKey };
-declare class Encoder implements IEncoder {
+export declare class Encoder implements IEncoder {
     contentTopic: string;
     private publicKey;
     private sigPrivKey?;
@@ -30,7 +30,7 @@ declare class Encoder implements IEncoder {
  * @param ephemeral An optional flag to mark message as ephemeral, ie, not to be stored by Waku Store nodes.
  */
 export declare function createEncoder(contentTopic: string, publicKey: Uint8Array, sigPrivKey?: Uint8Array, ephemeral?: boolean): Encoder;
-declare class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
+export declare class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
     private privateKey;
     constructor(contentTopic: string, privateKey: Uint8Array);
     fromProtoObj(protoMessage: IProtoMessage): Promise<DecodedMessage | undefined>;

package/dist/ecies.js

@@ -1,10 +1,11 @@
-import { Decoder as DecoderV0, proto } from "@waku/core/lib/message/version_0";
+import { Decoder as DecoderV0 } from "@waku/core/lib/message/version_0";
+import { WakuMessage } from "@waku/proto";
 import debug from "debug";
 import { decryptAsymmetric, encryptAsymmetric, postCipher, preCipher, } from "./waku_payload.js";
 import { DecodedMessage, generatePrivateKey, getPublicKey, OneMillion, Version, } from "./index.js";
 export { DecodedMessage, generatePrivateKey, getPublicKey };
 const log = debug("waku:message-encryption:ecies");
-class Encoder {
+export class Encoder {
     constructor(contentTopic, publicKey, sigPrivKey, ephemeral = false) {
         this.contentTopic = contentTopic;
         this.publicKey = publicKey;
@@ -15,7 +16,7 @@ class Encoder {
         const protoMessage = await this.toProtoObj(message);
         if (!protoMessage)
             return;
-        return proto.WakuMessage.encode(protoMessage);
+        return WakuMessage.encode(protoMessage);
     }
     async toProtoObj(message) {
         const timestamp = message.timestamp ?? new Date();
@@ -56,7 +57,7 @@ class Encoder {
 export function createEncoder(contentTopic, publicKey, sigPrivKey, ephemeral = false) {
     return new Encoder(contentTopic, publicKey, sigPrivKey, ephemeral);
 }
-class Decoder extends DecoderV0 {
+export class Decoder extends DecoderV0 {
     constructor(contentTopic, privateKey) {
         super(contentTopic);
         this.privateKey = privateKey;

package/dist/ecies.js.map

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

package/dist/symmetric.d.ts

@@ -2,7 +2,7 @@ import { Decoder as DecoderV0 } from "@waku/core/lib/message/version_0";
 import type { IDecoder, IEncoder, IMessage, IProtoMessage } from "@waku/interfaces";
 import { DecodedMessage, generateSymmetricKey } from "./index.js";
 export { DecodedMessage, generateSymmetricKey };
-declare class Encoder implements IEncoder {
+export declare class Encoder implements IEncoder {
     contentTopic: string;
     private symKey;
     private sigPrivKey?;
@@ -30,7 +30,7 @@ declare class Encoder implements IEncoder {
  * @param ephemeral An optional flag to mark message as ephemeral, ie, not to be stored by Waku Store nodes.
  */
 export declare function createEncoder(contentTopic: string, symKey: Uint8Array, sigPrivKey?: Uint8Array, ephemeral?: boolean): Encoder;
-declare class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
+export declare class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
     private symKey;
     constructor(contentTopic: string, symKey: Uint8Array);
     fromProtoObj(protoMessage: IProtoMessage): Promise<DecodedMessage | undefined>;

package/dist/symmetric.js

@@ -1,10 +1,11 @@
-import { Decoder as DecoderV0, proto } from "@waku/core/lib/message/version_0";
+import { Decoder as DecoderV0 } from "@waku/core/lib/message/version_0";
+import { WakuMessage } from "@waku/proto";
 import debug from "debug";
 import { decryptSymmetric, encryptSymmetric, postCipher, preCipher, } from "./waku_payload.js";
 import { DecodedMessage, generateSymmetricKey, OneMillion, Version, } from "./index.js";
 export { DecodedMessage, generateSymmetricKey };
 const log = debug("waku:message-encryption:symmetric");
-class Encoder {
+export class Encoder {
     constructor(contentTopic, symKey, sigPrivKey, ephemeral = false) {
         this.contentTopic = contentTopic;
         this.symKey = symKey;
@@ -15,7 +16,7 @@ class Encoder {
         const protoMessage = await this.toProtoObj(message);
         if (!protoMessage)
             return;
-        return proto.WakuMessage.encode(protoMessage);
+        return WakuMessage.encode(protoMessage);
     }
     async toProtoObj(message) {
         const timestamp = message.timestamp ?? new Date();
@@ -56,7 +57,7 @@ class Encoder {
 export function createEncoder(contentTopic, symKey, sigPrivKey, ephemeral = false) {
     return new Encoder(contentTopic, symKey, sigPrivKey, ephemeral);
 }
-class Decoder extends DecoderV0 {
+export class Decoder extends DecoderV0 {
     constructor(contentTopic, symKey) {
         super(contentTopic);
         this.symKey = symKey;

package/dist/symmetric.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/message-encryption",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Waku Message Payload Encryption",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -75,18 +75,20 @@
   "dependencies": {
     "@noble/secp256k1": "^1.3.4",
     "@waku/byte-utils": "*",
+    "@waku/core": "*",
     "@waku/interfaces": "*",
+    "@waku/proto": "*",
     "js-sha3": "^0.8.0",
-    "@waku/core": "*"
+    "chai": "^4.3.6",
+    "debug": "^4.3.4",
+    "fast-check": "^2.14.0"
   },
   "devDependencies": {
-    "fast-check": "^2.14.0",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@typescript-eslint/parser": "^5.8.1",
-    "chai": "^4.3.6",
     "cspell": "^6.17.0",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",

package/src/ecies.ts

@@ -1,10 +1,11 @@
-import { Decoder as DecoderV0, proto } from "@waku/core/lib/message/version_0";
+import { Decoder as DecoderV0 } from "@waku/core/lib/message/version_0";
 import type {
   IDecoder,
   IEncoder,
   IMessage,
   IProtoMessage,
 } from "@waku/interfaces";
+import { WakuMessage } from "@waku/proto";
 import debug from "debug";
 
 import {
@@ -26,7 +27,7 @@ export { DecodedMessage, generatePrivateKey, getPublicKey };
 
 const log = debug("waku:message-encryption:ecies");
 
-class Encoder implements IEncoder {
+export class Encoder implements IEncoder {
   constructor(
     public contentTopic: string,
     private publicKey: Uint8Array,
@@ -38,7 +39,7 @@ class Encoder implements IEncoder {
     const protoMessage = await this.toProtoObj(message);
     if (!protoMessage) return;
 
-    return proto.WakuMessage.encode(protoMessage);
+    return WakuMessage.encode(protoMessage);
   }
 
   async toProtoObj(message: IMessage): Promise<IProtoMessage | undefined> {
@@ -89,7 +90,7 @@ export function createEncoder(
   return new Encoder(contentTopic, publicKey, sigPrivKey, ephemeral);
 }
 
-class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
+export class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
   constructor(contentTopic: string, private privateKey: Uint8Array) {
     super(contentTopic);
   }

package/src/symmetric.ts

@@ -1,10 +1,11 @@
-import { Decoder as DecoderV0, proto } from "@waku/core/lib/message/version_0";
+import { Decoder as DecoderV0 } from "@waku/core/lib/message/version_0";
 import type {
   IDecoder,
   IEncoder,
   IMessage,
   IProtoMessage,
 } from "@waku/interfaces";
+import { WakuMessage } from "@waku/proto";
 import debug from "debug";
 
 import {
@@ -25,7 +26,7 @@ export { DecodedMessage, generateSymmetricKey };
 
 const log = debug("waku:message-encryption:symmetric");
 
-class Encoder implements IEncoder {
+export class Encoder implements IEncoder {
   constructor(
     public contentTopic: string,
     private symKey: Uint8Array,
@@ -37,7 +38,7 @@ class Encoder implements IEncoder {
     const protoMessage = await this.toProtoObj(message);
     if (!protoMessage) return;
 
-    return proto.WakuMessage.encode(protoMessage);
+    return WakuMessage.encode(protoMessage);
   }
 
   async toProtoObj(message: IMessage): Promise<IProtoMessage | undefined> {
@@ -87,7 +88,7 @@ export function createEncoder(
   return new Encoder(contentTopic, symKey, sigPrivKey, ephemeral);
 }
 
-class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
+export class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
   constructor(contentTopic: string, private symKey: Uint8Array) {
     super(contentTopic);
   }