Merge pull request #156 from architecture-building-systems/release-4.0

Merge release-4.0 into master

Author: reyery

.env.development

@@ -1 +1,4 @@
 VITE_CEA_URL="http://localhost:5050"
+VITE_AUTH_URL="http://localhost:3000"
+
+VITE_AUTH_COOKIE_NAME="stack-access"

.env.electron

@@ -1 +1,4 @@
 VITE_CEA_URL="http://localhost:5050"
+VITE_AUTH_URL="http://localhost:3000"
+
+VITE_AUTH_COOKIE_NAME="stack-access"

.eslintrc.js

@@ -38,12 +38,17 @@ module.exports = {
     ecmaVersion: 'latest',
     sourceType: 'module',
   },
-  plugins: ['react-refresh', 'simple-import-sort'],
+  plugins: [
+    'eslint-plugin-react-compiler',
+    'react-refresh',
+    'simple-import-sort',
+  ],
   rules: {
     'prettier/prettier': ['error', {}, { usePrettierrc: true }],
     'react/react-in-jsx-scope': 'off',
     'jsx-a11y/accessible-emoji': 'off',
     'react/prop-types': 'off',
+    'react-compiler/react-compiler': 'warn',
     // 'simple-import-sort/imports': 'error',
     // 'simple-import-sort/exports': 'error',
     'jsx-a11y/anchor-is-valid': [

.yarnrc.yml

@@ -1,4 +1,4 @@
-nodeLinker: node-modules
-
 injectEnvironmentFiles:
   - .env.electron.local?
+
+nodeLinker: node-modules

Dockerfile

@@ -1,14 +1,34 @@
-FROM node:current-alpine
+FROM node:current-alpine AS builder
+
+ARG VITE_CEA_URL=""
+ENV VITE_CEA_URL=$VITE_CEA_URL
 
 RUN corepack enable
 
 WORKDIR /app
+
+# Copy only package files first to leverage cache
 COPY package.json yarn.lock .yarnrc.yml ./
 
-RUN yarn
+# Install dependencies
+RUN yarn install --frozen-lockfile
+
+# Copy source code
 COPY . .
 
+# Build the application
 RUN yarn build
-EXPOSE 4173
 
-CMD [ "yarn", "preview", "--host" ]
+# Create production image
+FROM nginx:alpine
+
+LABEL org.opencontainers.image.source=https://github.com/architecture-building-systems/CityEnergyAnalyst-GUI
+
+# Copy built assets from builder stage
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+# Expose port
+EXPOSE 80
+
+# Use nginx to serve the static files
+CMD ["nginx", "-g", "daemon off;"]

dev-app-update.yml

@@ -0,0 +1,3 @@
+provider: github
+owner: architecture-building-systems
+repo: CityEnergyAnalyst-GUI

electron/cea/env.mjs

@@ -1,4 +1,5 @@
 import { app } from 'electron';
+import { fileURLToPath } from 'url';
 import path from 'path';
 import os from 'os';
 import { exec, execSync, spawn } from 'child_process';
@@ -11,7 +12,15 @@ const execAsync = promisify(exec);
 
 const paths = {
   darwin: {
-    micromamba: path.join(process.resourcesPath, os.arch(), 'micromamba'),
+    micromamba: app.isPackaged
+      ? path.join(process.resourcesPath, os.arch(), 'micromamba')
+      : // FIXME: Temp fix for dev env
+        path.join(
+          fileURLToPath(import.meta.url),
+          '../../../dependencies',
+          os.arch(),
+          'micromamba',
+        ),
     root: path.join(app.getPath('documents'), 'CityEnergyAnalyst'),
   },
   win32: {
@@ -80,10 +89,17 @@ export const getCEAenvVersion = async () => {
 };
 
 export const checkCEAenv = async () => {
+  // Check if CEA is in the environment
   try {
     await execAsync(
       `"${getMicromambaPath(true)}" -r "${getCEARootPath()}" -n cea run cea --version`,
     );
+
+    // Check if CEA is installed as editable package (i.e. dev mode)
+    const { stdout } = await execAsync(
+      `"${getMicromambaPath(true)}" -r "${getCEARootPath()}" -n cea run pip show cityenergyanalyst`,
+    );
+    return stdout.toString().trim().includes('Editable project location');
   } catch (error) {
     console.error(error);
     throw new CEAError(
@@ -104,7 +120,7 @@ const fetchCondaLock = async (ceaVersion, condaLockPath) => {
     await downloadFile(condaLockUrl, condaLockPath);
   } catch (error) {
     console.error(error);
-    new Error(`Unable to download file from ${condaLockUrl}`);
+    throw new Error(`Unable to fetch conda environment file.`);
   }
 };
 
@@ -206,7 +222,7 @@ export const updateCEAenv = async (ceaVersion) => {
         getCEARootPath(),
         '-n',
         'cea',
-        'update',
+        'create',
         '-f',
         condaLockPath,
         '-y',

electron/cea/process.mjs

@@ -1,6 +1,4 @@
-import fs from 'fs';
-import path from 'path';
-import { spawn } from 'child_process';
+import { spawn, execSync } from 'child_process';
 
 import { app, dialog } from 'electron';
 
@@ -15,21 +13,15 @@ export function createCEAProcess(url, BrowserWindow, callback) {
   console.log(`createCEAProcess(${url})`);
   // For windows
   if (process.platform === 'win32') {
-    let scriptPath = path.join(
-      path.dirname(process.execPath),
-      '/../',
-      'dashboard.bat',
-    );
-    // Fallback to default install path
-    if (!fs.existsSync(scriptPath))
-      scriptPath = path.join(
-        process.env.USERPROFILE,
-        'Documents',
-        'CityEnergyAnalyst',
-        'dashboard.bat',
-      );
-    console.log(scriptPath);
-    cea = spawn('cmd.exe', ['/c', scriptPath]);
+    cea = spawn(getMicromambaPath(), [
+      '-r',
+      getCEARootPath(),
+      '-n',
+      'cea',
+      'run',
+      'cea',
+      'dashboard',
+    ]);
   } else if (process.platform === 'darwin') {
     cea = spawn(getMicromambaPath(), [
       '-r',
@@ -43,6 +35,8 @@ export function createCEAProcess(url, BrowserWindow, callback) {
   }
 
   if (cea) {
+    console.debug('CEA process started with PID:', cea.pid);
+
     // Attach cea output to console
     cea.stdout.on('data', function (data) {
       console.log(data.toString('utf8').trim());
@@ -54,7 +48,10 @@ export function createCEAProcess(url, BrowserWindow, callback) {
 
     // Show Error message box when CEA encounters any error on startup
     cea.stderr.on('data', saveStartupError);
-    cea.on('exit', showStartupError);
+    cea.on('exit', () => {
+      cea = null;
+      showStartupError();
+    });
   }
 
   function saveStartupError(message) {
@@ -85,10 +82,41 @@ export function createCEAProcess(url, BrowserWindow, callback) {
 }
 
 // Kill process and stop all timed events
-export function killCEAProcess() {
+export function killCEAProcess(killTimeout = 10000) {
   if (cea) {
     cea.removeAllListeners('exit');
-    process.kill(cea.pid);
+    let result = false;
+
+    if (process.platform === 'win32') {
+      // FIXME: Force kill on windows for now
+      console.debug('Forcing process kill using taskkill on Windows');
+      try {
+        execSync(`taskkill /PID ${cea.pid} /T /F`);
+        result = true;
+      } catch (error) {
+        console.error(`Error killing process: ${error?.message}`);
+      }
+    } else {
+      try {
+        setTimeout(() => process.kill(cea.pid, 'SIGKILL'), killTimeout);
+
+        result = process.kill(cea.pid, 'SIGTERM');
+      } catch (error) {
+        if (error.code === 'ESRCH') {
+          console.error('Unable to kill CEA process. (Process not found)');
+        } else {
+          console.error(error);
+        }
+      }
+    }
+
+    if (result) {
+      console.debug('CEA process killed with PID:', cea.pid);
+    } else {
+      console.error('Failed to kill CEA process with PID:', cea.pid);
+    }
+  } else {
+    console.debug('CEA process not found. Ignoring...');
   }
   interval && clearInterval(interval);
   timeout && clearTimeout(timeout);