Implement multi-environment CI/CD with PWA support and game features

.github/workflows/deploy.yml

@@ -51,6 +51,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+<<<<<<< HEAD
+      - name: Set App Version
+        run: node -e "const fs = require('fs'); const ver = fs.readFileSync('ver', 'utf8').trim(); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.version = ver + '.${{ github.run_number }}'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2)); if(fs.existsSync('electron/package.json')){const epkg = JSON.parse(fs.readFileSync('electron/package.json', 'utf8')); epkg.version = pkg.version; fs.writeFileSync('electron/package.json', JSON.stringify(epkg, null, 2));} console.log('Version set to ' + pkg.version);"
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -149,6 +154,11 @@ jobs:
         app_type: [bundled, pwa]
     steps:
       - uses: actions/checkout@v4
+<<<<<<< HEAD
+      - name: Set App Version
+        run: node -e "const fs = require('fs'); const ver = fs.readFileSync('ver', 'utf8').trim(); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.version = ver + '.${{ github.run_number }}'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2)); if(fs.existsSync('electron/package.json')){const epkg = JSON.parse(fs.readFileSync('electron/package.json', 'utf8')); epkg.version = pkg.version; fs.writeFileSync('electron/package.json', JSON.stringify(epkg, null, 2));} console.log('Version set to ' + pkg.version);"
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -242,6 +252,12 @@ jobs:
           npx cap sync android
 
           cd android
+<<<<<<< HEAD
+          VERSION=$(cat ../ver | tr -d '\r\n').${{ github.run_number }}
+          sed -i "s/versionName \".*\"/versionName \"$VERSION\"/g" app/build.gradle
+          sed -i "s/versionCode .*/versionCode ${{ github.run_number }}/g" app/build.gradle
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
           ./gradlew assembleDebug
           ./gradlew bundleDebug
 
@@ -272,7 +288,12 @@ jobs:
           mkdir -p deb-package/usr/share/applications
           mkdir -p deb-package/usr/share/icons/hicolor/512x512/apps
 
+<<<<<<< HEAD
+          VERSION=$(cat ver | tr -d '\r\n').${{ github.run_number }}
+          sed -e "s|\${AppName}|$APP_NAME|g" -e "s|Version: 1.0.0|Version: $VERSION|g" .pwa/linux-control > deb-package/DEBIAN/control
+=======
           sed -e "s|\${AppName}|$APP_NAME|g" .pwa/linux-control > deb-package/DEBIAN/control
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
 
           sed -e "s|\${ManifestUrl}|$MANIFEST_URL|g" .pwa/linux-launcher.sh > deb-package/usr/bin/$APP_NAME
           chmod +x deb-package/usr/bin/$APP_NAME
@@ -285,7 +306,11 @@ jobs:
 
           sudo apt-get update && sudo apt-get install -y rpm
           mkdir -p rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+<<<<<<< HEAD
+          sed -e "s|\${AppName}|$APP_NAME|g" -e "s|\${Workspace}|$GITHUB_WORKSPACE|g" -e "s|Version:        1.0.0|Version:        $VERSION|g" .pwa/linux.spec > rpmbuild/SPECS/pwa.spec
+=======
           sed -e "s|\${AppName}|$APP_NAME|g" -e "s|\${Workspace}|$GITHUB_WORKSPACE|g" .pwa/linux.spec > rpmbuild/SPECS/pwa.spec
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
 
           rpmbuild -bb --define "_topdir $GITHUB_WORKSPACE/rpmbuild" rpmbuild/SPECS/pwa.spec
           cp rpmbuild/RPMS/noarch/*.rpm .
@@ -327,6 +352,11 @@ jobs:
         app_type: [bundled, pwa]
     steps:
       - uses: actions/checkout@v4
+<<<<<<< HEAD
+      - name: Set App Version
+        run: node -e "const fs = require('fs'); const ver = fs.readFileSync('ver', 'utf8').trim(); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.version = ver + '.${{ github.run_number }}'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2)); if(fs.existsSync('electron/package.json')){const epkg = JSON.parse(fs.readFileSync('electron/package.json', 'utf8')); epkg.version = pkg.version; fs.writeFileSync('electron/package.json', JSON.stringify(epkg, null, 2));} console.log('Version set to ' + pkg.version);"
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -441,8 +471,14 @@ jobs:
           Copy-Item $IconSrc "$AppDir\Assets\Square44x44Logo.png"
           Copy-Item $IconSrc "$AppDir\Assets\SplashScreen.png"
 
+<<<<<<< HEAD
+          $Version = (Get-Content -Path "ver" -Raw).Trim() + "." + $env:GITHUB_RUN_NUMBER + ".0"
+          $ManifestContent = Get-Content -Path ".pwa/windows-bundled.appxmanifest.xml" -Raw
+          $ManifestContent = $ManifestContent -replace '\$\{Prefix\}', $Prefix -replace 'Version="1\.0\.0\.0"', "Version=`"$Version`""
+=======
           $ManifestContent = Get-Content -Path ".pwa/windows-bundled.appxmanifest.xml" -Raw
           $ManifestContent = $ManifestContent -replace '\$\{Prefix\}', $Prefix
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
           Set-Content -Path "$AppDir\AppxManifest.xml" -Value $ManifestContent
 
           $MakeAppx = (Get-ChildItem -Path "C:\Program Files (x86)\Windows Kits\10\bin\*\x64\makeappx.exe" -ErrorAction SilentlyContinue | Sort-Object FullName -Descending | Select-Object -First 1).FullName
@@ -477,8 +513,14 @@ jobs:
           Copy-Item $IconSrc "$AppDir\Assets\Square44x44Logo.png"
           Copy-Item $IconSrc "$AppDir\Assets\SplashScreen.png"
 
+<<<<<<< HEAD
+          $Version = (Get-Content -Path "ver" -Raw).Trim() + "." + $env:GITHUB_RUN_NUMBER + ".0"
+          $ManifestContent = Get-Content -Path ".pwa/windows-pwa.appxmanifest.xml" -Raw
+          $ManifestContent = $ManifestContent -replace '\$\{Prefix\}', $Prefix -replace '\$\{ManifestUrl\}', $ManifestUrl -replace 'Version="1\.0\.0\.0"', "Version=`"$Version`""
+=======
           $ManifestContent = Get-Content -Path ".pwa/windows-pwa.appxmanifest.xml" -Raw
           $ManifestContent = $ManifestContent -replace '\$\{Prefix\}', $Prefix -replace '\$\{ManifestUrl\}', $ManifestUrl
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
           Set-Content -Path "$AppDir\AppxManifest.xml" -Value $ManifestContent
 
           $MakeAppx = (Get-ChildItem -Path "C:\Program Files (x86)\Windows Kits\10\bin\*\x64\makeappx.exe" -ErrorAction SilentlyContinue | Sort-Object FullName -Descending | Select-Object -First 1).FullName
@@ -518,6 +560,11 @@ jobs:
         app_type: [bundled, pwa]
     steps:
       - uses: actions/checkout@v4
+<<<<<<< HEAD
+      - name: Set App Version
+        run: node -e "const fs = require('fs'); const ver = fs.readFileSync('ver', 'utf8').trim(); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.version = ver + '.${{ github.run_number }}'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2)); if(fs.existsSync('electron/package.json')){const epkg = JSON.parse(fs.readFileSync('electron/package.json', 'utf8')); epkg.version = pkg.version; fs.writeFileSync('electron/package.json', JSON.stringify(epkg, null, 2));} console.log('Version set to ' + pkg.version);"
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -611,6 +658,12 @@ jobs:
           npx cap add ios
           npx @capacitor/assets generate --ios
           npx cap sync ios
+<<<<<<< HEAD
+          VERSION=$(cat ver | tr -d '\r\n').${{ github.run_number }}
+          /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $VERSION" ios/App/App/Info.plist
+          /usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${{ github.run_number }}" ios/App/App/Info.plist
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
           cd ios/App
           xcodebuild -project App.xcodeproj -scheme App -configuration Debug -sdk iphonesimulator -derivedDataPath build
           xcodebuild archive -project App.xcodeproj -scheme App -configuration Release -archivePath build/App.xcarchive CODE_SIGNING_ALLOWED=NO || true
@@ -642,6 +695,11 @@ jobs:
         app_type: [bundled, pwa]
     steps:
       - uses: actions/checkout@v4
+<<<<<<< HEAD
+      - name: Set App Version
+        run: node -e "const fs = require('fs'); const ver = fs.readFileSync('ver', 'utf8').trim(); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.version = ver + '.${{ github.run_number }}'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2)); if(fs.existsSync('electron/package.json')){const epkg = JSON.parse(fs.readFileSync('electron/package.json', 'utf8')); epkg.version = pkg.version; fs.writeFileSync('electron/package.json', JSON.stringify(epkg, null, 2));} console.log('Version set to ' + pkg.version);"
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
 
       - name: Download Web Artifact
         uses: actions/download-artifact@v4
@@ -678,11 +736,20 @@ jobs:
           cp .pwa/icons-$build_prefix/pwa/icon-512x512.png ext-firefox/icon.png
 
           # 1. Chromium Extension (Chrome, Edge, Brave, Opera, ChromeOS)
+<<<<<<< HEAD
+          VERSION=$(cat ver | tr -d '\r\n').${{ github.run_number }}
+          sed -e "s|\${AppName}|$APP_NAME|g" -e "s|\"version\": \"1.0.0\"|\"version\": \"$VERSION\"|g" .pwa/chromium-manifest.json > ext-chromium/manifest.json
+          sed -e "s|\${TargetUrl}|$TARGET_URL|g" .pwa/extension-background.js > ext-chromium/background.js
+
+          # 2. Firefox Extension
+          sed -e "s|\${AppName}|$APP_NAME|g" -e "s|\${Prefix}|$build_prefix|g" -e "s|\"version\": \"1.0.0\"|\"version\": \"$VERSION\"|g" .pwa/firefox-manifest.json > ext-firefox/manifest.json
+=======
           sed -e "s|\${AppName}|$APP_NAME|g" .pwa/chromium-manifest.json > ext-chromium/manifest.json
           sed -e "s|\${TargetUrl}|$TARGET_URL|g" .pwa/extension-background.js > ext-chromium/background.js
 
           # 2. Firefox Extension
           sed -e "s|\${AppName}|$APP_NAME|g" -e "s|\${Prefix}|$build_prefix|g" .pwa/firefox-manifest.json > ext-firefox/manifest.json
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
           sed -e "s|\${TargetUrl}|$TARGET_URL|g" .pwa/extension-background.js > ext-firefox/background.js
 
           # Zip the extensions (Ready for Chrome Web Store & Mozilla Add-ons)

audio_to_ogg.py

@@ -0,0 +1,39 @@
+import os
+import subprocess
+from pathlib import Path
+
+def convert_to_ogg(input_folder):
+    formats = [".mp3", ".wav", ".m4a", ".flac", ".ogg"]
+    print("Starting batch conversion...")
+
+    if not os.path.exists(os.path.join(input_folder, "converted")):
+        os.mkdir(os.path.join(input_folder, "converted"))
+
+    for ext in formats:
+        for file_path in Path(input_folder).glob(f"*{ext}"):
+            input_file = str(file_path)
+            output_file = str(Path(input_folder) / "converted/" / file_path.with_suffix('.ogg').name)
+            command = [
+                "ffmpeg",
+                "-i", input_file,
+                "-c:a", "libvorbis",
+                "-q:a", "5",
+                "-map_metadata", "-1",
+                "-vn",
+                "-ac", "1",
+                "-ar", "32000",
+                "-af", "silenceremove=start_periods=1:start_duration=0:start_threshold=-50dB",
+                "-y",
+                output_file
+            ]
+            print(f"Converting {file_path.name} to OGG...")
+            try:
+                subprocess.run(command, check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                print(f" -> Saved to {output_file}")
+            except subprocess.CalledProcessError as e:
+                print(f" -> Error converting {file_path.name}. Ensure it's a valid audio file.")
+                print(e)
+    print("Done!")
+
+convert_to_ogg("public/sound/music")
+convert_to_ogg("public/sound/sfx")

capacitor.config.ts

@@ -1,9 +1,22 @@
 import type { CapacitorConfig } from '@capacitor/cli';
+<<<<<<< HEAD
+import type { CapacitorElectronConfig } from '@capacitor-community/electron';
+
+const config: CapacitorElectronConfig = {
+  appId: 'com.cheems.app',
+  appName: 'Cheems Bonk Game',
+  webDir: 'dist/cheems-angular/browser',
+  electron: {
+    trayIconAndMenuEnabled: false,
+    splashScreenEnabled: false
+  }
+=======
 
 const config: CapacitorConfig = {
   appId: 'com.cheems.app',
   appName: 'Cheems Bonk Game',
   webDir: 'dist/cheems-angular/browser'
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
 };
 
 export default config;

electron/electron-builder.config.json

@@ -7,6 +7,10 @@
     "buildResources": "assets"
   },
   "files": [
+<<<<<<< HEAD
+    "app/**/*",
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
     "build/**/*",
     "node_modules/**/*",
     "package.json"

electron/src/index.ts

@@ -4,7 +4,10 @@ import type { MenuItemConstructorOptions } from 'electron';
 import { app, MenuItem } from 'electron';
 import electronIsDev from 'electron-is-dev';
 import unhandled from 'electron-unhandled';
+<<<<<<< HEAD
+=======
 import { autoUpdater } from 'electron-updater';
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
 
 import { ElectronCapacitorApp, setupContentSecurityPolicy, setupReloadWatcher } from './setup';
 
@@ -45,6 +48,13 @@ if (electronIsDev) {
   setupContentSecurityPolicy(myCapacitorApp.getCustomURLScheme());
   // Initialize our app, build windows, and load content.
   await myCapacitorApp.init();
+<<<<<<< HEAD
+
+  myCapacitorApp.getMainWindow().on('close', () => {
+    app.quit();
+  });
+=======
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
 })();
 
 // Handle when all of our windows are close (platforms have their own expectations).

ngsw-config.json

@@ -17,15 +17,39 @@
       }
     },
     {
+<<<<<<< HEAD
+      "name": "essential-assets",
+=======
       "name": "assets",
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
       "installMode": "prefetch",
       "updateMode": "prefetch",
       "resources": {
         "files": [
+<<<<<<< HEAD
+          "/closet.json",
+          "/items/*.json",
+          "/lang/*.lang",
+          "/sound/music/A_Jazz_Piano.ogg",
+          "/sound/sfx/hit.ogg",
+          "/img/cheems/normal.webp",
+          "/**/*.(svg|cur|woff|woff2|ttf|otf)"
+        ]
+      }
+    },
+    {
+      "name": "lazy-assets",
+      "installMode": "lazy",
+      "updateMode": "lazy",
+      "resources": {
+        "files": [
+          "/**/*.(jpg|jpeg|png|apng|webp|avif|gif|txt|xml|csv|ico|ogg|mp3|wav|m4a)",
+=======
           "/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2|txt|json|xml|csv|ico|ogg|mp3|wav|m4a|lang)",
           "/closet.json",
           "/items/*.json",
           "/lang/*.lang",
+>>>>>>> 978282b3d376db0a28f8a319cd5e15d9f5cddf20
           "/sound/**/*",
           "/img/**/*",
           "/games/**/*"

png_to_webp.py

@@ -0,0 +1,18 @@
+import os
+from PIL import Image
+
+def batch_convert_png_to_webp(folder_path, quality=85):
+    for filename in os.listdir(folder_path):
+        if filename.lower().endswith(".png"):
+            png_path = os.path.join(folder_path, filename)
+            webp_filename = os.path.splitext(filename)[0] + ".webp"
+            webp_path = os.path.join(folder_path, webp_filename)
+
+            with Image.open(png_path) as img:
+                img.save(webp_path, "webp", quality=quality)
+            print(f"Converted: {filename} -> {webp_filename}")
+
+batch_convert_png_to_webp("public/img/cheems", 100)
+batch_convert_png_to_webp("public/img/hit", 100)
+batch_convert_png_to_webp("public/img/music", 100)
+