From e1bd1214d37423ccc78e55a30acf697c778fe4bd Mon Sep 17 00:00:00 2001 From: Vinayak Sarawagi Date: Sun, 27 Apr 2025 17:49:51 +0530 Subject: [PATCH 1/3] fix(core): improve cache retrieval in InMemoryDriver - Enhanced the get method to parse JSON values from the cache, returning null for missing keys. - Added error handling to ensure non-JSON values are returned correctly. --- packages/core/lib/cache/drivers/inMemory.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/core/lib/cache/drivers/inMemory.ts b/packages/core/lib/cache/drivers/inMemory.ts index 28fa52e..66b3754 100644 --- a/packages/core/lib/cache/drivers/inMemory.ts +++ b/packages/core/lib/cache/drivers/inMemory.ts @@ -11,8 +11,13 @@ export class InMemoryDriver implements CacheDriver { async get(key: string): Promise { await this.initialiseModules(); - const cacheKey = `${this.options.prefix}:::${key}`; - return this.client.get(cacheKey); + const value = await this.client.get(`${this.options.prefix}:::${key}`); + if (!value) return null; + try { + return JSON.parse(value); + } catch (e) { + return value; + } } async set( From c231331cd766f525d9c0ddca190f95d6519c7d76 Mon Sep 17 00:00:00 2001 From: Vinayak Sarawagi Date: Sat, 3 May 2025 11:39:08 +0530 Subject: [PATCH 2/3] chore(core): remove console logs and delete unused worker class - Removed console log statements from various files to clean up the codebase. - Deleted the ScheduleWorker class as it was no longer needed. --- packages/core/lib/console/inquirer.ts | 1 - packages/core/lib/mailer/providers/mailgun.ts | 2 -- .../lib/rest/http-server/route-explorer.ts | 3 --- packages/core/lib/scheduler/metadata.ts | 1 - packages/core/lib/scheduler/worker.ts | 18 ------------------ packages/core/lib/storage/drivers/s3Storage.ts | 3 --- packages/core/lib/utils/object.ts | 2 -- 7 files changed, 30 deletions(-) delete mode 100644 packages/core/lib/scheduler/worker.ts diff --git a/packages/core/lib/console/inquirer.ts b/packages/core/lib/console/inquirer.ts index 9807d4b..0df642e 100644 --- a/packages/core/lib/console/inquirer.ts +++ b/packages/core/lib/console/inquirer.ts @@ -11,7 +11,6 @@ export class Inquirer { const answers = await prompt([ { name: 'question', message: question, type: 'input' }, ]); - console.log(answers); return answers['question']; } diff --git a/packages/core/lib/mailer/providers/mailgun.ts b/packages/core/lib/mailer/providers/mailgun.ts index 8cf254b..d597a62 100644 --- a/packages/core/lib/mailer/providers/mailgun.ts +++ b/packages/core/lib/mailer/providers/mailgun.ts @@ -41,8 +41,6 @@ export class MailgunProvider implements BaseProvider { })), }); - console.log(report); - return; } diff --git a/packages/core/lib/rest/http-server/route-explorer.ts b/packages/core/lib/rest/http-server/route-explorer.ts index f8a8bc1..aec6311 100644 --- a/packages/core/lib/rest/http-server/route-explorer.ts +++ b/packages/core/lib/rest/http-server/route-explorer.ts @@ -99,9 +99,6 @@ export class RouteExplorer { if (!pathMethod) return; - console.log(instance.constructor); - console.log(controllerKey, methodPath, pathMethod, key); - const fullHttpPath = joinRoute(controllerKey, methodPath); return { method: pathMethod, path: fullHttpPath }; } diff --git a/packages/core/lib/scheduler/metadata.ts b/packages/core/lib/scheduler/metadata.ts index 2606965..4bea5ec 100644 --- a/packages/core/lib/scheduler/metadata.ts +++ b/packages/core/lib/scheduler/metadata.ts @@ -18,7 +18,6 @@ export class SchedulerRegistry { options?.name && schedule.name(options.name); schedule.cron(cronExpression); - console.log(this.schedules); } static register(name: string, schedule: Schedule): void { diff --git a/packages/core/lib/scheduler/worker.ts b/packages/core/lib/scheduler/worker.ts deleted file mode 100644 index e363f3d..0000000 --- a/packages/core/lib/scheduler/worker.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { SchedulerRegistry } from './metadata.js'; - -export class ScheduleWorker { - static init() { - return new ScheduleWorker(); - } - - async run(): Promise { - // const cronPackage = await Package.load('cron'); - const schedules = SchedulerRegistry.getAllSchedules(); - - for (const [schedule, options] of Object.entries(schedules)) { - console.log(schedule, options); - // const job = CronJob.from({}); - } - // const job = CronJob.from({}) - } -} diff --git a/packages/core/lib/storage/drivers/s3Storage.ts b/packages/core/lib/storage/drivers/s3Storage.ts index 10db3ae..76a39f5 100644 --- a/packages/core/lib/storage/drivers/s3Storage.ts +++ b/packages/core/lib/storage/drivers/s3Storage.ts @@ -29,12 +29,10 @@ export class S3Storage implements StorageDriver { } getStream(filePath: string): ReadStream { - console.log('file path ===> ', filePath); throw new Error('Method not implemented.'); } listDir(path: string): Promise> { - console.log(path); throw new Error('Method not implemented.'); } @@ -293,7 +291,6 @@ export class S3Storage implements StorageDriver { params?: Record, ): Promise { this.initialiseModules(); - console.log(path, ttlInMins, params); throw new Error('Method not implemented.'); } diff --git a/packages/core/lib/utils/object.ts b/packages/core/lib/utils/object.ts index 8be476e..12bb1c0 100644 --- a/packages/core/lib/utils/object.ts +++ b/packages/core/lib/utils/object.ts @@ -149,9 +149,7 @@ export class Obj { static hash(obj: Record): string { const sortedObj = this.sort(obj); - console.log(sortedObj); const jsonString = JSON.stringify(sortedObj); - console.log(jsonString); return ''; } From fd94f71af4e48a2e6083bc693cc9b3286c22a147 Mon Sep 17 00:00:00 2001 From: Vinayak Sarawagi Date: Sat, 3 May 2025 11:39:47 +0530 Subject: [PATCH 3/3] chore(core): bump version to 0.1.60 and remove unused worker export - Updated package version to 0.1.60. - Removed export of the unused worker module from the scheduler index. --- packages/core/lib/scheduler/index.ts | 1 - packages/core/package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/core/lib/scheduler/index.ts b/packages/core/lib/scheduler/index.ts index b6a4367..1778b08 100644 --- a/packages/core/lib/scheduler/index.ts +++ b/packages/core/lib/scheduler/index.ts @@ -1,5 +1,4 @@ export * from './metadata.js'; -export * from './worker.js'; export * from './decorator.js'; export * from './schedule.js'; export * from './frequency.js'; diff --git a/packages/core/package.json b/packages/core/package.json index 4b03a72..988ccfc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@intentjs/core", - "version": "0.1.59", + "version": "0.1.60", "description": "Core module for Intent", "repository": { "type": "git",