d1s 0.2.6 → 0.2.9

package/dist/app/app/api/query/route.js

@@ -11,15 +11,19 @@ import {
 import { handleSchemaChange } from '@/lib/migrations';
 import { isSchemaChange } from '@/lib/sql-operations';
 import { parseSQLError } from '@/lib/parse-sql-error';
+import logger from '@/lib/logger';
 
 /**
  * API POST handler to execute SQL queries against the configured D1 database.
  */
 export async function POST(req) {
+  logger.logRequest('POST', '/api/query');
+
   try {
     // Ensure that the project directory is set.
     const projectDir = process.env.D1_PROJECT_DIR;
     if (!projectDir) {
+      logger.error('Project directory not configured');
       return NextResponse.json(
         { error: 'Project directory not configured' },
         { status: 500 }
@@ -28,7 +32,10 @@ export async function POST(req) {
 
     // Extract the SQL query from the request body.
     const { query } = await req.json();
-    // console.log('Received query:', query);
+
+    if (logger.shouldLog('debug')) {
+      logger.debug('Received query:', query);
+    }
 
     if (!query?.trim()) {
       return NextResponse.json(
@@ -40,6 +47,7 @@ export async function POST(req) {
     // Retrieve the Wrangler configuration using the centralized helper.
     const wranglerResult = await findWranglerConfig(projectDir);
     if (!wranglerResult || !wranglerResult.config) {
+      logger.error('No Wrangler configuration file found');
       return NextResponse.json(
         { success: false, error: { message: 'No Wrangler configuration file found' } },
         { status: 404 }
@@ -94,7 +102,7 @@ export async function POST(req) {
       // Process schema changes and capture migrations.
       // The handleSchemaChange helper is responsible for executing the DDL statements.
       const migrations = await handleSchemaChange(projectDir, databaseName, statements);
-      console.log('Schema changes processed:', migrations);
+      // console.log('Schema changes processed:', migrations);
       
       result = {
         success: true,
@@ -127,7 +135,7 @@ export async function POST(req) {
     return NextResponse.json(result);
 
   } catch (error) {
-    console.error('Query execution error:', error);
+    logger.logError(error, 'query-route');
     const parsedError = parseSQLError(error);
     
     const statusCode = 

package/dist/app/app/api/tables/[name]/route.js

@@ -5,6 +5,7 @@ import { promisify } from 'util';
 import { exec } from 'child_process';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
 import { dbQueue } from '@/lib/database-queue';
+import logger from '@/lib/logger';
 
 const execAsync = promisify(exec);
 
@@ -35,7 +36,7 @@ async function executeD1Query(command, projectDir, databaseName) {
     const result = JSON.parse(stdout);
     return result[0]?.results || [];
   } catch (error) {
-    console.error('Query execution error:', error);
+    logger.error('Query execution error:', error);
     throw error;
   } finally {
     isProcessing = false;
@@ -145,7 +146,7 @@ export async function GET(request, context) {
       });
 
     } catch (error) {
-      console.error('Error handling request:', error);
+      logger.error('Error handling request:', error);
       return NextResponse.json({
         success: false,
         error: {

package/dist/app/app/api/tables/route.js

@@ -4,6 +4,7 @@ import { NextResponse } from 'next/server';
 import { promisify } from 'util';
 import { exec } from 'child_process';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
+import logger from '@/lib/logger';
 
 const execAsync = promisify(exec);
 
@@ -75,11 +76,13 @@ async function retryWithTimeout(fn, retries = 3, timeout = 1000) {
  * It uses the Wrangler configuration (via findWranglerConfig) to determine the D1 database.
  */
 export async function GET() {
+  logger.logRequest('GET', '/api/tables');
+
   try {
     const projectDir = process.env.D1_PROJECT_DIR;
 
     if (!projectDir) {
-      console.error('D1_PROJECT_DIR environment variable is not set');
+      logger.error('D1_PROJECT_DIR environment variable is not set');
       return NextResponse.json(
         { error: 'Project directory not configured' },
         { status: 500 }
@@ -89,6 +92,7 @@ export async function GET() {
     // Use the centralized helper to get Wrangler configuration
     const wranglerResult = await findWranglerConfig(projectDir);
     if (!wranglerResult || !wranglerResult.config) {
+      logger.error('No Wrangler configuration file found');
       return NextResponse.json(
         { error: 'No Wrangler configuration file found in project directory' },
         { status: 404 }
@@ -138,7 +142,7 @@ export async function GET() {
     });
 
   } catch (error) {
-    console.error('Error fetching tables:', error);
+    logger.logError(error, 'tables-route');
     
     // Enhanced error response for troubleshooting
     const errorResponse = {

package/dist/app/app/api/update/route.js

@@ -0,0 +1,36 @@
+// app/api/update/route.js
+import { NextResponse } from 'next/server';
+import updateNotifier from 'update-notifier';
+import pkg from '../../../../package.json' assert { type: 'json' };
+
+export async function GET() {
+  try {
+    // Create notifier instance with package info
+    const notifier = updateNotifier({ 
+      pkg,
+      updateCheckInterval: 1000 * 60 * 60 * 24 // Check once per day
+    });
+
+    // If there's an update, notifier.update will contain the update info
+    if (notifier.update) {
+      const { latest, current } = notifier.update;
+      
+      // Only return update info if versions are different
+      if (latest !== current) {
+        return NextResponse.json({ 
+          update: {
+            latest,
+            current
+          }
+        });
+      }
+    }
+
+    // No update available
+    return NextResponse.json({ update: null });
+  } catch (error) {
+    console.error('Error checking for updates:', error);
+    // Return null on error to prevent banner from showing
+    return NextResponse.json({ update: null });
+  }
+}

package/dist/app/app/page.jsx

@@ -1,10 +1,11 @@
 // app/page.js
 'use client'
 
+import { useState } from 'react';
 import { AppSidebar } from '../components/sidebar';
 import { SQLEditor } from '../components/sql-editor';
 import { TableView } from '../components/table-view';
-import { useState } from 'react';
+import UpdateBanner from '@/components/update-banner';
 
 export default function StudioPage() {
   const [currentView, setCurrentView] = useState('sql-editor');
@@ -16,19 +17,28 @@ export default function StudioPage() {
   };
 
   return (
-    <div className="min-h-screen bg-background">
-      <AppSidebar 
-        className="w-64 border-r" 
-        currentView={currentView}
-        onNavigate={setCurrentView}
-        onTableSelect={handleTableSelect}
-      />
-      <main className="ml-64 h-screen">
-        {currentView === 'sql-editor' && <SQLEditor />}
-        {currentView === 'table-view' && selectedTable && (
-          <TableView tableName={selectedTable} />
-        )}
-      </main>
+    <div className="flex flex-col min-h-screen bg-background">
+      {/* Banner */}
+      <UpdateBanner />
+      
+      {/* Main layout */}
+      <div className="flex flex-1">
+        {/* Sidebar */}
+        <AppSidebar 
+          className="w-64 border-r fixed h-[calc(100vh-var(--banner-height,0px))]"
+          currentView={currentView}
+          onNavigate={setCurrentView}
+          onTableSelect={handleTableSelect}
+        />
+        
+        {/* Main content */}
+        <main className="ml-64 flex-1 h-[calc(100vh-var(--banner-height,0px))]">
+          {currentView === 'sql-editor' && <SQLEditor />}
+          {currentView === 'table-view' && selectedTable && (
+            <TableView tableName={selectedTable} />
+          )}
+        </main>
+      </div>
     </div>
   );
 }

package/dist/app/page.jsx

@@ -1,10 +1,11 @@
 // app/page.js
 'use client'
 
+import { useState } from 'react';
 import { AppSidebar } from '../components/sidebar';
 import { SQLEditor } from '../components/sql-editor';
 import { TableView } from '../components/table-view';
-import { useState } from 'react';
+import UpdateBanner from '@/components/update-banner';
 
 export default function StudioPage() {
   const [currentView, setCurrentView] = useState('sql-editor');
@@ -16,19 +17,28 @@ export default function StudioPage() {
   };
 
   return (
-    <div className="min-h-screen bg-background">
-      <AppSidebar 
-        className="w-64 border-r" 
-        currentView={currentView}
-        onNavigate={setCurrentView}
-        onTableSelect={handleTableSelect}
-      />
-      <main className="ml-64 h-screen">
-        {currentView === 'sql-editor' && <SQLEditor />}
-        {currentView === 'table-view' && selectedTable && (
-          <TableView tableName={selectedTable} />
-        )}
-      </main>
+    <div className="flex flex-col min-h-screen bg-background">
+      {/* Banner */}
+      <UpdateBanner />
+      
+      {/* Main layout */}
+      <div className="flex flex-1">
+        {/* Sidebar */}
+        <AppSidebar 
+          className="w-64 border-r fixed h-[calc(100vh-var(--banner-height,0px))]"
+          currentView={currentView}
+          onNavigate={setCurrentView}
+          onTableSelect={handleTableSelect}
+        />
+        
+        {/* Main content */}
+        <main className="ml-64 flex-1 h-[calc(100vh-var(--banner-height,0px))]">
+          {currentView === 'sql-editor' && <SQLEditor />}
+          {currentView === 'table-view' && selectedTable && (
+            <TableView tableName={selectedTable} />
+          )}
+        </main>
+      </div>
     </div>
   );
 }

package/dist/d1-studio.js

@@ -12,8 +12,20 @@ import { createServer } from 'http';
 import next from 'next';
 import { findWranglerConfig } from '../src/lib/find-wrangler-config.js';
 import logger from '../src/lib/logger.js';
+import updateNotifier from 'update-notifier';
+import pkg from '../package.json' with { type: 'json' };
+
+// Check for debug flag
+const hasDebugFlag = process.argv.includes('--debug');
+if (hasDebugFlag) {
+  process.env.DEBUG = 'true';
+  logger.debug('Debug mode enabled');
+}
+
+const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 * 60 * 24 });
+notifier.notify({ defer: false });
 
-// Compute the absolute path of this file and its directory.
+// Compute the absolute path of this file and its directory
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
@@ -26,6 +38,70 @@ class LicenseError extends Error {
   }
 }
 
+class StudioLicenseManager {
+  constructor() {
+    this.licenseDir = join(homedir(), '.d1studio');
+    this.licensePath = join(this.licenseDir, 'license.json');
+  }
+
+  async checkLicenseFile() {
+    try {
+      const licenseData = JSON.parse(await readFile(this.licensePath, 'utf8'));
+      
+      // If no end_date or subscription_status, the license is valid (perpetual license)
+      if (!licenseData.end_date || !licenseData.subscription_status) {
+        return {
+          licenseData,
+          isValid: true,
+          isExpiringSoon: false
+        };
+      }
+
+      // Check subscription status first
+      if (licenseData.subscription_status !== 'active') {
+        return {
+          licenseData,
+          isValid: false,
+          isExpiringSoon: false
+        };
+      }
+
+      const endDate = new Date(licenseData.end_date);
+      const now = new Date();
+      
+      // Check if subscription has ended
+      if (endDate < now) {
+        return {
+          licenseData,
+          isValid: false,
+          isExpiringSoon: false
+        };
+      }
+
+      // Check if subscription ends in next 7 days
+      const sevenDaysFromNow = new Date(now.getTime() + (7 * 24 * 60 * 60 * 1000));
+      const isExpiringSoon = endDate <= sevenDaysFromNow;
+
+      return {
+        licenseData,
+        isValid: true,
+        isExpiringSoon
+      };
+    } catch (error) {
+      return null;
+    }
+  }
+
+  async saveLicenseFile(licenseData) {
+    try {
+      await mkdir(this.licenseDir, { recursive: true });
+      await writeFile(this.licensePath, JSON.stringify(licenseData, null, 2));
+    } catch (error) {
+      throw new LicenseError('Failed to save license information', 'SAVE_ERROR');
+    }
+  }
+}
+
 async function generateHardwareId() {
   const osInfo = {
     platform: process.platform,
@@ -60,13 +136,6 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
       );
     }
 
-    if (result.end_date && new Date(result.end_date) < new Date()) {
-      throw new LicenseError(
-        'Your subscription has expired. Please renew your license to continue using D1 Studio.',
-        'SUBSCRIPTION_EXPIRED'
-      );
-    }
-
     return result;
   } catch (error) {
     if (error instanceof LicenseError) {
@@ -87,35 +156,6 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
   }
 }
 
-async function checkLicenseFile() {
-  const licenseDir = join(homedir(), '.d1studio');
-  const licensePath = join(licenseDir, 'license.json');
-
-  try {
-    const licenseData = JSON.parse(await readFile(licensePath, 'utf8'));
-    const hardwareId = await generateHardwareId();
-
-    if (licenseData.hardwareId !== hardwareId) {
-      return null;
-    }
-    return licenseData;
-  } catch (error) {
-    return null;
-  }
-}
-
-async function saveLicenseFile(licenseData) {
-  const licenseDir = join(homedir(), '.d1studio');
-  const licensePath = join(licenseDir, 'license.json');
-
-  try {
-    await mkdir(licenseDir, { recursive: true });
-    await writeFile(licensePath, JSON.stringify(licenseData, null, 2));
-  } catch (error) {
-    throw new LicenseError('Failed to save license information', 'SAVE_ERROR');
-  }
-}
-
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
     // Determine Next.js app directory based on environment:
@@ -170,20 +210,14 @@ async function startStudio() {
   try {
     logger.info(chalk.green('Initializing D1 Studio...'));
 
-    // Validate license
-    let licenseData = await checkLicenseFile();
-    logger.debug(chalk.blue(`License data found: ${JSON.stringify(licenseData)}`));
-
-    const TWELVE_HOURS_MS = 43200000; // 12 hours
-    let shouldRevalidate = true;
-    if (licenseData) {
-      const lastCheck = new Date(licenseData.lastValidatedAt || licenseData.activatedAt);
-      if (Date.now() - lastCheck.getTime() < TWELVE_HOURS_MS) {
-        shouldRevalidate = false;
-      }
-    }
+    const licenseManager = new StudioLicenseManager();
 
-    if (!licenseData || shouldRevalidate) {
+    // Check existing license
+    const licenseCheck = await licenseManager.checkLicenseFile();
+    
+    // Handle license validation
+    if (!licenseCheck || !licenseCheck.isValid) {
+      // Prompt for license information if needed
       const { default: inquirer } = await import('inquirer');
       logger.info(chalk.yellow('\nPlease enter your D1 Studio license information:'));
 
@@ -205,9 +239,8 @@ async function startStudio() {
         },
       ]);
 
-      logger.debug(chalk.blue(`Entered license information: ${JSON.stringify(answers)}`));
-
       const hardwareId = await generateHardwareId();
+
       try {
         const validation = await validateLicenseRemote(
           answers.licenseKey,
@@ -215,19 +248,29 @@ async function startStudio() {
           hardwareId
         );
 
-        licenseData = {
+        // Save the complete validation response
+        await licenseManager.saveLicenseFile({
           licenseKey: answers.licenseKey,
           email: answers.email,
-          activatedAt: new Date().toISOString(),
-          endDate: validation.end_date || null
-        };
+          hardwareId,
+          end_date: validation.end_date,
+          subscription_status: validation.subscription_status,
+          type: validation.licenseType,
+          activatedAt: new Date().toISOString()
+        });
 
-        await saveLicenseFile(licenseData);
         logger.info(chalk.green('\nLicense activated successfully!'));
       } catch (error) {
         logger.error(chalk.red(`\nLicense validation failed: ${error.message}`));
         process.exit(1);
       }
+    } else if (licenseCheck.isExpiringSoon) {
+      // Show warning about expiring subscription
+      const endDate = new Date(licenseCheck.licenseData.end_date).toLocaleDateString();
+      logger.warn(chalk.yellow(`
+        ⚠️  Your subscription will expire on ${endDate}
+        Please renew your subscription at https://d1-studio.com to continue using D1 Studio.
+      `));
     }
 
     // Get wrangler configuration
@@ -317,4 +360,4 @@ process.on('SIGTERM', () => {
 startStudio().catch((error) => {
   logger.error(chalk.red(`\nFailed to start D1 Studio: ${error}`));
   process.exit(1);
-});
+});

package/dist/lib/database-queue.js

@@ -1,33 +1,37 @@
 // utils/database-queue.js
+
+import logger from '@/lib/logger.js';
+
 class DatabaseQueue {
-   constructor() {
-     this.queue = [];
-     this.isProcessing = false;
-   }
+  constructor() {
+    this.queue = [];
+    this.isProcessing = false;
+  }
+
+  async add(operation) {
+    return new Promise((resolve, reject) => {
+      this.queue.push({ operation, resolve, reject });
+      this.processNext();
+    });
+  }
+
+  async processNext() {
+    if (this.isProcessing || this.queue.length === 0) return;
+    
+    this.isProcessing = true;
+    const { operation, resolve, reject } = this.queue.shift();
+    
+    try {
+      const result = await operation();
+      resolve(result);
+    } catch (error) {
+      logger.error('Error processing database queue operation:', error);
+      reject(error);
+    } finally {
+      this.isProcessing = false;
+      this.processNext();
+    }
+  }
+}
  
-   async add(operation) {
-     return new Promise((resolve, reject) => {
-       this.queue.push({ operation, resolve, reject });
-       this.processNext();
-     });
-   }
- 
-   async processNext() {
-     if (this.isProcessing || this.queue.length === 0) return;
-     
-     this.isProcessing = true;
-     const { operation, resolve, reject } = this.queue.shift();
-     
-     try {
-       const result = await operation();
-       resolve(result);
-     } catch (error) {
-       reject(error);
-     } finally {
-       this.isProcessing = false;
-       this.processNext();
-     }
-   }
- }
- 
- export const dbQueue = new DatabaseQueue();
+export const dbQueue = new DatabaseQueue();

package/dist/lib/find-wrangler-config.js

@@ -1,12 +1,15 @@
-// lib/find-wrangler-config.js
 import { readFile } from 'fs/promises';
 import { findUp } from 'find-up';
 import { parse as parseToml } from '@iarna/toml';
 import stripJsonComments from 'strip-json-comments';
 import logger from './logger.js';
 
+let cachedConfig = null;
+let cachedProjectPath = null;
+
 /**
  * Finds and parses the Wrangler configuration file.
+ * This function caches the result so that the configuration is read and logged only once per project path.
  * 
  * @param {string} userProjectPath - The path where to look for the config file
  * @returns {Promise<{config: object, projectPath: string}|null>}
@@ -17,8 +20,10 @@ export async function findWranglerConfig(userProjectPath) {
       throw new Error('Project path is required and must be a string');
     }
 
-    // Uncomment the following line to log the search path if needed:
-    // logger.debug(`Looking for wrangler configuration in: ${userProjectPath}`);
+    // Return the cached config if available for the same project path.
+    if (cachedConfig && cachedProjectPath === userProjectPath) {
+      return cachedConfig;
+    }
 
     // Define the possible configuration file names in priority order.
     const possibleFiles = ['wrangler.toml', 'wrangler.json', 'wrangler.jsonc'];
@@ -56,13 +61,14 @@ export async function findWranglerConfig(userProjectPath) {
       config = JSON.parse(configContent);
     }
 
-    return {
-      config,
-      projectPath: userProjectPath
-    };
+    // Cache the result.
+    cachedConfig = { config, projectPath: userProjectPath };
+    cachedProjectPath = userProjectPath;
+
+    return cachedConfig;
 
   } catch (error) {
     logger.error(`Error reading Wrangler configuration: ${error.message}`);
     throw error;
   }
-}
+}

package/dist/lib/logger.js

@@ -2,18 +2,57 @@ import winston from 'winston';
 
 const { combine, timestamp, printf, colorize } = winston.format;
 
-const logFormat = printf(({ level, message, timestamp }) => {
-  return `${timestamp} ${level}: ${message}`;
+const isDevelopment = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === undefined;
+const isProduction = process.env.NODE_ENV === 'production';
+// Check for DEBUG env var which is set by --debug flag
+const isDebug = process.env.DEBUG === 'true';
+
+const logFormat = printf(({ level, message, timestamp, ...metadata }) => {
+  let msg = `${timestamp} ${level}: ${message}`;
+  // Add metadata if present
+  if (Object.keys(metadata).length > 0) {
+    msg += ` ${JSON.stringify(metadata)}`;
+  }
+  return msg;
 });
 
 const logger = winston.createLogger({
-  level: process.env.NODE_ENV === 'development' ? 'debug' : 'info',
+  // Set log level based on environment and debug flag
+  level: isDebug ? 'debug' : (isProduction ? 'warn' : 'info'),
   format: combine(
     timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
     colorize(),
     logFormat
   ),
-  transports: [new winston.transports.Console()]
+  transports: [
+    new winston.transports.Console({
+      level: isDebug ? 'debug' : (isProduction ? 'warn' : 'info'),
+      silent: process.env.NODE_ENV === 'test'
+    })
+  ]
 });
 
-export default logger;
+// Add helper methods
+logger.logRequest = (method, path, params = {}) => {
+  logger.debug(`Request: ${method} ${path}`, params);
+};
+
+logger.logError = (error, source = 'unknown') => {
+  logger.error(`Error in ${source}: ${error.message}`, {
+    error: error.stack || error.message,
+    source
+  });
+};
+
+logger.shouldLog = (level) => {
+  const currentLevel = logger.level;
+  const levels = {
+    error: 0,
+    warn: 1,
+    info: 2,
+    debug: 3
+  };
+  return levels[level] <= levels[currentLevel];
+};
+
+export default logger;