feat!: Unify all packages

.github/release-please/config.json

@@ -9,11 +9,8 @@
   ],
   "packages": {
     "packages/client/api": {},
-    "packages/client/js-client.node": {},
-    "packages/client/js-client.web": {},
-    "packages/client/js-client.web.standalone": {},
-    "packages/client/tools": {},
+    "packages/core/js-client": {},
     "packages/core/interfaces": {},
-    "packages/core/js-peer": {}
+    "packages/core/marine-worker": {}
   }
 }

.github/release-please/manifest.json

@@ -1,9 +1,6 @@
 {
   "packages/client/api": "0.12.1",
-  "packages/client/js-client.node": "0.7.1",
-  "packages/client/js-client.web": "0.2.5",
-  "packages/client/js-client.web.standalone": "0.14.1",
-  "packages/client/tools": "0.2.1",
-  "packages/core/interfaces": "0.8.1",
-  "packages/core/js-peer": "0.9.1"
+  "packages/core/js-client": "0.0.10",
+  "packages/core/marine-worker": "0.2.10",
+  "packages/core/interfaces": "0.8.1"
 }

.github/workflows/e2e.yml

@@ -51,4 +51,4 @@ jobs:
     uses: fluencelabs/flox/.github/workflows/tests.yml@main
     with:
       js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
-      nox-image: "fluencelabs/nox:unstable_minimal"
+      nox-image: "fluencelabs/nox:unstable_minimal"

packages/@tests/aqua/package.json

@@ -18,6 +18,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@fluencelabs/js-client.api": "workspace:^",
+        "@fluencelabs/js-client": "workspace:^",
         "base64-js": "1.5.1"
     },
     "devDependencies": {

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

@@ -1,6 +1,6 @@
 import { fromByteArray } from 'base64-js';
-import { Fluence } from '@fluencelabs/js-client.api';
-import type { ClientConfig } from '@fluencelabs/js-client.api';
+import { Fluence } from '@fluencelabs/js-client';
+import type { ClientConfig } from '@fluencelabs/js-client';
 import { registerHelloWorld, helloTest, marineTest, resourceTest } from './_aqua/smoke_test.js';
 import { wasm } from './wasmb64.js';
 

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

@@ -17,9 +17,7 @@
     "author": "Fluence Labs",
     "license": "Apache-2.0",
     "dependencies": {
-        "@fluencelabs/js-client.api": "workspace:^",
-        "@fluencelabs/js-client.node": "workspace:^",
-        "@test/aqua_for_test": "workspace:^"
-    },
-    "devDependencies": {}
+        "@fluencelabs/js-client": "workspace:*",
+        "@test/aqua_for_test": "workspace:../../aqua"
+    }
 }

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

@@ -1,4 +1,4 @@
-import '@fluencelabs/js-client.node';
+import '@fluencelabs/js-client';
 import { runTest } from '@test/aqua_for_test';
 
 runTest().then(() => console.log('Smoke tests succeed!'));

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

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

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

@@ -2,20 +2,25 @@ import puppeteer from 'puppeteer';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 
-import { startCdn, startContentServer, stopServer } from '@test/test-utils';
+import { CDN_PUBLIC_PATH, startContentServer, stopServer } from '@test/test-utils';
+import { access, symlink } from 'fs/promises';
 
 const port = 3001;
 const uri = `http://localhost:${port}/`;
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const publicPath = join(__dirname, '../build/');
 
 const test = async () => {
-    const cdn = await startCdn(8766);
     const localServer = await startContentServer(port, publicPath);
+    try {
+        await access(join(publicPath, 'source'))
+    } catch {
+        await symlink(CDN_PUBLIC_PATH, join(publicPath, 'source'));
+    }
 
     console.log('starting puppeteer...');
-    const browser = await puppeteer.launch();
-    const page = await browser.newPage();
+    const browser = await puppeteer.launch({ headless: false });
+    const page = (await browser.pages())[0];
 
     // uncomment to debug what's happening inside the browser
     // page.on('console', (msg) => console.log('// from console: ', msg.text()));
@@ -34,7 +39,6 @@ const test = async () => {
     console.log('raw result: ', content);
 
     await browser.close();
-    await stopServer(cdn);
     await stopServer(localServer);
 
     if (!content) {

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

@@ -19,8 +19,8 @@
     "author": "Fluence Labs",
     "license": "Apache-2.0",
     "dependencies": {
-        "@fluencelabs/js-client.web.standalone": "workspace:^",
-        "@test/test-utils": "workspace:^"
+        "@fluencelabs/js-client": "workspace:^",
+        "@test/test-utils": "workspace:../../test-utils"
     },
     "devDependencies": {}
 }

packages/@tests/smoke/web/public/index.html

@@ -16,8 +16,8 @@ <h1>Open console f12</h1>
 
         <div id="res-placeholder"></div>
 
-        <script src='http://localhost:8765/js-client.min.js'></script>
-        <script src="./index.js"></script>
+        <script src="js-client.min.js"></script>
+        <script src="index.js"></script>
     </main>
 </body>
 

packages/@tests/smoke/web/public/index.js

@@ -84,7 +84,7 @@ const getRelayTime = () => {
 
 const main = async () => {
     console.log('starting fluence...');
-    await fluence.defaultClient.connect(relay);
+    fluence.defaultClient = await fluence.clientFactory(relay);
     console.log('started fluence');
 
     console.log('getting relay time...');
@@ -104,7 +104,7 @@ btn.addEventListener('click', () => {
     main().then((res) => {
         const inner = document.createElement('div');
         inner.id = 'res';
-        inner.innerText = 'res';
+        inner.innerText = res;
         document.getElementById('res-placeholder').appendChild(inner);
     });
 });

packages/@tests/smoke/web/src/index.ts

@@ -2,20 +2,25 @@ import puppeteer from 'puppeteer';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 
-import { startCdn, startContentServer, stopServer } from '@test/test-utils';
+import { CDN_PUBLIC_PATH, startCdn, startContentServer, stopServer } from '@test/test-utils';
+import { symlink, access } from 'fs/promises';
 
 const port = 3000;
 const uri = `http://localhost:${port}/`;
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const publicPath = join(__dirname, '../public/');
 
 const test = async () => {
-    const cdn = await startCdn(8765);
     const localServer = await startContentServer(port, publicPath);
+    try {
+        await access(join(publicPath, 'source'))
+    } catch {
+        await symlink(CDN_PUBLIC_PATH, join(publicPath, 'source'));
+    }
 
     console.log('starting puppeteer...');
     const browser = await puppeteer.launch();
-    const page = await browser.newPage();
+    const page = (await browser.pages())[0];
 
     // uncomment to debug what's happening inside the browser
     // page.on('console', (msg) => console.log('// from console: ', msg.text()));
@@ -34,7 +39,6 @@ const test = async () => {
     console.log('raw result: ', content);
 
     await browser.close();
-    await stopServer(cdn);
     await stopServer(localServer);
 
     if (!content) {

packages/@tests/test-utils/package.json

@@ -16,8 +16,6 @@
     "author": "Fluence Labs",
     "license": "Apache-2.0",
     "dependencies": {
-        "@fluencelabs/js-client.api": "workspace:^",
-        "@fluencelabs/js-client.node": "workspace:^",
         "serve-handler": "6.1.5"
     },
     "devDependencies": {

packages/@tests/test-utils/src/index.ts

@@ -7,14 +7,25 @@ import { fileURLToPath } from 'url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-const CDN_PUBLIC_PATH = join(__dirname, '../../../client/js-client.web.standalone/dist/');
+export const CDN_PUBLIC_PATH = join(__dirname, '../../../core/js-client/dist/browser');
 
 export const startCdn = (port: number) => startContentServer(port, CDN_PUBLIC_PATH);
 
 export const startContentServer = (port: number, publicDir: string): Promise<Server> => {
     const server = createServer((request, response) => {
         return handler(request, response, {
             public: publicDir,
+            rewrites: [{
+                source: '/js-client.min.js',
+                destination: '/source/index.umd.cjs'
+            }],
+            headers: [{
+                source: '**/*',
+                headers: [
+                    { key: 'Cross-Origin-Opener-Policy', value: 'same-origin' },
+                    { key: 'Cross-Origin-Embedder-Policy', value: 'require-corp' }
+                ]
+            }]
         });
     });
 

packages/client/api/README.md

@@ -2,6 +2,11 @@
 
 This package is a part of FluenceJS, the official implementation of the Fluence Peer in typescript. See the [FluenceJS repo](https://github.com/fluencelabs/fluence-js) for more info
 
+## Notes
+
+This package just reexports everything from main library for backward compatibility
+`export * from '@fluencelabs/js-client';`
+
 ## Contributing
 
 While the project is still in the early stages of development, you are welcome to track progress and contribute. As the project is undergoing rapid changes, interested contributors should contact the team before embarking on larger pieces of work. All contributors should consult with and agree to our [basic contributing rules](CONTRIBUTING.md).

packages/client/api/package.json

@@ -24,13 +24,14 @@
     "repository": "https://github.com/fluencelabs/fluence-js",
     "author": "Fluence Labs",
     "license": "Apache-2.0",
-    "dependencies": {
-        "@fluencelabs/interfaces": "0.8.1"
-    },
     "devDependencies": {
         "@fluencelabs/avm": "0.43.1",
+        "@fluencelabs/interfaces": "workspace:*",
         "@fluencelabs/marine-js": "0.7.2",
-        "microbundle": "0.15.1",
-        "dts-bundle-generator": "7.2.0"
+        "dts-bundle-generator": "7.2.0",
+        "microbundle": "0.15.1"
+    },
+    "dependencies": {
+        "@fluencelabs/js-client": "0.0.10"
     }
 }

packages/client/api/src/index.ts

@@ -13,120 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { getFluenceInterface, getFluenceInterfaceFromGlobalThis } from './util.js';
-import {
-    IFluenceClient,
-    ClientConfig,
-    RelayOptions,
-    ConnectionState,
-    CallAquaFunctionType,
-    RegisterServiceType,
-} from '@fluencelabs/interfaces';
-export type { IFluenceClient, ClientConfig, CallParams } from '@fluencelabs/interfaces';
 
-export {
-    ArrayType,
-    ArrowType,
-    ArrowWithCallbacks,
-    ArrowWithoutCallbacks,
-    BottomType,
-    FunctionCallConstants,
-    FunctionCallDef,
-    LabeledProductType,
-    NilType,
-    NonArrowType,
-    OptionType,
-    ProductType,
-    ScalarNames,
-    ScalarType,
-    ServiceDef,
-    StructType,
-    TopType,
-    UnlabeledProductType,
-    CallAquaFunctionType,
-    CallAquaFunctionArgs,
-    PassedArgs,
-    FnConfig,
-    RegisterServiceType,
-    RegisterServiceArgs,
-} from '@fluencelabs/interfaces';
-
-export { v5_callFunction, v5_registerService } from './compilerSupport/implementation.js';
-
-/**
- * Public interface to Fluence Network
- */
-export const Fluence = {
-    /**
-     * Connect to the Fluence network
-     * @param relay - relay node to connect to
-     * @param config - client configuration
-     */
-    connect: async (relay: RelayOptions, config?: ClientConfig): Promise<void> => {
-        const fluence = await getFluenceInterface();
-        const client = await fluence.clientFactory(relay, config);
-        fluence.defaultClient = client;
-    },
-
-    /**
-     * Disconnect from the Fluence network
-     */
-    disconnect: async (): Promise<void> => {
-        const fluence = await getFluenceInterface();
-        await fluence.defaultClient?.disconnect();
-        fluence.defaultClient = undefined;
-    },
-
-    /**
-     * Handle connection state changes. Immediately returns the current connection state
-     */
-    onConnectionStateChange(handler: (state: ConnectionState) => void): ConnectionState {
-        const optimisticResult = getFluenceInterfaceFromGlobalThis();
-        if (optimisticResult && optimisticResult.defaultClient) {
-            return optimisticResult.defaultClient.onConnectionStateChange(handler);
-        }
-
-        getFluenceInterface().then((fluence) => {
-            fluence.defaultClient?.onConnectionStateChange(handler);
-        });
-
-        return 'disconnected';
-    },
-
-    /**
-     * Low level API. Get the underlying client instance which holds the connection to the network
-     * @returns IFluenceClient instance
-     */
-    getClient: async (): Promise<IFluenceClient> => {
-        const fluence = await getFluenceInterface();
-        if (!fluence.defaultClient) {
-            throw new Error('Fluence client is not initialized. Call Fluence.connect() first');
-        }
-        return fluence.defaultClient;
-    },
-};
-
-/**
- * Low level API. Generally you need Fluence.connect() instead.
- * @returns IFluenceClient instance
- */
-export const createClient = async (relay: RelayOptions, config?: ClientConfig): Promise<IFluenceClient> => {
-    const fluence = await getFluenceInterface();
-    return await fluence.clientFactory(relay, config);
-};
-
-/**
- * Low level API. Generally you should use code generated by the Aqua compiler.
- */
-export const callAquaFunction: CallAquaFunctionType = async (args) => {
-    const fluence = await getFluenceInterface();
-    return await fluence.callAquaFunction(args);
-};
-
-/**
- * Low level API. Generally you should use code generated by the Aqua compiler.
- */
-export const registerService: RegisterServiceType = async (args) => {
-    const fluence = await getFluenceInterface();
-    return await fluence.registerService(args);
-};
+export * from '@fluencelabs/js-client';