klio 1.2.7 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klio",
-  "version": "1.2.7",
+  "version": "1.3.0",
   "description": "Eine CLI für astrologische Berechnungen",
   "main": "src/main.js",
   "bin": {

package/src/astrology/astrologyService.js

@@ -268,6 +268,9 @@ function getAstrologicalData(planetName, customDate = null) {
 
   // Verwende das angegebene Datum oder das aktuelle Datum (mit Zeitzonenberücksichtigung)
   let calcYear, calcMonth, calcDay, calcHour, calcMinute;
+  let timezoneOffsetMinutes;
+  let timezone = null;
+  let baseDate;
   
   if (customDate) {
     calcYear = customDate.year;
@@ -275,6 +278,18 @@ function getAstrologicalData(planetName, customDate = null) {
     calcDay = customDate.day;
     calcHour = customDate.hour;
     calcMinute = customDate.minute;
+    baseDate = customDate;
+    // Versuche, die Zeitzone vom customDate abzuleiten (z.B. Geburtsort)
+    if (customDate.location && customDate.location.timezone) {
+      timezone = customDate.location.timezone;
+    } else {
+      try {
+        const config = loadConfig();
+        if (config && config.currentLocation && config.currentLocation.timezone) {
+          timezone = config.currentLocation.timezone;
+        }
+      } catch (_) {}
+    }
   } else {
     // Verwende die aktuelle Zeit in der konfigurierten Zeitzone
     const timeData = getCurrentTimeInTimezone();
@@ -283,9 +298,24 @@ function getAstrologicalData(planetName, customDate = null) {
     calcDay = timeData.day;
     calcHour = timeData.hour;
     calcMinute = timeData.minute;
+    baseDate = timeData;
+    try {
+      const config = loadConfig();
+      if (config && config.currentLocation && config.currentLocation.timezone) {
+        timezone = config.currentLocation.timezone;
+      }
+    } catch (_) {}
+  }
+
+  // Bestimme Offset in Minuten (Lokalzeit - UTC)
+  if (timezone) {
+    timezoneOffsetMinutes = getTimezoneOffset({ year: calcYear, month: calcMonth, day: calcDay, hour: calcHour, minute: calcMinute }, timezone);
+  } else {
+    // Fallback: Systemoffset umkehren, damit (Lokalzeit - UTC) entsteht
+    timezoneOffsetMinutes = -new Date().getTimezoneOffset();
   }
 
-  const julianDay = swisseph.swe_julday(calcYear, calcMonth, calcDay, calcHour + calcMinute / 60, swisseph.SE_GREG_CAL);
+  const julianDay = calculateJulianDayUTC({ year: calcYear, month: calcMonth, day: calcDay, hour: calcHour, minute: calcMinute }, timezoneOffsetMinutes);
   const flag = swisseph.SEFLG_SWIEPH | swisseph.SEFLG_SPEED;
   const result = swisseph.swe_calc_ut(julianDay, planet, flag);
 
@@ -340,13 +370,18 @@ function getCriticalPlanets(customDate = null) {
     timeData = getCurrentTimeInTimezone();
   }
   
-  const julianDay = swisseph.swe_julday(
-    timeData.year, 
-    timeData.month, 
-    timeData.day, 
-    timeData.hour + timeData.minute / 60, 
-    swisseph.SE_GREG_CAL
-  );
+  // Berücksichtige die lokale Zeitzone für die Umrechnung nach UTC
+  let timezone = null;
+  try {
+    const config = loadConfig();
+    if (customDate && customDate.location && customDate.location.timezone) {
+      timezone = customDate.location.timezone;
+    } else if (config && config.currentLocation && config.currentLocation.timezone) {
+      timezone = config.currentLocation.timezone;
+    }
+  } catch (_) {}
+  const offsetMinutes = timezone ? getTimezoneOffset(timeData, timezone) : -new Date().getTimezoneOffset();
+  const julianDay = calculateJulianDayUTC(timeData, offsetMinutes);
   
   // Berechne Positionen aller Planeten
   for (const [name, planetId] of Object.entries(planets)) {
@@ -613,13 +648,16 @@ function isPlanetRetrograde(planetName, dateComponents) {
     if (planet === undefined) return false;
     
     // Berechne die Position mit Geschwindigkeitsinformation
-    const julianDay = swisseph.swe_julday(
-      dateComponents.year, 
-      dateComponents.month, 
-      dateComponents.day, 
-      dateComponents.hour + dateComponents.minute / 60, 
-      swisseph.SE_GREG_CAL
-    );
+    // Konvertiere Datum zu UTC basierend auf konfigurierter Zeitzone
+    let tz = null;
+    try {
+      const config = loadConfig();
+      if (config && config.currentLocation && config.currentLocation.timezone) {
+        tz = config.currentLocation.timezone;
+      }
+    } catch (_) {}
+    const off = tz ? getTimezoneOffset(dateComponents, tz) : -new Date().getTimezoneOffset();
+    const julianDay = calculateJulianDayUTC(dateComponents, off);
     
     const flag = swisseph.SEFLG_SWIEPH | swisseph.SEFLG_SPEED;
     const result = swisseph.swe_calc_ut(julianDay, planet, flag);
@@ -1343,7 +1381,6 @@ async function showCombinedAnalysis(planetName, transitDate = null, birthData =
   console.log('================================================================================');
   console.log(`Analyse-Datum: ${transitDate.day}.${transitDate.month}.${transitDate.year}`);
   console.log(`Geburtsdatum: ${birthData.day}.${birthData.month}.${birthData.year} ${birthData.hour}:${birthData.minute.toString().padStart(2, '0')}`);
-  console.log(`Haus-System: ${houseSystem.charAt(0).toUpperCase() + houseSystem.slice(1)} (basierend auf Geburts-ASC)`);
   console.log('');
 
   // Zeige Planetenpositionen und Häuser

package/src/cli/cli.js

@@ -1,7 +1,7 @@
 const { Command } = require('commander');
 const { planets, signs } = require('../astrology/astrologyConstants');
 const { showRetrogradePlanets } = require('../astrology/retrogradeService');
-const { getCurrentTimeInTimezone, showAspectFigures, analyzeElementDistribution, getTimezoneOffset, calculateJulianDayUTC, calculateHouses, getAstrologicalData, getPlanetHouse, showPlanetAspects, calculatePlanetAspects, getAllActiveAspects, showAllActiveAspects, getBirthDataFromConfig, detectAspectFigures, calculatePersonalTransits, showPersonalTransitAspects, showCombinedAnalysis, calculatePersonalTransitAspects, determineAspectPhase, findExactAspectTime, findLastExactAspectTime } = require('../astrology/astrologyService');
+const { getCurrentTimeInTimezone, showAspectFigures, analyzeElementDistribution, getTimezoneOffset, calculateJulianDayUTC, calculateHouses, getAstrologicalData, getPlanetHouse, showPlanetAspects, calculatePlanetAspects, getAllActiveAspects, showAllActiveAspects, getBirthDataFromConfig, detectAspectFigures, calculatePersonalTransits, showPersonalTransitAspects, showCombinedAnalysis, calculatePersonalTransitAspects, determineAspectPhase, findExactAspectTime, findLastExactAspectTime, getAspectAngle, getFutureAspects, getPastAspects } = require('../astrology/astrologyService');
 const { performSetup, showConfigStatus, loadConfig, setAIModel, askAIModel } = require('../config/configService');
 const { parseAppleHealthXML } = require('../health/healthService');
 const { analyzeStepsByPlanetSign, analyzeStressByPlanetAspects, analyzePlanetAspectsForSleep } = require('../health/healthAnalysis');
@@ -410,9 +410,9 @@ program
       return;
     }
 
-    // Kombinierte Analyse anzeigen, falls --a --i und --tr (oder --transit-aspekte) zusammen mit --hs angegeben
-    if ((options.a && shouldUseBirthData(options) && (options.transitAspekte || options.tr)) || 
-        (options.transitAspekte || options.tr) && options.hs) {
+    // Kombinierte Analyse anzeigen NUR wenn --tr/--transit-aspekte zusammen mit --hs angegeben ist
+    // Dadurch wird sichergestellt, dass `--tr` ohne `--hs` ausschließlich persönliche Transit-Aspekte zeigt
+    if ((options.transitAspekte || options.tr) && options.hs) {
       
       // Geburtsdaten sind erforderlich
       const birthData = getBirthDataFromConfig();
@@ -529,7 +529,6 @@ program
         console.log('================================================================================');
         console.log(`\nAnalyse-Datum: ${transitDateDisplay.day}.${transitDateDisplay.month}.${transitDateDisplay.year}`);
         console.log(`Geburtsdatum: ${birthData.day}.${birthData.month}.${birthData.year} ${birthData.hour}:${birthData.minute.toString().padStart(2, '0')}`);
-        console.log(`Haus-System: ${houseSystem.charAt(0).toUpperCase() + houseSystem.slice(1)} (basierend auf Geburts-ASC)`);
 
       }
       

package/src/config/configService.js

@@ -1,9 +1,56 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const axios = require('axios');
 const readline = require('readline');
 const { parseAndFormatMarkdown } = require('../utils/markdownFormatter');
 
+// Funktion zur Bestimmung des plattformübergreifenden Konfigurationspfads
+function getConfigPath() {
+  let configDir;
+  
+  // Bestimme das Konfigurationsverzeichnis basierend auf dem Betriebssystem
+  if (process.platform === 'win32') {
+    // Windows: Verwende %APPDATA%\astrocli
+    configDir = path.join(process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming'), 'astrocli');
+  } else if (process.platform === 'darwin') {
+    // macOS: Verwende ~/Library/Application Support/astrocli
+    configDir = path.join(os.homedir(), 'Library', 'Application Support', 'astrocli');
+  } else {
+    // Linux und andere Unix-Systeme: Verwende ~/.config/astrocli
+    configDir = path.join(os.homedir(), '.config', 'astrocli');
+  }
+  
+  // Erstelle das Verzeichnis, falls es nicht existiert
+  if (!fs.existsSync(configDir)) {
+    fs.mkdirSync(configDir, { recursive: true });
+  }
+  
+  return path.join(configDir, 'config.json');
+}
+
+// Funktion zur Migration der alten Konfiguration
+function migrateOldConfig() {
+  const oldConfigPath = path.join(__dirname, '../../astrocli-config.json');
+  const newConfigPath = getConfigPath();
+  
+  // Prüfe, ob die alte Konfiguration existiert und die neue noch nicht
+  if (fs.existsSync(oldConfigPath) && !fs.existsSync(newConfigPath)) {
+    try {
+      const oldConfigData = fs.readFileSync(oldConfigPath, 'utf8');
+      fs.writeFileSync(newConfigPath, oldConfigData);
+      console.log('📁 Alte Konfiguration erfolgreich migriert!');
+      console.log(`   Von: ${oldConfigPath}`);
+      console.log(`   Nach: ${newConfigPath}`);
+      return true;
+    } catch (error) {
+      console.error('Fehler bei der Migration der Konfiguration:', error.message);
+      return false;
+    }
+  }
+  return false;
+}
+
 // Funktion für Geocoding mit OpenMeteo
 async function geocodeLocation(locationName) {
   try {
@@ -37,9 +84,10 @@ async function geocodeLocation(locationName) {
 // Funktion zum Speichern der Konfiguration
 function saveConfig(config) {
   try {
-    const configPath = path.join(__dirname, '../../astrocli-config.json');
+    const configPath = getConfigPath();
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
     console.log('✓ Konfiguration erfolgreich gespeichert!');
+    console.log(`📁 Speicherort: ${configPath}`);
     return true;
   } catch (error) {
     console.error('Fehler beim Speichern der Konfiguration:', error.message);
@@ -50,7 +98,10 @@ function saveConfig(config) {
 // Funktion zum Laden der Konfiguration
 function loadConfig() {
   try {
-    const configPath = path.join(__dirname, '../../astrocli-config.json');
+    // Versuche zuerst, die alte Konfiguration zu migrieren
+    migrateOldConfig();
+    
+    const configPath = getConfigPath();
     if (fs.existsSync(configPath)) {
       const configData = fs.readFileSync(configPath, 'utf8');
       return JSON.parse(configData);

package/src/health/fileAnalysis.js

@@ -28,10 +28,16 @@ async function analyzeHouseDistribution(planetName, folderPath, houseSystem = 'K
       const planetLongitude = planetData.longitude;
       
       // Berechne die Hausposition für dieses Datum
-      const julianDay = swisseph.swe_julday(
-        dateComponents.year, dateComponents.month, dateComponents.day,
-        dateComponents.hour + dateComponents.minute / 60, swisseph.SE_GREG_CAL
-      );
+      const { calculateJulianDayUTC, getTimezoneOffset, loadConfig } = require('../astrology/astrologyService');
+      let tz = null;
+      try {
+        const config = loadConfig();
+        if (config && config.currentLocation && config.currentLocation.timezone) {
+          tz = config.currentLocation.timezone;
+        }
+      } catch (_) {}
+      const off = tz ? getTimezoneOffset(dateComponents, tz) : -new Date().getTimezoneOffset();
+      const julianDay = calculateJulianDayUTC(dateComponents, off);
 
       const houses = await calculateHouses(julianDay, houseSystem);
       const planetHouse = getPlanetHouse(planetLongitude, houses.house);
@@ -89,10 +95,16 @@ async function filterFilesByHouse(planetName, folderPath, targetHouse, houseSyst
       const planetLongitude = planetData.longitude;
       
       // Berechne die Hausposition für dieses Datum
-      const julianDay = swisseph.swe_julday(
-        dateComponents.year, dateComponents.month, dateComponents.day,
-        dateComponents.hour + dateComponents.minute / 60, swisseph.SE_GREG_CAL
-      );
+      const { calculateJulianDayUTC, getTimezoneOffset, loadConfig } = require('../astrology/astrologyService');
+      let tz = null;
+      try {
+        const config = loadConfig();
+        if (config && config.currentLocation && config.currentLocation.timezone) {
+          tz = config.currentLocation.timezone;
+        }
+      } catch (_) {}
+      const off = tz ? getTimezoneOffset(dateComponents, tz) : -new Date().getTimezoneOffset();
+      const julianDay = calculateJulianDayUTC(dateComponents, off);
 
       const houses = await calculateHouses(julianDay, houseSystem);
       const planetHouse = getPlanetHouse(planetLongitude, houses.house);