Merge branch 'develop' into angular_upgrade

.github/workflows/build-package-api.yml

@@ -0,0 +1,41 @@
+name: Build & Package API
+
+on:
+  workflow_call:
+    inputs: 
+      build_configuration: 
+        description: 'Build Configuration'
+        type: string
+        required: true
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  # Build prod
+  build-api-prod:
+    name: Build API (prod)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+          # include-prerelease: true
+
+      - name: Build .NET project (prod)
+        run: dotnet build ./WowsKarma.Api/WowsKarma.Api.csproj --configuration ${{ inputs.build_configuration }}
+
+      - name: Package API (prod)
+        run: dotnet publish ./WowsKarma.Api/WowsKarma.Api.csproj --configuration ${{ inputs.build_configuration }} --output ./publish
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: wowskarma_api
+          path: ./publish

.github/workflows/build-package-web.yml

@@ -0,0 +1,45 @@
+name: Build & Package Web App
+
+on:
+  workflow_call:
+    inputs:
+      build_configuration:
+        description: 'Build Configuration'
+        type: string
+        required: true
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  # Build angular app
+  build-web:
+    name: Build Web App
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20.x'
+
+    - name: Install Angular CLI
+      run: npm install -g @angular/cli
+
+    - name: Install dependencies
+      working-directory: wowskarma.app
+      run: npm install
+
+    - name: Build Angular app
+      working-directory: wowskarma.app
+      run: ng build --configuration=${{ inputs.build_configuration }}
+
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: wowskarma_app
+        path: ./wowskarma.app/dist

.github/workflows/deploy-preview.yml

@@ -0,0 +1,66 @@
+name: Deploy Preview to Server
+
+on:
+  push:
+    branches: [ develop ]
+
+permissions: 
+  contents: read
+  packages: read
+  deployments: write
+
+jobs:
+  # First: Make sure dev build ran fine.
+  build-test-solution:
+    name: Build & Test Solution
+    uses: ./.github/workflows/dotnet-build.yml
+
+  # Build & Package API & Web from 'build-package-api.yml' and 'build-package-web.yml'.
+  build-package-api: 
+    name: Build & Package API
+    needs: build-test-solution
+    uses: ./.github/workflows/build-package-api.yml
+    with:
+      build_configuration: 'Preview'
+
+  build-package-web:
+    name: Build & Package Web App
+    needs: build-test-solution
+    uses: ./.github/workflows/build-package-web.yml
+    with:
+      build_configuration: 'preview'
+
+  # Deploy to server
+  deploy-preview:
+    name: Deploy Preview to server
+    environment: 
+        name: preview
+        url: https://preview.wows-karma.com/
+    needs: 
+      - build-package-api
+      - build-package-web
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download packaged API artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: wowskarma_api
+          path: ./api
+
+      - name: Download packaged Web App artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: wowskarma_app
+          path: ./web
+
+      - name: Install SSH Key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_PRIVATEKEY }}
+          known_hosts: '*.nodsoft.net'
+
+      - name: Add Known Hosts
+        run: ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Deploy with rsync
+        run: rsync -rvmzOE . ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.SSH_DEPLOYPATH }}

.gitignore

@@ -371,3 +371,5 @@ wowskarma.app/pnpm-lock.yaml
 .store/
 
 wowskarma.api.minimap/main.py
+
+WowsKarma.Api/appsettings.Preview.json

WowsKarma.Api/Startup.cs

@@ -274,14 +274,16 @@ public void ConfigureServices(IServiceCollection services)
 		});
 
 		services.AddResiliencePolicies();
+
+		services.AddSystemd();
 	}
 
 	// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
 	public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 	{
 		app.UseETagger();
 		app.UseResponseCompression();
-
+		
 		app.UseSwagger();
 		app.UseSwaggerUI(c =>
 		{

WowsKarma.Api/WowsKarma.Api.csproj

@@ -50,6 +50,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
     <PackageReference Include="NodaTime" Version="3.1.9" />
     <PackageReference Include="Nodsoft.Wargaming.Api.Client" Version="0.3.5" />
     <PackageReference Include="Nodsoft.WowsReplaysUnpack.ExtendedData" Version="2.0.1" />

wowskarma.app/angular.json

@@ -61,13 +61,40 @@
               ],
               "outputHashing": "all"
             },
+            "preview": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "1mb",
+                  "maximumError": "4mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
+                }
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.preview.ts"
+                }
+              ],
+              "outputHashing": "all"
+            },
             "development": {
               "buildOptimizer": false,
               "optimization": false,
               "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
-              "namedChunks": true
+              "namedChunks": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.development.ts"
+                }
+              ]
             }
           },
           "defaultConfiguration": "production"

wowskarma.app/src/app/services/hubs/hub-base.ts

@@ -63,5 +63,5 @@ export abstract class HubBase {
         .withAutomaticReconnect()
         // Disabled the MessagePack serializer, due to casing issues.
         //.withHubProtocol(new signalRMsgPack.MessagePackHubProtocol())
-        .configureLogging(environment.production ? signalR.LogLevel.Warning : signalR.LogLevel.Information)
+        .configureLogging(environment.name !== "development" ? signalR.LogLevel.Warning : signalR.LogLevel.Information)
 }

wowskarma.app/src/environments/environment.preview.ts

@@ -0,0 +1,25 @@
+export const environment = {
+  name: "preview",
+
+  apiHost: {
+    EU: "https://api.preview.wows-karma.com",
+    NA: "https://api.preview.wows-karma.com",
+    CIS: "https://api.preview.wows-karma.com",
+    SEA: "https://api.preview.wows-karma.com",
+  },
+
+  applicationInsights: {
+    connectionString: "InstrumentationKey=3fab5b95-b531-4f15-95e9-83f31e2ed531;IngestionEndpoint=https://francecentral-1.in.applicationinsights.azure.com/;LiveEndpoint=https://francecentral.livediagnostics.monitor.azure.com/",
+  },
+
+  cookies: {
+    domain: "localhost",
+
+    name: {
+      EU: "Auth_EU",
+      NA: "Auth_NA",
+      CIS: "Auth_CIS",
+      SEA: "Auth_SEA",
+    },
+  },
+};

wowskarma.app/src/environments/environment.prod.ts

@@ -1,5 +1,5 @@
 export const environment = {
-    production: true,
+    name: "production",
 
     apiHost: {
         EU: "https://api.wows-karma.com",

wowskarma.app/src/environments/environment.ts

@@ -3,7 +3,7 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-    production: false,
+    name: "development",
 
     apiHost: {
         EU: "http://localhost:5010",

wowskarma.app/src/main.ts

@@ -6,7 +6,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
-if (environment.production) {
+if (environment.name === "production") {
   enableProdMode();
   //console.debug = (...args: any[]) => {};
 }