@chromahq/core 0.1.6 → 0.1.8

package/dist/index.cjs.js

@@ -1079,8 +1079,8 @@ class Scheduler {
     this.alarm = new AlarmAdapter();
     this.timeout = new TimeoutAdapter();
     console.log("Scheduler initialized");
-    this.alarm.onTrigger((id) => this.execute(id));
-    this.timeout.onTrigger((id) => this.execute(id));
+    this.alarm.onTrigger(this.execute.bind(this));
+    this.timeout.onTrigger(this.execute.bind(this));
   }
   schedule(id, options) {
     const context = this.registry.getContext(id);
@@ -1090,7 +1090,6 @@ class Scheduler {
     }
     console.log(`Scheduling job ${id} with options:`, options);
     const when = this.getScheduleTime(options);
-    console.log(`Job ${id} will execute at:`, new Date(when).toISOString());
     const adapter = when - Date.now() < 6e4 ? this.timeout : this.alarm;
     const timerId = adapter.schedule(id, when);
     if (adapter === this.timeout) {
@@ -1127,7 +1126,7 @@ class Scheduler {
     try {
       this.registry.updateState(id, JobState.RUNNING);
       console.log(`Executing job ${id}`);
-      await job.handle(context);
+      await job.handle.call(job, context);
       if (!context.isStopped() && !context.isPaused()) {
         this.registry.updateState(id, JobState.COMPLETED);
         const options = this.registry.meta(id);
@@ -1317,24 +1316,15 @@ class ApplicationBootstrap {
     const dependencies = [];
     for (const param of parameters) {
       const paramName = param.toLowerCase();
-      if (paramName === "store" || paramName.startsWith("store")) {
+      if (paramName === "appstore") {
         let storeInstance;
-        if (paramName === "store" && container.isBound("CentralStore")) {
+        if (paramName === "appstore" && container.isBound("CentralStore")) {
           storeInstance = container.get("CentralStore");
-        } else {
-          const storeKeyMatch = paramName.match(/^store(.+)$/);
-          if (storeKeyMatch && storeKeyMatch[1]) {
-            const storeName = storeKeyMatch[1].replace(/^([A-Z])/, (m) => m.toLowerCase());
-            const diKey = `CentralStore:${storeName}`;
-            if (container.isBound(diKey)) {
-              storeInstance = container.get(diKey);
-            }
+          if (!storeInstance) {
+            throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
           }
+          Reflect.defineMetadata("name", param, storeInstance);
         }
-        if (!storeInstance) {
-          this.logger.warn(`\u26A0\uFE0F  No store found for parameter "${param}" in ${ServiceClass.name}`);
-        }
-        dependencies.push(storeInstance);
         continue;
       }
       const matchingService = Array.from(this.serviceRegistry.entries()).find(
@@ -1458,6 +1448,9 @@ class ApplicationBootstrap {
       serviceMetadata.dependencies.forEach((dependency, index) => {
         b(_$1(dependency), ServiceClass, index);
       });
+      if (container.isBound("CentralStore")) {
+        b(_$1("CentralStore"), ServiceClass, serviceMetadata.dependencies.length);
+      }
       container.bind(ServiceClass).toSelf().inSingletonScope();
       serviceMetadata.registered = true;
       this.logger.success(`\u2705 Registered service: ${ServiceClass.name}`);
@@ -1519,6 +1512,9 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), MessageClass, index);
         });
+        if (container.isBound("CentralStore")) {
+          b(_$1("CentralStore"), MessageClass, dependencies.length);
+        }
         const messageMetadata = Reflect.getMetadata("name", MessageClass);
         const messageName = messageMetadata || MessageClass.name;
         container.bind(messageName).to(MessageClass).inSingletonScope();
@@ -1565,9 +1561,11 @@ class ApplicationBootstrap {
    */
   async registerJobs() {
     this.logger.info("\u{1F552} Registering jobs...");
-    const jobModules = undefined("/src/app/jobs/*.job.{ts,js}", {
-      eager: true
-    });
+    const jobModules = undefined(
+      "/src/app/jobs/**/*.job.{ts,js}",
+      { eager: true }
+    );
+    this.scheduler = new Scheduler();
     for (const module of Object.values(jobModules)) {
       const JobClass = module?.default;
       if (!JobClass) continue;
@@ -1577,13 +1575,15 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), JobClass, index);
         });
+        if (container.isBound("CentralStore")) {
+          b(_$1("CentralStore"), JobClass, dependencies.length);
+        }
         const jobMetadata = Reflect.getMetadata("name", JobClass);
         const jobName = jobMetadata || JobClass.name;
         container.bind(JobClass).toSelf().inSingletonScope();
-        const id = "12";
+        const id = `${jobName.toLowerCase()}:${JobClass.name.toLowerCase()} ${Math.random().toString(36).substring(2, 15)}`;
         const options = Reflect.getMetadata("job:options", JobClass) || {};
         const instance = container.get(JobClass);
-        this.scheduler = new Scheduler();
         JobRegistry.instance.register(id, instance, options);
         this.scheduler.schedule(id, options);
         this.logger.success(`\u2705 Registered job: ${jobName}`);

package/dist/index.es.js

@@ -1077,8 +1077,8 @@ class Scheduler {
     this.alarm = new AlarmAdapter();
     this.timeout = new TimeoutAdapter();
     console.log("Scheduler initialized");
-    this.alarm.onTrigger((id) => this.execute(id));
-    this.timeout.onTrigger((id) => this.execute(id));
+    this.alarm.onTrigger(this.execute.bind(this));
+    this.timeout.onTrigger(this.execute.bind(this));
   }
   schedule(id, options) {
     const context = this.registry.getContext(id);
@@ -1088,7 +1088,6 @@ class Scheduler {
     }
     console.log(`Scheduling job ${id} with options:`, options);
     const when = this.getScheduleTime(options);
-    console.log(`Job ${id} will execute at:`, new Date(when).toISOString());
     const adapter = when - Date.now() < 6e4 ? this.timeout : this.alarm;
     const timerId = adapter.schedule(id, when);
     if (adapter === this.timeout) {
@@ -1125,7 +1124,7 @@ class Scheduler {
     try {
       this.registry.updateState(id, JobState.RUNNING);
       console.log(`Executing job ${id}`);
-      await job.handle(context);
+      await job.handle.call(job, context);
       if (!context.isStopped() && !context.isPaused()) {
         this.registry.updateState(id, JobState.COMPLETED);
         const options = this.registry.meta(id);
@@ -1315,24 +1314,15 @@ class ApplicationBootstrap {
     const dependencies = [];
     for (const param of parameters) {
       const paramName = param.toLowerCase();
-      if (paramName === "store" || paramName.startsWith("store")) {
+      if (paramName === "appstore") {
         let storeInstance;
-        if (paramName === "store" && container.isBound("CentralStore")) {
+        if (paramName === "appstore" && container.isBound("CentralStore")) {
           storeInstance = container.get("CentralStore");
-        } else {
-          const storeKeyMatch = paramName.match(/^store(.+)$/);
-          if (storeKeyMatch && storeKeyMatch[1]) {
-            const storeName = storeKeyMatch[1].replace(/^([A-Z])/, (m) => m.toLowerCase());
-            const diKey = `CentralStore:${storeName}`;
-            if (container.isBound(diKey)) {
-              storeInstance = container.get(diKey);
-            }
+          if (!storeInstance) {
+            throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
           }
+          Reflect.defineMetadata("name", param, storeInstance);
         }
-        if (!storeInstance) {
-          this.logger.warn(`\u26A0\uFE0F  No store found for parameter "${param}" in ${ServiceClass.name}`);
-        }
-        dependencies.push(storeInstance);
         continue;
       }
       const matchingService = Array.from(this.serviceRegistry.entries()).find(
@@ -1456,6 +1446,9 @@ class ApplicationBootstrap {
       serviceMetadata.dependencies.forEach((dependency, index) => {
         b(_$1(dependency), ServiceClass, index);
       });
+      if (container.isBound("CentralStore")) {
+        b(_$1("CentralStore"), ServiceClass, serviceMetadata.dependencies.length);
+      }
       container.bind(ServiceClass).toSelf().inSingletonScope();
       serviceMetadata.registered = true;
       this.logger.success(`\u2705 Registered service: ${ServiceClass.name}`);
@@ -1517,6 +1510,9 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), MessageClass, index);
         });
+        if (container.isBound("CentralStore")) {
+          b(_$1("CentralStore"), MessageClass, dependencies.length);
+        }
         const messageMetadata = Reflect.getMetadata("name", MessageClass);
         const messageName = messageMetadata || MessageClass.name;
         container.bind(messageName).to(MessageClass).inSingletonScope();
@@ -1563,9 +1559,11 @@ class ApplicationBootstrap {
    */
   async registerJobs() {
     this.logger.info("\u{1F552} Registering jobs...");
-    const jobModules = import.meta.glob("/src/app/jobs/*.job.{ts,js}", {
-      eager: true
-    });
+    const jobModules = import.meta.glob(
+      "/src/app/jobs/**/*.job.{ts,js}",
+      { eager: true }
+    );
+    this.scheduler = new Scheduler();
     for (const module of Object.values(jobModules)) {
       const JobClass = module?.default;
       if (!JobClass) continue;
@@ -1575,13 +1573,15 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), JobClass, index);
         });
+        if (container.isBound("CentralStore")) {
+          b(_$1("CentralStore"), JobClass, dependencies.length);
+        }
         const jobMetadata = Reflect.getMetadata("name", JobClass);
         const jobName = jobMetadata || JobClass.name;
         container.bind(JobClass).toSelf().inSingletonScope();
-        const id = "12";
+        const id = `${jobName.toLowerCase()}:${JobClass.name.toLowerCase()} ${Math.random().toString(36).substring(2, 15)}`;
         const options = Reflect.getMetadata("job:options", JobClass) || {};
         const instance = container.get(JobClass);
-        this.scheduler = new Scheduler();
         JobRegistry.instance.register(id, instance, options);
         this.scheduler.schedule(id, options);
         this.logger.success(`\u2705 Registered job: ${jobName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chromahq/core",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Core library for building Chrome extensions with Chroma framework",
   "type": "module",
   "main": "dist/index.cjs.js",