Skip to content

Commit 0f5e437

Browse files
committed
Merge branch 'master' of github.com:waku-org/js-waku into weboko/webrtc
2 parents fe41e8d + 5334a7f commit 0f5e437

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3024
-1313
lines changed

.cspell.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,15 @@
5555
"fontsource",
5656
"globby",
5757
"gossipsub",
58+
"hackathons",
5859
"huilong",
5960
"iasked",
6061
"ihave",
6162
"ihaves",
6263
"ineed",
6364
"IPAM",
6465
"ipfs",
66+
"isready",
6567
"iwant",
6668
"jdev",
6769
"jswaku",
@@ -165,6 +167,7 @@
165167
"gen",
166168
"proto",
167169
"*.spec.ts",
170+
"*.log",
168171
"CHANGELOG.md"
169172
],
170173
"patterns": [

.github/workflows/ci.yml

Lines changed: 4 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
type: string
1616

1717
env:
18-
NODE_JS: "22"
18+
NODE_JS: "24"
1919

2020
jobs:
2121
check:
@@ -57,7 +57,7 @@ jobs:
5757
browser:
5858
runs-on: ubuntu-latest
5959
container:
60-
image: mcr.microsoft.com/playwright:v1.53.1-jammy
60+
image: mcr.microsoft.com/playwright:v1.56.1-jammy
6161
env:
6262
HOME: "/root"
6363
steps:
@@ -71,65 +71,18 @@ jobs:
7171
- run: npm run build:esm
7272
- run: npm run test:browser
7373

74-
build_rln_tree:
75-
if: false # This condition disables the job
76-
runs-on: ubuntu-latest
77-
steps:
78-
- uses: actions/checkout@v3
79-
with:
80-
repository: waku-org/js-waku
81-
- uses: actions/setup-node@v3
82-
with:
83-
node-version: ${{ env.NODE_JS }}
84-
- name: Check for existing RLN tree artifact
85-
id: check-artifact
86-
uses: actions/github-script@v6
87-
with:
88-
script: |
89-
const artifact = await github.rest.actions.listWorkflowRunArtifacts({
90-
owner: context.repo.owner,
91-
repo: context.repo.repo,
92-
run_id: context.runId
93-
});
94-
console.log(artifact);
95-
const foundArtifact = artifact.data.artifacts.find(art => art.name === 'rln_tree.tar.gz');
96-
if (foundArtifact) {
97-
core.setOutput('artifact_id', foundArtifact.id);
98-
core.setOutput('artifact_found', 'true');
99-
} else {
100-
core.setOutput('artifact_found', 'false');
101-
}
102-
- name: Download RLN tree artifact
103-
if: steps.check-artifact.outputs.artifact_found == 'true'
104-
uses: actions/download-artifact@v4
105-
with:
106-
name: rln_tree.tar.gz
107-
path: /tmp
108-
- uses: ./.github/actions/npm
109-
- name: Sync rln tree and save artifact
110-
run: |
111-
mkdir -p /tmp/rln_tree.db
112-
npm run build:esm
113-
npm run sync-rln-tree
114-
tar -czf rln_tree.tar.gz -C /tmp/rln_tree.db .
115-
- name: Upload artifact
116-
uses: actions/upload-artifact@v4
117-
with:
118-
name: rln_tree.tar.gz
119-
path: rln_tree.tar.gz
120-
12174
node:
12275
uses: ./.github/workflows/test-node.yml
12376
secrets: inherit
12477
with:
125-
nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.35.1' }}
78+
nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.36.0' }}
12679
test_type: node
12780
allure_reports: true
12881

12982
node_optional:
13083
uses: ./.github/workflows/test-node.yml
13184
with:
132-
nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.35.1' }}
85+
nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.36.0' }}
13386
test_type: node-optional
13487

13588
node_with_nwaku_master:

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
timeout-minutes: 60
1818
runs-on: ubuntu-latest
1919
container:
20-
image: mcr.microsoft.com/playwright:v1.53.1-jammy
20+
image: mcr.microsoft.com/playwright:v1.56.1-jammy
2121
steps:
2222
- uses: actions/checkout@v3
2323
- uses: actions/setup-node@v3

.github/workflows/pre-release.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,31 @@ on:
22
workflow_dispatch:
33

44
env:
5-
NODE_JS: "22"
5+
NODE_JS: "24"
6+
7+
permissions:
8+
id-token: write
9+
contents: read
610

711
jobs:
812
pre-release:
913
name: pre-release
1014
runs-on: ubuntu-latest
1115
if: github.event_name == 'workflow_dispatch'
1216
steps:
13-
- uses: actions/checkout@v3
14-
with:
17+
- uses: actions/checkout@v4
18+
with:
1519
repository: waku-org/js-waku
16-
17-
- uses: actions/setup-node@v3
20+
21+
- uses: actions/setup-node@v4
1822
with:
1923
node-version: ${{ env.NODE_JS }}
2024
registry-url: "https://registry.npmjs.org"
21-
25+
2226
- run: npm install
23-
27+
2428
- run: npm run build
25-
29+
2630
- run: npm run publish -- --tag next
2731
env:
2832
NODE_AUTH_TOKEN: ${{ secrets.NPM_JS_WAKU_PUBLISH }}

.github/workflows/test-node.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
default: false
2525

2626
env:
27-
NODE_JS: "22"
27+
NODE_JS: "24"
2828
# Ensure test type conditions remain consistent.
2929
WAKU_SERVICE_NODE_PARAMS: ${{ (inputs.test_type == 'go-waku-master') && '--min-relay-peers-to-publish=0' || '' }}
3030
DEBUG: ${{ inputs.debug }}
@@ -42,7 +42,7 @@ jobs:
4242
checks: write
4343
steps:
4444
- uses: actions/checkout@v3
45-
with:
45+
with:
4646
repository: waku-org/js-waku
4747

4848
- name: Remove unwanted software
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Merge allure reports
6464
if: always() && env.ALLURE_REPORTS == 'true'
65-
run: node ci/mergeAllureResults.cjs
65+
run: node ci/mergeAllureResults.cjs
6666

6767
- name: Get allure history
6868
if: always() && env.ALLURE_REPORTS == 'true'
@@ -125,4 +125,4 @@ jobs:
125125
echo "## Run Information" >> $GITHUB_STEP_SUMMARY
126126
echo "- **NWAKU**: ${{ env.WAKUNODE_IMAGE }}" >> $GITHUB_STEP_SUMMARY
127127
echo "## Test Results" >> $GITHUB_STEP_SUMMARY
128-
echo "Allure report will be available at: https://waku-org.github.io/allure-jswaku/${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
128+
echo "Allure report will be available at: https://waku-org.github.io/allure-jswaku/${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/test-reliability.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- all
1919

2020
env:
21-
NODE_JS: "22"
21+
NODE_JS: "24"
2222

2323
jobs:
2424
test:
@@ -34,7 +34,7 @@ jobs:
3434
if: ${{ github.event.inputs.test_type == 'all' }}
3535
steps:
3636
- uses: actions/checkout@v3
37-
with:
37+
with:
3838
repository: waku-org/js-waku
3939

4040
- name: Remove unwanted software
@@ -74,7 +74,7 @@ jobs:
7474
if: ${{ github.event.inputs.test_type != 'all' }}
7575
steps:
7676
- uses: actions/checkout@v3
77-
with:
77+
with:
7878
repository: waku-org/js-waku
7979

8080
- name: Remove unwanted software

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ packages/discovery/mock_local_storage
1717
.giga
1818
.cursor
1919
.DS_Store
20-
CLAUDE.md
20+
CLAUDE.md
21+
.env
22+
postgres-data/

.release-please-manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
"packages/discovery": "0.0.12",
1111
"packages/sds": "0.0.7",
1212
"packages/rln": "0.1.9",
13-
"packages/react": "0.0.7"
13+
"packages/react": "0.0.7",
14+
"packages/run": "0.0.1"
1415
}

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ npm install
2323
npm run doc
2424
```
2525

26+
# Using Nix shell
27+
```shell
28+
git clone https://github.com/waku-org/js-waku.git
29+
cd js-waku
30+
nix develop
31+
npm install
32+
npm run doc
33+
```
34+
2635
## Bugs, Questions & Features
2736

2837
If you encounter any bug or would like to propose new features, feel free to [open an issue](https://github.com/waku-org/js-waku/issues/new/).

ci/Jenkinsfile

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
pipeline {
2-
agent { label 'linux' }
2+
agent {
3+
docker {
4+
label 'linuxcontainer'
5+
image 'harbor.status.im/infra/ci-build-containers:linux-base-1.0.0'
6+
args '--volume=/nix:/nix ' +
7+
'--volume=/etc/nix:/etc/nix ' +
8+
'--user jenkins'
9+
}
10+
}
311

412
options {
513
disableConcurrentBuilds()
@@ -21,27 +29,35 @@ pipeline {
2129
stages {
2230
stage('Deps') {
2331
steps {
24-
sh 'npm install'
32+
script {
33+
nix.develop('npm install', pure: true)
34+
}
2535
}
2636
}
2737

2838
stage('Packages') {
2939
steps {
30-
sh 'npm run build'
40+
script {
41+
nix.develop('npm run build', pure: true)
42+
}
3143
}
3244
}
3345

3446
stage('Build') {
3547
steps {
36-
sh 'npm run doc'
48+
script {
49+
nix.develop('npm run doc', pure: true)
50+
}
3751
}
3852
}
3953

4054
stage('Publish') {
4155
when { expression { GIT_BRANCH.endsWith('master') } }
4256
steps {
4357
sshagent(credentials: ['status-im-auto-ssh']) {
44-
sh 'npm run deploy'
58+
script {
59+
nix.develop('npm run deploy', pure: true)
60+
}
4561
}
4662
}
4763
}

0 commit comments

Comments
 (0)