Release 2.0.105-b20

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ledfx",
-  "version": "2.0.105-b19",
+  "version": "2.0.105-b20",
   "description": "LedFx v2 - BladeMOD!",
   "author": "YeonV aka Blade",
   "private": true,

src/app/app/handlers.mts

@@ -48,7 +48,7 @@ export const handlers = async (
         wind.webContents.send('fromMain', ['platform', process.platform])
         break
       case 'get-core-params':
-        if (isCC) {
+        if (isCC()) {
           wind.webContents.send('fromMain', [
             'coreParams',
             coreParams[process.platform]
@@ -57,12 +57,12 @@ export const handlers = async (
         }
         break
       case 'start-core':
-        if (isCC) {
+        if (isCC()) {
           startInstance(wind, parameters.instance, subprocesses)
         }
         break
       case 'start-core-instance':
-        if (isCC) {
+        if (isCC()) {
           startInstance(
             wind,
             parameters.instance,
@@ -72,12 +72,12 @@ export const handlers = async (
         }
         break
       case 'stop-core-instance':
-        if (isCC) {
+        if (isCC()) {
           stopInstance(wind, parameters.instance, subprocesses)
         }
         break
       case 'delete-core-instance':
-        if (isCC) {
+        if (isCC()) {
           Object.entries(subprocesses).forEach(([name, subpy]) => {
             if (name === parameters.instance) {
               subpy.kill()
@@ -93,7 +93,7 @@ export const handlers = async (
         }
         break
       case 'delete-core-params':
-        if (isCC) {
+        if (isCC()) {
           store.set('coreParams', defaultCoreParams)
           coreParams.darwin = defaultCoreParams.darwin
           coreParams.win32 = defaultCoreParams.win32

src/app/app/instances.mts

@@ -47,15 +47,19 @@ export function stopInstance(
   if (subprocesses[name]) {
     subprocesses[name].running = false
     sendStatus(wind, subprocesses, false, name)
-    subprocesses[name].kill()
+    try {
+      subprocesses[name].kill()
+    } catch (error) {
+      console.error(`Failed to kill subprocess ${name}:`, error)
+    }
   }
 }
 
 export function startInstance(
   wind: BrowserWindow,
   name: string,
   subprocesses: Subprocesses,
-  port: string = '8889'
+  port: string = '8888'
 ) {
   try {
     const subpy = startCore(wind, process.platform as IPlatform, name, port)
@@ -72,16 +76,20 @@ export function startInstance(
         if (subprocesses[name]) {
           subprocesses[name].running = false
         }
-        if (wind && wind.webContents && !wind.isDestroyed() && subprocesses) {
-          // `subprocesses` is defined, proceed with calling `sendStatus`
-          try {
-            sendStatus(wind, subprocesses, false, name)
-          } catch (error) {
-            console.error(error)
+        try {
+          if (wind && wind.webContents && !wind.isDestroyed() && subprocesses) {
+            // `subprocesses` is defined, proceed with calling `sendStatus`
+            try {
+              sendStatus(wind, subprocesses, false, name)
+            } catch (error) {
+              console.error(error)
+            }
+          } else {
+            // `subprocesses` is not defined, handle this case as needed
+            console.error('subprocesses is not defined')
           }
-        } else {
-          // `subprocesses` is not defined, handle this case as needed
-          console.error('subprocesses is not defined')
+        } catch (error) {
+          console.error('Error accessing window or subprocesses:', error)
         }
       })
       subpy.on('error', () => {

src/app/app/utils/corePath.mts

@@ -8,7 +8,7 @@ const __dirname = path.dirname(__filename)
 const corePath = (file: string) =>
   path.join(
     path.dirname(__dirname),
-    isDev ? '../extraResources' : '../../extraResources',
+    isDev ? '../../extraResources' : '../../../extraResources',
     file
   )
 

src/app/app/utils/isCC.mts

@@ -1,9 +1,12 @@
+/* eslint-disable prettier/prettier */
 import fs from 'fs'
 import corePath from './corePath.mjs'
 import coreFile from './coreFile.mjs'
 
-export const isCC = fs.existsSync(
-  corePath(coreFile[process.platform as 'darwin' | 'linux' | 'win32'])
-)
+export const isCC = () => {
+  return fs.existsSync(
+    corePath(coreFile[process.platform as 'darwin' | 'linux' | 'win32'])
+  )
+}
 
 export default isCC

src/app/app/utils/startCore.mts

@@ -12,7 +12,7 @@ function startCore(
   wind: BrowserWindow,
   platform: 'darwin' | 'linux' | 'win32',
   instance = 'instance1',
-  port = '8889'
+  port = '8888'
 ) {
   let subpy: ChildProcessWithoutNullStreams | null = null
 

src/app/electron.ts

@@ -46,8 +46,7 @@ const ready = () =>
     }
     nativeTheme.themeSource = 'dark'
     const thePath = process.env.PORTABLE_EXECUTABLE_DIR || path.resolve('.')
-
-    wind = isCC
+    wind = isCC()
       ? createWindow(win, { additionalArguments: ['integratedCore'] })
       : createWindow(win)
 
@@ -65,8 +64,8 @@ const ready = () =>
         }
         return { action: 'allow' }
       })
-      if (isCC) startInstance(wind, 'instance1', subprocesses)
-      createTray(isCC, wind, thePath, __dirname)
+      if (isCC()) startInstance(wind, 'instance1', subprocesses)
+      createTray(isCC(), wind, thePath, __dirname)
     }
 
     ipcMain.on(

src/components/Dialogs/Instances.tsx

@@ -222,7 +222,7 @@ const Instances = ({
                 }
                 aria-label="delete"
                 onClick={(e) => {
-                  handleStartCore(e, newPort || parseInt(port, 10) || 8889)
+                  handleStartCore(e, newPort || parseInt(port, 10) || 8888)
                 }}
               >
                 <PlayArrow />
@@ -242,7 +242,7 @@ const Instances = ({
                 }
                 aria-label="stop"
                 onClick={(e) => {
-                  handleStopCore(e, newPort || parseInt(port, 10) || 8889)
+                  handleStopCore(e, newPort || parseInt(port, 10) || 8888)
                 }}
               >
                 <Stop />
@@ -313,7 +313,7 @@ const Instances = ({
                   handleDelete(
                     e,
                     parseInt(`${port}` || portRef.current?.value || '', 10) ||
-                      8889
+                      8888
                   )
                 }
               />
@@ -337,7 +337,7 @@ const Instances = ({
                 size="small"
                 aria-label="delete"
                 onClick={(e) => {
-                  handleStartCore(e, newPort || parseInt(port, 10) || 8889)
+                  handleStartCore(e, newPort || parseInt(port, 10) || 8888)
                 }}
               >
                 <PlayArrow />
@@ -347,7 +347,7 @@ const Instances = ({
                 size="small"
                 aria-label="stop"
                 onClick={(e) => {
-                  handleStopCore(e, newPort || parseInt(port, 10) || 8889)
+                  handleStopCore(e, newPort || parseInt(port, 10) || 8888)
                 }}
               >
                 <Stop />
@@ -434,7 +434,7 @@ const Instances = ({
               ? parseInt(portRef.current?.value, 10)
               : newPort) ||
               parseInt(port, 10) ||
-              8889
+              8888
           )
           if (portRef.current?.value) {
             portRef.current.value = `${parseInt(portRef.current.value, 10) + 1}`
@@ -462,7 +462,7 @@ const Instances = ({
         onConfirm={(e) =>
           handleDelete(
             e,
-            parseInt(`${port}` || portRef.current?.value || '', 10) || 8889
+            parseInt(`${port}` || portRef.current?.value || '', 10) || 8888
           )
         }
       /> */}