s3db.js 19.4.2 → 19.4.4-next.033a879c

package/dist/cli/index.js

@@ -8,8 +8,8 @@
  * terminal interaction and formatted output using tuiuiu.js components.
  */
 import { createCLI } from 'cli-args-parser';
-import inquirer from 'inquirer';
 import { Table, Spinner, red, green, yellow, cyan, gray, bold, dim, c, } from './components/index.js';
+import { prompt } from 'tuiuiu.js';
 import { S3db } from '../database.class.js';
 import fs from 'fs/promises';
 import path from 'path';
@@ -176,22 +176,11 @@ const cli = createCLI({
         configure: {
             description: 'Configure S3DB connection',
             handler: async () => {
-                const answers = await inquirer.prompt([
-                    {
-                        type: 'input',
-                        name: 'connection',
-                        message: 'Enter S3 connection string:',
-                        default: 's3://KEY:SECRET@bucket/database'
-                    },
-                    {
-                        type: 'list',
-                        name: 'defaultBehavior',
-                        message: 'Default behavior for resources:',
-                        choices: ['user-managed', 'enforce-limits', 'body-overflow', 'body-only', 'truncate-data'],
-                        default: 'user-managed'
-                    }
-                ]);
-                await saveConfig(answers);
+                const connection = await prompt.input('Enter S3 connection string:', {
+                    default: 's3://KEY:SECRET@bucket/database'
+                });
+                const defaultBehavior = await prompt.select('Default behavior for resources:', ['user-managed', 'enforce-limits', 'body-overflow', 'body-only', 'truncate-data'], { default: 'user-managed' });
+                await saveConfig({ connection, defaultBehavior });
                 console.log(green('✓ Configuration saved to ~/.s3db/config.json'));
             }
         },
@@ -406,15 +395,8 @@ const cli = createCLI({
                 const opts = result.options;
                 const pos = result.positional;
                 if (!opts.force) {
-                    const { confirm } = await inquirer.prompt([
-                        {
-                            type: 'confirm',
-                            name: 'confirm',
-                            message: `Are you sure you want to delete ${pos.id} from ${pos.resource}?`,
-                            default: false
-                        }
-                    ]);
-                    if (!confirm) {
+                    const confirmed = await prompt.confirm(`Are you sure you want to delete ${pos.id} from ${pos.resource}?`, { default: false });
+                    if (!confirmed) {
                         console.log(yellow('Cancelled'));
                         return;
                     }
@@ -1081,15 +1063,8 @@ const cli = createCLI({
                         const opts = result.options;
                         const pos = result.positional;
                         if (!opts.force) {
-                            const { confirm } = await inquirer.prompt([
-                                {
-                                    type: 'confirm',
-                                    name: 'confirm',
-                                    message: `This will delete ALL data from ${pos.resource}. Continue?`,
-                                    default: false
-                                }
-                            ]);
-                            if (!confirm) {
+                            const confirmed = await prompt.confirm(`This will delete ALL data from ${pos.resource}. Continue?`, { default: false });
+                            if (!confirmed) {
                                 console.log(yellow('Cancelled'));
                                 return;
                             }
@@ -1238,15 +1213,8 @@ const cli = createCLI({
                     handler: async (result) => {
                         const opts = result.options;
                         if (!opts.force) {
-                            const { confirm } = await inquirer.prompt([
-                                {
-                                    type: 'confirm',
-                                    name: 'confirm',
-                                    message: 'This will rollback ALL migrations. Continue?',
-                                    default: false
-                                }
-                            ]);
-                            if (!confirm) {
+                            const confirmed = await prompt.confirm('This will rollback ALL migrations. Continue?', { default: false });
+                            if (!confirmed) {
                                 console.log(yellow('Cancelled'));
                                 return;
                             }

package/dist/connection-string.class.js

@@ -158,11 +158,18 @@ export class ConnectionString {
         this.secretAccessKey = undefined;
         // Parse pathname
         let pathname = uri.pathname || '';
+        let isRelativePath = false;
         // Handle Windows paths (file:///C:/path/to/data)
         if (uri.hostname && uri.hostname.match(/^[a-zA-Z]$/)) {
             // Windows drive letter in hostname (file://C:/path)
             pathname = `${uri.hostname}:${pathname}`;
         }
+        else if (uri.hostname === '.' || uri.hostname === '..') {
+            // Relative path: file://./path or file://../path
+            // URL parser puts . or .. in hostname, reconstruct the relative path
+            pathname = `${uri.hostname}${pathname}`;
+            isRelativePath = true;
+        }
         else if (uri.hostname && uri.hostname !== 'localhost') {
             // UNC path (file://server/share/path)
             pathname = `//${uri.hostname}${pathname}`;
@@ -182,37 +189,19 @@ export class ConnectionString {
                 suggestion: 'Use file:///absolute/path or file://./relative/path'
             });
         }
-        // Parse path segments: /basePath/bucket/keyPrefix
-        const segments = decodedPath.split('/').filter(Boolean);
-        if (segments.length === 0) {
-            throw new ConnectionStringError('file:// connection string requires a path', {
-                input: uri.href,
-                suggestion: 'Use file:///absolute/path or file://./relative/path'
-            });
-        }
-        // For relative paths starting with ./ or ../
-        if (decodedPath.startsWith('./') || decodedPath.startsWith('../')) {
+        // For relative paths (detected from hostname or starting with ./ or ../)
+        if (isRelativePath || decodedPath.startsWith('./') || decodedPath.startsWith('../')) {
             this.basePath = path.resolve(decodedPath);
             this.bucket = 's3db';
             this.keyPrefix = '';
         }
-        else if (segments.length === 1) {
-            this.basePath = path.resolve('/', segments[0]);
+        else {
+            // Absolute path: use the entire path as basePath
+            // This is the intuitive behavior - file:///path/to/data means "use /path/to/data"
+            this.basePath = path.resolve(decodedPath);
             this.bucket = 's3db';
             this.keyPrefix = '';
         }
-        else if (segments.length === 2) {
-            const [baseSegment, bucketSegment] = segments;
-            this.basePath = path.resolve('/', baseSegment);
-            this.bucket = bucketSegment;
-            this.keyPrefix = '';
-        }
-        else {
-            const [baseSegment, bucketSegment, ...prefixSegments] = segments;
-            this.basePath = path.resolve('/', baseSegment);
-            this.bucket = bucketSegment;
-            this.keyPrefix = prefixSegments.join('/');
-        }
         // Set synthetic endpoint for compatibility
         this.endpoint = `file://${this.basePath}`;
         this.region = 'local';

package/dist/database.class.js

@@ -90,7 +90,7 @@ export class Database extends SafeEventEmitter {
         });
         this.savedMetadata = null;
         this.databaseOptions = options;
-        const executorPoolConfig = options?.executorPool ?? options?.operationsPool;
+        const executorPoolConfig = options?.executorPool;
         this._parallelism = this._normalizeParallelism(options?.parallelism ?? executorPoolConfig?.concurrency, 10);
         this.logLevel = options.logLevel || options.loggerOptions?.level || 'info';
         const loggerOptions = { ...(options.loggerOptions || {}) };
@@ -111,11 +111,6 @@ export class Database extends SafeEventEmitter {
             });
         }
         this._childLoggerLevels = options.loggerOptions?.childLevels || {};
-        if (options?.operationsPool && !options?.executorPool) {
-            this.logger.warn('⚠️  "operationsPool" is deprecated in s3db.js v16.x. ' +
-                'Use "executorPool" instead. ' +
-                'Migration: https://s3db.js/docs/migration/v16-to-v17');
-        }
         this.executorPool = this._normalizeOperationsPool(executorPoolConfig, this._parallelism);
         if (options?.taskExecutorMonitoring) {
             this.executorPool.monitoring = this._deepMerge(this.executorPool.monitoring || {}, options.taskExecutorMonitoring);
@@ -276,9 +271,6 @@ export class Database extends SafeEventEmitter {
             this.executorPool.concurrency = normalized;
         }
     }
-    get operationsPool() {
-        return this.executorPool;
-    }
     get config() {
         return {
             version: this.version,

package/dist/plugins/api/middlewares/validator.js

@@ -8,8 +8,7 @@ export function createValidationMiddleware(resource, options = {}) {
             return cached.middleware;
         }
     }
-    const { validateOnInsert = true, validateOnUpdate = true, partial = true } = options;
-    const schema = resource.schema;
+    const { validateOnInsert = true, validateOnUpdate = true } = options;
     const middleware = async (c, next) => {
         const method = c.req.method;
         const shouldValidate = (method === 'POST' && validateOnInsert) ||
@@ -27,12 +26,10 @@ export function createValidationMiddleware(resource, options = {}) {
             ]);
             return c.json(response, response._status);
         }
-        const isPartial = method === 'PATCH' && partial;
-        const validationResult = schema.validate(data, {
-            partial: isPartial,
-            strict: !isPartial
+        const validationResult = await resource.validator.validate(data, {
+            includeId: true
         });
-        if (!validationResult.valid) {
+        if (!validationResult.isValid) {
             const errors = (validationResult.errors || []).map((err) => ({
                 field: err.field || err.attribute || 'unknown',
                 message: err.message,

package/dist/plugins/backup/multi-backup-driver.class.js

@@ -57,14 +57,6 @@ export default class MultiBackupDriver extends BaseBackupDriver {
                 });
             }
         }
-        if (this.config.requireAll !== undefined) {
-            this.logger.warn('[MultiBackupDriver] DEPRECATED: The "requireAll" option is deprecated. ' +
-                'Use "strategy" instead: strategy: "any" (instead of requireAll: false) or strategy: "all" (instead of requireAll: true). ' +
-                'This will be removed in v17.0.');
-            if (this.config.requireAll === false) {
-                this.config.strategy = 'any';
-            }
-        }
         this.log(`Initialized with ${this.drivers.length} destinations, strategy: ${this.config.strategy}`);
     }
     async upload(filePath, backupId, manifest) {

package/dist/plugins/identity/concerns/interactive-wizard.js

@@ -1,7 +1,7 @@
 /**
  * Interactive Onboarding Wizard - CLI prompts for admin account creation
  *
- * Uses enquirer for beautiful CLI prompts (lazy-loaded peer dependency)
+ * Uses tuiuiu.js for CLI prompts (zero-dependency)
  * Only works in TTY environments (development)
  *
  * Security:
@@ -28,10 +28,10 @@ export class InteractiveWizard {
     }
     async run() {
         this._printBanner();
-        const { Input, Password } = await this._loadEnquirer();
-        const email = await this._promptEmail(Input);
-        const password = await this._promptPassword(Password);
-        const name = await this._promptName(Input);
+        const prompt = await this._loadTuiuiu();
+        const email = await this._promptEmail(prompt);
+        const password = await this._promptPassword(prompt);
+        const name = await this._promptName(prompt);
         this._printSuccess(email);
         return { email, password, name };
     }
@@ -53,28 +53,38 @@ export class InteractiveWizard {
         console.log(`   Login URL: ${this.config.issuer || 'http://localhost:4000'}/login`);
         console.log('');
     }
-    async _promptEmail(Input) {
+    async _promptEmail(prompt) {
         let attempts = 0;
         while (attempts < this.maxEmailAttempts) {
             attempts++;
-            const prompt = new Input({
-                name: 'email',
-                message: '👤 Admin Email:',
-                validate: (value) => {
-                    if (!value || !value.trim()) {
-                        return 'Email is required';
-                    }
-                    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) {
-                        return 'Please enter a valid email address';
+            try {
+                const email = await prompt.input('👤 Admin Email:', {
+                    validate: (value) => {
+                        if (!value || !value.trim()) {
+                            return 'Email is required';
+                        }
+                        if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) {
+                            return 'Please enter a valid email address';
+                        }
+                        return true;
                     }
-                    return true;
+                });
+                if (/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email || '')) {
+                    return email;
                 }
-            });
-            const email = await prompt.run();
-            if (/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email || '')) {
-                return email;
+                console.log('❌ Invalid email address. Please try again.\n');
+            }
+            catch (error) {
+                if (error.message?.includes('canceled') || error.message?.includes('aborted')) {
+                    throw new PluginError('Onboarding canceled by user', {
+                        pluginName: 'IdentityPlugin',
+                        operation: 'runInteractiveMode',
+                        statusCode: 400,
+                        retriable: false
+                    });
+                }
+                throw error;
             }
-            console.log('❌ Invalid email address. Please try again.\n');
         }
         throw new PluginError(`Max email attempts (${this.maxEmailAttempts}) exceeded`, {
             pluginName: 'IdentityPlugin',
@@ -83,13 +93,27 @@ export class InteractiveWizard {
             retriable: false
         });
     }
-    async _promptPassword(Password) {
+    async _promptPassword(prompt) {
         let attempts = 0;
         while (attempts < this.maxPasswordAttempts) {
             attempts++;
             try {
-                const password = await this._promptPasswordOnce(Password);
-                const confirmPassword = await this._promptPasswordConfirm(Password);
+                const password = await prompt.password('🔒 Admin Password:', {
+                    validate: (value) => {
+                        if (!value || !value.trim()) {
+                            return 'Password is required';
+                        }
+                        return true;
+                    }
+                });
+                const confirmPassword = await prompt.password('🔒 Confirm Password:', {
+                    validate: (value) => {
+                        if (!value || !value.trim()) {
+                            return 'Password confirmation is required';
+                        }
+                        return true;
+                    }
+                });
                 if (password !== confirmPassword) {
                     console.log('❌ Passwords do not match. Please try again.\n');
                     continue;
@@ -104,7 +128,7 @@ export class InteractiveWizard {
                 return password;
             }
             catch (error) {
-                if (error.name === 'ExitPromptError') {
+                if (error.message?.includes('canceled') || error.message?.includes('aborted')) {
                     throw new PluginError('Onboarding canceled by user', {
                         pluginName: 'IdentityPlugin',
                         operation: 'runInteractiveMode',
@@ -123,42 +147,24 @@ export class InteractiveWizard {
             suggestion: 'Use env or config mode for automated setup'
         });
     }
-    async _promptPasswordOnce(Password) {
-        const prompt = new Password({
-            name: 'password',
-            message: '🔒 Admin Password:',
-            mask: '*',
-            validate: (value) => {
-                if (!value || !value.trim()) {
-                    return 'Password is required';
-                }
-                return true;
-            }
-        });
-        return prompt.run();
-    }
-    async _promptPasswordConfirm(Password) {
-        const prompt = new Password({
-            name: 'confirmPassword',
-            message: '🔒 Confirm Password:',
-            mask: '*',
-            validate: (value) => {
-                if (!value || !value.trim()) {
-                    return 'Password confirmation is required';
-                }
-                return true;
+    async _promptName(prompt) {
+        try {
+            const name = await prompt.input('📝 Display Name (optional):', {
+                default: 'Administrator'
+            });
+            return name || 'Administrator';
+        }
+        catch (error) {
+            if (error.message?.includes('canceled') || error.message?.includes('aborted')) {
+                throw new PluginError('Onboarding canceled by user', {
+                    pluginName: 'IdentityPlugin',
+                    operation: 'runInteractiveMode',
+                    statusCode: 400,
+                    retriable: false
+                });
             }
-        });
-        return prompt.run();
-    }
-    async _promptName(Input) {
-        const prompt = new Input({
-            name: 'name',
-            message: '📝 Display Name (optional):',
-            initial: 'Administrator'
-        });
-        const name = await prompt.run();
-        return name || 'Administrator';
+            throw error;
+        }
     }
     _validatePassword(password) {
         const errors = [];
@@ -183,21 +189,18 @@ export class InteractiveWizard {
             errors
         };
     }
-    async _loadEnquirer() {
+    async _loadTuiuiu() {
         try {
-            const enquirer = await import('enquirer');
-            return {
-                Input: enquirer.Input,
-                Password: enquirer.Password
-            };
+            const tuiuiu = await import('tuiuiu.js');
+            return tuiuiu.prompt;
         }
         catch (error) {
-            throw new PluginError('enquirer package is required for interactive mode. Install with: npm install enquirer', {
+            throw new PluginError('tuiuiu.js package is required for interactive mode. Install with: npm install tuiuiu.js', {
                 pluginName: 'IdentityPlugin',
                 operation: 'runInteractiveMode',
                 cause: error,
                 retriable: false,
-                suggestion: 'Run: npm install enquirer@^2.4.1'
+                suggestion: 'Run: npm install tuiuiu.js'
             });
         }
     }

package/dist/plugins/identity/concerns/onboarding-manager.js

@@ -454,13 +454,13 @@ export class OnboardingManager {
             return admin;
         }
         catch (error) {
-            if (error.code === 'ERR_MODULE_NOT_FOUND' || error.message.includes('enquirer')) {
-                throw new PluginError('Interactive mode requires "enquirer" package. Install with: npm install enquirer', {
+            if (error.code === 'ERR_MODULE_NOT_FOUND' || error.message.includes('tuiuiu')) {
+                throw new PluginError('Interactive mode requires "tuiuiu.js" package. Install with: npm install tuiuiu.js', {
                     pluginName: 'IdentityPlugin',
                     operation: 'runInteractiveMode',
                     cause: error,
                     retriable: false,
-                    suggestion: 'Run: npm install enquirer, or use env/config mode instead'
+                    suggestion: 'Run: npm install tuiuiu.js, or use env/config mode instead'
                 });
             }
             throw error;

package/dist/plugins/identity/index.js

@@ -181,14 +181,6 @@ export class IdentityPlugin extends Plugin {
                 tagline: options.ui?.tagline || 'Secure Identity & Access Management',
                 welcomeMessage: options.ui?.welcomeMessage || 'Welcome back!',
                 logoUrl: options.ui?.logoUrl || null,
-                logo: (() => {
-                    if (options.ui?.logo) {
-                        this.logger?.warn('[IdentityPlugin] DEPRECATED: The "logo" field is deprecated. ' +
-                            'Use "logoUrl" instead: { ui: { logoUrl: "..." } }. ' +
-                            'This will be removed in v17.0.');
-                    }
-                    return options.ui?.logo || null;
-                })(),
                 favicon: options.ui?.favicon || null,
                 primaryColor: options.ui?.primaryColor || '#007bff',
                 secondaryColor: options.ui?.secondaryColor || '#6c757d',
@@ -233,7 +225,7 @@ export class IdentityPlugin extends Plugin {
                 templates: {
                     baseUrl: options.email?.templates?.baseUrl || options.ui?.baseUrl || `http://localhost:${options.port || 4000}`,
                     brandName: options.email?.templates?.brandName || options.ui?.title || 'S3DB Identity',
-                    brandLogo: options.email?.templates?.brandLogo || options.ui?.logo || null,
+                    brandLogo: options.email?.templates?.brandLogo || options.ui?.logoUrl || null,
                     brandColor: options.email?.templates?.brandColor || options.ui?.primaryColor || '#007bff',
                     supportEmail: options.email?.templates?.supportEmail || options.email?.replyTo || null,
                     customFooter: options.email?.templates?.customFooter || null

package/dist/plugins/identity/ui/layouts/base.js

@@ -39,7 +39,6 @@ export function BaseLayout(props) {
     const { title = 'Identity Provider', content = '', user = null, config = {}, error = null, success = null } = props;
     const theme = {
         title: config.title || 'S3DB Identity',
-        logo: config.logo || null,
         logoUrl: config.logoUrl || null,
         favicon: config.favicon || null,
         registrationEnabled: config.registrationEnabled !== false,

package/dist/plugins/metrics.plugin.js

@@ -25,19 +25,13 @@ export class MetricsPlugin extends Plugin {
             this.logger = createLogger({ name: 'MetricsPlugin', level: logLevel });
         }
         const metricsOptions = this.options;
-        const { resourceNames = {}, resources = {}, collectPerformance, collectErrors, collectUsage, retentionDays, flushInterval, prometheus = {}, ...rest } = metricsOptions;
+        const { resourceNames = {}, collectPerformance, collectErrors, collectUsage, retentionDays, flushInterval, prometheus = {}, ...rest } = metricsOptions;
         const resourceNamesOption = resourceNames || {};
-        const legacyResourceOption = resources || {};
         const prometheusConfig = prometheus || {};
-        if (Object.keys(legacyResourceOption).length > 0) {
-            this.logger.warn({}, '[MetricsPlugin] DEPRECATED: The "resources" option is deprecated. ' +
-                'Use "resourceNames" instead: { resourceNames: { metrics: "...", errors: "...", performance: "..." } }. ' +
-                'This will be removed in v17.0.');
-        }
         const resourceOverrides = {
-            metrics: resourceNamesOption.metrics ?? legacyResourceOption.metrics,
-            errors: resourceNamesOption.errors ?? legacyResourceOption.errors,
-            performance: resourceNamesOption.performance ?? legacyResourceOption.performance
+            metrics: resourceNamesOption.metrics,
+            errors: resourceNamesOption.errors,
+            performance: resourceNamesOption.performance
         };
         this._resourceDescriptors = {
             metrics: {

package/dist/plugins/puppeteer.plugin.js

@@ -198,9 +198,6 @@ export class PuppeteerPlugin extends Plugin {
                     timeout: 10000,
                     successRateThreshold: 0.3
                 },
-                server: null,
-                username: null,
-                password: null,
                 ...options.proxy
             },
             retries: {
@@ -284,11 +281,6 @@ export class PuppeteerPlugin extends Plugin {
                 message: 'pool.reuseTab is not supported yet and will be ignored.'
             });
         }
-        if (options.proxy?.server || options.proxy?.username || options.proxy?.password) {
-            this.logger.warn('[PuppeteerPlugin] DEPRECATED: The single proxy config (server, username, password) is deprecated. ' +
-                'Use the proxy.list array with proxy objects instead. Example: proxy: { list: [{ proxy: "http://host:port", username: "user", password: "pass" }] }. ' +
-                'This will be removed in v17.0.');
-        }
     }
     _resolveResourceNames() {
         return resolveResourceNames('puppeteer', this._resourceDescriptors, {
@@ -475,9 +467,6 @@ export class PuppeteerPlugin extends Plugin {
             const proxyArgs = this.proxyManager.getProxyLaunchArgs(proxy);
             launchOptions.args.push(...proxyArgs);
         }
-        else if (this.config.proxy.enabled && this.config.proxy.server) {
-            launchOptions.args.push(`--proxy-server=${this.config.proxy.server}`);
-        }
         const browser = await this.puppeteer.launch(launchOptions);
         if (!proxy && this.config.pool.enabled) {
             this.browserPool.push(browser);