Merge pull request #64 from gRoussac/dev

Update port sse

casper-escrow.code-workspace

@@ -5,6 +5,9 @@
     },
     {
       "path": "www"
+    },
+    {
+      "path": "docker"
     }
   ],
   "settings": {}

docker/Dockerfile

@@ -13,7 +13,6 @@ RUN unzip -q ./*.zip -d ${TMP}
 RUN mv ${TMP}/*/casper-sdk/ ./
 RUN mv ${TMP}/*/w* ./ && rm -rf ${TMP} *.zip
 WORKDIR /app/www
-ENV PORT=4200
 RUN npm install --verbose
 RUN npm run build --verbose
 CMD npm run serve

www/apps/api/project.json

@@ -6,14 +6,18 @@
   "targets": {
     "build": {
       "executor": "@nrwl/webpack:webpack",
-      "outputs": ["{options.outputPath}"],
+      "outputs": [
+        "{options.outputPath}"
+      ],
       "options": {
         "target": "node",
         "compiler": "tsc",
         "outputPath": "dist/apps/api",
         "main": "apps/api/src/main.ts",
         "tsConfig": "apps/api/tsconfig.app.json",
-        "assets": ["apps/api/src/assets"],
+        "assets": [
+          "apps/api/src/assets"
+        ],
         "webpackConfig": "apps/api/webpack.config.js"
       },
       "configurations": {
@@ -43,19 +47,25 @@
     },
     "lint": {
       "executor": "@nrwl/linter:eslint",
-      "outputs": ["{options.outputFile}"],
+      "outputs": [
+        "{options.outputFile}"
+      ],
       "options": {
-        "lintFilePatterns": ["apps/api/**/*.ts"]
+        "lintFilePatterns": [
+          "apps/api/**/*.ts"
+        ]
       }
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/apps/api"],
+      "outputs": [
+        "{workspaceRoot}/coverage/apps/api"
+      ],
       "options": {
         "jestConfig": "apps/api/jest.config.ts",
         "passWithNoTests": true
       }
     }
   },
   "tags": []
-}
+}

www/apps/api/src/environments/environment.ts

@@ -20,5 +20,4 @@ export const environment = {
   users,
   apiUrl: 'https://rpc.testnet.casperlabs.io',
   sseUrl: 'https://rpc.testnet.casperlabs.io'
-  // apiUrl: 'http://localhost:11101/rpc'
 };

www/apps/frontend/src/environments/environment.ts

@@ -3,7 +3,7 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-  production: false
+  production: false,
 };
 
 /*

www/libs/feature/deployer/src/lib/put-deploy/put-deploy.component.ts

@@ -190,7 +190,7 @@ export class PutDeployComponent implements AfterViewInit, OnDestroy {
       session_args_json: string = this.argsElt?.nativeElement.value?.trim() || '',
       payment_amount: string = this.gasFeeElt?.nativeElement.value?.trim() || '',
       ttl: string = this.TTLElt?.nativeElement.value?.trim() || '',
-      session_call_package: boolean = !!this.isPackageElt?.nativeElement.checked;
+      session_call_package = !!this.isPackageElt?.nativeElement.checked;
 
     this.deploy = this.deployService.makeDeploy(
       {

www/libs/feature/deployer/src/lib/state-root-hash/state-root-hash.component.ts

@@ -1,5 +1,5 @@
 import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnDestroy, ViewChild } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { CommonModule, DOCUMENT } from '@angular/common';
 import { Peer } from '@casper-api/api-interfaces';
 import { DeployerService } from '@casper-data/data-access-deployer';
 import { Subscription } from 'rxjs';
@@ -21,6 +21,7 @@ export class StateRootHashComponent implements OnDestroy, AfterViewInit {
   private getStateRootHashSubscription!: Subscription;
   private getPeersSubscription!: Subscription;
   private getStatusSubscription!: Subscription;
+  private window!: (Window & typeof globalThis) | null;
 
   peers!: Peer[];
   status = '';
@@ -30,12 +31,14 @@ export class StateRootHashComponent implements OnDestroy, AfterViewInit {
 
   constructor(
     @Inject(ENV_CONFIG) public readonly config: EnvironmentConfig,
+    @Inject(DOCUMENT) private document: Document,
     private readonly deployerService: DeployerService,
     private readonly resultService: ResultService,
     private readonly routeurHubService: RouteurHubService,
     private readonly changeDetectorRef: ChangeDetectorRef,
     private readonly storageService: StorageService
   ) {
+    this.window = this.document.defaultView;
     this.defaults = [
       this.config['default_node_localhost'],
       this.config['default_node_testnet'],
@@ -54,7 +57,12 @@ export class StateRootHashComponent implements OnDestroy, AfterViewInit {
           this.defaults.push(this.apiUrl);
         }
       } else {
-        this.apiUrl = this.defaults[0];
+        const currentHost = this.window?.location.hostname;
+        if (currentHost && this.defaults[0].includes(currentHost)) {
+          this.apiUrl = this.defaults[0];
+        } else {
+          this.apiUrl = this.defaults[1];
+        }
       }
       this.getPeers();
     });

www/libs/util/config/src/config.ts

@@ -4,7 +4,8 @@ export type EnvironmentConfig = {
 const rpc_port = '7777';
 const sse_port = '9999';
 const rpc_port_localhost = '11101';
-const sse_port_localhost = '4200';
+const currentPort = window?.location?.port;
+const sse_port_localhost = currentPort || '4200';
 const localhost = "http://localhost";
 const default_node_localhost = [localhost, rpc_port_localhost].join(':');
 const default_node_testnet = "https://rpc.testnet.casperlabs.io";

www/libs/util/services/wasm/src/lib/wasm.factory.ts

@@ -1,6 +1,7 @@
 import { ApplicationInitStatus, APP_INITIALIZER, inject, InjectionToken, Provider } from "@angular/core";
 import * as deployer from "deployer";
 import * as casper_sdk from "casper-sdk";
+import { config } from "@casper-util/config";
 
 const initDeployer = deployer.default;
 const Deployer = deployer.Deployer;
@@ -18,7 +19,7 @@ export const fetchWasmFactory = async (): Promise<deployer.Deployer> => {
 
 export const fetchSDKFactory = async (): Promise<casper_sdk.SDK> => {
   const wasm = await initSDK('assets/casper_rust_wasm_sdk_bg.wasm');
-  const casperSDK = new SDK('http://localhost:4200');
+  const casperSDK = new SDK(config['default_node_localhost']);
   return wasm && casperSDK;
 };
 
@@ -47,4 +48,4 @@ export function provideSafeAsync<T>(
       },
     },
   ];
-}
+};