Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 97c2491

Browse files
Akimshamsartemrenovate[bot]fluencebotValeryAntopol
authored
feat!: Unify all packages (#327)
* * Separate marine worker as a package * Trying to fix tests * Finalizing test fixes * fix: rename back to Fluence CLI (#320) chore: rename back to Fluence CLI * fix(deps): update dependency @fluencelabs/avm to v0.43.1 (#322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: release master (#324) * chore: release master * chore: Regenerate pnpm lock file * feat: use marine-js 0.7.2 (#321) * use marine-js 0.5.0 * increace some timeouts * increace some timeouts * use latest marine + remove larger timeouts * propagate CallParameters type * use marine 0.7.2 * Temp use node 18 and 20 * Comment out node 20.x --------- Co-authored-by: Anatoly Laskaris <github_me@nahsi.dev> * chore: Fix test with node 18/20 error message (#323) * Fix test with node 18/20 error message * Run tests on node 18 and 20 * Enhance description * Fix type and obj property --------- Co-authored-by: Anatoly Laskaris <github_me@nahsi.dev> * * Separate marine worker as a package * Trying to fix tests * Finalizing test fixes * * Refactoring packages. * Using CDN to load .wasm deps. * Setting up tests for new architecture * Fix almost all tests * Fix last strange test * Remove package specific packages * Remove avm class as it looks excessive * marine worker new version * misc refactoring/remove console.log's * Rename package js-peer to js-client * Move service info to marine worker * Change CDN path * Fix worker race confition * Remove buffer type * Remove turned off headless mode in platform tests * Remove async keyword to make tests pass * Remove util package * Make js-client.api package just reexport interface from js-client main package * Update package info in CI * Fix review comments * Remove test entry from marine-worker package * Misc fixes * Fix worker type * Add fetchers * Specify correct versions for js-client package * Set first ver for js-client * Update libp2p and related dep versions to the latest * Build all deps into package itself * Fix review * Refine package * Fix comment * Update packages/core/js-client/src/fetchers/browser.ts * Update packages/core/js-client/src/fetchers/index.ts * Update packages/core/js-client/src/fetchers/node.ts * Update packages/core/js-client/src/jsPeer/FluencePeer.ts * Update packages/core/js-client/src/keypair/__test__/KeyPair.spec.ts * Update packages/core/js-client/src/jsPeer/FluencePeer.ts Co-authored-by: shamsartem <shamsartem@gmail.com> * Delete outdated file * Need types for build to work * Inline func call * Add comments to replacement lines. P.S. we can remove some of them after update libp2p --------- Co-authored-by: shamsartem <shamsartem@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: fluencebot <116741523+fluencebot@users.noreply.github.com> Co-authored-by: Valery Antopol <valery.antopol@gmail.com> Co-authored-by: Anatoly Laskaris <github_me@nahsi.dev>
1 parent 2d2f559 commit 97c2491

File tree

130 files changed

+3375
-3144
lines changed

Some content is hidden

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

130 files changed

+3375
-3144
lines changed

‎.github/release-please/config.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
],
1010
"packages": {
1111
"packages/client/api": {},
12-
"packages/client/js-client.node": {},
13-
"packages/client/js-client.web": {},
14-
"packages/client/js-client.web.standalone": {},
15-
"packages/client/tools": {},
12+
"packages/core/js-client": {},
1613
"packages/core/interfaces": {},
17-
"packages/core/js-peer": {}
14+
"packages/core/marine-worker": {}
1815
}
1916
}

‎.github/release-please/manifest.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"packages/client/api": "0.12.1",
3-
"packages/client/js-client.node": "0.7.1",
4-
"packages/client/js-client.web": "0.2.5",
5-
"packages/client/js-client.web.standalone": "0.14.1",
6-
"packages/client/tools": "0.2.1",
7-
"packages/core/interfaces": "0.8.1",
8-
"packages/core/js-peer": "0.9.1"
3+
"packages/core/js-client": "0.0.10",
4+
"packages/core/marine-worker": "0.2.10",
5+
"packages/core/interfaces": "0.8.1"
96
}

‎.github/workflows/e2e.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ jobs:
5151
uses: fluencelabs/flox/.github/workflows/tests.yml@main
5252
with:
5353
js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
54-
nox-image: "fluencelabs/nox:unstable_minimal"
54+
nox-image: "fluencelabs/nox:unstable_minimal"

‎packages/@tests/aqua/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"license": "Apache-2.0",
1919
"dependencies": {
2020
"@fluencelabs/js-client.api": "workspace:^",
21+
"@fluencelabs/js-client": "workspace:^",
2122
"base64-js": "1.5.1"
2223
},
2324
"devDependencies": {

‎packages/@tests/aqua/src/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { fromByteArray } from 'base64-js';
2-
import { Fluence } from '@fluencelabs/js-client.api';
3-
import type { ClientConfig } from '@fluencelabs/js-client.api';
2+
import { Fluence } from '@fluencelabs/js-client';
3+
import type { ClientConfig } from '@fluencelabs/js-client';
44
import { registerHelloWorld, helloTest, marineTest, resourceTest } from './_aqua/smoke_test.js';
55
import { wasm } from './wasmb64.js';
66

‎packages/@tests/smoke/node/package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
"author": "Fluence Labs",
1818
"license": "Apache-2.0",
1919
"dependencies": {
20-
"@fluencelabs/js-client.api": "workspace:^",
21-
"@fluencelabs/js-client.node": "workspace:^",
22-
"@test/aqua_for_test": "workspace:^"
23-
},
24-
"devDependencies": {}
20+
"@fluencelabs/js-client": "workspace:*",
21+
"@test/aqua_for_test": "workspace:../../aqua"
22+
}
2523
}

‎packages/@tests/smoke/node/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@fluencelabs/js-client.node';
1+
import '@fluencelabs/js-client';
22
import { runTest } from '@test/aqua_for_test';
33

44
runTest().then(() => console.log('Smoke tests succeed!'));

‎packages/@tests/smoke/web-cra-ts/public/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1" />
88
<meta name="theme-color" content="#000000" />
99
<meta name="description" content="Web site created using create-react-app" />
10-
<script src='http://localhost:8766/js-client.min.js' async></script>
10+
<!-- Ideally we want to use 'async' here. Currently, it's not supported. -->
11+
<script src="js-client.min.js"></script>
1112
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
1213
<!--
1314
manifest.json provides metadata used when your web app is installed on a

‎packages/@tests/smoke/web-cra-ts/test/index.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,25 @@ import puppeteer from 'puppeteer';
22
import { dirname, join } from 'path';
33
import { fileURLToPath } from 'url';
44

5-
import { startCdn, startContentServer, stopServer } from '@test/test-utils';
5+
import { CDN_PUBLIC_PATH, startContentServer, stopServer } from '@test/test-utils';
6+
import { access, symlink } from 'fs/promises';
67

78
const port = 3001;
89
const uri = `http://localhost:${port}/`;
910
const __dirname = dirname(fileURLToPath(import.meta.url));
1011
const publicPath = join(__dirname, '../build/');
1112

1213
const test = async () => {
13-
const cdn = await startCdn(8766);
1414
const localServer = await startContentServer(port, publicPath);
15+
try {
16+
await access(join(publicPath, 'source'))
17+
} catch {
18+
await symlink(CDN_PUBLIC_PATH, join(publicPath, 'source'));
19+
}
1520

1621
console.log('starting puppeteer...');
17-
const browser = await puppeteer.launch();
18-
const page = await browser.newPage();
22+
const browser = await puppeteer.launch({ headless: false });
23+
const page = (await browser.pages())[0];
1924

2025
// uncomment to debug what's happening inside the browser
2126
// page.on('console', (msg) => console.log('// from console: ', msg.text()));
@@ -34,7 +39,6 @@ const test = async () => {
3439
console.log('raw result: ', content);
3540

3641
await browser.close();
37-
await stopServer(cdn);
3842
await stopServer(localServer);
3943

4044
if (!content) {

‎packages/@tests/smoke/web/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"author": "Fluence Labs",
2020
"license": "Apache-2.0",
2121
"dependencies": {
22-
"@fluencelabs/js-client.web.standalone": "workspace:^",
23-
"@test/test-utils": "workspace:^"
22+
"@fluencelabs/js-client": "workspace:^",
23+
"@test/test-utils": "workspace:../../test-utils"
2424
},
2525
"devDependencies": {}
2626
}

0 commit comments

Comments
 (0)