update

Author: Tom Softreck

Makefile

@@ -1,14 +1,20 @@
-# LogLama Makefile
+# WebTask Makefile
+
+# Load environment variables from .env file
+ifneq (,$(wildcard ./.env))
+    include .env
+    export $(shell sed 's/=.*//' .env)
+endif
 
 # Default values that can be overridden
-PORT ?= 8081
-HOST ?= 127.0.0.1
+PORT ?= 9000
+HOST ?= 0.0.0.0
 PYTHON ?= python3
 LOG_DIR ?= ./logs
 DB_PATH ?= $(LOG_DIR)/loglama.db
 EXAMPLE_DB_PATH ?= $(LOG_DIR)/example.db
 
-.PHONY: all setup install test test-unit test-integration test-ansible lint format clean run-api web run-example view-logs run-integration run-examples build publish publish-test check-publish help
+.PHONY: all setup install test test-unit test-integration test-ansible lint format clean run-api web run-example view-logs run-integration run-examples build publish publish-test check-publish help start stop restart status
 
 all: help
 
@@ -87,6 +93,25 @@ publish-full:
 	@chmod +x scripts/publish.sh
 	@./scripts/publish.sh
 
+# Start the WebTask server
+start:
+	@echo "Starting WebTask server on $(HOST):$(PORT)..."
+	@poetry run webtask --host $(HOST) --port $(PORT)
+
+# Stop the WebTask server
+stop:
+	@echo "Stopping WebTask server on port $(PORT)..."
+	@-pkill -f "webtask --host $(HOST) --port $(PORT)" || echo "No WebTask server found running on port $(PORT)"
+
+# Restart the WebTask server
+restart: stop start
+
+# Show status of WebTask server
+status:
+	@pgrep -f "webtask --host $(HOST) --port $(PORT)" > /dev/null && \
+		echo "WebTask server is running on $(HOST):$(PORT)" || \
+		echo "WebTask server is not running on $(HOST):$(PORT)"
+
 # Dry run of the publishing process
 publish-dry-run:
 	@echo "Running dry run of publishing process..."

env.example

@@ -0,0 +1,3 @@
+# WebTask Server Configuration
+HOST=0.0.0.0
+PORT=9000

pyproject.toml

@@ -30,6 +30,7 @@ packages = [{include = "webtask"}]
 
 [tool.poetry.dependencies]
 python = "^3.7"
+psutil = "^5.9.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.0"

webtask/server.py

@@ -2,18 +2,51 @@
 webtask HTTP Server
 """
 
+import json
+import psutil
+import socket
+import time
 import webbrowser
 import threading
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional, Union
 
 
 class WebTaskHandler(SimpleHTTPRequestHandler):
     """Custom HTTP handler for webtask"""
+    
+    # Define API routes as a class variable to ensure they're available immediately
+    api_routes = {}
+    
     def __init__(self, *args: Any, **kwargs: Any) -> None:
+        # Initialize the routes before calling parent's __init__
+        self.api_routes = {
+            '/api/processes': self.handle_processes,
+            '/api/system': self.handle_system_info,
+            '/api/services': self.handle_services,
+            '/api/disk': self.handle_disk_usage,
+        }
         static_dir = Path(__file__).parent / "static"
         super().__init__(*args, directory=str(static_dir), **kwargs)
+        
+    def do_GET(self) -> None:
+        """Handle GET requests, routing API calls or serving static files."""
+        if self.path in self.api_routes:
+            self.api_routes[self.path]()
+        else:
+            # Default to serving static files
+            super().do_GET()
+            
+    def send_json_response(self, data: Union[Dict, List], status_code: int = 200) -> None:
+        """Send a JSON response with the given data and status code."""
+        self.send_response(status_code)
+        self.send_header('Content-Type', 'application/json')
+        self.send_header('Cache-Control', 'no-cache, no-store, must-revalidate')
+        self.send_header('Pragma', 'no-cache')
+        self.send_header('Expires', '0')
+        self.end_headers()
+        self.wfile.write(json.dumps(data).encode('utf-8'))
 
     def end_headers(self) -> None:
         self.send_header(
@@ -24,7 +57,92 @@ def end_headers(self) -> None:
         self.send_header('Expires', '0')
         super().end_headers()
 
+    def handle_processes(self) -> None:
+        """Return a list of running processes."""
+        processes = []
+        for proc in psutil.process_iter(['pid', 'name', 'username', 'cpu_percent', 'memory_percent']):
+            try:
+                processes.append({
+                    'pid': proc.info['pid'],
+                    'name': proc.info['name'],
+                    'user': proc.info['username'],
+                    'cpu': proc.info['cpu_percent'],
+                    'memory': proc.info['memory_percent']
+                })
+            except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                pass
+        self.send_json_response(processes)
+
+    def handle_system_info(self) -> None:
+        """Return system information."""
+        cpu_percent = psutil.cpu_percent(interval=1)
+        memory = psutil.virtual_memory()
+        disk = psutil.disk_usage('/')
+        
+        system_info = {
+            'cpu': {
+                'percent': cpu_percent,
+                'cores': psutil.cpu_count(),
+                'load_avg': [x / psutil.cpu_count() * 100 for x in psutil.getloadavg()]
+            },
+            'memory': {
+                'total': memory.total,
+                'available': memory.available,
+                'used': memory.used,
+                'percent': memory.percent
+            },
+            'disk': {
+                'total': disk.total,
+                'used': disk.used,
+                'free': disk.free,
+                'percent': disk.percent
+            },
+            'hostname': socket.gethostname(),
+            'uptime': int(time.time() - psutil.boot_time())
+        }
+        self.send_json_response(system_info)
+
+    def handle_services(self) -> None:
+        """Return a list of running services."""
+        services = []
+        # This is a simplified example - you might need to adjust based on the OS
+        try:
+            if hasattr(psutil, 'win_service_iter'):
+                for service in psutil.win_service_iter():
+                    services.append({
+                        'name': service.name(),
+                        'display_name': service.display_name(),
+                        'status': service.status()
+                    })
+            else:
+                # Fallback for non-Windows systems
+                services = [{'name': 'service1', 'status': 'running'}, 
+                           {'name': 'service2', 'status': 'stopped'}]
+        except Exception as e:
+            services = [{'error': f'Service listing error: {str(e)}'}]
+        self.send_json_response(services)
+
+    def handle_disk_usage(self) -> None:
+        """Return disk usage information."""
+        partitions = []
+        for partition in psutil.disk_partitions():
+            try:
+                usage = psutil.disk_usage(partition.mountpoint)
+                partitions.append({
+                    'device': partition.device,
+                    'mountpoint': partition.mountpoint,
+                    'fstype': partition.fstype,
+                    'total': usage.total,
+                    'used': usage.used,
+                    'free': usage.free,
+                    'percent': usage.percent
+                })
+            except Exception as e:
+                print(f"Error getting disk usage for {partition.mountpoint}: {e}")
+        self.send_json_response(partitions)
+
     def log_message(self, format: str, *args: Any) -> None:
+        """Override to prevent logging every request to stderr."""
         pass