diff --git a/package.json b/package.json index bade374e..c4ce204a 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,10 @@ "output": "dist" }, "artifactName": "capra_web_ui_setup.${ext}", - "extends": "electron-snowpack/config/electron-builder.js" + "extends": "electron-snowpack/config/electron-builder.js", + "extraFiles": [ + "script/**" + ] }, "dependencies": { "@cycjimmy/jsmpeg-player": "^6.0.5", diff --git a/snowpack.config.js b/snowpack.config.js index 8819a19a..5ca7247f 100644 --- a/snowpack.config.js +++ b/snowpack.config.js @@ -2,7 +2,6 @@ module.exports = { extends: 'electron-snowpack/config/snowpack.js', mount: { 'src/shared': '/shared', - script: '/script', }, alias: { '@/': './src/', diff --git a/src/main/rtspServer.ts b/src/main/rtspServer.ts index d59af8cd..6dbd17ac 100644 --- a/src/main/rtspServer.ts +++ b/src/main/rtspServer.ts @@ -2,8 +2,8 @@ import { log } from '@/main/logger'; import { app, ipcMain } from 'electron'; import { ExecaChildProcess, execa } from 'execa'; import path from 'path'; -import { isDev } from '@/main/isDev'; import { RTSP_START, RTSP_STOP } from './preload'; +import process from 'process'; interface RtspProcess { process: ExecaChildProcess; @@ -17,16 +17,15 @@ const ports = Array.from({ length: 61 }, (_, i) => i + 9000); ipcMain.handle(RTSP_START, (_, url: string) => { const nextPort = ports.shift() ?? 9000; - const process = execa('node', [ - isDev + const rtspProcess = execa('node', [ + !app.isPackaged ? './script/rtspServer.js' - : path.join(app.getAppPath(), '../renderer/script/rtspServer.js'), + : path.resolve(`${process.resourcesPath}/../script/rtspServer.js`), url, nextPort.toString(), ]); - rtspServers.set(nextPort, { - process, + process: rtspProcess, wsPort: nextPort, });