Skip to content

Commit de6415f

Browse files
authored
Merge pull request #999 from waku-org/feat/split-message
2 parents fa53d3c + 3346dbb commit de6415f

26 files changed

+374
-68
lines changed

.size-limit.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = [
2020
},
2121
{
2222
name: "Asymmetric, symmetric encryption and signature",
23-
path: "packages/core/bundle/lib/waku_message/version_1.js",
23+
path: "packages/message-encryption/bundle/index.js",
2424
import: "{ MessageV1, AsymEncoder, AsymDecoder, SymEncoder, SymDecoder }",
2525
},
2626
{

package-lock.json

+75-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"doc": "run-s doc:*",
1818
"doc:html": "typedoc # --treatWarningsAsErrors",
1919
"doc:cname": "echo 'js.waku.org' > docs/CNAME",
20-
"release": "lerna run --concurrency 1 release -- --"
20+
"release": "multi-semantic-release"
2121
},
2222
"devDependencies": {
2323
"@semantic-release/changelog": "^6.0.1",

packages/core/package.json

-10
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
"types": "./dist/lib/waku_message/version_0.d.ts",
2626
"import": "./dist/lib/waku_message/version_0.js"
2727
},
28-
"./lib/waku_message/version_1": {
29-
"types": "./dist/lib/waku_message/version_1.d.ts",
30-
"import": "./dist/lib/waku_message/version_1.js"
31-
},
3228
"./lib/waku_message/topic_only_message": {
3329
"types": "./dist/lib/waku_message/topic_only_message.d.ts",
3430
"import": "./dist/lib/waku_message/topic_only_message.js"
@@ -87,17 +83,13 @@
8783
"reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build",
8884
"release": "semantic-release"
8985
},
90-
"browser": {
91-
"crypto": false
92-
},
9386
"engines": {
9487
"node": ">=16"
9588
},
9689
"dependencies": {
9790
"@waku/byte-utils": "*",
9891
"@chainsafe/libp2p-gossipsub": "^4.1.1",
9992
"@chainsafe/libp2p-noise": "^8.0.1",
100-
"@libp2p/crypto": "^1.0.4",
10193
"@libp2p/interface-connection": "3.0.1",
10294
"@libp2p/interface-peer-discovery": "^1.0.0",
10395
"@libp2p/interface-peer-id": "^1.0.2",
@@ -109,13 +101,11 @@
109101
"@libp2p/peer-id": "^1.1.10",
110102
"@libp2p/websockets": "^3.0.3",
111103
"@multiformats/multiaddr": "^11.0.6",
112-
"@noble/secp256k1": "^1.3.4",
113104
"@waku/interfaces": "*",
114105
"debug": "^4.3.4",
115106
"it-all": "^1.0.6",
116107
"it-length-prefixed": "^8.0.2",
117108
"it-pipe": "^2.0.4",
118-
"js-sha3": "^0.8.0",
119109
"libp2p": "0.38.0",
120110
"p-event": "^5.0.1",
121111
"protons-runtime": "^3.1.0",

packages/core/rollup.config.js

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export default {
99
"lib/predefined_bootstrap_nodes": "dist/lib/predefined_bootstrap_nodes.js",
1010
"lib/wait_for_remote_peer": "dist/lib/wait_for_remote_peer.js",
1111
"lib/waku_message/version_0": "dist/lib/waku_message/version_0.js",
12-
"lib/waku_message/version_1": "dist/lib/waku_message/version_1.js",
1312
"lib/waku_message/topic_only_message":
1413
"dist/lib/waku_message/topic_only_message.js",
1514
},

packages/core/src/index.ts

-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
export { DefaultPubSubTopic } from "./lib/constants";
22

3-
export {
4-
generatePrivateKey,
5-
generateSymmetricKey,
6-
getPublicKey,
7-
} from "./lib/crypto";
8-
93
export * as proto_message from "./proto/message";
104
export * as proto_topic_only_message from "./proto/topic_only_message";
115

packages/core/src/lib/waku_message/version_0.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import debug from "debug";
1010
import * as proto from "../../proto/message";
1111

1212
const log = debug("waku:message:version-0");
13-
1413
const OneMillion = BigInt(1_000_000);
14+
1515
export const Version = 0;
16+
export { proto };
1617

1718
export class MessageV0 implements Message {
1819
constructor(protected proto: proto.WakuMessage) {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
parserOptions: {
3+
tsconfigRootDir: __dirname,
4+
project: "./tsconfig.dev.json",
5+
},
6+
};
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extension": ["ts"],
3+
"spec": "src/**/*.spec.ts",
4+
"require": ["ts-node/register", "isomorphic-fetch", "jsdom-global/register"],
5+
"loader": "ts-node/esm",
6+
"node-option": [
7+
"experimental-specifier-resolution=node",
8+
"loader=ts-node/esm"
9+
],
10+
"exit": true
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
build
2+
bundle
3+
dist
4+
node_modules
+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
process.env.CHROME_BIN = require("puppeteer").executablePath();
2+
const webpack = require("webpack");
3+
4+
module.exports = function (config) {
5+
config.set({
6+
frameworks: ["webpack", "mocha"],
7+
files: ["src/**/*.ts"],
8+
preprocessors: {
9+
"src/**/*.ts": ["webpack"],
10+
},
11+
envPreprocessor: ["CI"],
12+
reporters: ["progress"],
13+
browsers: ["ChromeHeadless"],
14+
singleRun: true,
15+
client: {
16+
mocha: {
17+
timeout: 6000, // Default is 2s
18+
},
19+
},
20+
webpack: {
21+
mode: "development",
22+
module: {
23+
rules: [{ test: /\.([cm]?ts|tsx)$/, loader: "ts-loader" }],
24+
},
25+
plugins: [
26+
new webpack.DefinePlugin({
27+
"process.env.CI": process.env.CI || false,
28+
}),
29+
new webpack.ProvidePlugin({
30+
process: "process/browser.js",
31+
}),
32+
],
33+
resolve: {
34+
extensions: [".ts", ".tsx", ".js"],
35+
extensionAlias: {
36+
".js": [".js", ".ts"],
37+
".cjs": [".cjs", ".cts"],
38+
".mjs": [".mjs", ".mts"],
39+
},
40+
},
41+
stats: { warnings: false },
42+
devtool: "inline-source-map",
43+
},
44+
});
45+
};

0 commit comments

Comments
 (0)