Merge pull request #3 from octra-labs/fix-binaries

fpv-dev · web-flow · commit e2987ca9ba02 · 2025-06-18T14:35:23.000+05:00
Fix assets in binaries
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,18 +16,22 @@ jobs:
         include:
           - os: ubuntu-latest
             target: linux-x64
+            bun-target: bun-linux-x64
             artifact-name: wallet-generator-linux-x64
             executable-ext: ""
           - os: windows-latest
             target: windows-x64
+            bun-target: bun-windows-x64
             artifact-name: wallet-generator-windows-x64
             executable-ext: ".exe"
           - os: macos-13
             target: macos-x64
+            bun-target: bun-darwin-x64
             artifact-name: wallet-generator-macos-x64
             executable-ext: ""
           - os: macos-latest
             target: macos-arm64
+            bun-target: bun-darwin-arm64
             artifact-name: wallet-generator-macos-arm64
             executable-ext: ""
 
@@ -51,12 +55,12 @@ jobs:
           mkdir C:\temp-bun-cache-init
           cd C:\temp-bun-cache-init
           echo 'console.log("cache init");' > index.js
-          bun build --compile --outfile=cache-init${{ matrix.executable-ext }} ./index.js
+          bun build --compile --target=${{ matrix.bun-target }}-baseline --outfile=cache-init${{ matrix.executable-ext }} ./index.js
           cd ${{ github.workspace }}
           Remove-Item -Recurse -Force C:\temp-bun-cache-init
 
       - name: Build executable
-        run: bun build --compile --outfile=wallet-generator${{ matrix.executable-ext }} ./wallet_generator.ts
+        run: bun build --compile --target=${{ matrix.bun-target }}-baseline --outfile=wallet-generator${{ matrix.executable-ext }} ./wallet_generator.ts
 
       - name: Test executable (Linux/macOS)
         if: runner.os != 'Windows'
@@ -80,7 +84,7 @@ jobs:
           fi
           
           # Test embedded assets
-          if curl -f http://localhost:8888/logo.svg > /dev/null 2>&1; then
+          if curl -f http://localhost:8888/assets/logo.svg > /dev/null 2>&1; then
             echo "✓ Embedded assets are working"
           else
             echo "✗ Embedded assets failed"
@@ -119,7 +123,7 @@ jobs:
           
           # Test embedded assets
           try {
-            $response = Invoke-WebRequest -Uri "http://localhost:8888/logo.svg" -TimeoutSec 10
+            $response = Invoke-WebRequest -Uri "http://localhost:8888/assets/logo.svg" -TimeoutSec 10
             if ($response.StatusCode -eq 200) {
               Write-Host "✓ Embedded assets are working"
             } else {
@@ -143,3 +147,48 @@ jobs:
           name: ${{ matrix.artifact-name }}
           path: wallet-generator${{ matrix.executable-ext }}
           retention-days: 30
+
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/')
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./artifacts
+
+      - name: Display structure of downloaded files
+        run: ls -la ./artifacts/
+
+      - name: Create release archives
+        run: |
+          cd ./artifacts
+          for dir in */; do
+            artifact_name=${dir%/}
+            cd "$dir"
+            if [[ "$artifact_name" == *"windows"* ]]; then
+              zip "../${artifact_name}.zip" wallet-generator.exe
+            else
+              tar -czf "../${artifact_name}.tar.gz" wallet-generator
+            fi
+            cd ..
+          done
+          ls -la
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            ./artifacts/*.zip
+            ./artifacts/*.tar.gz
+          generate_release_notes: true
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
diff --git a/index.html b/index.html
@@ -3,20 +3,20 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
+    <link rel="icon" type="image/svg+xml" href="/assets/logo.svg" />
     <title>Octra Wallet Generator</title>
     <style>
         @font-face {
           font-family: 'National';
-          src: url('/national-regular.woff2') format('woff2');
+          src: url('/assets/national-regular.woff2') format('woff2');
           font-weight: 400;
           font-style: normal;
           font-display: swap;
        }
        
        @font-face {
           font-family: 'FoundersGrotesk';
-          src: url('/founders-grotesk-bold.woff2') format('woff2');
+          src: url('/assets/founders-grotesk-bold.woff2') format('woff2');
           font-weight: 700;
           font-style: normal;
           font-display: swap;
diff --git a/wallet_generator.ts b/wallet_generator.ts
@@ -5,23 +5,24 @@ import { fileURLToPath } from "url";
 import nacl from "tweetnacl";
 import bip39 from "bip39";
 
+import indexHtml from "./index.html" with { type: "text" };
+import logoSvg from "./assets/logo.svg" with { type: "text" };
+import foundersGroteskFontPath from "./assets/founders-grotesk-bold.woff2" with { type: "file" };
+import nationalFontPath from "./assets/national-regular.woff2" with { type: "file" };
+
 // ESM equivalent of __dirname
 const __filename: string = fileURLToPath(import.meta.url);
 const __dirname: string = path.dirname(__filename);
 
 // Embed static assets for executable builds
-let indexHtml: string = "";
-let logoSvg: string = "";
 let foundersGroteskFont: ArrayBuffer;
 let nationalFont: ArrayBuffer;
 
 // Load assets asynchronously
 async function loadAssets() {
   try {
-    indexHtml = await Bun.file("index.html").text();
-    logoSvg = await Bun.file("assets/logo.svg").text();
-    foundersGroteskFont = await Bun.file("assets/founders-grotesk-bold.woff2").arrayBuffer();
-    nationalFont = await Bun.file("assets/national-regular.woff2").arrayBuffer();
+    foundersGroteskFont = await Bun.file(foundersGroteskFontPath).arrayBuffer();
+    nationalFont = await Bun.file(nationalFontPath).arrayBuffer();
   } catch (error) {
     console.warn("Could not load embedded assets:", error.message);
     // Assets will be served from filesystem instead
@@ -231,13 +232,13 @@ function deriveForNetwork(
   const coinType: number = networkType === 0 ? 0 : networkType;
 
   const basePath: number[] = [
-    0x80000000 | 345, // Purpose
-    0x80000000 | coinType, // Coin type
-    0x80000000 | network, // Network
+    0x80000000 + 345, // Purpose
+    0x80000000 + coinType, // Coin type
+    0x80000000 + network, // Network
   ];
 
-  const contractPath: number[] = [0x80000000 | contract, 0x80000000 | account];
-  const optionalPath: number[] = [0x80000000 | token, 0x80000000 | subnet];
+  const contractPath: number[] = [0x80000000 + contract, 0x80000000 + account];
+  const optionalPath: number[] = [0x80000000 + token, 0x80000000 + subnet];
   const finalPath: number[] = [index];
 
   const fullPath: number[] = [
@@ -609,41 +610,38 @@ function serveEmbeddedAsset(pathname: string): Response | null {
         });
       }
       break;
-    
+
     case '/assets/logo.svg':
-    case '/logo.svg':
       if (logoSvg) {
         return new Response(logoSvg, {
           headers: { 'Content-Type': 'image/svg+xml' }
         });
       }
       break;
-    
+
     case '/assets/founders-grotesk-bold.woff2':
-    case '/founders-grotesk-bold.woff2':
       if (foundersGroteskFont) {
         return new Response(foundersGroteskFont, {
-          headers: { 
+          headers: {
             'Content-Type': 'font/woff2',
             'Cache-Control': 'public, max-age=31536000'
           }
         });
       }
       break;
-    
+
     case '/assets/national-regular.woff2':
-    case '/national-regular.woff2':
       if (nationalFont) {
         return new Response(nationalFont, {
-          headers: { 
+          headers: {
             'Content-Type': 'font/woff2',
             'Cache-Control': 'public, max-age=31536000'
           }
         });
       }
       break;
   }
-  
+
   return null;
 }
 
