d1s 0.2.1 → 0.2.3

package/scripts/studio.js

@@ -16,9 +16,6 @@ import { findWranglerConfig } from '../src/lib/find-wrangler-config.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// console.log(chalk.blue('Resolved __filename:'), __filename);
-// console.log(chalk.blue('Resolved __dirname:'), __dirname);
-
 // License validation utilities
 class LicenseError extends Error {
   constructor(message, type = 'VALIDATION_ERROR') {
@@ -68,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) {
@@ -123,14 +128,18 @@ async function saveLicenseFile(licenseData) {
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
     const dev = process.env.NODE_ENV === 'development';
-    // Point to the parent directory that contains both app and .next
-    const dir = join(__dirname, '..');
+
+    // Determine the directory where Next.js build is located:
+    // In production (published package), __dirname is in the 'dist' folder so we use it directly.
+    // In development, we assume the structure is different and go one level up.
+    const isProduction = process.env.NODE_ENV !== 'development';
+    const nextAppDir = isProduction ? __dirname : join(__dirname, '..');
+
     const app = next({ 
       dev,
-      dir,
+      dir: nextAppDir,
       conf: {
         distDir: '.next',
-        // Ensure app directory is correctly set for routing
         experimental: {
           appDir: true
         }
@@ -189,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:'));
 
@@ -214,7 +234,6 @@ async function startStudio() {
       console.log(chalk.blue('Entered license information:'), answers);
 
       const hardwareId = await generateHardwareId();
-      // console.log(chalk.blue('Generated hardware ID:'), hardwareId);
 
       try {
         const validation = await validateLicenseRemote(
@@ -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,12 +259,13 @@ 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
     try {
       const userProjectPath = process.cwd();
-      // console.log(chalk.blue('Current working directory:'), userProjectPath);
     
       if (!userProjectPath) {
         console.error(chalk.red('Error: Could not determine project directory'));
@@ -250,7 +273,6 @@ async function startStudio() {
       }
     
       const wranglerResult = await findWranglerConfig(userProjectPath);
-      // console.log(chalk.blue('Wrangler config result:'), wranglerResult);
     
       if (!wranglerResult || !wranglerResult.config) {
         console.error(chalk.red('\nError: No wrangler.toml found in current directory'));
@@ -260,7 +282,6 @@ async function startStudio() {
       }
     
       const { config, projectPath } = wranglerResult;
-      // console.log(chalk.blue('Resolved wrangler.toml project path:'), projectPath);
     
       if (!config.d1_databases?.length) {
         console.error(chalk.red('\nError: No D1 databases configured in wrangler.toml'));
@@ -341,4 +362,4 @@ process.on('SIGTERM', () => {
 startStudio().catch((error) => {
   console.error(chalk.red('\nFailed to start D1 Studio:'), error);
   process.exit(1);
-});
+});