d1s 0.2.2 → 0.2.4

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

@@ -52,19 +52,19 @@ 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...');
+    // console.log('Fetching remote migration metadata...');
     const remoteMigrations = await getRemoteMigrations(projectDir, databaseName, env);
-    console.log('Remote migration metadata:', remoteMigrations);
+    // console.log('Remote migration metadata:', remoteMigrations);
 
     // --- STEP 2: For each remote migration, fetch its file content ---
-    console.log('Fetching migration file content from remote...');
+    // console.log('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}`);
+        // console.log(`Staged migration file: ${migrationFileName}`);
         await writeFile(path.join(stagingDir, migrationFileName), content, 'utf8');
       } catch (fileError) {
         console.error(`Error fetching content for migration ${migration.name}:`, fileError);
@@ -73,12 +73,12 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     }
 
     // --- STEP 3: Fetch local schema for destructive update ---
-    console.log('Fetching local schema for destructive update...');
+    // console.log('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);
+    // console.log('Local table schema:', tableSchema);
     const dropOrder = tableSchema.length > 0
       ? analyzeDependencies(
           tableSchema.map(obj => ({
@@ -88,18 +88,18 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           }))
         )
       : [];
-    console.log('Computed drop order:', dropOrder);
+    // console.log('Computed drop order:', dropOrder);
 
     // --- STEP 4: Destructive update (all-or-nothing) ---
-    console.log('Beginning destructive update...');
+    // console.log('Beginning destructive update...');
     try {
-      console.log('Disabling foreign keys...');
+      // console.log('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}`);
+        // console.log(`Dropping trigger: ${trigger.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -111,7 +111,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}`);
+        // console.log(`Dropping index: ${index.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -122,7 +122,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}`);
+        // console.log(`Dropping table: ${tableName}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -131,7 +131,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           false
         );
       }
-      console.log('Re-enabling foreign keys...');
+      // console.log('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 +139,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
 
     // --- STEP 5: Reset the local migrations table ---
     try {
-      console.log('Resetting local migrations table...');
+      // console.log('Resetting local migrations table...');
       await initMigrationsTable(projectDir, databaseName, 'local', true);
     } catch (initError) {
       throw new Error(`Error resetting migrations table: ${initError.message}`);
@@ -152,7 +152,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     try {
       for (const [filename, content] of stagedFiles.entries()) {
         currentFilename = filename;
-        console.log(`Applying migration: ${filename}`);
+        // console.log(`Applying migration: ${filename}`);
         // Write the migration file to the main migrations folder.
         await writeFile(path.join(migrationsDir, filename), content, 'utf8');
 
@@ -162,7 +162,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           .update(content)
           .digest('hex');
 
-        console.log(`Recording migration: ${filename} with checksum ${checksum}`);
+        // console.log(`Recording migration: ${filename} with checksum ${checksum}`);
         await recordMigration(
           projectDir,
           databaseName,
@@ -181,20 +181,20 @@ 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...');
+    // console.log('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}`);
+        // console.log(`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`);
+      // console.log(`Copying staged file ${filename} to main migrations folder`);
       await writeFile(path.join(migrationsDir, filename), content, 'utf8');
     }
 
-    console.log('Pull migration applied successfully.');
+    // console.log('Pull migration applied successfully.');
     return {
       appliedMigrations: Array.from(stagedFiles.keys()),
       details: appliedPreview

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

@@ -133,7 +133,7 @@ for (const migrationFile of migrationFiles) {
         results.preview.push(previewRecord);
       }
     }
-    console.log("Push Confirm Result (server):", results);
+    // console.log("Push Confirm Result (server):", results);
     return { success: true, preview: false, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {

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

@@ -100,7 +100,7 @@ async function pushToRemote(projectDir, accountId, apiToken, databaseName, previ
       }
     }
 
-    console.log("Push Preview Result (server):", results);
+    // console.log("Push Preview Result (server):", results);
     return { success: true, preview: true, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {

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

@@ -28,7 +28,7 @@ export async function POST(req) {
 
     // Extract the SQL query from the request body.
     const { query } = await req.json();
-    console.log('Received query:', query);
+    // console.log('Received query:', query);
 
     if (!query?.trim()) {
       return NextResponse.json(
@@ -57,11 +57,11 @@ export async function POST(req) {
 
     // Use the first configured database.
     const databaseName = config.d1_databases[0].database_name;
-    console.log('Using database:', databaseName);
+    // console.log('Using database:', databaseName);
 
     // Parse the query into individual SQL statements.
     let statements = parseQuery(query);
-    console.log('Parsed statements:', statements);
+    // console.log('Parsed statements:', statements);
 
     if (!statements.length) {
       return NextResponse.json(
@@ -72,7 +72,7 @@ export async function POST(req) {
 
     // Validate each parsed statement.
     statements = statements.map(validateStatement);
-    console.log('Validated statements:', statements);
+    // console.log('Validated statements:', statements);
 
     // Initialize the migrations table (if it doesn't already exist).
     const createMigrationsTable = `
@@ -87,7 +87,7 @@ export async function POST(req) {
 
     // Determine whether the query involves any schema changes.
     const hasSchemaChanges = statements.some(isSchemaChange);
-    console.log('Has schema changes:', hasSchemaChanges);
+    // console.log('Has schema changes:', hasSchemaChanges);
 
     let result;
     if (hasSchemaChanges) {
@@ -105,7 +105,7 @@ export async function POST(req) {
       // For data modification queries, execute the statements.
       const results = [];
       for (const stmt of statements) {
-        console.log('Executing data modification:', stmt.sql);
+        // console.log('Executing data modification:', stmt.sql);
         const output = await executeSQL(projectDir, databaseName, stmt.sql);
         
         try {
@@ -113,7 +113,7 @@ export async function POST(req) {
           const queryResults = parsed[0]?.results || [];
           results.push(...queryResults);
         } catch (parseError) {
-          console.log('Non-JSON output:', output);
+          // console.log('Non-JSON output:', output);
           continue;
         }
       }

package/dist/d1-studio.js

@@ -65,6 +65,14 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
       );
     }
 
+    // Check for subscription expiration if end_date is provided.
+    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) {
@@ -190,7 +198,18 @@ async function startStudio() {
     let licenseData = await checkLicenseFile();
     console.log(chalk.blue('License data found:'), licenseData);
 
-    if (!licenseData) {
+    const TWELVE_HOURS_MS = 43200000; // 12 hours
+    let shouldRevalidate = true;
+
+    if (licenseData) {
+      // Use lastValidatedAt if available; otherwise, fall back to activatedAt.
+      const lastCheck = new Date(licenseData.lastValidatedAt || licenseData.activatedAt);
+      if (Date.now() - lastCheck.getTime() < TWELVE_HOURS_MS) {
+        shouldRevalidate = false;
+      }
+    }
+
+    if (!licenseData || shouldRevalidate) {
       const { default: inquirer } = await import('inquirer');
       console.log(chalk.blue('\nPlease enter your D1 Studio license information:'));
 
@@ -223,12 +242,15 @@ async function startStudio() {
           hardwareId
         );
 
+        // Optionally, you can store the returned end_date for future checks.
         licenseData = {
           licenseKey: answers.licenseKey,
           email: answers.email,
           hardwareId,
           licenseType: validation.licenseType,
           activatedAt: new Date().toISOString(),
+          lastValidatedAt: new Date().toISOString(),
+          endDate: validation.end_date || null
         };
 
         await saveLicenseFile(licenseData);
@@ -237,6 +259,8 @@ async function startStudio() {
         console.error(chalk.red('\nLicense validation failed:'), error.message);
         process.exit(1);
       }
+    } else {
+      // console.log(chalk.blue('Using cached license data.'));
     }
 
     // Get wrangler configuration

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

@@ -17,7 +17,7 @@ export async function findWranglerConfig(userProjectPath) {
       throw new Error('Project path is required and must be a string');
     }
 
-    console.log(chalk.blue('Looking for wrangler configuration in:'), userProjectPath);
+    // console.log(chalk.blue('Looking for wrangler configuration in:'), userProjectPath);
 
     // Define the possible configuration file names in priority order.
     const possibleFiles = ['wrangler.toml', 'wrangler.json', 'wrangler.jsonc'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d1s",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "type": "module",
   "description": "D1 Studio – a native studio for managing Cloudflare D1 databases.",
   "main": "./dist/d1-studio.js",

package/scripts/studio.js

@@ -65,6 +65,14 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
       );
     }
 
+    // Check for subscription expiration if end_date is provided.
+    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) {
@@ -190,7 +198,18 @@ async function startStudio() {
     let licenseData = await checkLicenseFile();
     console.log(chalk.blue('License data found:'), licenseData);
 
-    if (!licenseData) {
+    const TWELVE_HOURS_MS = 43200000; // 12 hours
+    let shouldRevalidate = true;
+
+    if (licenseData) {
+      // Use lastValidatedAt if available; otherwise, fall back to activatedAt.
+      const lastCheck = new Date(licenseData.lastValidatedAt || licenseData.activatedAt);
+      if (Date.now() - lastCheck.getTime() < TWELVE_HOURS_MS) {
+        shouldRevalidate = false;
+      }
+    }
+
+    if (!licenseData || shouldRevalidate) {
       const { default: inquirer } = await import('inquirer');
       console.log(chalk.blue('\nPlease enter your D1 Studio license information:'));
 
@@ -223,12 +242,15 @@ async function startStudio() {
           hardwareId
         );
 
+        // Optionally, you can store the returned end_date for future checks.
         licenseData = {
           licenseKey: answers.licenseKey,
           email: answers.email,
           hardwareId,
           licenseType: validation.licenseType,
           activatedAt: new Date().toISOString(),
+          lastValidatedAt: new Date().toISOString(),
+          endDate: validation.end_date || null
         };
 
         await saveLicenseFile(licenseData);
@@ -237,6 +259,8 @@ async function startStudio() {
         console.error(chalk.red('\nLicense validation failed:'), error.message);
         process.exit(1);
       }
+    } else {
+      // console.log(chalk.blue('Using cached license data.'));
     }
 
     // Get wrangler configuration

package/src/app/api/databases/route.js

@@ -15,7 +15,7 @@ export async function GET() {
       );
     }
 
-    console.log('Looking for Wrangler configuration in:', projectDir);
+    // console.log('Looking for Wrangler configuration in:', projectDir);
     
     // Use findWranglerConfig helper
     const wranglerResult = await findWranglerConfig(projectDir);

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

@@ -52,19 +52,19 @@ 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...');
+    // console.log('Fetching remote migration metadata...');
     const remoteMigrations = await getRemoteMigrations(projectDir, databaseName, env);
-    console.log('Remote migration metadata:', remoteMigrations);
+    // console.log('Remote migration metadata:', remoteMigrations);
 
     // --- STEP 2: For each remote migration, fetch its file content ---
-    console.log('Fetching migration file content from remote...');
+    // console.log('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}`);
+        // console.log(`Staged migration file: ${migrationFileName}`);
         await writeFile(path.join(stagingDir, migrationFileName), content, 'utf8');
       } catch (fileError) {
         console.error(`Error fetching content for migration ${migration.name}:`, fileError);
@@ -73,12 +73,12 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     }
 
     // --- STEP 3: Fetch local schema for destructive update ---
-    console.log('Fetching local schema for destructive update...');
+    // console.log('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);
+    // console.log('Local table schema:', tableSchema);
     const dropOrder = tableSchema.length > 0
       ? analyzeDependencies(
           tableSchema.map(obj => ({
@@ -88,18 +88,18 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           }))
         )
       : [];
-    console.log('Computed drop order:', dropOrder);
+    // console.log('Computed drop order:', dropOrder);
 
     // --- STEP 4: Destructive update (all-or-nothing) ---
-    console.log('Beginning destructive update...');
+    // console.log('Beginning destructive update...');
     try {
-      console.log('Disabling foreign keys...');
+      // console.log('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}`);
+        // console.log(`Dropping trigger: ${trigger.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -111,7 +111,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}`);
+        // console.log(`Dropping index: ${index.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -122,7 +122,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}`);
+        // console.log(`Dropping table: ${tableName}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -131,7 +131,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           false
         );
       }
-      console.log('Re-enabling foreign keys...');
+      // console.log('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 +139,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
 
     // --- STEP 5: Reset the local migrations table ---
     try {
-      console.log('Resetting local migrations table...');
+      // console.log('Resetting local migrations table...');
       await initMigrationsTable(projectDir, databaseName, 'local', true);
     } catch (initError) {
       throw new Error(`Error resetting migrations table: ${initError.message}`);
@@ -152,7 +152,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     try {
       for (const [filename, content] of stagedFiles.entries()) {
         currentFilename = filename;
-        console.log(`Applying migration: ${filename}`);
+        // console.log(`Applying migration: ${filename}`);
         // Write the migration file to the main migrations folder.
         await writeFile(path.join(migrationsDir, filename), content, 'utf8');
 
@@ -162,7 +162,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           .update(content)
           .digest('hex');
 
-        console.log(`Recording migration: ${filename} with checksum ${checksum}`);
+        // console.log(`Recording migration: ${filename} with checksum ${checksum}`);
         await recordMigration(
           projectDir,
           databaseName,
@@ -181,20 +181,20 @@ 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...');
+    // console.log('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}`);
+        // console.log(`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`);
+      // console.log(`Copying staged file ${filename} to main migrations folder`);
       await writeFile(path.join(migrationsDir, filename), content, 'utf8');
     }
 
-    console.log('Pull migration applied successfully.');
+    // console.log('Pull migration applied successfully.');
     return {
       appliedMigrations: Array.from(stagedFiles.keys()),
       details: appliedPreview

package/src/app/api/push-remote/confirm/route.js

@@ -133,7 +133,7 @@ for (const migrationFile of migrationFiles) {
         results.preview.push(previewRecord);
       }
     }
-    console.log("Push Confirm Result (server):", results);
+    // console.log("Push Confirm Result (server):", results);
     return { success: true, preview: false, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {

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

@@ -100,7 +100,7 @@ async function pushToRemote(projectDir, accountId, apiToken, databaseName, previ
       }
     }
 
-    console.log("Push Preview Result (server):", results);
+    // console.log("Push Preview Result (server):", results);
     return { success: true, preview: true, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {

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

@@ -28,7 +28,7 @@ export async function POST(req) {
 
     // Extract the SQL query from the request body.
     const { query } = await req.json();
-    console.log('Received query:', query);
+    // console.log('Received query:', query);
 
     if (!query?.trim()) {
       return NextResponse.json(
@@ -57,11 +57,11 @@ export async function POST(req) {
 
     // Use the first configured database.
     const databaseName = config.d1_databases[0].database_name;
-    console.log('Using database:', databaseName);
+    // console.log('Using database:', databaseName);
 
     // Parse the query into individual SQL statements.
     let statements = parseQuery(query);
-    console.log('Parsed statements:', statements);
+    // console.log('Parsed statements:', statements);
 
     if (!statements.length) {
       return NextResponse.json(
@@ -72,7 +72,7 @@ export async function POST(req) {
 
     // Validate each parsed statement.
     statements = statements.map(validateStatement);
-    console.log('Validated statements:', statements);
+    // console.log('Validated statements:', statements);
 
     // Initialize the migrations table (if it doesn't already exist).
     const createMigrationsTable = `
@@ -87,7 +87,7 @@ export async function POST(req) {
 
     // Determine whether the query involves any schema changes.
     const hasSchemaChanges = statements.some(isSchemaChange);
-    console.log('Has schema changes:', hasSchemaChanges);
+    // console.log('Has schema changes:', hasSchemaChanges);
 
     let result;
     if (hasSchemaChanges) {
@@ -105,7 +105,7 @@ export async function POST(req) {
       // For data modification queries, execute the statements.
       const results = [];
       for (const stmt of statements) {
-        console.log('Executing data modification:', stmt.sql);
+        // console.log('Executing data modification:', stmt.sql);
         const output = await executeSQL(projectDir, databaseName, stmt.sql);
         
         try {
@@ -113,7 +113,7 @@ export async function POST(req) {
           const queryResults = parsed[0]?.results || [];
           results.push(...queryResults);
         } catch (parseError) {
-          console.log('Non-JSON output:', output);
+          // console.log('Non-JSON output:', output);
           continue;
         }
       }

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

@@ -17,7 +17,7 @@ export async function findWranglerConfig(userProjectPath) {
       throw new Error('Project path is required and must be a string');
     }
 
-    console.log(chalk.blue('Looking for wrangler configuration in:'), userProjectPath);
+    // console.log(chalk.blue('Looking for wrangler configuration in:'), userProjectPath);
 
     // Define the possible configuration file names in priority order.
     const possibleFiles = ['wrangler.toml', 'wrangler.json', 'wrangler.jsonc'];