Move non-relevant code from Marine repo into FluenceJS

.github/workflows/tests.yml

@@ -1,112 +1,42 @@
-name: Run tests with worflow_call
+name: Run tests
 
-on:
-  workflow_call:
-    inputs:
-      rust-peer-image:
-        description: "rust-peer image tag"
-        type: string
-        default: "fluencelabs/fluence:minimal"
-      avm-version:
-        description: "@fluencelabs/avm version"
-        type: string
-        default: "null"
-      marine-js-version:
-        description: "@fluencelabs/marine-js version"
-        type: string
-        default: "null"
-      ref:
-        description: "git ref to checkout to"
-        type: string
-        default: "master"
+defaults:
+    run:
+        working-directory: .
 
-env:
-  RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}"
-  FORCE_COLOR: true
-  CI: true
+on:
+    push:
 
 jobs:
-  fluence-js:
-    name: "Run tests"
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      id-token: write
-
-    strategy:
-      matrix:
-        node-version:
-          - 16.x
-          - 17.x
-
-    steps:
-      - name: Import secrets
-        uses: hashicorp/[email protected]
-        with:
-          url: https://vault.fluence.dev
-          path: jwt/github
-          role: ci
-          method: jwt
-          jwtGithubAudience: "https://github.com/fluencelabs"
-          jwtTtl: 300
-          secrets: |
-            kv/docker-registry/basicauth/ci username | DOCKER_USERNAME ;
-            kv/docker-registry/basicauth/ci password | DOCKER_PASSWORD
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          registry: docker.fluence.dev
-          username: ${{ env.DOCKER_USERNAME }}
-          password: ${{ env.DOCKER_PASSWORD }}
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          repository: fluencelabs/fluence-js
-          ref: ${{ inputs.ref }}
-
-      - name: Pull rust-peer image
-        run: docker pull $RUST_PEER_IMAGE
-
-      - name: Run rust-peer
-        uses: isbang/[email protected]
-        with:
-          compose-file: ".github/e2e/docker-compose.yml"
-          down-flags: "--volumes"
-
-      - name: Setup pnpm
-        uses: pnpm/[email protected]
-        with:
-          version: 7
-
-      - name: Setup node ${{ matrix.node-version }} with self-hosted registry
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          registry-url: "https://npm.fluence.dev"
-          cache: "pnpm"
-
-      - run: pnpm i
-
-      - name: Set avm version
-        if: inputs.avm-version != 'null'
-        uses: fluencelabs/github-actions/npm-set-dependency@main
-        with:
-          package: "@fluencelabs/avm"
-          version: ${{ inputs.avm-version }}
-          working-directory: packages/fluence-js
-          package-manager: pnpm
-
-      - name: Set marine-js version
-        if: inputs.marine-js-version != 'null'
-        uses: fluencelabs/github-actions/npm-set-dependency@main
-        with:
-          package: "@fluencelabs/marine-js"
-          version: ${{ inputs.marine-js-version }}
-          working-directory: packages/fluence-js
-          package-manager: pnpm
-
-      - run: pnpm -r build
-      - run: pnpm -r test
+    build:
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                node-version: [16.x, 17.x, 18.x]
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Setup Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Setup pnpm
+              uses: pnpm/[email protected]
+              with:
+                version: 7
+
+            - name: Run container with Fluence node
+              run: |
+                  docker pull fluencelabs/fluence
+                  docker run -d --rm -e RUST_LOG="info" -p 1210:1210 -p 4310:4310 fluencelabs/fluence -t 1210 -w 4310 -k gKdiCSUr1TFGFEgu2t8Ch1XEUsrN5A2UfBLjSZvfci9SPR3NvZpACfcpPGC3eY4zma1pk7UvYv5zb1VjvPHwCjj --local --aqua-pool-size 2
+
+            - run: pnpm i
+            - run: pnpm -r build
+              env:
+                  CI: true
+            - run: pnpm -r test
+              env:
+                  CI: true

.github/workflows/tests.yml.disabled

@@ -0,0 +1,112 @@
+name: Run tests with worflow_call
+
+on:
+  workflow_call:
+    inputs:
+      rust-peer-image:
+        description: "rust-peer image tag"
+        type: string
+        default: "fluencelabs/fluence:minimal"
+      avm-version:
+        description: "@fluencelabs/avm version"
+        type: string
+        default: "null"
+      marine-js-version:
+        description: "@fluencelabs/marine-js version"
+        type: string
+        default: "null"
+      ref:
+        description: "git ref to checkout to"
+        type: string
+        default: "master"
+
+env:
+  RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}"
+  FORCE_COLOR: true
+  CI: true
+
+jobs:
+  fluence-js:
+    name: "Run tests"
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      id-token: write
+
+    strategy:
+      matrix:
+        node-version:
+          - 16.x
+          - 17.x
+
+    steps:
+      - name: Import secrets
+        uses: hashicorp/[email protected]
+        with:
+          url: https://vault.fluence.dev
+          path: jwt/github
+          role: ci
+          method: jwt
+          jwtGithubAudience: "https://github.com/fluencelabs"
+          jwtTtl: 300
+          secrets: |
+            kv/docker-registry/basicauth/ci username | DOCKER_USERNAME ;
+            kv/docker-registry/basicauth/ci password | DOCKER_PASSWORD
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: docker.fluence.dev
+          username: ${{ env.DOCKER_USERNAME }}
+          password: ${{ env.DOCKER_PASSWORD }}
+
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          repository: fluencelabs/fluence-js
+          ref: ${{ inputs.ref }}
+
+      - name: Pull rust-peer image
+        run: docker pull $RUST_PEER_IMAGE
+
+      - name: Run rust-peer
+        uses: isbang/[email protected]
+        with:
+          compose-file: ".github/e2e/docker-compose.yml"
+          down-flags: "--volumes"
+
+      - name: Setup pnpm
+        uses: pnpm/[email protected]
+        with:
+          version: 7
+
+      - name: Setup node ${{ matrix.node-version }} with self-hosted registry
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: "https://npm.fluence.dev"
+          cache: "pnpm"
+
+      - run: pnpm i
+
+      - name: Set avm version
+        if: inputs.avm-version != 'null'
+        uses: fluencelabs/github-actions/npm-set-dependency@main
+        with:
+          package: "@fluencelabs/avm"
+          version: ${{ inputs.avm-version }}
+          working-directory: packages/fluence-js
+          package-manager: pnpm
+
+      - name: Set marine-js version
+        if: inputs.marine-js-version != 'null'
+        uses: fluencelabs/github-actions/npm-set-dependency@main
+        with:
+          package: "@fluencelabs/marine-js"
+          version: ${{ inputs.marine-js-version }}
+          working-directory: packages/fluence-js
+          package-manager: pnpm
+
+      - run: pnpm -r build
+      - run: pnpm -r test

.npmrc

@@ -1 +1,2 @@
 auto-install-peers=true
+save-exact=true

README.md

@@ -30,12 +30,16 @@ pnpm -r build
 
 ### Repository structure
 
-| Folder                      | Package                 | Description                                   |
-| --------------------------- | ----------------------- | --------------------------------------------- |
-| packages/fluence-js         | @fluencelabs/fluence-js | TypeScript implementation of the Fluence Peer |
-| packages/fluence-interfaces | @fluencelabs/interfaces | Common interfaces used in Fluence Peer        |
-| packages/fluence-connection | @fluencelabs/connection | Connectivity layer used in Fluence Peer       |
-| packages/fluence-keypair    | @fluencelabs/keypair    | Key Pair implementation                       |
+| Folder                            | Package                               | Description                                   |
+| --------------------------------- | ------------------------------------- | --------------------------------------------- |
+| packages/core/js-peer             | @fluencelabs/js-peer                  | TypeScript implementation of the Fluence Peer |
+| packages/core/interfaces          | @fluencelabs/interfaces               | Common interfaces used in Fluence Peer        |
+| packages/core/connection          | @fluencelabs/connection               | Connectivity layer used in Fluence Peer       |
+| packages/core/keypair             | @fluencelabs/keypair                  | Key Pair implementation                       |
+| packages/marine/background-runner | @fluencelabs/marine.background-runner | MarineJS background runner                    |
+| packages/marine/deps-loader.node  | @fluencelabs/marine.deps-loader.node  | MarineJS deps loader for nodejs               |
+| packages/marine/deps-loader.web   | @fluencelabs/marine.deps-loader.web   | MarineJS deps loader for web                  |
+| packages/marine/worker-script     | @fluencelabs/marine.worker-script     | MarineJS background worker script             |
 
 ### Running tests