fix(tests): Repair integration tests [fixes DXJ-506] (#364)

* Add test server

* remove headless

* Support for web-cra

* Review fixes and bug fixes

* Add error message

Author: Akim

.eslintrc.json

@@ -18,7 +18,7 @@
     "license-header",
     "unused-imports"
   ],
-  "ignorePatterns": ["**/node_modules/**/*", "**/dist/**/*"],
+  "ignorePatterns": ["**/node_modules/", "**/dist/", "**/build/", "**/public/"],
   "rules": {
     "eqeqeq": [
       "error",

.gitignore

@@ -7,3 +7,4 @@ node_modules/
 
 # Build directory
 **/dist
+**/public

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

@@ -4,10 +4,11 @@ import { fileURLToPath } from "url";
 
 import {
   CDN_PUBLIC_PATH,
+  createSymlinkIfNotExists,
+  JS_CLIENT_DEPS_PATH,
   startContentServer,
   stopServer,
 } from "@test/test-utils";
-import { access, symlink } from "fs/promises";
 
 const port = 3001;
 const uri = `http://localhost:${port}/`;
@@ -16,11 +17,11 @@ const publicPath = join(__dirname, "../build/");
 
 const test = async () => {
   const localServer = await startContentServer(port, publicPath);
-  try {
-    await access(join(publicPath, "source"));
-  } catch {
-    await symlink(CDN_PUBLIC_PATH, join(publicPath, "source"));
-  }
+  await createSymlinkIfNotExists(CDN_PUBLIC_PATH, join(publicPath, "source"));
+  await createSymlinkIfNotExists(
+    JS_CLIENT_DEPS_PATH,
+    join(publicPath, "node_modules"),
+  );
 
   console.log("starting puppeteer...");
   const browser = await puppeteer.launch();

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

@@ -85,7 +85,9 @@ const getRelayTime = () => {
 
 const main = async () => {
   console.log("starting fluence...");
-  fluence.defaultClient = await fluence.clientFactory(relay, {});
+  fluence.defaultClient = await fluence.clientFactory(relay, {
+    CDNUrl: "http://localhost:3000",
+  });
   console.log("started fluence");
 
   console.log("getting relay time...");

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

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import { symlink, access } from "fs/promises";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 
 import {
   CDN_PUBLIC_PATH,
+  createSymlinkIfNotExists,
+  JS_CLIENT_DEPS_PATH,
   startContentServer,
   stopServer,
 } from "@test/test-utils";
@@ -33,11 +34,12 @@ const publicPath = join(__dirname, "../public/");
 const test = async () => {
   const localServer = await startContentServer(port, publicPath);
 
-  try {
-    await access(join(publicPath, "source"));
-  } catch {
-    await symlink(CDN_PUBLIC_PATH, join(publicPath, "source"));
-  }
+  await createSymlinkIfNotExists(CDN_PUBLIC_PATH, join(publicPath, "source"));
+
+  await createSymlinkIfNotExists(
+    JS_CLIENT_DEPS_PATH,
+    join(publicPath, "node_modules"),
+  );
 
   console.log("starting puppeteer...");
   const browser = await puppeteer.launch();

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

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { access, symlink } from "fs/promises";
 import { createServer } from "http";
 import type { Server } from "http";
 import { dirname, join } from "path";
@@ -28,10 +29,26 @@ export const CDN_PUBLIC_PATH = join(
   "../../../core/js-client/dist/browser",
 );
 
+export const JS_CLIENT_DEPS_PATH = join(
+  __dirname,
+  "../../../core/js-client/node_modules",
+);
+
 export const startCdn = (port: number) => {
   return startContentServer(port, CDN_PUBLIC_PATH);
 };
 
+export const createSymlinkIfNotExists = async (
+  target: string,
+  path: string,
+) => {
+  try {
+    await access(path);
+  } catch {
+    await symlink(target, path);
+  }
+};
+
 export const startContentServer = (
   port: number,
   publicDir: string,
@@ -44,6 +61,22 @@ export const startContentServer = (
           source: "/js-client.min.js",
           destination: "/source/index.umd.cjs",
         },
+        // TODO:
+        // something like this
+        // {
+        //   source: "/@fluencelabs/:name(\\w+)@:version([\\d.]+)/:path*",
+        //   destination: "/deps/@fluencelabs/:name/:path",
+        // }
+        // not supported for some reason. Need to manually iterate over all possible paths
+        {
+          source: "/@fluencelabs/:name([\\w-]+)@:version([\\d.]+)/dist/:asset",
+          destination: "/node_modules/@fluencelabs/:name/dist/:asset",
+        },
+        {
+          source:
+            "/@fluencelabs/:name([\\w-]+)@:version([\\d.]+)/dist/:prefix/:asset",
+          destination: "/node_modules/@fluencelabs/:name/dist/:prefix/:asset",
+        },
       ],
       headers: [
         {

packages/core/interfaces/src/commonTypes.ts

@@ -23,14 +23,6 @@ import { InterfaceToType, MaybePromise } from "./utils.js";
  */
 export type PeerIdB58 = string;
 
-/**
- * Node of the Fluence network specified as a pair of node's multiaddr and it's peer id
- */
-export type Node = {
-  peerId: PeerIdB58;
-  multiaddr: string;
-};
-
 /**
  * Additional information about a service call
  * @typeparam ArgName

packages/core/interfaces/src/compilerSupport/compilerSupportInterface.ts

@@ -15,7 +15,6 @@
  */
 
 import { JSONValue } from "../commonTypes.js";
-import { IFluenceInternalApi } from "../fluenceClient.js";
 
 import {
   FnConfig,
@@ -38,11 +37,12 @@ export type PassedArgs = { [key: string]: JSONValue | ArgCallbackFunction };
 /**
  * Arguments for callAquaFunction function
  */
+// TODO: move to js-client side
 export interface CallAquaFunctionArgs {
   /**
    * Peer to call the function on
    */
-  peer: IFluenceInternalApi;
+  peer: unknown;
 
   /**
    * Function definition
@@ -79,7 +79,7 @@ export interface RegisterServiceArgs {
   /**
    * Peer to register the service on
    */
-  peer: IFluenceInternalApi;
+  peer: unknown;
 
   /**
    * Service definition

packages/core/interfaces/src/index.ts

@@ -17,5 +17,4 @@
 export * from "./compilerSupport/aquaTypeDefinitions.js";
 export * from "./compilerSupport/compilerSupportInterface.js";
 export * from "./commonTypes.js";
-export * from "./fluenceClient.js";
 export * from "./future.js";

packages/core/js-client/src/clientPeer/ClientPeer.ts

@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  ClientConfig,
-  ConnectionState,
-  IFluenceClient,
-  RelayOptions,
-} from "@fluencelabs/interfaces";
-
 import {
   RelayConnection,
   RelayConnectionConfig,
@@ -32,6 +25,13 @@ import { IMarineHost } from "../marine/interfaces.js";
 import { relayOptionToMultiaddr } from "../util/libp2pUtils.js";
 import { logger } from "../util/logger.js";
 
+import {
+  ClientConfig,
+  IFluenceClient,
+  ConnectionState,
+  RelayOptions,
+} from "./types.js";
+
 const log = logger("client");
 
 const DEFAULT_TTL_MS = 7000;