@paralect/hive 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paralect/hive",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "",
   "main": "index.js",
   "bin": {

package/starter/src/app-config/index.js

@@ -8,6 +8,10 @@ dotenv.config({ path: `${__dirname}/.env.app` });
 console.log('process.env.HIVE_SRC', process.env.HIVE_SRC)
 
 if (process.env.HIVE_SRC) {
+  dotenv.config({
+    path: `${process.env.HIVE_SRC}/app-config/.env`,
+  });
+
   dotenv.config({
     path: `${process.env.HIVE_SRC}/app-config/.env.app`,
   });

package/starter/src/db.js

@@ -29,7 +29,7 @@ db.init = async () => {
       db.schemas[schemaName] = schema;
       db.services[schemaName] = db.createService(`${resourceName}`, {
         validate: (obj) => { 
-          return schema.passthrough().parseAsync(obj)
+          return { value: schema.passthrough().parse(obj) };
         },
       });
 

package/starter/src/scheduler.js

@@ -1,21 +1,32 @@
+import path from 'path';
+import fs from 'fs';
 import moment from 'moment';
 import schedule from 'node-schedule';
 import requireDir from 'require-dir';
 
 export default () => {
-  requireDir(`${process.env.HIVE_SRC || "."}/scheduler/handlers`, {
-    mapValue: (handler, handlerName) => {
-      console.log(
-        `[scheduler] Registering handler ${handlerName} with cron ${handler.cron}`
-      );
+  const paths = [path.resolve(__dirname, './scheduler/handlers')];
+  if (process.env.HIVE_SRC) {
+    paths.push(path.resolve(process.env.HIVE_SRC, './scheduler/handlers'))
+  }
 
-      schedule.scheduleJob(handler.cron, () => {
-        console.log(
-          `[scheduler] ${moment().format()} executing ${handlerName} with cron ${handler.cron
-          }`
-        );
-        handler.handler();
+  paths.forEach((pathName) => {
+    if (fs.existsSync(pathName)) {
+      requireDir(pathName, {
+        mapValue: (handler, handlerName) => {
+          console.log(
+            `[scheduler] Registering handler ${handlerName} with cron ${handler.cron}`
+          );
+
+          schedule.scheduleJob(handler.cron, () => {
+            console.log(
+              `[scheduler] ${moment().format()} executing ${handlerName} with cron ${handler.cron
+              }`
+            );
+            handler.handler();
+          });
+        },
       });
-    },
+    }
   });
 }