fix: worker outside the exe

.github/workflows/build-binaries.yml

@@ -97,16 +97,19 @@ jobs:
           bun build server/index.ts --compile --target ${{ matrix.bun-target }} --outfile ${{ matrix.binary }}
         shell: pwsh
 
+      - name: Build worker
+        run: bun build server/organize-worker.ts --target ${{ matrix.bun-target }} --outfile organize-worker.js
+
       - name: Package archive (Windows)
         if: matrix.target == 'windows-x64'
-        run: Compress-Archive -Path ${{ matrix.binary }}, public -DestinationPath ${{ matrix.archive }}
+        run: Compress-Archive -Path ${{ matrix.binary }}, organize-worker.js, public -DestinationPath ${{ matrix.archive }}
         shell: pwsh
 
       - name: Package archive (Unix)
         if: matrix.target != 'windows-x64'
         run: |
           chmod +x ${{ matrix.binary }}
-          zip -r ${{ matrix.archive }} ${{ matrix.binary }} public/
+          zip -r ${{ matrix.archive }} ${{ matrix.binary }} organize-worker.js public/
 
       - name: Upload archive to Release
         uses: softprops/action-gh-release@v2

package.json

@@ -8,16 +8,15 @@
     "dev:server": "tsx watch server/index.ts",
     "dev:client": "vite",
     "build": "vite build && tsc -p tsconfig.server.json",
-    "build:bun:linux": "bun build server/index.ts --compile --target bun-linux-x64    --outfile binaries/fankarr-linux-x64",
-    "build:bun:windows": "bun build server/index.ts --compile --target bun-windows-x64  --outfile binaries/fankarr-windows-x64.exe",
-    "build:bun:macos": "bun build server/index.ts --compile --target bun-darwin-arm64 --outfile binaries/fankarr-macos",
+    "build:bun:linux": "bun build server/index.ts --compile --target bun-linux-x64    --outfile binaries/fankarr-linux-x64 && bun build server/organize-worker.ts --target bun-linux-x64    --outfile binaries/organize-worker.js",
+    "build:bun:windows": "bun build server/index.ts --compile --target bun-windows-x64  --outfile binaries/fankarr-windows-x64.exe && bun build server/organize-worker.ts --target bun-windows-x64  --outfile binaries/organize-worker.js",
+    "build:bun:macos": "bun build server/index.ts --compile --target bun-darwin-arm64 --outfile binaries/fankarr-macos && bun build server/organize-worker.ts --target bun-darwin-arm64 --outfile binaries/organize-worker.js",
     "build:bun:all": "pnpm build:bun:linux && pnpm build:bun:windows && pnpm build:bun:macos",
     "start": "node dist/server/index.js",
     "preview": "vite preview"
   },
   "dependencies": {
     "@tailwindcss/vite": "^4.2.1",
-    "bcryptjs": "^3.0.3",
     "cookie-parser": "^1.4.7",
     "express": "^5.2.1",
     "jsonwebtoken": "^9.0.3",
@@ -25,10 +24,10 @@
     "pinia": "^3.0.4",
     "tailwindcss": "^4.2.1",
     "vue": "^3.5.25",
-    "vue-router": "^5.0.3"
+    "vue-router": "^5.0.3",
+    "bcryptjs": "^3.0.3"
   },
   "devDependencies": {
-    "@types/bcrypt": "^5.0.2",
     "@types/cookie-parser": "^1.4.8",
     "@types/express": "^5.0.6",
     "@types/jsonwebtoken": "^9.0.9",
@@ -39,6 +38,7 @@
     "tsx": "^4.21.0",
     "typescript": "~5.9.3",
     "vite": "^7.3.1",
-    "vue-tsc": "^3.1.5"
+    "vue-tsc": "^3.1.5",
+    "@types/bcrypt": "^5.0.2"
   }
 }

server/organize.ts

@@ -13,6 +13,18 @@ import { logger } from './logger.js'
 // Un seul worker à la fois
 let workerRunning = false
 
+// Résolution du chemin du worker
+// En binaire Bun compilé : le worker est à côté de l'exécutable
+// En Docker/dev : à côté du fichier courant
+function resolveWorkerPath(): string {
+    const _isBunBinary = typeof (globalThis as any).Bun !== 'undefined'
+        && path.dirname((process as any).execPath) !== process.cwd()
+    if (_isBunBinary) {
+        return path.join(path.dirname((process as any).execPath), 'organize-worker.js')
+    }
+    return path.join(path.dirname(new URL(import.meta.url).pathname), 'organize-worker.js')
+}
+
 export interface OrganizeResult {
     total   : number
     skipped : number
@@ -112,7 +124,7 @@ export async function autoOrganizeAll(
     onResult?: (r: { hash: string; name: string; done: number; skipped: number; errors: number; errorFiles: { file: string; error: string }[] }) => void
 ): Promise<void> {
     if (workerRunning) {
-        logger.debug('organize', 'Worker déjà en cours, skip')
+        console.log('[organize] Worker déjà en cours, skip')
         return
     }
 
@@ -120,7 +132,7 @@ export async function autoOrganizeAll(
     try {
         torrents = await listFn()
     } catch (err) {
-        logger.error('organize', "Impossible de récupérer la liste des torrents: " + (err instanceof Error ? err.message : String(err)))
+        console.error('[organize] Impossible de récupérer la liste des torrents:', err)
         return
     }
 
@@ -129,18 +141,20 @@ export async function autoOrganizeAll(
     const seedingCount = torrents.filter(t => t.state === 'seeding').length
     if (seedingCount === 0) return
 
-    logger.info('organize', `Lancement worker (${seedingCount} torrents en seeding)`)
+    console.log(`[organize] Lancement worker (${seedingCount} torrents en seeding)`)
     workerRunning = true
 
-    const workerPath = path.join(path.dirname(new URL(import.meta.url).pathname), 'organize-worker.js')
+    const workerPath = resolveWorkerPath()
 
     const worker = new Worker(workerPath)
 
     worker.on('message', (msg: any) => {
         if (msg.type === 'log') {
-            logger[msg.level as 'debug'|'info'|'warn'|'error']('organize', msg.msg)
+            if (msg.level === 'error') console.error(msg.msg)
+            else if (msg.level === 'warn') console.warn(msg.msg)
+            else console.log(msg.msg)
         } else if (msg.type === 'result') {
-            logger.info('organize', `${msg.name} → ${msg.done} OK, ${msg.skipped} skippés, ${msg.errors.length} erreurs`)
+            console.log(`[organize] ${msg.name} → ${msg.done} OK, ${msg.skipped} skippés, ${msg.errors.length} erreurs`)
             onResult?.({
                 hash       : msg.hash,
                 name       : msg.name,
@@ -150,19 +164,19 @@ export async function autoOrganizeAll(
                 errorFiles : msg.errors,
             })
         } else if (msg.type === 'done') {
-            logger.debug('organize', 'Worker terminé')
+            console.log('[organize] Worker terminé')
             workerRunning = false
             worker.terminate()
         }
     })
 
     worker.on('error', (err) => {
-        logger.error('organize', `Worker erreur: ${err instanceof Error ? err.message : err}`)
+        console.error('[organize] Worker erreur:', err)
         workerRunning = false
     })
 
     worker.on('exit', (code) => {
-        if (code !== 0) logger.error('organize', `Worker exit code ${code}`)
+        if (code !== 0) console.error(`[organize] Worker exit code ${code}`)
         workerRunning = false
     })
 
@@ -180,7 +194,7 @@ export async function organizeTorrent(
     savePath: string
 ): Promise<OrganizeResult> {
     return new Promise((resolve, reject) => {
-        const workerPath = path.join(path.dirname(new URL(import.meta.url).pathname), 'organize-worker.js')
+        const workerPath = resolveWorkerPath()
         const worker = new Worker(workerPath)
 
         // On envoie un seul torrent "fictif seeding"
@@ -189,7 +203,9 @@ export async function organizeTorrent(
 
         worker.on('message', (msg: any) => {
             if (msg.type === 'log') {
-                logger[msg.level as 'debug'|'info'|'warn'|'error']('organize', msg.msg)
+                if (msg.level === 'error') console.error(msg.msg)
+                else if (msg.level === 'warn') console.warn(msg.msg)
+                else console.log(msg.msg)
             } else if (msg.type === 'result') {
                 result.total   = msg.total
                 result.skipped = msg.skipped