Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into FLU-353
Browse files Browse the repository at this point in the history
  • Loading branch information
nahsi committed Jul 6, 2023
2 parents 9256075 + c991f09 commit 0aeeaaa
Show file tree
Hide file tree
Showing 19 changed files with 156 additions and 53 deletions.
12 changes: 6 additions & 6 deletions .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"packages/client/api": "0.11.7",
"packages/client/js-client.node": "0.6.11",
"packages/client/js-client.web": "0.2.3",
"packages/client/js-client.web.standalone": "0.13.10",
"packages/client/api": "0.12.0",
"packages/client/js-client.node": "0.7.0",
"packages/client/js-client.web": "0.2.4",
"packages/client/js-client.web.standalone": "0.14.0",
"packages/client/tools": "0.2.1",
"packages/core/interfaces": "0.7.6",
"packages/core/js-peer": "0.8.10"
"packages/core/interfaces": "0.8.0",
"packages/core/js-peer": "0.9.0"
}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
- run: pnpm -r build

- name: Publish to npm registry
run: pnpm --no-git-checks -r publish -filter '@fluencelabs/*' --access public
run: pnpm --no-git-checks -r publish -filter '@fluencelabs/*' --access public --tag unstable

slack:
if: always()
Expand Down Expand Up @@ -165,4 +165,4 @@ jobs:
status: "failure"
notification_title: "*{workflow}* has {status_message}"
message_format: "${{ steps.status.outputs.jobs }} {status_message} in <{repo_url}|{repo}>"
footer: "<{run_url}>"
footer: "<{run_url}>"
15 changes: 14 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ on:
nox-image:
description: "nox image tag"
type: string
<<<<<<< HEAD

Check failure on line 9 in .github/workflows/tests.yml

View workflow job for this annotation

GitHub Actions / actionlint

[actionlint] .github/workflows/tests.yml#L9

could not parse as YAML: yaml: line 9: could not find expected ':' [yaml-syntax]
Raw output
.github/workflows/tests.yml:9:0: could not parse as YAML: yaml: line 9: could not find expected ':' [yaml-syntax]
default: "fluencelabs/nox:unstable_minimal"
=======
default: "fluencelabs/nox:unstable_ipfs"
>>>>>>> origin/master
avm-version:
description: "@fluencelabs/avm version"
type: string
Expand All @@ -24,6 +28,7 @@ env:
NOX_IMAGE: "${{ inputs.nox-image }}"
FORCE_COLOR: true
CI: true
# DEBUG: '*'

jobs:
js-client:
Expand Down Expand Up @@ -101,4 +106,12 @@ jobs:

- run: pnpm -r --no-frozen-lockfile i
- run: pnpm -r build
- run: pnpm -r test
<<<<<<< HEAD
- run: pnpm -r test
=======
- run: pnpm -r test

- name: Dump rust-peer logs
if: always()
uses: jwalton/gh-docker-logs@v2
>>>>>>> origin/master
Binary file not shown.
18 changes: 18 additions & 0 deletions packages/client/api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,24 @@
* dependencies
* @fluencelabs/interfaces bumped from 0.7.3 to 0.7.4

## [0.12.0](https://github.com/fluencelabs/js-client/compare/js-client.api-v0.11.7...js-client.api-v0.12.0) (2023-06-29)


### ⚠ BREAKING CHANGES

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315)

### Features

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315) ([8bae6e2](https://github.com/fluencelabs/js-client/commit/8bae6e24e62153b567f320ccecc7bce76bc826d1))


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @fluencelabs/interfaces bumped from 0.7.6 to 0.8.0

## [0.11.7](https://github.com/fluencelabs/js-client/compare/js-client.api-v0.11.6...js-client.api-v0.11.7) (2023-06-20)


Expand Down
6 changes: 3 additions & 3 deletions packages/client/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluencelabs/js-client.api",
"version": "0.11.7",
"version": "0.12.0",
"description": "JS Client API",
"engines": {
"node": ">=10",
Expand All @@ -25,10 +25,10 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/interfaces": "0.7.6"
"@fluencelabs/interfaces": "0.8.0"
},
"devDependencies": {
"@fluencelabs/avm": "https://github.com/fluencelabs/js-client/raw/feat/add-signatures/avm-0.39.1-feat-VM-276-aquavm-keypair-e2816f6-1588-1.0.tgz",
"@fluencelabs/avm": "0.40.0",
"@fluencelabs/marine-js": "0.3.45",
"microbundle": "0.15.1",
"dts-bundle-generator": "7.2.0"
Expand Down
19 changes: 19 additions & 0 deletions packages/client/js-client.node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,25 @@
* dependencies
* @fluencelabs/js-peer bumped from 0.8.8 to 0.8.9

## [0.7.0](https://github.com/fluencelabs/js-client/compare/js-client.node-v0.6.11...js-client.node-v0.7.0) (2023-06-29)


### ⚠ BREAKING CHANGES

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315)

### Features

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315) ([8bae6e2](https://github.com/fluencelabs/js-client/commit/8bae6e24e62153b567f320ccecc7bce76bc826d1))


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @fluencelabs/js-peer bumped from 0.8.10 to 0.9.0
* @fluencelabs/interfaces bumped from 0.7.6 to 0.8.0

## [0.6.11](https://github.com/fluencelabs/js-client/compare/js-client.node-v0.6.10...js-client.node-v0.6.11) (2023-06-20)


Expand Down
8 changes: 4 additions & 4 deletions packages/client/js-client.node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluencelabs/js-client.node",
"version": "0.6.11",
"version": "0.7.0",
"description": "TypeScript implementation of Fluence Peer",
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand All @@ -22,9 +22,9 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/js-peer": "0.8.10",
"@fluencelabs/interfaces": "0.7.6",
"@fluencelabs/avm": "https://github.com/fluencelabs/js-client/raw/feat/add-signatures/avm-0.39.1-feat-VM-276-aquavm-keypair-e2816f6-1588-1.0.tgz",
"@fluencelabs/js-peer": "0.9.0",
"@fluencelabs/interfaces": "0.8.0",
"@fluencelabs/avm": "0.40.0",
"@fluencelabs/marine-js": "0.3.45",
"platform": "1.3.6"
},
Expand Down
19 changes: 19 additions & 0 deletions packages/client/js-client.web.standalone/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,25 @@
* dependencies
* @fluencelabs/js-peer bumped from 0.8.8 to 0.8.9

## [0.14.0](https://github.com/fluencelabs/js-client/compare/js-client.web.standalone-v0.13.10...js-client.web.standalone-v0.14.0) (2023-06-29)


### ⚠ BREAKING CHANGES

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315)

### Features

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315) ([8bae6e2](https://github.com/fluencelabs/js-client/commit/8bae6e24e62153b567f320ccecc7bce76bc826d1))


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @fluencelabs/js-peer bumped from 0.8.10 to 0.9.0
* @fluencelabs/interfaces bumped from 0.7.6 to 0.8.0

## [0.13.10](https://github.com/fluencelabs/js-client/compare/js-client.web.standalone-v0.13.9...js-client.web.standalone-v0.13.10) (2023-06-20)


Expand Down
8 changes: 4 additions & 4 deletions packages/client/js-client.web.standalone/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluencelabs/js-client.web.standalone",
"version": "0.13.10",
"version": "0.14.0",
"description": "TypeScript implementation of Fluence Peer",
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand All @@ -16,13 +16,13 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/js-peer": "0.8.10",
"@fluencelabs/interfaces": "0.7.6",
"@fluencelabs/js-peer": "0.9.0",
"@fluencelabs/interfaces": "0.8.0",
"buffer": "6.0.3",
"process": "0.11.10"
},
"devDependencies": {
"@fluencelabs/avm": "https://github.com/fluencelabs/js-client/raw/feat/add-signatures/avm-0.39.1-feat-VM-276-aquavm-keypair-e2816f6-1588-1.0.tgz",
"@fluencelabs/avm": "0.40.0",
"@fluencelabs/marine-js": "0.3.45",
"@types/node": "16.11.59",
"@types/jest": "28.1.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/client/js-client.web/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
* dependencies
* @fluencelabs/js-peer bumped from 0.8.8 to 0.8.9

### Dependencies

* The following workspace dependencies were updated
* dependencies
* @fluencelabs/js-peer bumped from 0.8.10 to 0.9.0
* @fluencelabs/interfaces bumped from 0.7.6 to 0.8.0

## [0.2.3](https://github.com/fluencelabs/js-client/compare/js-client.web-v0.2.2...js-client.web-v0.2.3) (2023-06-20)


Expand Down
6 changes: 3 additions & 3 deletions packages/client/js-client.web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluencelabs/js-client.web",
"version": "0.2.3",
"version": "0.2.4",
"description": "TypeScript implementation of Fluence Peer",
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand All @@ -16,8 +16,8 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/js-peer": "0.8.10",
"@fluencelabs/interfaces": "0.7.6"
"@fluencelabs/js-peer": "0.9.0",
"@fluencelabs/interfaces": "0.8.0"
},
"devDependencies": {
"@types/node": "16.11.59",
Expand Down
11 changes: 11 additions & 0 deletions packages/core/interfaces/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [0.8.0](https://github.com/fluencelabs/js-client/compare/interfaces-v0.7.6...interfaces-v0.8.0) (2023-06-29)


### ⚠ BREAKING CHANGES

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315)

### Features

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315) ([8bae6e2](https://github.com/fluencelabs/js-client/commit/8bae6e24e62153b567f320ccecc7bce76bc826d1))

## [0.7.6](https://github.com/fluencelabs/js-client/compare/interfaces-v0.7.5...interfaces-v0.7.6) (2023-06-20)


Expand Down
4 changes: 2 additions & 2 deletions packages/core/interfaces/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@fluencelabs/interfaces",
"type": "module",
"version": "0.7.6",
"version": "0.8.0",
"description": "Interfaces",
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand Down Expand Up @@ -50,7 +50,7 @@
"dependencies": {},
"devDependencies": {
"@multiformats/multiaddr": "11.3.0",
"@fluencelabs/avm": "https://github.com/fluencelabs/js-client/raw/feat/add-signatures/avm-0.39.1-feat-VM-276-aquavm-keypair-e2816f6-1588-1.0.tgz",
"@fluencelabs/avm": "0.40.0",
"@fluencelabs/marine-js": "0.3.45"
}
}
18 changes: 18 additions & 0 deletions packages/core/js-peer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Changelog

## [0.9.0](https://github.com/fluencelabs/js-client/compare/js-peer-v0.8.10...js-peer-v0.9.0) (2023-06-29)


### ⚠ BREAKING CHANGES

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315)

### Features

* **avm:** avm 0.40.0 (https://github.com/fluencelabs/js-client/pull/315) ([8bae6e2](https://github.com/fluencelabs/js-client/commit/8bae6e24e62153b567f320ccecc7bce76bc826d1))


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @fluencelabs/interfaces bumped from 0.7.6 to 0.8.0

## [0.8.10](https://github.com/fluencelabs/js-client/compare/js-peer-v0.8.9...js-peer-v0.8.10) (2023-06-20)


Expand Down
6 changes: 3 additions & 3 deletions packages/core/js-peer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluencelabs/js-peer",
"version": "0.8.10",
"version": "0.9.0",
"description": "TypeScript implementation of Fluence Peer",
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand All @@ -17,8 +17,8 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/interfaces": "0.7.6",
"@fluencelabs/avm": "https://github.com/fluencelabs/js-client/raw/feat/add-signatures/avm-0.39.1-feat-VM-276-aquavm-keypair-e2816f6-1588-1.0.tgz",
"@fluencelabs/interfaces": "0.8.0",
"@fluencelabs/avm": "0.40.0",
"@fluencelabs/marine-js": "0.3.45",
"multiformats": "11.0.1",
"debug": "4.3.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('FluenceClient usage test suite', () => {
(call %init_peer_id% ("callback" "callback") [result])
)
)
(seq
(seq
(call init_relay ("op" "identity") [])
(call %init_peer_id% ("callback" "error") [%last_error%])
)
Expand Down
2 changes: 1 addition & 1 deletion packages/core/js-peer/src/clientPeer/checkConnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const checkConnection = async (peer: ClientPeer, ttl?: number): Promise<b
}
return true;
} catch (e) {
log.error('error on establishing connection. Relay: %s error: %j', e, peer.getRelayPeerId());
log.error('error on establishing connection. Relay: %s error: %j', peer.getRelayPeerId(), e);
return false;
}
};
Loading

0 comments on commit 0aeeaaa

Please sign in to comment.