@ductape/sdk 0.0.8 → 0.1.0

package/dist/index.js

@@ -63,8 +63,8 @@ const productsApi_service_1 = require("./api/services/productsApi.service");
 const imports_service_1 = __importDefault(require("./imports/imports.service"));
 const processor_service_1 = __importDefault(require("./processor/services/processor.service"));
 const logs_service_1 = __importDefault(require("./logs/logs.service"));
+const utils_1 = require("./utils");
 const mime = __importStar(require("mime-types"));
-const processor_utils_1 = require("./processor/utils/processor.utils");
 const database_1 = require("./database");
 const graph_1 = require("./graph");
 const workflows_1 = require("./workflows");
@@ -81,7 +81,7 @@ const cache_1 = require("./cache");
 const jobs_1 = require("./jobs");
 const secrets_1 = require("./secrets");
 const warehouse_1 = require("./warehouse");
-const utils_1 = require("./apps/utils");
+const utils_2 = require("./apps/utils");
 /**
  * @typedef {Object} IProduct
  * @property {string} tag - Unique product tag.
@@ -2003,7 +2003,7 @@ class Ductape {
                 const schedule = data.schedule || {};
                 const startAt = typeof schedule.start_at === 'string' ? new Date(schedule.start_at).getTime() : schedule.start_at || Date.now();
                 // Generate job tag based on type, notification, and event
-                const jobTag = `${(0, utils_1.tagify)(data.notification)}:${(0, utils_1.tagify)(data.event)}`;
+                const jobTag = `${(0, utils_2.tagify)(data.notification)}:${(0, utils_2.tagify)(data.event)}`;
                 // Check if job exists, if not create it
                 const existingJob = await productBuilder.fetchJob(jobTag);
                 if (!existingJob) {
@@ -2054,7 +2054,7 @@ class Ductape {
              * @param {string} [options.env] - Environment slug filter (e.g. prd).
              * @param {string} [options.notification_tag] - Notification event filter (e.g. rematch-notifications:order-placed).
              * @param {string} [options.status] - Status filter: pending | sent | failed | reprocessing.
-             * @param {string} [options.type] - Type filter: email | push | sms | callback | notification.
+             * @param {string} [options.type] - Type filter: email | push | sms | callback | slack | discord | notification.
              * @param {string|Date} [options.start_date] - Start of time range (ISO string or Date).
              * @param {string|Date} [options.end_date] - End of time range (ISO string or Date).
              * @param {number} [options.page] - Page number (default 1).
@@ -4706,17 +4706,17 @@ class Ductape {
                 const schedule = data.schedule || {};
                 const startAt = typeof schedule.start_at === 'string' ? new Date(schedule.start_at).getTime() : schedule.start_at || Date.now();
                 // Generate job tag based on type, app, and event
-                const jobTag = `action:${data.app}:${data.event}`;
+                const jobTag = `action:${data.app}:${data.action}`;
                 // Check if job exists, if not create it
                 const existingJob = await productBuilder.fetchJob(jobTag);
                 if (!existingJob) {
                     await productBuilder.createJob({
                         tag: jobTag,
-                        name: `Action: ${data.app}/${data.event}`,
-                        description: `Auto-created job for action ${data.event} on app ${data.app}`,
+                        name: `Action: ${data.app}/${data.action}`,
+                        description: `Auto-created job for action ${data.action} on app ${data.app}`,
                         type: types_1.JobEventTypes.ACTION,
                         app: data.app,
-                        event: data.event,
+                        event: data.action,
                         executions: 0,
                         intervals: schedule.every || 0,
                         start_at: startAt,
@@ -5026,7 +5026,7 @@ class Ductape {
         this.redis_url = redis_url;
         // Services are lazily initialized via factory methods (createNewDatabaseService, etc.)
         // This ensures initUserAuth() is called before service creation
-        //return createDeepProxy(this, this.environment);
+        return (0, utils_1.createDeepProxy)(this, this.environment);
     }
     async loadBullMQ() {
         if (typeof window !== 'undefined') {
@@ -5045,118 +5045,129 @@ class Ductape {
      * @returns {Promise<void>} Resolves when Redis and queues are initialized.
      */
     async monitor() {
-        if (typeof window !== 'undefined') {
-            throw new Error('RedisService can only be used in a server environment.');
-        }
-        if (!this.redis_url) {
-            throw new Error('Redis URL is not provided.');
-        }
-        if (this.redisClient) {
-            // Already connected
-            return;
-        }
-        if (!this.public_key) {
-            await this.initUserAuth(false);
-        }
-        const Redis = await this.loadRedis();
-        const { Queue, Worker: BullWorker } = await this.loadBullMQ();
-        // Create Redis client with required options for BullMQ
-        this.redisClient = new Redis.default(this.redis_url, {
-            maxRetriesPerRequest: null, // Required by BullMQ
-        });
-        // Initialize job queues
-        this.jobsQueue = new Queue('ductape_jobs', {
-            connection: this.redisClient,
-        });
-        this.healthCheckQueue = new Queue('ductape_healthchecks', {
-            connection: this.redisClient,
-        });
-        this.healthCheckUpdaterQueue = new Queue('healthchecks-updater', {
-            connection: this.redisClient,
-        });
-        // Schedule healthcheck jobs for all products/environments
-        await this.scheduleAllHealthcheckJobs();
-        // Initialize job worker
-        this.jobsWorker = new BullWorker('ductape_jobs', async (job) => {
-            console.log(`Processing job ${job.id} of type ${job.name}`, job.data);
-            const processor = await this.createNewProcessor();
-            await processor.runJobs(job);
-        }, {
-            connection: this.redisClient,
-        });
-        // Initialize health check worker
-        this.healthCheckWorker = new BullWorker('ductape_healthchecks', async (job) => {
-            console.log(`Running health check job ${job.id}`, job.data);
-            const processor = await this.createNewProcessor();
-            console.log('FIND JOB!!!!', job.data);
-            if (job && job.data && Object.keys(job.data).length) {
-                // Call processAction with job.data
-                const result = await processor.processAction(job.data);
-                // Write result to Redis cache
-                await processor.writeHealthcheckResultToCache(job.data, Object.assign({ status: (result === null || result === void 0 ? void 0 : result.status) || 'unknown', lastChecked: Date.now() }, result));
-                // Re-enqueue the job for continuous healthchecks
-                //await this.scheduleHealthcheckJob(job.data);
+        console.log('[MONITOR] monitor() called');
+        try {
+            if (typeof window !== 'undefined') {
+                throw new Error('RedisService can only be used in a server environment.');
             }
-        }, {
-            connection: this.redisClient,
-        });
-        // Add a repeatable job to update DB every 10 minutes
-        await this.healthCheckUpdaterQueue.add('healthchecks-updater', {}, {
-            jobId: 'healthchecks-updater',
-            repeat: { every: 5 * 60 * 1000 },
-        });
-        // Healthcheck updater worker
-        this.healthCheckUpdaterWorker = new BullWorker('healthchecks-updater', async (job) => {
-            console.log('Init Processor for healthcheck Updater');
-            if (job.name !== 'healthchecks-updater')
+            if (!this.redis_url) {
+                throw new Error('Redis URL is not provided.');
+            }
+            // Skip full setup only if we already have queues and workers (full setup was done)
+            if (this.redisClient && this.healthCheckQueue && this.healthCheckWorker) {
+                console.log('[MONITOR] Already running (Redis + queues + workers present), skipping setup');
                 return;
-            // Gather all healthcheck results from Redis
-            const keys = await this.redisClient.keys('healthcheck:*');
-            console.log('Found Keys for healthcheck updater', JSON.stringify(keys));
-            const envResults = {};
-            for (const key of keys) {
-                const [_, productTag, tag, envSlug] = key.split(':');
-                console.log(`${productTag} , ${tag}, ${envSlug}`);
-                const data = JSON.parse(await this.redisClient.get(key));
-                if (!envResults[productTag])
-                    envResults[productTag] = {};
-                if (!envResults[productTag][tag])
-                    envResults[productTag][tag] = {};
-                envResults[productTag][tag][envSlug] = data;
             }
-            for (const productTag in envResults) {
-                const tagsData = Object.entries(envResults[productTag]).map(([tag, envs]) => ({
-                    tag,
-                    environments: Object.entries(envs).map(([slug, data]) => (Object.assign({ slug }, data))),
-                }));
-                console.log();
-                const processor = await this.createNewProcessor();
-                console.log('PROCESSING ENV RESULT', productTag, tagsData);
-                await processor.updateHealthcheckOnProcessor(productTag, tagsData);
+            if (!this.public_key) {
+                await this.initUserAuth(false);
             }
-        }, {
-            connection: this.redisClient,
-        });
-        // Attach error listeners — record failed phase on JobExecutionTracker when worker job fails
-        this.jobsWorker.on('failed', async (job, err) => {
-            var _a;
-            console.error(`Job ${job === null || job === void 0 ? void 0 : job.id} failed:`, err);
-            const jobId = (_a = job === null || job === void 0 ? void 0 : job.data) === null || _a === void 0 ? void 0 : _a._job_id;
-            if (jobId && this.workspace_id) {
-                try {
+            if (!this.redisClient) {
+                const Redis = await this.loadRedis();
+                this.redisClient = new Redis.default(this.redis_url, {
+                    maxRetriesPerRequest: null, // Required by BullMQ
+                });
+                console.log('[MONITOR] Redis connected');
+            }
+            const { Queue, Worker: BullWorker } = await this.loadBullMQ();
+            // Initialize job queues
+            this.jobsQueue = new Queue('ductape_jobs', {
+                connection: this.redisClient,
+            });
+            this.healthCheckQueue = new Queue('ductape_healthchecks', {
+                connection: this.redisClient,
+            });
+            this.healthCheckUpdaterQueue = new Queue('healthchecks-updater', {
+                connection: this.redisClient,
+            });
+            // Schedule healthcheck jobs for all products/environments
+            await this.scheduleAllHealthcheckJobs();
+            // Initialize job worker
+            this.jobsWorker = new BullWorker('ductape_jobs', async (job) => {
+                console.log(`Processing job ${job.id} of type ${job.name}`, job.data);
+                const processor = await this.createNewProcessor();
+                await processor.runJobs(job);
+            }, {
+                connection: this.redisClient,
+            });
+            // Initialize health check worker (uses ductape.health.run so probe types and secrets are handled by the health service)
+            this.healthCheckWorker = new BullWorker('ductape_healthchecks', async (job) => {
+                const data = job === null || job === void 0 ? void 0 : job.data;
+                if (!(data === null || data === void 0 ? void 0 : data.tag) || !data.env || !data.product)
+                    return;
+                const healthcheckService = await this.createNewHealthcheckService();
+                await healthcheckService.run({
+                    product: data.product,
+                    env: data.env,
+                    tag: data.tag,
+                });
+            }, {
+                connection: this.redisClient,
+            });
+            // Add a repeatable job to update DB every 10 minutes
+            await this.healthCheckUpdaterQueue.add('healthchecks-updater', {}, {
+                jobId: 'healthchecks-updater',
+                repeat: { every: 5 * 60 * 1000 },
+            });
+            // Healthcheck updater worker
+            this.healthCheckUpdaterWorker = new BullWorker('healthchecks-updater', async (job) => {
+                console.log('Init Processor for healthcheck Updater');
+                if (job.name !== 'healthchecks-updater')
+                    return;
+                // Gather all healthcheck results from Redis
+                const keys = await this.redisClient.keys('healthcheck:*');
+                console.log('Found Keys for healthcheck updater', JSON.stringify(keys));
+                const envResults = {};
+                for (const key of keys) {
+                    const [_, productTag, tag, envSlug] = key.split(':');
+                    console.log(`${productTag} , ${tag}, ${envSlug}`);
+                    const data = JSON.parse(await this.redisClient.get(key));
+                    if (!envResults[productTag])
+                        envResults[productTag] = {};
+                    if (!envResults[productTag][tag])
+                        envResults[productTag][tag] = {};
+                    envResults[productTag][tag][envSlug] = data;
+                }
+                for (const productTag in envResults) {
+                    const tagsData = Object.entries(envResults[productTag]).map(([tag, envs]) => ({
+                        tag,
+                        environments: Object.entries(envs).map(([slug, data]) => (Object.assign({ slug }, data))),
+                    }));
+                    console.log();
                     const processor = await this.createNewProcessor();
-                    const msg = err instanceof Error ? err.message : String(err);
-                    const code = err && typeof err.code === 'string' ? err.code : undefined;
-                    await processor.recordJobExecutionPhaseFailed(jobId, msg, code);
+                    console.log('PROCESSING ENV RESULT', productTag, tagsData);
+                    await processor.updateHealthcheckOnProcessor(productTag, tagsData);
                 }
-                catch (e) {
-                    console.error('[jobsWorker] failed to record job execution phase (failed)', { jobId, error: e });
+            }, {
+                connection: this.redisClient,
+            });
+            // Attach error listeners — record failed phase on JobExecutionTracker when worker job fails
+            this.jobsWorker.on('failed', async (job, err) => {
+                var _a;
+                console.error(`Job ${job === null || job === void 0 ? void 0 : job.id} failed:`, err);
+                const jobId = (_a = job === null || job === void 0 ? void 0 : job.data) === null || _a === void 0 ? void 0 : _a._job_id;
+                if (jobId && this.workspace_id) {
+                    try {
+                        const processor = await this.createNewProcessor();
+                        const msg = err instanceof Error ? err.message : String(err);
+                        const code = err && typeof err.code === 'string' ? err.code : undefined;
+                        await processor.recordJobExecutionPhaseFailed(jobId, msg, code);
+                    }
+                    catch (e) {
+                        console.error('[jobsWorker] failed to record job execution phase (failed)', { jobId, error: e });
+                    }
                 }
-            }
-        });
-        this.healthCheckWorker.on('failed', (job, err) => {
-            console.error(`Health check ${job === null || job === void 0 ? void 0 : job.id} failed:`, err);
-        });
+            });
+            this.healthCheckWorker.on('failed', (job, err) => {
+                console.error(`Health check ${job === null || job === void 0 ? void 0 : job.id} failed:`, err);
+            });
+            console.log('[MONITOR] Setup complete: Redis, job queue, healthcheck queue and workers are running. Process will stay alive for scheduled jobs.');
+        }
+        catch (e) {
+            console.error('[MONITOR] monitor() error:', e);
+            if (e instanceof Error)
+                console.error('[MONITOR] stack:', e.stack);
+            throw e;
+        }
     }
     /**
      * Schedules all healthcheck jobs for all products and environments.
@@ -5170,36 +5181,40 @@ class Ductape {
                 user_id: this.user_id,
                 workspace_id: this.workspace_id,
             }));
+        console.log(`[MONITOR] Scheduling healthcheck jobs for ${Array.isArray(products) ? products.length : 0} product(s)`);
+        const auth = {
+            token: this.token,
+            public_key: this.public_key,
+            user_id: this.user_id,
+            workspace_id: this.workspace_id,
+            access_key: this.accessKey,
+        };
+        let scheduledCount = 0;
         for (const product of products) {
-            const healthchecks = product.healthchecks || [];
-            const privateKey = product.private_key;
+            const productId = product._id != null ? String(product._id) : null;
+            const healthchecks = productId != null
+                ? (await this.productsApi.fetchProductComponents(productId, 'healthcheck', auth)) || []
+                : product.healthchecks || [];
             for (const healthcheck of healthchecks) {
                 for (const env of healthcheck.envs) {
-                    let decryptedInput = env.input;
-                    if (typeof decryptedInput === 'string') {
-                        decryptedInput = JSON.parse((0, processor_utils_1.decrypt)(decryptedInput, privateKey));
-                    }
                     const jobData = {
-                        healthcheck: healthcheck.tag,
-                        env: env.slug,
                         product: product.tag,
-                        app: healthcheck.app,
-                        input: decryptedInput,
-                        event: healthcheck.event,
-                        retries: healthcheck.retries || 0,
+                        env: env.slug,
+                        tag: healthcheck.tag,
                     };
                     const jobId = `healthcheck-exec-${healthcheck.tag}-${env.slug}`;
                     await this.scheduleHealthcheckJob(jobId, jobData, healthcheck.interval);
+                    scheduledCount++;
                 }
             }
         }
+        console.log(`[MONITOR] Scheduled ${scheduledCount} healthcheck job(s)`);
     }
     /**
      * Schedules a single healthcheck job with the given interval (ms).
      * If interval is not provided, defaults to 60s.
      */
     async scheduleHealthcheckJob(jobId, jobData, interval) {
-        console.log('JOBBERMAN', { jobId, jobData, interval });
         const job = await this.healthCheckQueue.getJob(jobId);
         if (job) {
             await job.remove();
@@ -5298,11 +5313,12 @@ class Ductape {
         }
         catch (e) {
             const error = ((_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.errors) || e.message || 'Unknown error';
-            console.log("Errr", e);
+            console.log('Errr', e);
             throw new Error(error);
         }
     }
     createNewLogger(product_id, app_id) {
+        var _a;
         return new logs_service_1.default({
             workspace_id: this.workspace_id,
             public_key: this.public_key,
@@ -5311,6 +5327,7 @@ class Ductape {
             product_id,
             env_type: this.environment,
             app_id,
+            workspace_private_key: (_a = this._privateKey) !== null && _a !== void 0 ? _a : undefined,
         });
     }
     async createNewProductBuilder() {
@@ -5534,6 +5551,7 @@ class Ductape {
      * @returns CacheService instance
      */
     async createNewCacheService() {
+        var _a;
         const subCheck = false;
         await this.initUserAuth(subCheck);
         if (!this._cacheService) {
@@ -5544,6 +5562,7 @@ class Ductape {
                 token: this.token,
                 env_type: this.environment,
                 access_key: this.accessKey,
+                workspace_private_key: (_a = this._privateKey) !== null && _a !== void 0 ? _a : undefined,
             });
         }
         return this._cacheService;
@@ -5614,6 +5633,7 @@ class Ductape {
      * @returns SessionsService instance
      */
     async createNewSessionsService() {
+        var _a;
         const subCheck = false;
         await this.initUserAuth(subCheck);
         return new sessions_1.SessionsService({
@@ -5624,6 +5644,7 @@ class Ductape {
             env_type: this.environment,
             access_key: this.accessKey,
             redis_client: this.redisClient,
+            workspace_private_key: (_a = this._privateKey) !== null && _a !== void 0 ? _a : undefined,
         });
     }
     /**
@@ -5652,6 +5673,7 @@ class Ductape {
      * @returns BrokersService instance
      */
     async createNewBrokersService() {
+        var _a;
         // Return cached instance if available
         if (this._brokersService) {
             return this._brokersService;
@@ -5667,6 +5689,7 @@ class Ductape {
             token: this.token,
             env_type: this.environment,
             access_key: this.accessKey,
+            workspace_private_key: (_a = this._privateKey) !== null && _a !== void 0 ? _a : undefined,
         });
         return this._brokersService;
     }
@@ -5721,6 +5744,9 @@ class Ductape {
     async createNewHealthcheckService() {
         const subCheck = false;
         await this.initUserAuth(subCheck);
+        // Ensure secrets service is initialized and set globally so probe services
+        // (DatabaseService, StorageService, WorkflowService, etc.) can resolve $secret{...}
+        await this.createNewSecretsService();
         if (!this._healthcheckService) {
             this._healthcheckService = new resilience_1.HealthcheckService({
                 workspace_id: this.workspace_id,