fix: build and embedded binary

.changeset/fast-crabs-fly.md

@@ -0,0 +1,6 @@
+---
+'renterd': patch
+'hostd': patch
+---
+
+Fixed an issue with the binary embedding.

.github/workflows/pr.yml

@@ -56,6 +56,9 @@ jobs:
       - name: Build
         run: yarn workspace ${{ matrix.app }} build
         shell: bash
+      - name: Download daemon binary
+        run: yarn workspace ${{ matrix.app }} download:binary
+        shell: bash
       - name: Package executable bundles, sign and notarize, make distributables
         env:
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
@@ -78,6 +81,9 @@ jobs:
       - name: Build
         run: yarn workspace ${{ matrix.app }} build
         shell: bash
+      - name: Download daemon binary
+        run: yarn workspace ${{ matrix.app }} download:binary
+        shell: bash
       - name: Package executable bundles, make distributables
         run: yarn workspace ${{ matrix.app }} make --arch=arm64,x64
         shell: bash

hostd/forge.config.js

@@ -8,6 +8,7 @@ module.exports = {
       appleApiKeyId: process.env.APPLE_API_KEY,
       appleApiIssuer: process.env.APPLE_API_ISSUER,
     },
+    extraResource: ['bin'],
     icon: './assets/icons/icon',
   },
   rebuildConfig: {},

hostd/main/asset.ts

@@ -1,8 +1,17 @@
 import path from 'path'
-import { env } from './env'
+
+export function getResourcePath(name: string) {
+  return path.join(process.resourcesPath, name)
+}
+
+export function getResourceAsarPath(name: string) {
+  return getResourcePath(path.join('app.asar', name))
+}
+
+export function getResourceAsarUnpackedPath(name: string) {
+  return getResourcePath(path.join('app.asar.unpacked', name))
+}
 
 export function getAsset(name: string) {
-  return env.isDev
-    ? path.join(process.cwd(), 'assets', name)
-    : path.join(__dirname, '../assets', name)
+  return getResourceAsarPath(path.join('assets', name))
 }

hostd/main/binary.ts

@@ -1,10 +1,8 @@
 import * as path from 'path'
-import { env } from './env'
+import { getResourcePath } from './asset'
 
 export function getBinaryDirectoryPath(): string {
-  return env.isDev
-    ? path.join(process.cwd(), 'bin')
-    : path.join(__dirname, '../bin')
+  return getResourcePath('bin')
 }
 
 export function getBinaryFilePath(): string {

hostd/main/window.ts

@@ -1,9 +1,9 @@
-import path, { join } from 'path'
+import { join } from 'path'
 import { BrowserWindow, app } from 'electron'
 import { format } from 'url'
 import { state } from './state'
 import { system } from './system'
-import { getAsset } from './asset'
+import { getAsset, getResourceAsarPath } from './asset'
 import { env } from './env'
 
 export function initWindow() {
@@ -30,7 +30,7 @@ export function initWindow() {
   const url = env.isDev
     ? 'http://localhost:8000/'
     : format({
-        pathname: path.join(__dirname, '../../renderer/out/index.html'),
+        pathname: getResourceAsarPath('renderer/out/index.html'),
         protocol: 'file:',
         slashes: true,
       })

hostd/package.json

@@ -82,14 +82,5 @@
     "postcss": "^8.4.31",
     "rimraf": "^3.0.2",
     "typescript": "5.0.3"
-  },
-  "build": {
-    "icon": "assets/appicon.png",
-    "asar": true,
-    "files": [
-      "dist",
-      "assets",
-      "bin"
-    ]
   }
 }

renterd/forge.config.js

@@ -8,6 +8,7 @@ module.exports = {
       appleApiKeyId: process.env.APPLE_API_KEY,
       appleApiIssuer: process.env.APPLE_API_ISSUER,
     },
+    extraResource: ['bin'],
     icon: './assets/icons/icon',
   },
   rebuildConfig: {},

renterd/main/asset.ts

@@ -1,8 +1,17 @@
 import path from 'path'
-import { env } from './env'
+
+export function getResourcePath(name: string) {
+  return path.join(process.resourcesPath, name)
+}
+
+export function getResourceAsarPath(name: string) {
+  return getResourcePath(path.join('app.asar', name))
+}
+
+export function getResourceAsarUnpackedPath(name: string) {
+  return getResourcePath(path.join('app.asar.unpacked', name))
+}
 
 export function getAsset(name: string) {
-  return env.isDev
-    ? path.join(process.cwd(), 'assets', name)
-    : path.join(__dirname, '../assets', name)
+  return getResourceAsarPath(path.join('assets', name))
 }

renterd/main/binary.ts

@@ -1,10 +1,8 @@
 import * as path from 'path'
-import { env } from './env'
+import { getResourcePath } from './asset'
 
 export function getBinaryDirectoryPath(): string {
-  return env.isDev
-    ? path.join(process.cwd(), 'bin')
-    : path.join(__dirname, '../bin')
+  return getResourcePath('bin')
 }
 
 export function getBinaryFilePath(): string {

renterd/main/daemon.ts

@@ -10,6 +10,7 @@ export async function startDaemon(): Promise<void> {
     await stopDaemon()
     const config = getConfig()
     const binaryFilePath = getBinaryFilePath()
+
     state.daemon = spawn(binaryFilePath, [], {
       env: { ...process.env, RENTERD_CONFIG_FILE: getConfigFilePath() },
       cwd: config.directory,

renterd/main/window.ts

@@ -1,9 +1,9 @@
-import path, { join } from 'path'
+import { join } from 'path'
 import { BrowserWindow, app } from 'electron'
 import { format } from 'url'
 import { state } from './state'
 import { system } from './system'
-import { getAsset } from './asset'
+import { getAsset, getResourceAsarPath } from './asset'
 import { env } from './env'
 
 export function initWindow() {
@@ -30,7 +30,7 @@ export function initWindow() {
   const url = env.isDev
     ? 'http://localhost:8000/'
     : format({
-        pathname: path.join(__dirname, '../../renderer/out/index.html'),
+        pathname: getResourceAsarPath('renderer/out/index.html'),
         protocol: 'file:',
         slashes: true,
       })

renterd/package.json

@@ -82,14 +82,5 @@
     "postcss": "^8.4.31",
     "rimraf": "^3.0.2",
     "typescript": "5.0.3"
-  },
-  "build": {
-    "icon": "assets/appicon.png",
-    "asar": true,
-    "files": [
-      "dist",
-      "assets",
-      "bin"
-    ]
   }
 }