Merge pull request #2503 from planetarium/release/2.7.4

Release/2.7.4 to main

Author: Akamig

.github/workflows/release.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - release/*
       - hotfix/*
+      - preview/*
     tags: ["*"]
 
 permissions:
@@ -30,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     environment:
-      name: ${{ startsWith(github.event.ref, 'refs/tags/') && 'main' || 'internal' }}
+      name: ${{ startsWith(github.event.ref, 'refs/tags/') && 'main' || startsWith(github.event.ref, 'refs/heads/preview/') && 'preview' || 'internal' }}
 
     steps:
       - uses: actions/[email protected]
@@ -48,12 +49,10 @@ jobs:
         with:
           distribution: "temurin"
           java-version: "11"
-      
       - name: Sync time on Ubuntu
         continue-on-error: true
         if: runner.os == 'Linux'
         run: sudo chronyc -a makestep
-      
       - name: Sync time on macOS
         continue-on-error: true
         if: runner.os == 'macOS'
@@ -73,8 +72,20 @@ jobs:
           then
             sed "s/Please replace it/${{ secrets.APPLE_TEAM_ID }}/g" electron-builder.main.yml > temp2.txt
             mv temp2.txt electron-builder.main.yml
+          elif [[ "${{ startsWith(github.event.ref, 'refs/heads/preview/') }}" == true ]]
+          then
+            timestamp=$(date +%y%m%d%H%M%S)
+            version=$(jq -r .version package.json | awk -F'.' '{print $1"."$2}')
+            jq --arg version "$version.$timestamp" '.version = $version' package.json > tmp.$$.json && mv tmp.$$.json package.json
+            jq --arg suffix " Preview" '.productName += $suffix' package.json > tmp.$$.json && mv tmp.$$.json package.json
+            jq --arg suffix "Preview" '.name += $suffix' package.json > tmp.$$.json && mv tmp.$$.json package.json
+            sed 's/NineChronicles@workspace/NineChroniclesPreview@workspace/g' yarn.lock > temp1.txt
+            mv temp1.txt yarn.lock
+            mv ./signing/sandbox_code_sign_tool.properties ./tmp/codesign/conf/code_sign_tool.properties
+            sed "s/Please replace it/${{ secrets.APPLE_TEAM_ID }}/g" electron-builder.preview.yml > temp2.txt
+            mv temp2.txt electron-builder.preview.yml
           else
-            timestamp=$(date +%s)
+            timestamp=$(date +%y%m%d%H%M%S)
             version=$(jq -r .version package.json | awk -F'.' '{print $1"."$2}')
             jq --arg version "$version.$timestamp" '.version = $version' package.json > tmp.$$.json && mv tmp.$$.json package.json
             jq --arg suffix " Internal" '.productName += $suffix' package.json > tmp.$$.json && mv tmp.$$.json package.json
@@ -115,6 +126,11 @@ jobs:
             sh ./scripts/release.sh main ${{ matrix.packCmd }}
             aws cloudfront create-invalidation --distribution-id ${{ secrets.CF_DISTRIBUTION_ID }} --paths "/main/launcher/latest.yml"
             aws cloudfront create-invalidation --distribution-id ${{ secrets.CF_DISTRIBUTION_ID }} --paths "/main/launcher/latest-mac.yml"
+          elif [[ "${{ startsWith(github.event.ref, 'refs/heads/preview/') }}" == true ]]
+          then
+            sh ./scripts/release.sh preview ${{ matrix.packCmd }}
+            aws cloudfront create-invalidation --distribution-id ${{ secrets.CF_DISTRIBUTION_ID }} --paths "/main/launcher/latest.yml"
+            aws cloudfront create-invalidation --distribution-id ${{ secrets.CF_DISTRIBUTION_ID }} --paths "/main/launcher/latest-mac.yml"
           else
             sh ./scripts/release.sh internal ${{ matrix.packCmd }}
             aws cloudfront create-invalidation --distribution-id ${{ secrets.CF_DISTRIBUTION_ID }} --paths "/internal/launcher/latest.yml"
@@ -127,7 +143,6 @@ jobs:
           rm -fR ./dist/*-unpacked
           rm -fR ./dist/mac
           rm -fR ./dist/mac-arm64
-          
         env:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}

README.md

@@ -1,13 +1,35 @@
-# Nine Chronicles Launcher
+<br>
+
+<div align="center">
+
+[<img src="./src/main/resources/logo.png" width="144"/>](https://nine-chronicles.com/)
+
+  <h1 align="center">Nine Chronicles Launcher</h1>
+
+  <p align="center">
+    <strong>Game Launcher with embedded NCG Wallet</strong>
+  </p>
+  
 [![Discord](https://img.shields.io/discord/539405872346955788?color=6278DA&label=Planetarium&logo=discord&logoColor=white)](https://discord.gg/JyujU8E4SD)
 [![Planetarium-Dev Discord Invite](https://img.shields.io/discord/928926944937013338?color=6278DA&label=Planetarium-dev&logo=discord&logoColor=white)](https://discord.gg/RYJDyFRYY7)
-[Wiki for more in-depth information.](https://github.com/planetarium/9c-launcher/wiki)
+
+</div>
 
 ## Overview
 
-Electron-based multi-platform game launcher to run [Nine Chronicles.](https://github.com/planetarium/NineChronicles)
+9c-launcher is a game launcher to run [Nine Chronicles](https://github.com/planetarium/NineChronicles), with embedded private key management & NCG wallet capabilities.
+The launcher is written in Typescript, and uses GraphQL, Electron, React.
+
+## Features
+- Game execution and update, with multiple release channel support.
+- Automatically selects optimized RPC server for user's network
+- Private key creation, import from QR code or raw secp256k1 key, encrypt using [Web3 Secret Storage](https://ethereum.org/en/developers/docs/data-structures-and-encoding/web3-secret-storage/) specs.
+- [NCG](https://gold.nine-chronicles.com/) wallet: Send NCG to other addresses or swap to WNCG.
+- Supports Windows, macOS, Linux.
 
-## Installation
+## Setup
+> **Note**
+> The repository is under refactor process, v2 changes will be still migrated, but if you want to participate in new version, but if you want to participate ongoing refactoring check out [v3/dev](https://github.com/planetarium/9c-launcher/tree/v3/dev) and related branches.
 
 First, install all dependencies required for development.
 

electron-builder.internal.yml

@@ -12,15 +12,15 @@ win:
     - target: "nsis"
       arch:
         - "x64"
-  icon: "app.ico"
+  icon: "./src/renderer/resources/launcher-icon/internal/app.ico"
 nsis:
   oneClick: false
   perMachine: false
   allowElevation: false
   allowToChangeInstallationDirectory: true
   deleteAppDataOnUninstall: true
 mac:
-  icon: "AppIcon.icns"
+  icon: "./src/renderer/resources/launcher-icon/internal/AppIcon.icns"
   target:
     - "dmg"
     - "zip"
@@ -30,7 +30,7 @@ mac:
   entitlementsInherit: "./signing/entitlements.inherit.plist"
   notarize: { teamId: "Please replace it" }
 dmg:
-  icon: "AppIcon.icns"
+  icon: "./src/renderer/resources/launcher-icon/internal/AppIcon.icns"
   sign: false
   iconSize: 75
   contents:

electron-builder.local.yml

@@ -11,7 +11,7 @@ win:
     - "zip"
   icon: "app.ico"
 mac:
-  icon: "AppIcon.icns"
+  icon: "./src/renderer/resources/launcher-icon/main/AppIcon.icns"
   target:
     - "tar.gz"
   category: "public.app-category.games"

electron-builder.main.yml

@@ -11,7 +11,7 @@ win:
     - target: "nsis"
       arch:
         - "x64"
-  icon: "app.ico"
+  icon: "./src/renderer/resources/launcher-icon/main/app.ico"
   sign: "./scripts/sign.js"
 nsis:
   oneClick: false
@@ -20,7 +20,7 @@ nsis:
   allowToChangeInstallationDirectory: true
   deleteAppDataOnUninstall: true
 mac:
-  icon: "AppIcon.icns"
+  icon: "./src/renderer/resources/launcher-icon/main/AppIcon.icns"
   target:
     - "dmg"
     - "zip"
@@ -30,7 +30,7 @@ mac:
   entitlementsInherit: "./signing/entitlements.inherit.plist"
   notarize: { teamId: "Please replace it" }
 dmg:
-  icon: "AppIcon.icns"
+  icon: "./src/renderer/resources/launcher-icon/main/AppIcon.icns"
   iconSize: 75
   sign: false
   contents:

electron-builder.preview.yml

@@ -0,0 +1,51 @@
+appId: "com.nine-chronicles-preview"
+asar: true
+productName: "Nine Chronicles Preview"
+files:
+  - "!**/*"
+  - from: build
+    filter:
+      - '**/*'
+win:
+  target:
+    - "zip"
+    - target: "nsis"
+      arch:
+        - "x64"
+  icon: "./src/renderer/resources/launcher-icon/preview/app.ico"
+nsis:
+  oneClick: false
+  perMachine: false
+  allowElevation: false
+  allowToChangeInstallationDirectory: true
+  deleteAppDataOnUninstall: true
+mac:
+  icon: "./src/renderer/resources/launcher-icon/preview/AppIcon.icns"
+  target:
+    - "dmg"
+    - "zip"
+  category: "public.app-category.games"
+  hardenedRuntime: true
+  entitlements: "./signing/entitlements.plist"
+  entitlementsInherit: "./signing/entitlements.inherit.plist"
+  notarize: { teamId: "Please replace it" }
+dmg:
+  icon: "./src/renderer/resources/launcher-icon/preview/AppIcon.icns"
+  sign: false
+  iconSize: 75
+  contents:
+    - x: 130
+      y: 200
+    - x: 410
+      y: 200
+      type: "link"
+      path: "/Applications"
+linux:
+  target:
+    - "zip"
+    - "AppImage"
+publish:
+  provider: "s3"
+  bucket: "9c-release.planetariumhq.com"
+  path: "preview/launcher"
+  acl: "private"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "NineChronicles",
   "productName": "Nine Chronicles",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "Game Launcher for Nine Chronicles",
   "author": "Planetarium <[email protected]>",
   "license": "GPL-3.0",
@@ -24,12 +24,15 @@
     "build": "yarn codegen && webpack --env NODE_ENV=development --env target=render && webpack --env NODE_ENV=development --env target=main",
     "build-main": "yarn codegen && webpack --env NODE_ENV=production --env target=render --env DEFAULT_NETWORK=main && webpack --env NODE_ENV=production --env target=main --env DEFAULT_NETWORK=main",
     "build-internal": "yarn codegen && webpack --env NODE_ENV=production --env target=render --env DEFAULT_NETWORK=internal && webpack --env NODE_ENV=production --env target=main --env DEFAULT_NETWORK=internal",
+    "build-preview": "yarn codegen && webpack --env NODE_ENV=production --env target=render --env DEFAULT_NETWORK=preview && webpack --env NODE_ENV=production --env target=main --env DEFAULT_NETWORK=preview",
     "server": "yarn webpack serve --env NODE_ENV=development --env target=render --hot",
     "start": "yarn webpack --env NODE_ENV=development --env target=main && electron ./build/.",
     "start:v2": "yarn webpack --env NODE_ENV=development --env target=main && electron ./build/. --v2",
     "pack-local": "yarn run build-internal && yarn run electron-builder -mw --x64 --config ./electron-builder.local.yml",
     "pack-internal": "yarn run build-internal && yarn run electron-builder -mwl --arm64 --x64 --config ./electron-builder.internal.yml",
+    "pack-preview": "yarn run build-preview && yarn run electron-builder -mwl --arm64 --x64 --config ./electron-builder.preview.yml",
     "pack-main": "yarn run build-main && yarn run electron-builder -mwl --arm64 --x64 --config ./electron-builder.main.yml",
+    "release-preview": "sh ./scripts/release.sh preview",
     "release-internal": "sh ./scripts/release.sh internal",
     "release-main": "sh ./scripts/release.sh main",
     "dev": "concurrently --kill-others \"yarn server\" \"yarn start\"",
@@ -85,7 +88,7 @@
     "electron-dl": "^3.0.2",
     "electron-log": "^4.4.8",
     "electron-store": "8.0.2",
-    "electron-updater": "^5.3.0",
+    "electron-updater": "^6.3.9",
     "fast-glob": "^3.2.11",
     "framer-motion": "^6.3.3",
     "graphql": "15.7.2",
@@ -177,7 +180,7 @@
     "terser-webpack-plugin": "^5.3.9",
     "typescript": "^5.2.2",
     "vitest": "^0.34.3",
-    "webpack": "^5.88.2",
+    "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   },

scripts/icon-generator.sh

@@ -0,0 +1,19 @@
+magick pc_Launcher_1024x1024_R.png -resize 32x32 icon-32.png
+magick pc_Launcher_1024x1024_R.png -resize 48x48 icon-48.png
+magick pc_Launcher_1024x1024_R.png -resize 96x96 icon-96.png
+magick pc_Launcher_1024x1024_R.png -resize 256x256 icon-256.png
+magick pc_Launcher_1024x1024_R.png -resize 512x512 icon-512.png
+magick icon-32.png icon-48.png icon-96.png icon-256.png icon-512.png app.ico
+mkdir AppIcon.iconset
+mv icon-32.png AppIcon.iconset/icon_16x16.png
+magick pc_Launcher_1024x1024_R.png -resize 16x16 AppIcon.iconset/[email protected]
+mv icon-48.png AppIcon.iconset/icon_32x32.png
+magick pc_Launcher_1024x1024_R.png -resize 64x64 AppIcon.iconset/[email protected]
+mv icon-96.png AppIcon.iconset/icon_128x128.png
+magick pc_Launcher_1024x1024_R.png -resize 256x256 AppIcon.iconset/[email protected]
+mv icon-256.png AppIcon.iconset/icon_256x256.png
+magick pc_Launcher_1024x1024_R.png -resize 512x512 AppIcon.iconset/[email protected]
+mv icon-512.png AppIcon.iconset/icon_512x512.png
+cp pc_Launcher_1024x1024_R.png AppIcon.iconset/[email protected]
+iconutil -c icns AppIcon.iconset
+rm -rf pc_Launcher_1024x1024_R.png AppIcon.iconset

src/interfaces/config.ts

@@ -41,4 +41,5 @@ export interface IConfig {
   Maintenance: boolean;
   SwapAvailabilityCheckServiceUrl: string;
   ArenaServiceUrl: string;
+  ThorSeasonBannerUrl: string | undefined;
 }