chore: fix build [fixes DXJ-482] (#352)

* Remove additional node targeted build

* Fix test errors

* Typo fix

* Remove headless

* Prevent JSON error

* Cache json parsing

* Remove resource test as it's not working in new nox

* Fix test output

* enable smoke tests

* add puppeteer to deps

* Remove headless option

Author: Akim

.github/workflows/tests.yml

@@ -6,7 +6,7 @@ on:
       nox-image:
         description: "nox image tag"
         type: string
-        default: "fluencelabs/nox:minimal_0.2.5"
+        default: "fluencelabs/nox:minimal_0.2.9"
       avm-version:
         description: "@fluencelabs/avm version"
         type: string

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

@@ -53,15 +53,6 @@ export const runTest = async (): Promise<TestResult> => {
         console.log('my peer id: ', client.getPeerId());
         console.log('my sk id: ', fromByteArray(client.getPeerSecretKey()));
 
-        console.log('running resource test...');
-        const [res, errors] = await resourceTest('my_resource');
-        if (res === null) {
-            console.log('resource test failed, errors', errors);
-            return { type: 'failure', error: errors.join(', ') };
-        } else {
-            console.log('resource test finished, result', res);
-        }
-
         console.log('running hello test...');
         const hello = await helloTest();
         console.log('hello test finished, result: ', hello);
@@ -75,9 +66,8 @@ export const runTest = async (): Promise<TestResult> => {
         console.log('marine test finished, result: ', marine);
 
         const returnVal = {
-            res,
             hello,
-            // marine,
+            marine,
         };
         return { type: 'success', data: JSON.stringify(returnVal) };
     } finally {

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

@@ -11,7 +11,7 @@
     "type": "module",
     "scripts": {
         "build": "tsc",
-        "test_commented_out": "node --loader ts-node/esm ./src/index.ts"
+        "test": "node --loader ts-node/esm ./src/index.ts"
     },
     "repository": "https://github.com/fluencelabs/fluence-js",
     "author": "Fluence Labs",

packages/@tests/smoke/web-cra-ts/package.json

@@ -19,10 +19,11 @@
         "web-vitals": "2.1.4"
     },
     "devDependencies": {
-        "@test/test-utils": "workspace:^"
+        "@test/test-utils": "workspace:^",
+        "puppeteer": "19.7.2"
     },
     "scripts": {
-        "test_commented_out": "node --loader ts-node/esm ./test/index.ts",
+        "test": "node --loader ts-node/esm ./test/index.ts",
         "simulate-cdn": "http-server -p 8766 ../../../client/js-client.web.standalone/dist",
         "start": "react-scripts start",
         "build": "react-scripts build",

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

@@ -19,7 +19,7 @@ const test = async () => {
     }
 
     console.log('starting puppeteer...');
-    const browser = await puppeteer.launch({ headless: false });
+    const browser = await puppeteer.launch();
     const page = (await browser.pages())[0];
 
     // uncomment to debug what's happening inside the browser

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

@@ -12,7 +12,7 @@
     "scripts": {
         "build": "tsc",
         "simulate-cdn": "http-server -p 8765 ../../../client/js-client.web.standalone/dist",
-        "test_commented_out": "node --loader ts-node/esm ./src/index.ts",
+        "test": "node --loader ts-node/esm ./src/index.ts",
         "serve": "http-server public"
     },
     "repository": "https://github.com/fluencelabs/fluence-js",
@@ -22,5 +22,7 @@
         "@fluencelabs/js-client": "workspace:^",
         "@test/test-utils": "workspace:../../test-utils"
     },
-    "devDependencies": {}
+    "devDependencies": {
+        "puppeteer": "19.7.2"
+    }
 }

packages/core/js-client/build.ts

@@ -9,17 +9,17 @@
     "files": [
         "dist"
     ],
-    "main": "./dist/browser/index.js",
-    "unpkg": "./dist/browser/index.js",
-    "types": "./dist/types/index.d.ts",
+    "main": "./dist/index.js",
+    "unpkg": "./dist/browser/index.umd.js",
+    "types": "./dist/index.d.ts",
     "exports": {
-        "types": "./dist/types/index.d.ts",
-        "node": "./dist/node/index.js",
+        "types": "./dist/index.d.ts",
+        "node": "./dist/index.js",
         "default": "./dist/browser/index.js"
     },
     "type": "module",
     "scripts": {
-        "build": "node --loader ts-node/esm build.ts && tsc --emitDeclarationOnly",
+        "build": "tsc && vite build",
         "test": "vitest --threads false run"
     },
     "repository": "https://github.com/fluencelabs/fluence-js",
@@ -29,6 +29,7 @@
         "@chainsafe/libp2p-noise": "13.0.0",
         "@chainsafe/libp2p-yamux": "5.0.0",
         "@fluencelabs/interfaces": "workspace:*",
+        "@fluencelabs/marine-worker": "0.3.3",
         "@libp2p/crypto": "2.0.3",
         "@libp2p/interface": "0.1.2",
         "@libp2p/peer-id": "3.0.2",
@@ -55,15 +56,12 @@
         "@fluencelabs/aqua-api": "0.9.3",
         "@fluencelabs/avm": "0.48.0",
         "@fluencelabs/marine-js": "0.7.2",
-        "@fluencelabs/marine-worker": "workspace:*",
-        "@laynezh/vite-plugin-lib-assets": "0.5.2",
         "@rollup/plugin-inject": "5.0.3",
         "@types/bs58": "4.0.1",
         "@types/debug": "4.1.7",
+        "@types/node": "20.7.0",
         "@types/uuid": "8.3.2",
-        "node-stdlib-browser": "1.2.0",
         "vite": "4.0.4",
-        "vite-plugin-replace": "0.1.1",
         "vite-tsconfig-paths": "4.0.3",
         "vitest": "0.29.7"
     }

packages/core/js-client/package.json

@@ -14,6 +14,27 @@
  * limitations under the License.
  */
 
-export async function fetchResource(assetPath: string, version: string) {
-    return fetch(new globalThis.URL(`@fluencelabs/js-client@${version}/dist` + assetPath, `https://unpkg.com/`));
+interface PackageJsonContent {
+    dependencies: Record<string, string | undefined>;
+    devDependencies: Record<string, string | undefined>;
+}
+
+// This will be substituted in build phase
+const packageJsonContentString = `__PACKAGE_JSON_CONTENT__`;
+let parsedPackageJsonContent: PackageJsonContent;
+
+const PRIMARY_CDN = "https://unpkg.com/"; 
+
+export async function fetchResource(pkg: string, assetPath: string) {
+    const packageJsonContent = parsedPackageJsonContent || (parsedPackageJsonContent = JSON.parse(packageJsonContentString));
+    const version = packageJsonContent.dependencies[pkg] || packageJsonContent.devDependencies[pkg];
+    
+    if (version === undefined) {
+        const availableDeps = [...Object.keys(packageJsonContent.dependencies), ...Object.keys(packageJsonContent.devDependencies)];
+        throw new Error(`Cannot find version of ${pkg} in package.json. Available versions: ${availableDeps.join(',')}`);
+    }
+    
+    const refinedAssetPath = assetPath.startsWith('/') ? assetPath.slice(1) : assetPath;
+    
+    return fetch(new globalThis.URL(`${pkg}@${version}/` + refinedAssetPath, PRIMARY_CDN));
 }

packages/core/js-client/src/fetchers/browser.ts

@@ -20,11 +20,11 @@ import process from 'process';
 
 const isNode = typeof process !== 'undefined' && process?.release?.name === 'node';
 
-export async function fetchResource(assetPath: string, version: string) {
+export async function fetchResource(pkg: string, path: string) {
     switch (true) {
         case isNode:
-            return fetchResourceNode(assetPath, version);
+            return fetchResourceNode(pkg, path);
         default:
-            return fetchResourceBrowser(assetPath, version);
+            return fetchResourceBrowser(pkg, path);
     }
 }