d1s 0.2.3 → 0.2.5

package/dist/d1-studio.js

@@ -11,6 +11,7 @@ import express from 'express';
 import { createServer } from 'http';
 import next from 'next';
 import { findWranglerConfig } from '../src/lib/find-wrangler-config.js';
+import logger from '../src/lib/logger.js';
 
 // Compute the absolute path of this file and its directory.
 const __filename = fileURLToPath(import.meta.url);
@@ -46,14 +47,8 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
   try {
     const response = await fetch(`${baseUrl}/api/validate-license`, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        licenseKey,
-        email,
-        hardwareId,
-      }),
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ licenseKey, email, hardwareId }),
     });
 
     const result = await response.json();
@@ -65,7 +60,6 @@ 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.',
@@ -78,7 +72,6 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
     if (error instanceof LicenseError) {
       throw error;
     }
-
     if (error.name === 'TypeError' && error.message.includes('fetch')) {
       throw new LicenseError(
         process.env.NODE_ENV === 'development'
@@ -87,7 +80,6 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
         'CONNECTION_ERROR'
       );
     }
-
     throw new LicenseError(
       'An unexpected error occurred during license validation',
       'VALIDATION_ERROR'
@@ -106,7 +98,6 @@ async function checkLicenseFile() {
     if (licenseData.hardwareId !== hardwareId) {
       return null;
     }
-
     return licenseData;
   } catch (error) {
     return null;
@@ -127,22 +118,19 @@ async function saveLicenseFile(licenseData) {
 
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
-    const dev = process.env.NODE_ENV === 'development';
-
-    // 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.
+    // Determine Next.js app directory based on environment:
+    // In production (published package) __dirname is used.
+    // In development (npm link), assume the build is in the parent folder.
     const isProduction = process.env.NODE_ENV !== 'development';
     const nextAppDir = isProduction ? __dirname : join(__dirname, '..');
 
+    const dev = process.env.NODE_ENV === 'development';
     const app = next({ 
       dev,
       dir: nextAppDir,
       conf: {
         distDir: '.next',
-        experimental: {
-          appDir: true
-        }
+        experimental: { appDir: true }
       }
     });
     const handle = app.getRequestHandler();
@@ -150,41 +138,29 @@ async function startServer(port, projectDirectory) {
     app.prepare()
       .then(() => {
         const server = express();
-        
-        // Set environment variables
         process.env.PORT = port.toString();
         process.env.D1_PROJECT_DIR = projectDirectory;
+        const httpServer = createServer((req, res) => handle(req, res));
 
-        // Create HTTP server
-        const httpServer = createServer((req, res) => {
-          handle(req, res);
-        });
-
-        // Handle all requests through Next.js
-        server.all('*', (req, res) => {
-          return handle(req, res);
-        });
+        server.all('*', (req, res) => handle(req, res));
 
-        // Start listening
         httpServer.listen(port, (err) => {
           if (err) {
-            console.error(chalk.red('Failed to start server:'), err);
+            logger.error(chalk.red(`Failed to start server: ${err}`));
             rejectPromise(err);
             return;
           }
-
-          console.log(chalk.green(`Server started on port ${port}`));
+          logger.info(chalk.green(`Server started on port ${port}`));
           resolvePromise(httpServer);
         });
 
-        // Handle server errors
         httpServer.on('error', (err) => {
-          console.error(chalk.red('Server error:'), err);
+          logger.error(chalk.red(`Server error: ${err}`));
           rejectPromise(err);
         });
       })
       .catch((err) => {
-        console.error(chalk.red('Failed to prepare Next.js app:'), err);
+        logger.error(chalk.red(`Failed to prepare Next.js app: ${err}`));
         rejectPromise(err);
       });
   });
@@ -192,17 +168,15 @@ async function startServer(port, projectDirectory) {
 
 async function startStudio() {
   try {
-    console.log(chalk.green('Initializing D1 Studio...'));
+    logger.info(chalk.green('Initializing D1 Studio...'));
 
     // Validate license
     let licenseData = await checkLicenseFile();
-    console.log(chalk.blue('License data found:'), licenseData);
+    logger.debug(chalk.blue(`License data found: ${JSON.stringify(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;
@@ -211,7 +185,7 @@ async function startStudio() {
 
     if (!licenseData || shouldRevalidate) {
       const { default: inquirer } = await import('inquirer');
-      console.log(chalk.blue('\nPlease enter your D1 Studio license information:'));
+      logger.info(chalk.yellow('\nPlease enter your D1 Studio license information:'));
 
       const answers = await inquirer.prompt([
         {
@@ -231,10 +205,9 @@ async function startStudio() {
         },
       ]);
 
-      console.log(chalk.blue('Entered license information:'), answers);
+      logger.debug(chalk.blue(`Entered license information: ${JSON.stringify(answers)}`));
 
       const hardwareId = await generateHardwareId();
-
       try {
         const validation = await validateLicenseRemote(
           answers.licenseKey,
@@ -242,51 +215,42 @@ 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);
-        console.log(chalk.green('\nLicense activated successfully!'));
+        logger.info(chalk.green('\nLicense activated successfully!'));
       } catch (error) {
-        console.error(chalk.red('\nLicense validation failed:'), error.message);
+        logger.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();
-    
       if (!userProjectPath) {
-        console.error(chalk.red('Error: Could not determine project directory'));
+        logger.error(chalk.red('Error: Could not determine project directory'));
         process.exit(1);
       }
-    
+
       const wranglerResult = await findWranglerConfig(userProjectPath);
-    
       if (!wranglerResult || !wranglerResult.config) {
-        console.error(chalk.red('\nError: No wrangler.toml found in current directory'));
-        console.log(chalk.yellow('Make sure you are in a Cloudflare Workers project directory'));
-        console.log(chalk.yellow('with a valid wrangler.toml file.'));
+        logger.error(chalk.red('\nError: No wrangler.toml found in current directory'));
+        logger.info(chalk.yellow('Make sure you are in a Cloudflare Workers project directory'));
+        logger.info(chalk.yellow('with a valid wrangler.toml file.'));
         process.exit(1);
       }
-    
+
       const { config, projectPath } = wranglerResult;
-    
       if (!config.d1_databases?.length) {
-        console.error(chalk.red('\nError: No D1 databases configured in wrangler.toml'));
-        console.log(chalk.yellow('\nAdd D1 configuration to your wrangler.toml:'));
-        console.log(chalk.gray(`
+        logger.error(chalk.red('\nError: No D1 databases configured in wrangler.toml'));
+        logger.info(chalk.yellow('\nAdd D1 configuration to your wrangler.toml:'));
+        logger.info(chalk.gray(`
     [[d1_databases]]
     binding = "DB"
     database_name = "my-database"
@@ -294,11 +258,10 @@ async function startStudio() {
         `));
         process.exit(1);
       }
-    
-      // Display found databases
-      console.log(chalk.green('\nFound D1 databases:'));
+
+      logger.info(chalk.green('\nFound D1 databases:'));
       config.d1_databases.forEach((db) => {
-        console.log(chalk.blue(`  - ${db.database_name} (${db.binding})`));
+        logger.info(chalk.blue(`  - ${db.database_name} (${db.binding})`));
       });
 
       const port = 4000;
@@ -306,7 +269,7 @@ async function startStudio() {
 
       await startServer(port, projectPath);
 
-      console.log(chalk.green(`
+      logger.info(chalk.green(`
     ┌─────────────────────────────────────────┐
     │                                         │
     │   D1 Studio is running on port ${port}    │
@@ -316,50 +279,42 @@ async function startStudio() {
     └─────────────────────────────────────────┘
       `));
 
-      // Add delay before opening browser
       await new Promise(resolve => setTimeout(resolve, 2000));
 
       try {
         await open(url, {
           wait: false,
           url: true,
-          app: {
-            name: open.apps.chrome
-          }
+          app: { name: open.apps.chrome }
         }).catch(() => {
-          return open(url, {
-            wait: false,
-            url: true
-          });
+          return open(url, { wait: false, url: true });
         });
       } catch (browserError) {
-        console.log(chalk.yellow('\nCould not automatically open browser.'));
-        console.log(chalk.blue('Please open your browser and navigate to:'), url);
+        logger.info(chalk.yellow('\nCould not automatically open browser.'));
+        logger.info(chalk.blue(`Please open your browser and navigate to: ${url}`));
       }
-
     } catch (configError) {
-      console.error(chalk.red('\nConfiguration error:'), configError.message);
+      logger.error(chalk.red(`\nConfiguration error: ${configError.message}`));
       process.exit(1);
     }
-
   } catch (error) {
-    console.error(chalk.red('\nFailed to start D1 Studio:'), error);
+    logger.error(chalk.red(`\nFailed to start D1 Studio: ${error}`));
     process.exit(1);
   }
 }
 
 // Handle termination
 process.on('SIGINT', () => {
-  console.log(chalk.yellow('\nShutting down D1 Studio...'));
+  logger.info(chalk.yellow('\nShutting down D1 Studio...'));
   process.exit(0);
 });
 
 process.on('SIGTERM', () => {
-  console.log(chalk.yellow('\nShutting down D1 Studio...'));
+  logger.info(chalk.yellow('\nShutting down D1 Studio...'));
   process.exit(0);
 });
 
 startStudio().catch((error) => {
-  console.error(chalk.red('\nFailed to start D1 Studio:'), error);
+  logger.error(chalk.red(`\nFailed to start D1 Studio: ${error}`));
   process.exit(1);
 });

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

@@ -3,7 +3,7 @@ import { readFile } from 'fs/promises';
 import { findUp } from 'find-up';
 import { parse as parseToml } from '@iarna/toml';
 import stripJsonComments from 'strip-json-comments';
-import chalk from 'chalk';
+import logger from './logger.js';
 
 /**
  * Finds and parses the Wrangler configuration file.
@@ -17,14 +17,15 @@ 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);
+    // Uncomment the following line to log the search path if needed:
+    // logger.debug(`Looking for wrangler configuration in: ${userProjectPath}`);
 
     // Define the possible configuration file names in priority order.
     const possibleFiles = ['wrangler.toml', 'wrangler.json', 'wrangler.jsonc'];
     let configPath = null;
     let configFileUsed = null;
 
-    // Search for any of the possible config files
+    // Search for any of the possible config files.
     for (const file of possibleFiles) {
       configPath = await findUp(file, { cwd: userProjectPath });
       if (configPath) {
@@ -34,21 +35,21 @@ export async function findWranglerConfig(userProjectPath) {
     }
 
     if (!configPath) {
-      console.log(chalk.yellow('No Wrangler configuration file found in:'), userProjectPath);
+      logger.warn(`No Wrangler configuration file found in: ${userProjectPath}`);
       return null;
     }
 
-    console.log(chalk.green(`Found ${configFileUsed} at:`), configPath);
+    logger.info(`Found ${configFileUsed} at: ${configPath}`);
 
-    // Read the configuration file
+    // Read the configuration file.
     let configContent = await readFile(configPath, 'utf-8');
     let config;
 
-    // Parse based on file type
+    // Parse based on file type.
     if (configFileUsed.endsWith('.toml')) {
       config = parseToml(configContent);
     } else {
-      // If it's JSONC, strip comments before parsing
+      // If it's JSONC, strip comments before parsing.
       if (configFileUsed.endsWith('.jsonc')) {
         configContent = stripJsonComments(configContent);
       }
@@ -61,7 +62,7 @@ export async function findWranglerConfig(userProjectPath) {
     };
 
   } catch (error) {
-    console.error(chalk.red('Error reading Wrangler configuration:'), error.message);
+    logger.error(`Error reading Wrangler configuration: ${error.message}`);
     throw error;
   }
 }

package/dist/lib/logger.js

@@ -0,0 +1,19 @@
+import winston from 'winston';
+
+const { combine, timestamp, printf, colorize } = winston.format;
+
+const logFormat = printf(({ level, message, timestamp }) => {
+  return `${timestamp} ${level}: ${message}`;
+});
+
+const logger = winston.createLogger({
+  level: process.env.NODE_ENV === 'development' ? 'debug' : 'info',
+  format: combine(
+    timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
+    colorize(),
+    logFormat
+  ),
+  transports: [new winston.transports.Console()]
+});
+
+export default logger;

package/package.json

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