clawsql 0.1.5 → 0.1.7

package/dist/cli/utils/command-executor.js

@@ -0,0 +1,224 @@
+"use strict";
+/**
+ * ClawSQL CLI - Command Executor Utility
+ *
+ * Executes shell commands with:
+ * - Abstract progress output to console
+ * - Detailed logging to file (~/.clawsql/logs/clawsql.log)
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getClawSQLHome = getClawSQLHome;
+exports.getLogFilePath = getLogFilePath;
+exports.ensureLogDir = ensureLogDir;
+exports.appendToLog = appendToLog;
+exports.logCommandHeader = logCommandHeader;
+exports.executeCommand = executeCommand;
+exports.executeWithProgress = executeWithProgress;
+exports.clearProgressCache = clearProgressCache;
+const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+/**
+ * Get the ClawSQL home directory (~/.clawsql/)
+ */
+function getClawSQLHome() {
+    const homeDir = os.homedir();
+    return path.join(homeDir, '.clawsql');
+}
+/**
+ * Get the log file path (~/.clawsql/logs/clawsql.log)
+ */
+function getLogFilePath() {
+    return path.join(getClawSQLHome(), 'logs', 'clawsql.log');
+}
+/**
+ * Ensure the log directory exists
+ */
+function ensureLogDir() {
+    const logDir = path.dirname(getLogFilePath());
+    if (!fs.existsSync(logDir)) {
+        fs.mkdirSync(logDir, { recursive: true });
+    }
+}
+/**
+ * Append output to the log file
+ */
+function appendToLog(_command, output, stream = 'stdout') {
+    ensureLogDir();
+    const logPath = getLogFilePath();
+    const timestamp = new Date().toISOString();
+    const lines = output.split('\n').filter(line => line.trim());
+    for (const line of lines) {
+        const logLine = `[${timestamp}] [${stream}] ${line}\n`;
+        fs.appendFileSync(logPath, logLine);
+    }
+}
+/**
+ * Write a command header to the log file
+ */
+function logCommandHeader(command) {
+    ensureLogDir();
+    const logPath = getLogFilePath();
+    const timestamp = new Date().toISOString();
+    const header = `\n[${timestamp}] === ${command} ===\n`;
+    fs.appendFileSync(logPath, header);
+}
+/**
+ * Docker/docker-compose progress patterns
+ * Maps output patterns to user-friendly messages
+ */
+const PROGRESS_PATTERNS = [
+    { pattern: /Pulling image|Pulling from|Pulling fs layer/i, message: 'Pulling images...' },
+    { pattern: /Downloading|Extracting/i, message: 'Downloading images...' },
+    { pattern: /Creating network/i, message: 'Creating network...' },
+    { pattern: /Creating volume/i, message: 'Creating volumes...' },
+    { pattern: /Building|Step \d+\/\d+/i, message: 'Building containers...' },
+    { pattern: /Creating .*Container/i, message: 'Creating containers...' },
+    { pattern: /Starting .*Container/i, message: 'Starting containers...' },
+    { pattern: /Network .* created/i, message: 'Network created' },
+    { pattern: /Volume .* created/i, message: 'Volume created' },
+    { pattern: /Container .* started/i, message: 'Container started' },
+    { pattern: /Container .* created/i, message: 'Container created' },
+    { pattern: /Removing container/i, message: 'Removing containers...' },
+    { pattern: /Removed container/i, message: 'Container removed' },
+    { pattern: /Stopping container/i, message: 'Stopping containers...' },
+    { pattern: /Stopped container/i, message: 'Container stopped' },
+    { pattern: /Removing network/i, message: 'Removing network...' },
+    { pattern: /Removed network/i, message: 'Network removed' },
+    { pattern: /Removing volume/i, message: 'Removing volumes...' },
+    { pattern: /Removed volume/i, message: 'Volume removed' },
+    { pattern: /Error|error|ERROR/i, message: 'Error detected' },
+    { pattern: /Warning|warning|WARN/i, message: 'Warning detected' },
+];
+/**
+ * Parse output and extract progress message
+ */
+function parseProgressMessage(output) {
+    for (const { pattern, message } of PROGRESS_PATTERNS) {
+        if (pattern.test(output)) {
+            return message;
+        }
+    }
+    return null;
+}
+/**
+ * Track which messages have been shown to avoid repetition
+ */
+const shownMessages = new Set();
+/**
+ * Execute a shell command with abstract progress output and file logging
+ */
+function executeCommand(cmd, args, options) {
+    return new Promise((resolve) => {
+        // Log command header if specified
+        if (options?.logCommand) {
+            logCommandHeader(options.logCommand);
+        }
+        const proc = (0, child_process_1.spawn)(cmd[0], [...cmd.slice(1), ...args], {
+            cwd: options?.cwd,
+            stdio: 'pipe', // Always capture output
+            env: options?.env ? { ...process.env, ...options.env } : process.env,
+        });
+        let stdout = '';
+        let stderr = '';
+        // Track shown messages for this execution
+        const localShownMessages = new Set();
+        proc.stdout?.on('data', (data) => {
+            const output = data.toString();
+            stdout += output;
+            // Log to file
+            appendToLog(options?.logCommand || 'command', output, 'stdout');
+            // Parse for progress message
+            if (options?.onProgress) {
+                const progressMsg = parseProgressMessage(output);
+                if (progressMsg && !localShownMessages.has(progressMsg)) {
+                    localShownMessages.add(progressMsg);
+                    options.onProgress(progressMsg);
+                }
+            }
+        });
+        proc.stderr?.on('data', (data) => {
+            const output = data.toString();
+            stderr += output;
+            // Log to file
+            appendToLog(options?.logCommand || 'command', output, 'stderr');
+            // Parse for progress message (errors can also contain useful info)
+            if (options?.onProgress) {
+                const progressMsg = parseProgressMessage(output);
+                if (progressMsg && !localShownMessages.has(progressMsg)) {
+                    localShownMessages.add(progressMsg);
+                    options.onProgress(progressMsg);
+                }
+            }
+        });
+        proc.on('close', (code) => {
+            resolve({
+                success: code === 0,
+                stdout,
+                stderr,
+            });
+        });
+        proc.on('error', (err) => {
+            const errorMsg = `Failed to execute command: ${err.message}`;
+            appendToLog(options?.logCommand || 'command', errorMsg, 'stderr');
+            resolve({
+                success: false,
+                stdout: '',
+                stderr: errorMsg,
+            });
+        });
+    });
+}
+/**
+ * Execute a command with simple progress indicator
+ * Shows a spinner while the command runs
+ */
+async function executeWithProgress(cmd, args, options) {
+    // Show initial message
+    if (options.onProgress) {
+        options.onProgress(options.initialMessage);
+    }
+    return executeCommand(cmd, args, options);
+}
+/**
+ * Clear the shown messages cache (call at the start of each command)
+ */
+function clearProgressCache() {
+    shownMessages.clear();
+}
+exports.default = executeCommand;
+//# sourceMappingURL=command-executor.js.map

package/dist/cli/utils/command-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-executor.js","sourceRoot":"","sources":["../../../src/cli/utils/command-executor.ts"],"names":[],"mappings":"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"}

package/dist/config/settings.js

@@ -94,7 +94,7 @@ const SyncSettingsSchema = zod_1.z.object({
 });
 const SettingsSchema = zod_1.z.object({
     appName: zod_1.z.string().default('ClawSQL'),
-    appVersion: zod_1.z.string().default('0.1.5'),
+    appVersion: zod_1.z.string().default('0.1.6'),
     debug: zod_1.z.boolean().default(false),
     metadataDb: MetadataDBSettingsSchema,
     orchestrator: OrchestratorSettingsSchema,

package/dist/core/discovery/topology.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topology.d.ts","sourceRoot":"","sources":["../../../src/core/discovery/topology.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"topology.d.ts","sourceRoot":"","sources":["../../../src/core/discovery/topology.ts"],"names":[],"mappings":"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"}

package/dist/core/discovery/topology.js

@@ -155,7 +155,10 @@ class OrchestratorClient {
     async getInstance(host, port = 3306) {
         try {
             const response = await this.client.get(`/api/instance/${host}/${port}`);
-            return this.parseInstance(response.data);
+            logger.debug({ host, port, data: response.data }, 'Orchestrator getInstance response');
+            const instance = this.parseInstance(response.data);
+            logger.debug({ host, port, instance }, 'Parsed instance');
+            return instance;
         }
         catch (error) {
             if (axios_1.default.isAxiosError(error) && error.response?.status === 404) {

package/dist/core/discovery/topology.js.map

@@ -1 +1 @@
-{"version":3,"file":"topology.js","sourceRoot":"","sources":["../../../src/core/discovery/topology.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"topology.js","sourceRoot":"","sources":["../../../src/core/discovery/topology.ts"],"names":[],"mappings":"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"}

package/docker/Dockerfile.allinone

@@ -9,7 +9,7 @@
 # - Grafana (visualization)
 # - Supervisord (process manager)
 
-FROM docker.io/library/node:20-alpine AS clawsql-builder
+FROM node:20-slim AS clawsql-builder
 
 WORKDIR /build
 COPY package.json package-lock.json* ./
@@ -18,27 +18,30 @@ COPY . .
 RUN npm run build
 
 # =============================================================================
-# Final all-in-one image
+# Final all-in-one image (Debian-based for glibc compatibility)
 # =============================================================================
-FROM docker.io/library/alpine:3.19
+FROM debian:bookworm-slim
 
 # Install all dependencies
-RUN apk add --no-cache \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     nodejs \
     npm \
     curl \
     wget \
-    mysql-client \
+    default-mysql-client \
     supervisor \
     python3 \
-    py3-pip \
+    python3-pip \
     bash \
-    shadow \
-    && pip3 install --break-system-packages supervisor
+    procps \
+    gnupg \
+    lsb-release \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
 
 # Download and install components
-ARG ORCHESTRATOR_VERSION=latest
-ARG PROXYSQL_VERSION=latest
+ARG ORCHESTRATOR_VERSION=3.2.6
+ARG PROXYSQL_VERSION=3.0.6
 ARG PROMETHEUS_VERSION=2.45.0
 ARG GRAFANA_VERSION=10.2.0
 
@@ -54,24 +57,21 @@ RUN mkdir -p /opt/clawsql \
     /var/lib/grafana \
     /data
 
-# Copy ClawSQL application
-COPY --from=clawsql-builder /build/dist /opt/clawsql/dist
-COPY --from=clawsql-builder /build/node_modules /opt/clawsql/node_modules
-COPY --from=clawsql-builder /build/package.json /opt/clawsql/
-COPY docker/orchestrator/orchestrator.conf.json /etc/orchestrator.conf.json
-COPY docker/proxysql/proxysql.cnf /etc/proxysql.cnf
-COPY docker/prometheus/prometheus.yml /etc/prometheus.yml
-COPY docker/grafana/provisioning /opt/grafana/conf/provisioning
-COPY docker/grafana/dashboards /opt/grafana/dashboards
+# Download Orchestrator
+RUN ARCH=$(uname -m) && \
+    if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; elif [ "$ARCH" = "aarch64" ]; then ARCH="arm64"; fi && \
+    wget -q "https://github.com/openark/orchestrator/releases/download/v${ORCHESTRATOR_VERSION}/orchestrator-${ORCHESTRATOR_VERSION}-linux-${ARCH}.tar.gz" -O /tmp/orchestrator.tar.gz && \
+    tar -xzf /tmp/orchestrator.tar.gz -C /opt/orchestrator --strip-components=1 && \
+    rm /tmp/orchestrator.tar.gz
 
-# Download Orchestrator (we'll use a binary release if available, or the Docker image)
+# Download and install ProxySQL (install before copying our config)
 RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; fi && \
-    wget -q "https://github.com/openark/orchestrator/releases/download/v3.2.6/orchestrator-${ARCH}.tar.gz" -O /tmp/orchestrator.tar.gz || true && \
-    if [ -f /tmp/orchestrator.tar.gz ]; then \
-        tar -xzf /tmp/orchestrator.tar.gz -C /opt/orchestrator --strip-components=1 && \
-        rm /tmp/orchestrator.tar.gz; \
-    fi
+    if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; elif [ "$ARCH" = "aarch64" ]; then ARCH="arm64"; fi && \
+    wget -q "https://github.com/sysown/proxysql/releases/download/v${PROXYSQL_VERSION}/proxysql_${PROXYSQL_VERSION}-debian12_${ARCH}.deb" -O /tmp/proxysql.deb && \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::="--force-confnew" /tmp/proxysql.deb && \
+    rm /tmp/proxysql.deb && \
+    rm -rf /var/lib/apt/lists/*
 
 # Download Prometheus
 RUN ARCH=$(uname -m) && \
@@ -87,8 +87,17 @@ RUN ARCH=$(uname -m) && \
     tar -xzf /tmp/grafana.tar.gz -C /opt/grafana --strip-components=1 && \
     rm /tmp/grafana.tar.gz
 
-# ProxySQL will be installed from Alpine package or downloaded
-RUN apk add --no-cache proxysql || true
+# Copy ClawSQL application
+COPY --from=clawsql-builder /build/dist /opt/clawsql/dist
+COPY --from=clawsql-builder /build/node_modules /opt/clawsql/node_modules
+COPY --from=clawsql-builder /build/package.json /opt/clawsql/
+
+# Copy configuration files (after installing packages to avoid conflicts)
+COPY docker/orchestrator/orchestrator.conf.json /etc/orchestrator.conf.json
+COPY docker/proxysql/proxysql.cnf /etc/proxysql.cnf
+COPY docker/prometheus/prometheus.yml /etc/prometheus.yml
+COPY docker/grafana/provisioning /opt/grafana/conf/provisioning
+COPY docker/grafana/dashboards /opt/grafana/dashboards
 
 # Copy supervisord configuration
 COPY docker/supervisord.conf /etc/supervisord.conf

package/docker-compose.demo.yml

@@ -16,9 +16,6 @@ services:
       - "3306:3306"
     environment:
       - MYSQL_ROOT_PASSWORD=rootpassword
-      - MYSQL_DATABASE=clawsql
-      - MYSQL_USER=clawsql
-      - MYSQL_PASSWORD=clawsqlpassword
     command: >
       --server-id=1
       --log-bin=mysql-bin

package/docker-compose.yml

@@ -52,6 +52,8 @@ services:
         condition: service_started
       proxysql:
         condition: service_started
+      metadata-mysql:
+        condition: service_healthy
     networks:
       - clawsql-network
     restart: unless-stopped
@@ -189,6 +191,7 @@ services:
       MYSQL_PASSWORD: ${METADATA_DB_PASSWORD:-clawsql_password}
     volumes:
       - metadata-mysql-data:/var/lib/mysql
+      - ./init/metadata.sql:/docker-entrypoint-initdb.d/01-metadata.sql
     networks:
       - clawsql-network
     restart: unless-stopped

package/init/metadata.sql

@@ -0,0 +1,11 @@
+-- Metadata MySQL initialization script
+-- Recreate clawsql user with mysql_native_password for Orchestrator compatibility
+
+-- Drop the user created by MYSQL_USER env var (which uses caching_sha2_password)
+DROP USER IF EXISTS 'clawsql'@'%';
+
+-- Recreate with mysql_native_password
+CREATE USER 'clawsql'@'%' IDENTIFIED WITH mysql_native_password BY 'clawsql_password';
+GRANT ALL PRIVILEGES ON *.* TO 'clawsql'@'%' WITH GRANT OPTION;
+
+FLUSH PRIVILEGES;

package/init/primary.sql

@@ -1,6 +1,6 @@
 -- Primary initialization script
 -- Create replication user with mysql_native_password for compatibility
-CREATE USER IF NOT EXISTS 'repl'@'%' IDENTIFIED WITH mysql_native_password BY 'replpassword';
+CREATE USER IF NOT EXISTS 'repl'@'%' IDENTIFIED WITH mysql_native_password BY 'repl_password';
 GRANT REPLICATION SLAVE ON *.* TO 'repl'@'%';
 
 -- Create monitoring user
@@ -13,6 +13,9 @@ GRANT SELECT ON mysql.* TO 'monitor'@'%';
 CREATE USER IF NOT EXISTS 'clawsql'@'%' IDENTIFIED WITH mysql_native_password BY 'clawsql_password';
 GRANT ALL PRIVILEGES ON *.* TO 'clawsql'@'%' WITH GRANT OPTION;
 
+-- Create demo database
+CREATE DATABASE IF NOT EXISTS clawsql;
+
 -- Create application user for demo database
 CREATE USER IF NOT EXISTS 'app'@'%' IDENTIFIED WITH mysql_native_password BY 'apppassword';
 GRANT ALL PRIVILEGES ON clawsql.* TO 'app'@'%';

package/init/replica.sql

@@ -1,4 +1,14 @@
 -- Replica initialization script
+-- Create users for Orchestrator access
+CREATE USER IF NOT EXISTS 'clawsql'@'%' IDENTIFIED WITH mysql_native_password BY 'clawsql_password';
+GRANT ALL PRIVILEGES ON *.* TO 'clawsql'@'%' WITH GRANT OPTION;
+
+-- Create monitoring user
+CREATE USER IF NOT EXISTS 'monitor'@'%' IDENTIFIED WITH mysql_native_password BY 'monitorpassword';
+GRANT REPLICATION CLIENT, PROCESS ON *.* TO 'monitor'@'%';
+
+FLUSH PRIVILEGES;
+
 -- Configure replication to primary
 STOP SLAVE;
 
@@ -6,8 +16,8 @@ CHANGE REPLICATION SOURCE TO
     SOURCE_HOST='mysql-primary',
     SOURCE_PORT=3306,
     SOURCE_USER='repl',
-    SOURCE_PASSWORD='replpassword',
+    SOURCE_PASSWORD='repl_password',
     SOURCE_AUTO_POSITION=1,
     GET_SOURCE_PUBLIC_KEY=1;
 
-START SLAVE;
+START SLAVE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawsql",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "MySQL Cluster Automation and Operations Management System",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/__tests__/config/settings.test.d.ts

@@ -1,5 +0,0 @@
-/**
- * Tests for ClawSQL configuration settings
- */
-export {};
-//# sourceMappingURL=settings.test.d.ts.map

package/dist/__tests__/config/settings.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"settings.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/config/settings.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}