d1s 0.2.6 → 0.2.9

package/dist/lib/migrations.js

@@ -16,6 +16,7 @@ import {
   tableExists
 } from './sql-operations.js';
 import { analyzeDependencies } from '@/lib/schema-operations';
+import logger from './logger.js';
 
 const execAsync = promisify(exec);
 
@@ -67,7 +68,7 @@ export async function initMigrationsTable(projectDir, databaseName, environment
       );
     }
   } catch (error) {
-    console.error(`Failed to initialize migrations table in ${environment}:`, error);
+    logger.error(`Failed to initialize migrations table in ${environment}:`, error);
     throw error;
   }
 }
@@ -173,7 +174,6 @@ export async function getRemoteMigrations(projectDir, databaseName, env) {
  * @param {Object} migrationData { name, checksum }
  * @param {('local'|'remote')} environment 
  */
-// Update tracking function to handle both cases
 export async function trackMigration(projectDir, databaseName, { name, checksum }, environment = 'local') {
   const flag = environment === 'remote' ? '--remote' : '--local';
   
@@ -215,7 +215,7 @@ export async function trackMigration(projectDir, databaseName, { name, checksum
       { cwd: projectDir }
     );
   } catch (error) {
-    console.error('Failed to track migration:', error);
+    logger.error('Failed to track migration:', error);
     throw error;
   }
 }
@@ -273,7 +273,7 @@ export async function compareMigrations(projectDir, databaseName) {
       count: migrationMap.size
     };
   } catch (error) {
-    console.error('Failed to compare migrations:', error);
+    logger.error('Failed to compare migrations:', error);
     throw error;
   }
 }

package/dist/lib/schema-operations.js

@@ -1,5 +1,7 @@
 // schema-operations.js
+
 import { executeSQL, ErrorTypes } from './sql-operations.js';
+import logger from './logger.js';
 
 /**
  * Retrieves the current database schema (tables, indexes, triggers),
@@ -24,6 +26,7 @@ export async function getCurrentSchema(projectDir, databaseName, env = {}, remot
     const parsed = JSON.parse(result);
     return parsed[0]?.results || [];
   } catch (error) {
+    logger.error('Failed to get current schema:', error);
     throw {
       type: ErrorTypes.EXECUTION_ERROR,
       message: 'Failed to get current schema',
@@ -100,4 +103,4 @@ export function orderTables(dependencies) {
     }
   }
   return ordered;
-}
+}

package/dist/lib/sql-operations.js

@@ -2,6 +2,7 @@
 
 import { promisify } from 'util';
 import { exec } from 'child_process';
+import logger from '@/lib/logger';
 
 const execAsync = promisify(exec);
 
@@ -293,13 +294,19 @@ export async function executeSQL(projectDir, databaseName, sql, env = {}, remote
     const npxCommand = isWindows ? 'npx.cmd' : 'npx';
     const executionFlag = remote ? '--remote' : '--local';
     const command = `${npxCommand} wrangler d1 execute ${databaseName} ${executionFlag} --command="${cleanSQL.replace(/"/g, '\\"')}"`;
+    
+    // Only log in development
+    if (logger.shouldLog('debug')) {
+      logger.debug('Executing command:', command);
+    }
+    
     const execOptions = {
       cwd: projectDir,
       env: { ...process.env, ...env },
       maxBuffer: 1024 * 1024 * 10,
       shell: true
     };
-    console.log('Executing command:', command);
+    // console.log('Executing command:', command);
     const { stdout, stderr } = await execAsync(command, execOptions);
     if (stderr && !stderr.includes('🌀')) {
       throw new Error(stderr);
@@ -335,6 +342,83 @@ export async function executeSQL(projectDir, databaseName, sql, env = {}, remote
   }
 }
 
+/**
+ * Fetches the latest `limit` records for a given table from the remote database.
+ *
+ * This implementation uses the executeSQL function with the remote flag enabled.
+ * It orders the results based on the provided ordering column. If no ordering column is provided,
+ * it falls back to the default "id" column.
+ *
+ * @param {string} projectDir - The project directory.
+ * @param {string} databaseName - The D1 database name.
+ * @param {string} tableName - The table to fetch records for.
+ * @param {object} env - Environment variables (including credentials).
+ * @param {number} limit - The number of records to fetch.
+ * @param {string} [orderingColumn="id"] - The column to order by.
+ * @returns {Promise<Array<object>>} Array of row objects.
+ */
+export async function fetchRemoteTableData(
+  projectDir,
+  databaseName,
+  tableName,
+  env,
+  limit,
+  orderingColumn = "id"
+) {
+  // Use the provided ordering column; if not provided, default to "id".
+  const query = `SELECT * FROM "${tableName}" ORDER BY "${orderingColumn}" DESC LIMIT ${limit};`;
+  try {
+    // Execute the SQL command on the remote database.
+    const result = await executeSQL(projectDir, databaseName, query, env, true);
+    
+    // ExecuteSQL returns stdout that should contain a JSON array starting from a '['.
+    const jsonStart = result.indexOf('[');
+    if (jsonStart === -1) {
+      throw new Error(`Unexpected result format: ${result}`);
+    }
+    const jsonStr = result.substring(jsonStart);
+    const parsed = JSON.parse(jsonStr);
+    // Assuming the structure: parsed[0].results contains the rows.
+    const rows = parsed[0]?.results || [];
+    return rows;
+  } catch (error) {
+    logger.error(`Error fetching remote data for table ${tableName}:`, error);
+    throw error;
+  }
+}
+
+/**
+ * Generates a bulk insert SQL statement for the specified table and rows.
+ *
+ * This function constructs a single INSERT statement that inserts multiple rows.
+ * It escapes single quotes in string values. You may need to extend this for
+ * additional data types (e.g., numbers, dates, booleans) or more complex structures.
+ *
+ * @param {string} tableName - The table to insert into.
+ * @param {Array<object>} rows - An array of objects, each representing a row.
+ * @returns {string} The bulk insert SQL statement.
+ */
+export function generateBulkInsertSQL(tableName, rows) {
+  if (!rows || rows.length === 0) return '';
+  
+  // Get the list of columns from the first row object.
+  const columns = Object.keys(rows[0]);
+  const columnList = columns.map(col => `"${col}"`).join(', ');
+
+  // Build the values list for each row.
+  const valuesList = rows.map(row => {
+    const values = columns.map(col => {
+      const value = row[col];
+      if (value === null || value === undefined) return 'NULL';
+      // For simplicity, treat the value as a string.
+      return `'${String(value).replace(/'/g, "''")}'`;
+    }).join(', ');
+    return `(${values})`;
+  }).join(', ');
+
+  return `INSERT INTO "${tableName}" (${columnList}) VALUES ${valuesList};`;
+}
+
 // ---------------------------------------------------------------------
 // SQL Formatting and Helper Functions
 // ---------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d1s",
-  "version": "0.2.6",
+  "version": "0.2.9",
   "type": "module",
   "description": "D1 Studio – a native studio for managing Cloudflare D1 databases.",
   "main": "./dist/d1-studio.js",
@@ -65,6 +65,7 @@
     "@radix-ui/react-tabs": "^1.1.2",
     "@radix-ui/react-toast": "^1.2.5",
     "@radix-ui/react-tooltip": "^1.1.7",
+    "axios": "^1.7.9",
     "chalk": "^4.1.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -82,6 +83,7 @@
     "strip-json-comments": "^5.0.1",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
+    "update-notifier": "^7.3.1",
     "winston": "^3.17.0"
   },
   "devDependencies": {

package/scripts/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);
-});
+});