klio 1.5.0 → 1.5.2

package/.dockerignore

@@ -0,0 +1,9 @@
+node_modules
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.git
+.gitignore
+.idea
+sessions
+.DS_Store

package/.nvmrc

@@ -0,0 +1 @@
+20

package/Dockerfile

@@ -0,0 +1,18 @@
+FROM node:20-bookworm-slim
+
+WORKDIR /app
+
+# Build deps for native modules like swisseph
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends python3 make g++ \
+  && rm -rf /var/lib/apt/lists/*
+
+COPY package.json package-lock.json ./
+RUN npm ci
+
+COPY . .
+
+ENV NODE_ENV=production
+EXPOSE 37421
+
+CMD ["node", "src/gui/server.js"]

package/README.md

@@ -56,7 +56,28 @@ This will start a web server on port 37421 (or a different port if specified) an
 klio --gui --gui-port 8080
 ```
 
-### Configuration
+### Running with Docker
+
+You can also run the GUI using Docker for easy deployment:
+
+```bash
+# Build the Docker image
+docker build -t astrocli-gui .
+
+# Run the container
+docker run -p 3006:37421 astrocli-gui
+```
+
+This will start the GUI on `http://localhost:37421`.
+
+
+### Demo
+
+Try a live demo of klio web here:
+
+🌐 [https://klio.up.railway.app](https://klio.up.railway.app)
+
+## Configuration
 
 - **Show status**: `--status` - Shows the stored configuration data
 - **Setup**: `--setup` - Setup for a default chart which can be accessed with `--i` for example `klio --a --i` for displaying the natal aspects. In this setup you can also set up a local AI model for LM-Studio.

package/compose.yaml

@@ -0,0 +1,6 @@
+services:
+  astrocli-gui:
+    build: .
+    ports:
+      - "3006:37421"
+    restart: unless-stopped

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "klio",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "A CLI for astrological calculations",
   "main": "src/main.js",
   "bin": {
     "klio": "./src/main.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build:gui-css": "tailwindcss -i ./src/gui/public/tailwind.css -o ./src/gui/public/tailwind.generated.css --minify",
+    "watch:gui-css": "tailwindcss -i ./src/gui/public/tailwind.css -o ./src/gui/public/tailwind.generated.css --watch"
   },
   "keywords": [
     "astrology",
@@ -19,15 +21,18 @@
   "license": "ISC",
   "type": "commonjs",
   "dependencies": {
+    "@webcontainer/api": "^1.6.1",
     "axios": "^1.13.4",
+    "bcryptjs": "^3.0.3",
     "commander": "^14.0.3",
     "csv": "^6.4.1",
     "csv-parser": "^3.0.0",
     "express": "^4.19.2",
+    "express-session": "^1.19.0",
     "fast-xml-parser": "^5.3.4",
     "moment-timezone": "^0.6.0",
     "node-fetch": "^3.3.2",
-    "sqlite3": "^5.1.7",
+    "session-file-store": "^1.5.0",
     "swisseph": "^0.5.17"
   }
 }

package/src/astrology/astrologyService.js

@@ -1,4 +1,4 @@
-const swisseph = require('swisseph');
+const swisseph = require('./swissephAdapter');
 const fs = require('fs');
 const moment = require('moment-timezone');
 const csvParser = require('csv-parser');
@@ -50,11 +50,11 @@ function getCurrentTimeInTimezone() {
 }
 
 // Function to load birth data from configuration
-function getBirthDataFromConfig() {
+function getBirthDataFromConfig(userId = null) {
   try {
     // First try to load the new configuration
     const { loadConfig } = require('../config/configService');
-    const config = loadConfig();
+    const config = loadConfig(userId);
     
     if (config && config.birthData) {
       // Parse birth date (Format: DD.MM.YYYY)
@@ -78,32 +78,34 @@ function getBirthDataFromConfig() {
       };
     }
     
-    // If the new configuration was not found, try the old file
-    const configPath = path.join(__dirname, '../../astrocli-config.json');
-    if (fs.existsSync(configPath)) {
-      const configData = fs.readFileSync(configPath, 'utf8');
-      const oldConfig = JSON.parse(configData);
-      
-      if (oldConfig && oldConfig.birthData) {
-        // Parse birth date (Format: DD.MM.YYYY)
-        const dateParts = oldConfig.birthData.date.split('.');
-        const day = parseInt(dateParts[0]);
-        const month = parseInt(dateParts[1]);
-        const year = parseInt(dateParts[2]);
-        
-        // Parse birth time (Format: HH:MM)
-        const timeParts = oldConfig.birthData.time.split(':');
-        const hour = parseInt(timeParts[0]);
-        const minute = parseInt(timeParts[1]);
+    // If the new configuration was not found, try the old file (only for global config)
+    if (!userId) {
+      const configPath = path.join(__dirname, '../../astrocli-config.json');
+      if (fs.existsSync(configPath)) {
+        const configData = fs.readFileSync(configPath, 'utf8');
+        const oldConfig = JSON.parse(configData);
         
-        return {
-          year: year,
-          month: month,
-          day: day,
-          hour: hour,
-          minute: minute,
-          location: oldConfig.birthData.location
-        };
+        if (oldConfig && oldConfig.birthData) {
+          // Parse birth date (Format: DD.MM.YYYY)
+          const dateParts = oldConfig.birthData.date.split('.');
+          const day = parseInt(dateParts[0]);
+          const month = parseInt(dateParts[1]);
+          const year = parseInt(dateParts[2]);
+          
+          // Parse birth time (Format: HH:MM)
+          const timeParts = oldConfig.birthData.time.split(':');
+          const hour = parseInt(timeParts[0]);
+          const minute = parseInt(timeParts[1]);
+          
+          return {
+            year: year,
+            month: month,
+            day: day,
+            hour: hour,
+            minute: minute,
+            location: oldConfig.birthData.location
+          };
+        }
       }
     }
   } catch (error) {
@@ -114,14 +116,14 @@ function getBirthDataFromConfig() {
 }
 
 // Function to load person data (including birth data)
-function getPersonDataFromConfig(personId = 'birth') {
+function getPersonDataFromConfig(personId = 'birth', userId = null) {
   try {
     const { getPersonData } = require('../config/configService');
     
     if (personId === 'birth') {
-      return getBirthDataFromConfig();
+      return getBirthDataFromConfig(userId);
     } else {
-      return getPersonData(personId);
+      return getPersonData(personId, userId);
     }
   } catch (error) {
     console.error(`Error loading data for ${personId}:`, error.message);
@@ -684,7 +686,7 @@ function showPlanetAspects(planetName, dateComponents, useBirthData = false, use
   
   console.log(`Aspects for ${planetLabel}:`);
   console.log('================================================================================');
-  console.log('| Aspect      | Planet   | Orb   | Exact Date/Time               |');
+  console.log('| Aspect      | Planet   | Orb   |');
   console.log('================================================================================');
   
   if (aspects.length === 0) {
@@ -696,14 +698,8 @@ function showPlanetAspects(planetName, dateComponents, useBirthData = false, use
       const planetFormatted = planetNameFormatted.padEnd(8, ' ');
       const orb = aspect.orb.padEnd(4, ' ');
       
-      // Calculate exact date and time for this aspect
-      const exactDateTime = findExactAspectTime(planetName, aspect.planet, aspect.type, dateComponents);
-      if (exactDateTime) {
-        const dateTimeStr = `${String(exactDateTime.day).padStart(2, '0')}.${String(exactDateTime.month).padStart(2, '0')}.${exactDateTime.year} ${String(exactDateTime.hour).padStart(2, '0')}:${String(exactDateTime.minute).padStart(2, '0')}`;
-        console.log(`| ${aspectName} | ${planetFormatted} | ${orb}° | ${dateTimeStr} |`);
-      } else {
-        console.log(`| ${aspectName} | ${planetFormatted} | ${orb}° | Calculation failed |`);
-      }
+      // Exact time calculation removed
+      console.log(`| ${aspectName} | ${planetFormatted} | ${orb}° |`);
     });
   }
   
@@ -724,7 +720,7 @@ function showPlanetComboAspects(planetNames, dateComponents, useBirthData = fals
   
   console.log(`Aspects between ${planetLabels}:`);
   console.log('================================================================================');
-  console.log('| Planet 1     | Planet 2     | Aspect      | Orb   | Exact Date/Time               |');
+  console.log('| Planet 1     | Planet 2     | Aspect      | Orb   |');
   console.log('================================================================================');
   
   if (aspects.length === 0) {
@@ -738,14 +734,8 @@ function showPlanetComboAspects(planetNames, dateComponents, useBirthData = fals
       const aspectName = aspect.type.padEnd(11, ' ');
       const orb = aspect.orb.padEnd(4, ' ');
       
-      // Calculate exact date and time for this aspect
-      const exactDateTime = findExactAspectTime(aspect.planet1, aspect.planet2, aspect.type, dateComponents);
-      if (exactDateTime) {
-        const dateTimeStr = `${String(exactDateTime.day).padStart(2, '0')}.${String(exactDateTime.month).padStart(2, '0')}.${exactDateTime.year} ${String(exactDateTime.hour).padStart(2, '0')}:${String(exactDateTime.minute).padStart(2, '0')}`;
-        console.log(`| ${planet1Padded} | ${planet2Padded} | ${aspectName} | ${orb}° | ${dateTimeStr} |`);
-      } else {
-        console.log(`| ${planet1Padded} | ${planet2Padded} | ${aspectName} | ${orb}° | Calculation failed |`);
-      }
+      // Exact time calculation removed
+      console.log(`| ${planet1Padded} | ${planet2Padded} | ${aspectName} | ${orb}° |`);
     });
   }
   
@@ -758,107 +748,7 @@ function showPlanetComboAspects(planetNames, dateComponents, useBirthData = fals
   }
 }
 
-// Helper function to calculate exact date and time for an exact aspect
-function findExactAspectTime(planet1, planet2, aspectType, startDate) {
-  const targetAngle = getAspectAngle(aspectType);
-  
-  if (targetAngle === null) {
-    return null;
-  }
-  
-  // We search in a reasonable time window (90 days in the future)
-  // to find the next exact aspect
-  // Especially important for slow planets like Saturn, Uranus, Neptune, Pluto
-  let bestMatch = null;
-  let bestDistance = Infinity;
-  
-  // Search only in the future (0-90 days after start date)
-  const searchWindow = 90; // days
-  
-  // We search in smaller steps (every 2 hours) to get more precise results
-  const stepsPerDay = 12; // 2-hour steps
-  
-  for (let daysOffset = 0; daysOffset <= searchWindow; daysOffset++) {
-    for (let hourOffset = 0; hourOffset < 24; hourOffset++) { // Every hour
-      for (let minuteOffset = 0; minuteOffset < 60; minuteOffset += 5) { // Every 5 minutes
-        const testDate = addDays(startDate, daysOffset);
-        testDate.hour = hourOffset;
-        testDate.minute = minuteOffset;
-        
-        // Calculate positions of both planets
-        const planet1Data = getAstrologicalData(planet1, testDate);
-        const planet2Data = getAstrologicalData(planet2, testDate);
-        
-        // Calculate angle between planets
-        const angleDiff = Math.abs(planet1Data.longitude - planet2Data.longitude) % 360;
-        const normalizedAngle = Math.min(angleDiff, 360 - angleDiff);
-        const distanceToTarget = Math.abs(normalizedAngle - targetAngle);
-        
-        // Store the best result
-        if (distanceToTarget < bestDistance) {
-          bestDistance = distanceToTarget;
-          bestMatch = {...testDate};
-        }
-      }
-    }
-  }
-  
-  // If we found an aspect close enough to the target, return it
-  // Stricter tolerance of 0.5° for better accuracy
-  if (bestMatch && bestDistance <= 0.5) { // Tolerance of 0.5°
-    return bestMatch;
-  }
-  
-  return null;
-}
 
-// Function to find the last exact aspect in the past (for separative phases)
-function findLastExactAspectTime(planet1, planet2, aspectType, startDate) {
-  const targetAngle = getAspectAngle(aspectType);
-  
-  if (targetAngle === null) {
-    return null;
-  }
-  
-  // Search in the past (up to 180 days before start date)
-  let bestMatch = null;
-  let bestDistance = Infinity;
-  
-  // Search in a time window of 180 days before start date
-  const searchWindow = 180; // days
-  
-  for (let daysOffset = -searchWindow; daysOffset <= 0; daysOffset++) {
-    for (let hourOffset = 0; hourOffset < 24; hourOffset++) { // Every hour
-      for (let minuteOffset = 0; minuteOffset < 60; minuteOffset += 5) { // Every 5 minutes
-        const testDate = addDays(startDate, daysOffset);
-        testDate.hour = hourOffset;
-        testDate.minute = minuteOffset;
-        
-        // Calculate positions of both planets
-        const planet1Data = getAstrologicalData(planet1, testDate);
-        const planet2Data = getAstrologicalData(planet2, testDate);
-        
-        // Calculate angle between planets
-        const angleDiff = Math.abs(planet1Data.longitude - planet2Data.longitude) % 360;
-        const normalizedAngle = Math.min(angleDiff, 360 - angleDiff);
-        const distanceToTarget = Math.abs(normalizedAngle - targetAngle);
-        
-        // Store the best result
-        if (distanceToTarget < bestDistance) {
-          bestDistance = distanceToTarget;
-          bestMatch = {...testDate};
-        }
-      }
-    }
-  }
-  
-  // If we found an aspect close enough to the target, return it
-  if (bestMatch && bestDistance <= 0.5) { // Tolerance of 0.5°
-    return bestMatch;
-  }
-  
-  return null;
-}
 
 // Function to calculate all active aspects between all planets
 function getAllActiveAspects(dateComponents) {
@@ -1775,7 +1665,7 @@ function showAllActiveAspects(dateComponents, useBirthData = false) {
   
   console.log('Active Aspects (all planets) - Classified by Precision:');
   console.log('═══════════════════════════════════════════════════════════════════════════');
-  console.log('║ Planet 1     │ Planet 2     │ Orb    │ Status       │ Exact Date/Time              ║');
+  console.log('║ Planet 1     │ Planet 2     │ Orb    │ Status       ║');
   console.log('═══════════════════════════════════════════════════════════════════════════');
   
   if (sortedAspects.length === 0) {
@@ -1826,14 +1716,10 @@ function showAllActiveAspects(dateComponents, useBirthData = false) {
           );
           const statusPadded = phase.padEnd(11, ' ');
           
-          // Calculate the exact date and time for this aspect
-          const exactDateTime = findExactAspectTime(aspect.planet1, aspect.planet2, aspect.type, dateComponents);
-          let dateTimeStr = '-';
-          if (exactDateTime) {
-            dateTimeStr = `${String(exactDateTime.day).padStart(2, '0')}.${String(exactDateTime.month).padStart(2, '0')}.${exactDateTime.year} ${String(exactDateTime.hour).padStart(2, '0')}:${String(exactDateTime.minute).padStart(2, '0')}`;
-          }
+          // Exact time calculation removed
+          const dateTimeStr = '-';
           
-          console.log(`║ ${planet1Padded} │ ${planet2Padded} │ ${orb}° │ ${statusPadded} │ ${dateTimeStr} ║`);
+          console.log(`║ ${planet1Padded} │ ${planet2Padded} │ ${orb}° │ ${statusPadded} ║`);
         });
       }
     });
@@ -2953,8 +2839,6 @@ module.exports = {
   getPastAspects,
   getAspectAngle,
   getFutureAspects,
-  findExactAspectTime,
-  findLastExactAspectTime,
   analyzeCSVWithDatetime,
   detectAspectFigures,
   showAspectFigures,