@ductape/sdk 0.1.20 → 0.1.22

package/dist/database/databases.service.js

@@ -196,6 +196,26 @@ class DatabaseService {
             access_key: this.config.access_key,
         });
     }
+    /**
+     * Get or create a ProductBuilder without prefetching product metadata (use bootstrap on connect).
+     */
+    getOrCreateProductBuilder(productTag) {
+        let builder = this.productBuilders.get(productTag);
+        if (!builder) {
+            builder = this.createNewProductBuilder();
+            this.productBuilders.set(productTag, builder);
+        }
+        return builder;
+    }
+    cacheBootstrapProductContext(productTag, boot) {
+        var _a;
+        if (boot.product_id) {
+            this.productId = boot.product_id;
+        }
+        if ((_a = boot.private_key) === null || _a === void 0 ? void 0 : _a.trim()) {
+            this.privateKeys.set(productTag, boot.private_key);
+        }
+    }
     /**
      * Get or create a ProductBuilder instance for the given product tag
      */
@@ -277,6 +297,28 @@ class DatabaseService {
         const builder = await this.getProductBuilder(productTag);
         return builder.fetchDatabase(databaseTag);
     }
+    /** Single bootstrap API call for connect — product + database config + private_key. */
+    async bootstrapDatabaseForConnect(productTag, databaseTag, envSlug) {
+        var _a;
+        if (!(envSlug === null || envSlug === void 0 ? void 0 : envSlug.trim())) {
+            throw new database_error_1.DatabaseError('env is required for database connect', enums_1.DatabaseErrorType.VALIDATION_ERROR);
+        }
+        const builder = this.getOrCreateProductBuilder(productTag);
+        const boot = await builder.bootstrapDatabase({
+            product_tag: productTag,
+            env_slug: envSlug,
+            database_tag: databaseTag,
+        });
+        this.cacheBootstrapProductContext(productTag, boot);
+        if (!(boot === null || boot === void 0 ? void 0 : boot.database)) {
+            throw new database_error_1.DatabaseError(`Database '${databaseTag}' not found for product '${productTag}'.`, enums_1.DatabaseErrorType.NOT_FOUND);
+        }
+        const database = boot.database;
+        if (boot.private_key && ((_a = database.envs) === null || _a === void 0 ? void 0 : _a.length)) {
+            database.envs = database.envs.map((env) => (Object.assign(Object.assign({}, env), { connection_url: env.connection_url ? (0, processor_utils_1.decrypt)(env.connection_url, boot.private_key) : env.connection_url })));
+        }
+        return database;
+    }
     /**
      * Update a database configuration
      * @param productTag - The product tag
@@ -699,8 +741,7 @@ class DatabaseService {
             if (!config.product) {
                 throw new database_error_1.DatabaseError(`Database '${config.database}' not found locally. Please provide 'product' to fetch from remote.`, enums_1.DatabaseErrorType.NOT_FOUND);
             }
-            await this.getProductBuilder(config.product);
-            const dbConfig = await this.fetchDatabase(config.product, config.database);
+            const dbConfig = await this.bootstrapDatabaseForConnect(config.product, config.database, config.env);
             if (!dbConfig) {
                 throw new database_error_1.DatabaseError(`Database '${config.database}' not found for product '${config.product}'.`, enums_1.DatabaseErrorType.NOT_FOUND);
             }
@@ -786,8 +827,7 @@ class DatabaseService {
             if (!config.product) {
                 throw new database_error_1.DatabaseError(`Database '${config.database}' not found locally. Please provide 'product' to fetch from remote.`, enums_1.DatabaseErrorType.NOT_FOUND);
             }
-            await this.getProductBuilder(config.product);
-            const dbConfig = await this.fetchDatabase(config.product, config.database);
+            const dbConfig = await this.bootstrapDatabaseForConnect(config.product, config.database, config.env);
             if (!dbConfig) {
                 throw new database_error_1.DatabaseError(`Database '${config.database}' not found for product '${config.product}'.`, enums_1.DatabaseErrorType.NOT_FOUND);
             }
@@ -851,7 +891,7 @@ class DatabaseService {
         try {
             let connectionUrl = context.connectionUrl;
             let vpcTunnelOptions = {};
-            if (this.config && (context.authMode === 'cloud_connection' || (0, secrets_1.isSecretReference)(connectionUrl).isSecret)) {
+            if (this.config && context.authMode === 'cloud_connection') {
                 const runtimeAuth = {
                     token: this.config.token,
                     public_key: this.config.public_key,
@@ -1170,11 +1210,11 @@ class DatabaseService {
                     return cached.data;
                 }
             }
-            await this.ensureAdapterFor(resolvedOptions);
-            const adapter = this.getAdapter(resolvedOptions);
-            const queryBuilder = new query_builder_1.QueryBuilder(adapter.getDatabaseType());
-            const builtQuery = queryBuilder.buildQuery(resolvedOptions);
-            const result = await adapter.query(builtQuery);
+            const result = await this.withAdapterRetry(resolvedOptions, async (adapter) => {
+                const queryBuilder = new query_builder_1.QueryBuilder(adapter.getDatabaseType());
+                const builtQuery = queryBuilder.buildQuery(resolvedOptions);
+                return adapter.query(builtQuery);
+            });
             // Store in cache if cache tag is provided
             if (options.cache && this.cacheManager && privateKey && productTag) {
                 const cacheConfig = await this.validateCache(productTag, options.cache);
@@ -1274,9 +1314,7 @@ class DatabaseService {
                     return cached.data;
                 }
             }
-            await this.ensureAdapterFor(options);
-            const adapter = this.getAdapter(options);
-            const result = await adapter.raw(options);
+            const result = await this.withAdapterRetry(options, async (adapter) => adapter.raw(options));
             // Store in cache if cache tag is provided
             if (options.cache && this.cacheManager && privateKey && options.product) {
                 const cacheConfig = await this.validateCache(options.product, options.cache);
@@ -1388,9 +1426,7 @@ class DatabaseService {
                 const preSaveResult = await processor.process(resolvedOptions.data, resolvedOptions.preSave);
                 processedData = preSaveResult.data;
             }
-            await this.ensureAdapterFor(resolvedOptions);
-            const adapter = this.getAdapter(resolvedOptions);
-            const result = await adapter.insert(Object.assign(Object.assign({}, resolvedOptions), { data: processedData }));
+            const result = await this.withAdapterRetry(resolvedOptions, async (adapter) => adapter.insert(Object.assign(Object.assign({}, resolvedOptions), { data: processedData })));
             const end = Date.now();
             (_f = this.logService) === null || _f === void 0 ? void 0 : _f.add(Object.assign(Object.assign({}, baseLogs), { start,
                 end, message: 'Database insert - success', successful_execution: true, status: logs_types_1.LogEventStatus.SUCCESS }));
@@ -1470,9 +1506,7 @@ class DatabaseService {
                 const preSaveResult = await processor.process(resolvedOptions.data, resolvedOptions.preSave);
                 processedData = preSaveResult.data;
             }
-            await this.ensureAdapterFor(resolvedOptions);
-            const adapter = this.getAdapter(resolvedOptions);
-            const result = await adapter.update(Object.assign(Object.assign({}, resolvedOptions), { data: processedData }));
+            const result = await this.withAdapterRetry(resolvedOptions, async (adapter) => adapter.update(Object.assign(Object.assign({}, resolvedOptions), { data: processedData })));
             const end = Date.now();
             (_f = this.logService) === null || _f === void 0 ? void 0 : _f.add(Object.assign(Object.assign({}, baseLogs), { start,
                 end, message: 'Database update - success', successful_execution: true, status: logs_types_1.LogEventStatus.SUCCESS }));
@@ -1535,9 +1569,7 @@ class DatabaseService {
             } }, sessionLogFields);
         (_e = this.logService) === null || _e === void 0 ? void 0 : _e.add(Object.assign(Object.assign({}, baseLogs), { start, message: 'Database delete - initiated', status: logs_types_1.LogEventStatus.PROCESSING }));
         try {
-            await this.ensureAdapterFor(resolvedOptions);
-            const adapter = this.getAdapter(resolvedOptions);
-            const result = await adapter.delete(resolvedOptions);
+            const result = await this.withAdapterRetry(resolvedOptions, async (adapter) => adapter.delete(resolvedOptions));
             const end = Date.now();
             (_f = this.logService) === null || _f === void 0 ? void 0 : _f.add(Object.assign(Object.assign({}, baseLogs), { start,
                 end, message: 'Database delete - success', successful_execution: true, status: logs_types_1.LogEventStatus.SUCCESS }));
@@ -1608,9 +1640,7 @@ class DatabaseService {
             } }, sessionLogFields);
         (_e = this.logService) === null || _e === void 0 ? void 0 : _e.add(Object.assign(Object.assign({}, baseLogs), { start, message: 'Database upsert - initiated', status: logs_types_1.LogEventStatus.PROCESSING }));
         try {
-            await this.ensureAdapterFor(resolvedOptions);
-            const adapter = this.getAdapter(resolvedOptions);
-            const result = await adapter.upsert(resolvedOptions);
+            const result = await this.withAdapterRetry(resolvedOptions, async (adapter) => adapter.upsert(resolvedOptions));
             const end = Date.now();
             (_f = this.logService) === null || _f === void 0 ? void 0 : _f.add(Object.assign(Object.assign({}, baseLogs), { start,
                 end, message: 'Database upsert - success', successful_execution: true, status: logs_types_1.LogEventStatus.SUCCESS }));
@@ -2577,7 +2607,7 @@ class DatabaseService {
         return adapter;
     }
     /**
-     * Ensure an adapter exists for the given database/env/product (connect on demand).
+     * Ensure an adapter exists for the given database/env/product (lazy connect on failure).
      * Use before getAdapter() when options include database+env+product (e.g. from proxy).
      */
     async ensureAdapterFor(options) {
@@ -2587,7 +2617,34 @@ class DatabaseService {
         const existing = this.adapters.get(contextKey);
         if (existing && typeof existing.isConnected === 'function' && existing.isConnected())
             return;
-        await this.connect({ database: options.database, env: options.env, product: options.product });
+        if (existing)
+            return;
+        if (!this.connectionContexts.get(contextKey)) {
+            await this.connect({ database: options.database, env: options.env, product: options.product });
+        }
+    }
+    isConnectionError(error) {
+        var _a, _b;
+        const message = String((_b = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error) !== null && _b !== void 0 ? _b : '').toLowerCase();
+        return ['connection', 'connect', 'closed', 'reset', 'timeout', 'refused', 'broken pipe', 'not connected', 'eof', 'network']
+            .some((needle) => message.includes(needle));
+    }
+    async withAdapterRetry(options, fn) {
+        await this.ensureAdapterFor(options);
+        const adapter = this.getAdapter(options);
+        try {
+            return await fn(adapter);
+        }
+        catch (error) {
+            if (!this.isConnectionError(error))
+                throw error;
+            await this.connect({
+                database: options.database,
+                env: options.env,
+                product: options.product,
+            });
+            return await fn(this.getAdapter(options));
+        }
     }
     /**
      * Get the current connection context