d1s 0.2.6 → 0.2.8

package/dist/app/app/api/pull-remote/confirm/route.js

@@ -12,6 +12,7 @@ import {
 } from '@/lib/sql-operations';
 import { getCurrentSchema, analyzeDependencies } from '@/lib/schema-operations';
 import { initMigrationsTable, recordMigration, getRemoteMigrations } from '@/lib/migrations.js';
+import logger from '@/lib/logger';
 
 /**
  * Applies the pull migrations by:
@@ -52,33 +53,33 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     await Promise.all(stagedFilesList.map(file => unlink(path.join(stagingDir, file))));
 
     // --- STEP 1: Fetch remote migration metadata ---
-    // console.log('Fetching remote migration metadata...');
+    logger.debug('Fetching remote migration metadata...');
     const remoteMigrations = await getRemoteMigrations(projectDir, databaseName, env);
-    // console.log('Remote migration metadata:', remoteMigrations);
+    logger.debug('Remote migration metadata:', remoteMigrations);
 
     // --- STEP 2: For each remote migration, fetch its file content ---
-    // console.log('Fetching migration file content from remote...');
+    logger.debug('Fetching migration file content from remote...');
     const stagedFiles = new Map();
     for (const migration of remoteMigrations) {
       try {
         const migrationFileName = migration.name; // Use the remote migration's name.
         const content = await getMigrationFileContent(projectDir, databaseName, migrationFileName, env);
         stagedFiles.set(migrationFileName, content);
-        // console.log(`Staged migration file: ${migrationFileName}`);
+        logger.debug(`Staged migration file: ${migrationFileName}`);
         await writeFile(path.join(stagingDir, migrationFileName), content, 'utf8');
       } catch (fileError) {
-        console.error(`Error fetching content for migration ${migration.name}:`, fileError);
+        logger.error(`Error fetching content for migration ${migration.name}:`, fileError);
         throw new Error(`Failed to fetch migration file content for ${migration.name}`);
       }
     }
 
     // --- STEP 3: Fetch local schema for destructive update ---
-    // console.log('Fetching local schema for destructive update...');
+    logger.debug('Fetching local schema for destructive update...');
     const currentSchema = await getCurrentSchema(projectDir, databaseName, env, false);
     const tableSchema = currentSchema.filter(obj =>
       obj.type === 'table' && obj.name && obj.name.toLowerCase() !== 'if'
     );
-    // console.log('Local table schema:', tableSchema);
+    logger.debug('Local table schema:', tableSchema);
     const dropOrder = tableSchema.length > 0
       ? analyzeDependencies(
           tableSchema.map(obj => ({
@@ -88,18 +89,18 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           }))
         )
       : [];
-    // console.log('Computed drop order:', dropOrder);
+    logger.debug('Computed drop order:', dropOrder);
 
     // --- STEP 4: Destructive update (all-or-nothing) ---
-    // console.log('Beginning destructive update...');
+    logger.debug('Beginning destructive update...');
     try {
-      // console.log('Disabling foreign keys...');
+      logger.debug('Disabling foreign keys...');
       await executeSQL(projectDir, databaseName, 'PRAGMA foreign_keys=OFF;', env, false);
       
       // Drop triggers.
       const triggers = currentSchema.filter(obj => obj.type === 'trigger');
       for (const trigger of triggers) {
-        // console.log(`Dropping trigger: ${trigger.name}`);
+        logger.debug(`Dropping trigger: ${trigger.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -111,7 +112,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
       // Drop indexes.
       const indexes = currentSchema.filter(obj => obj.type === 'index');
       for (const index of indexes) {
-        // console.log(`Dropping index: ${index.name}`);
+        logger.debug(`Dropping index: ${index.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -122,7 +123,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
       }
       // Drop tables in reverse dependency order.
       for (const tableName of dropOrder.reverse()) {
-        // console.log(`Dropping table: ${tableName}`);
+        logger.debug(`Dropping table: ${tableName}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -131,7 +132,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           false
         );
       }
-      // console.log('Re-enabling foreign keys...');
+      logger.debug('Re-enabling foreign keys...');
       await executeSQL(projectDir, databaseName, 'PRAGMA foreign_keys=ON;', env, false);
     } catch (dropError) {
       throw new Error(`Error dropping existing objects: ${dropError.message}`);
@@ -139,7 +140,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
 
     // --- STEP 5: Reset the local migrations table ---
     try {
-      // console.log('Resetting local migrations table...');
+      logger.debug('Resetting local migrations table...');
       await initMigrationsTable(projectDir, databaseName, 'local', true);
     } catch (initError) {
       throw new Error(`Error resetting migrations table: ${initError.message}`);
@@ -152,7 +153,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     try {
       for (const [filename, content] of stagedFiles.entries()) {
         currentFilename = filename;
-        // console.log(`Applying migration: ${filename}`);
+        logger.debug(`Applying migration: ${filename}`);
         // Write the migration file to the main migrations folder.
         await writeFile(path.join(migrationsDir, filename), content, 'utf8');
 
@@ -162,7 +163,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           .update(content)
           .digest('hex');
 
-        // console.log(`Recording migration: ${filename} with checksum ${checksum}`);
+        logger.debug(`Recording migration: ${filename} with checksum ${checksum}`);
         await recordMigration(
           projectDir,
           databaseName,
@@ -181,26 +182,26 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     }
 
     // --- STEP 7: Replace main migrations folder with staged files ---
-    // console.log('Replacing main migrations folder with staged files...');
+    logger.debug('Replacing main migrations folder with staged files...');
     const mainFiles = await readdir(migrationsDir).catch(() => []);
     if (mainFiles.length) {
       for (const file of mainFiles) {
-        // console.log(`Deleting local migration file: ${file}`);
+        logger.debug(`Deleting local migration file: ${file}`);
         await unlink(path.join(migrationsDir, file));
       }
     }
     for (const [filename, content] of stagedFiles.entries()) {
-      // console.log(`Copying staged file ${filename} to main migrations folder`);
+      logger.debug(`Copying staged file ${filename} to main migrations folder`);
       await writeFile(path.join(migrationsDir, filename), content, 'utf8');
     }
 
-    // console.log('Pull migration applied successfully.');
+    logger.debug('Pull migration applied successfully.');
     return {
       appliedMigrations: Array.from(stagedFiles.keys()),
       details: appliedPreview
     };
   } catch (error) {
-    console.error('Pull migration error:', error);
+    logger.error('Pull migration error:', error);
     throw error;
   }
 }
@@ -251,7 +252,7 @@ export async function POST(req) {
       details: result
     });
   } catch (error) {
-    console.error('Pull remote confirm error:', error);
+    logger.error('Pull remote confirm error:', error);
     return NextResponse.json({
       success: false,
       error: {

package/dist/app/app/api/pull-remote/preview/route.js

@@ -2,9 +2,10 @@
 
 import { NextResponse } from 'next/server';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
-import { ErrorTypes,} from '@/lib/sql-operations';
+import { ErrorTypes } from '@/lib/sql-operations';
 import { getCurrentSchema, analyzeDependencies } from '@/lib/schema-operations';
 import { getRemoteMigrations } from '@/lib/migrations.js';
+import logger from '@/lib/logger';
 
 /**
  * Generates a preview for pulling remote migrations.
@@ -64,7 +65,7 @@ async function generatePullPreview(projectDir, accountId, apiToken, databaseName
 
     return preview;
   } catch (error) {
-    console.error('Pull preview generation error:', error);
+    logger.error('Pull preview generation error:', error);
     throw error;
   }
 }
@@ -123,7 +124,7 @@ export async function POST(req) {
       details: preview
     });
   } catch (error) {
-    console.error('Pull remote preview error:', error);
+    logger.error('Pull remote preview error:', error);
     return NextResponse.json({
       success: false,
       error: {

package/dist/app/app/api/push-remote/preview/route.js

@@ -6,6 +6,7 @@ import path from 'path';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
 import { executeSQL, ErrorTypes } from '@/lib/sql-operations';
 import { validateMigrationFile } from '@/lib/migrations.js';
+import logger from '@/lib/logger';
 
 /**
  * Pushes migration preview to remote.
@@ -100,7 +101,7 @@ async function pushToRemote(projectDir, accountId, apiToken, databaseName, previ
       }
     }
 
-    // console.log("Push Preview Result (server):", results);
+    logger.debug("Push Preview Result (server):", results);
     return { success: true, preview: true, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {
@@ -157,7 +158,7 @@ export async function POST(req) {
       details: result
     });
   } catch (error) {
-    console.error('Push to remote preview error:', error);
+    logger.error('Push to remote preview error:', error);
     return NextResponse.json({
       success: false,
       error: {

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,11 @@
+// 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() {
+  // Check for updates (you might want to cache this result to avoid too many requests)
+  const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 * 60 * 24 });
+  const update = notifier.update;
+  return NextResponse.json({ update });
+}

package/dist/app/app/page.jsx

@@ -1,10 +1,12 @@
 // 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');
@@ -17,12 +19,16 @@ export default function StudioPage() {
 
   return (
     <div className="min-h-screen bg-background">
+      {/* notification banner at the top of the page */}
+      <UpdateBanner />
+      {/* sidebar */}
       <AppSidebar 
         className="w-64 border-r" 
         currentView={currentView}
         onNavigate={setCurrentView}
         onTableSelect={handleTableSelect}
       />
+      {/* main content */}
       <main className="ml-64 h-screen">
         {currentView === 'sql-editor' && <SQLEditor />}
         {currentView === 'table-view' && selectedTable && (

package/dist/d1-studio.js

@@ -12,8 +12,13 @@ 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' assert { type: 'json' };
 
-// Compute the absolute path of this file and its directory.
+const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 * 60 * 24 });
+notifier.notify({ defer: false });
+
+// Compute the absolute path of this file and its directory
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
@@ -26,6 +31,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 +129,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 +149,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 +203,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 +232,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 +241,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 +353,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();