@chromahq/core 0.1.7 → 0.1.9

package/dist/index.cjs.js

@@ -1073,14 +1073,28 @@ function getNextCronDate(expr) {
   }
 }
 
-class Scheduler {
+function Injectable() {
+  return function(constructor) {
+    L$1()(constructor);
+  };
+}
+
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (decorator(result)) || result;
+  return result;
+};
+let Scheduler = class {
   constructor() {
     this.registry = JobRegistry.instance;
     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 +1104,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 +1140,9 @@ class Scheduler {
     try {
       this.registry.updateState(id, JobState.RUNNING);
       console.log(`Executing job ${id}`);
-      await job.handle(context);
+      const jobInstance = container.get(id);
+      console.log(jobInstance);
+      await jobInstance.handle.bind(jobInstance).call(jobInstance, context);
       if (!context.isStopped() && !context.isPaused()) {
         this.registry.updateState(id, JobState.COMPLETED);
         const options = this.registry.meta(id);
@@ -1160,7 +1175,10 @@ class Scheduler {
     const jobs = [];
     return jobs;
   }
-}
+};
+Scheduler = __decorateClass([
+  Injectable()
+], Scheduler);
 
 class ApplicationBootstrap {
   constructor() {
@@ -1217,6 +1235,7 @@ class ApplicationBootstrap {
    */
   async bootServices() {
     this.logger.info("\u{1F680} Booting services...");
+    console.log("services", this.serviceRegistry.entries());
     for (const [serviceName, ServiceClass] of this.serviceRegistry.entries()) {
       try {
         const instance = container.get(ServiceClass);
@@ -1276,7 +1295,7 @@ class ApplicationBootstrap {
           const diKey = `CentralStore:${store.name}`;
           container.bind(diKey).toConstantValue(storeInstance);
           if (isFirstStore) {
-            container.bind("CentralStore").toConstantValue(storeInstance);
+            container.bind("appStore").toConstantValue(storeInstance);
             isFirstStore = false;
           }
           this.registerMessageClass(classes.GetStoreStateMessage, `store:${store.name}:getState`);
@@ -1319,13 +1338,11 @@ class ApplicationBootstrap {
       const paramName = param.toLowerCase();
       if (paramName === "appstore") {
         let storeInstance;
-        if (paramName === "appstore" && container.isBound("CentralStore")) {
-          storeInstance = container.get("CentralStore");
-          if (!storeInstance) {
-            throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
-          }
-          Reflect.defineMetadata("name", param, storeInstance);
+        storeInstance = container.get("appStore");
+        if (!storeInstance) {
+          throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
         }
+        dependencies.push("appStore");
         continue;
       }
       const matchingService = Array.from(this.serviceRegistry.entries()).find(
@@ -1449,9 +1466,6 @@ 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}`);
@@ -1513,9 +1527,6 @@ 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();
@@ -1562,9 +1573,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;
@@ -1574,16 +1587,13 @@ 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)}`;
+        container.bind(id).to(JobClass).inSingletonScope();
         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}`);
@@ -1670,12 +1680,6 @@ function Message(name) {
   };
 }
 
-function Injectable() {
-  return function(constructor) {
-    L$1()(constructor);
-  };
-}
-
 class Booteable {
   /**
    * Optional destroy method to be called when the service is being destroyed.

package/dist/index.es.js

@@ -1071,14 +1071,28 @@ function getNextCronDate(expr) {
   }
 }
 
-class Scheduler {
+function Injectable() {
+  return function(constructor) {
+    L$1()(constructor);
+  };
+}
+
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (decorator(result)) || result;
+  return result;
+};
+let Scheduler = class {
   constructor() {
     this.registry = JobRegistry.instance;
     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 +1102,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 +1138,9 @@ class Scheduler {
     try {
       this.registry.updateState(id, JobState.RUNNING);
       console.log(`Executing job ${id}`);
-      await job.handle(context);
+      const jobInstance = container.get(id);
+      console.log(jobInstance);
+      await jobInstance.handle.bind(jobInstance).call(jobInstance, context);
       if (!context.isStopped() && !context.isPaused()) {
         this.registry.updateState(id, JobState.COMPLETED);
         const options = this.registry.meta(id);
@@ -1158,7 +1173,10 @@ class Scheduler {
     const jobs = [];
     return jobs;
   }
-}
+};
+Scheduler = __decorateClass([
+  Injectable()
+], Scheduler);
 
 class ApplicationBootstrap {
   constructor() {
@@ -1215,6 +1233,7 @@ class ApplicationBootstrap {
    */
   async bootServices() {
     this.logger.info("\u{1F680} Booting services...");
+    console.log("services", this.serviceRegistry.entries());
     for (const [serviceName, ServiceClass] of this.serviceRegistry.entries()) {
       try {
         const instance = container.get(ServiceClass);
@@ -1274,7 +1293,7 @@ class ApplicationBootstrap {
           const diKey = `CentralStore:${store.name}`;
           container.bind(diKey).toConstantValue(storeInstance);
           if (isFirstStore) {
-            container.bind("CentralStore").toConstantValue(storeInstance);
+            container.bind("appStore").toConstantValue(storeInstance);
             isFirstStore = false;
           }
           this.registerMessageClass(classes.GetStoreStateMessage, `store:${store.name}:getState`);
@@ -1317,13 +1336,11 @@ class ApplicationBootstrap {
       const paramName = param.toLowerCase();
       if (paramName === "appstore") {
         let storeInstance;
-        if (paramName === "appstore" && container.isBound("CentralStore")) {
-          storeInstance = container.get("CentralStore");
-          if (!storeInstance) {
-            throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
-          }
-          Reflect.defineMetadata("name", param, storeInstance);
+        storeInstance = container.get("appStore");
+        if (!storeInstance) {
+          throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
         }
+        dependencies.push("appStore");
         continue;
       }
       const matchingService = Array.from(this.serviceRegistry.entries()).find(
@@ -1447,9 +1464,6 @@ 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}`);
@@ -1511,9 +1525,6 @@ 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();
@@ -1560,9 +1571,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;
@@ -1572,16 +1585,13 @@ 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)}`;
+        container.bind(id).to(JobClass).inSingletonScope();
         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}`);
@@ -1668,12 +1678,6 @@ function Message(name) {
   };
 }
 
-function Injectable() {
-  return function(constructor) {
-    L$1()(constructor);
-  };
-}
-
 class Booteable {
   /**
    * Optional destroy method to be called when the service is being destroyed.

package/package.json

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