oak-backend-base 2.1.0 → 2.2.0

package/lib/AppLoader.d.ts

@@ -14,4 +14,6 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     initialize(dropIfExists?: boolean): Promise<void>;
     getStore(): DbStore<ED, Cxt>;
     startWatchers(): void;
+    startTimers(): void;
+    execStartRoutines(): Promise<void>;
 }

package/lib/AppLoader.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppLoader = void 0;
 const tslib_1 = require("tslib");
+const node_schedule_1 = require("node-schedule");
 const actionDef_1 = require("oak-domain/lib/store/actionDef");
 const checkers_1 = require("oak-domain/lib/checkers");
 const triggers_1 = require("oak-domain/lib/triggers");
@@ -10,8 +11,8 @@ const types_1 = require("oak-domain/lib/types");
 const DbStore_1 = require("./DbStore");
 const index_1 = tslib_1.__importDefault(require("oak-common-aspect/lib/index"));
 function initTriggers(dbStore, path) {
-    const { triggers } = require(`${path}/lib/triggers/index`);
-    const { checkers } = require(`${path}/lib/checkers/index`);
+    const triggers = require(`${path}/lib/triggers/index`);
+    const checkers = require(`${path}/lib/checkers/index`);
     const { ActionDefDict } = require(`${path}/lib/oak-app-domain/ActionDefDict`);
     const { triggers: adTriggers, checkers: adCheckers } = (0, actionDef_1.analyzeActionDefDict)(dbStore.getSchema(), ActionDefDict);
     triggers.forEach((trigger) => dbStore.registerTrigger(trigger));
@@ -24,7 +25,7 @@ function initTriggers(dbStore, path) {
     dynamicTriggers.forEach((trigger) => dbStore.registerTrigger(trigger));
 }
 function startWatchers(dbStore, path, contextBuilder) {
-    const { watchers } = require(`${path}/lib/watchers/index`);
+    const watchers = require(`${path}/lib/watchers/index`);
     const { ActionDefDict } = require(`${path}/lib/oak-app-domain/ActionDefDict`);
     const { watchers: adWatchers } = (0, actionDef_1.analyzeActionDefDict)(dbStore.getSchema(), ActionDefDict);
     const totalWatchers = watchers.concat(adWatchers);
@@ -84,7 +85,7 @@ class AppLoader extends types_1.AppLoader {
     constructor(path, contextBuilder, dbConfig) {
         super(path);
         const { storageSchema } = require(`${path}/lib/oak-app-domain/Storage`);
-        this.aspectDict = Object.assign({}, index_1.default, require(`${path}/lib/aspects/index`).aspectDict);
+        this.aspectDict = Object.assign({}, index_1.default, require(`${path}/lib/aspects/index`));
         this.dbStore = new DbStore_1.DbStore(storageSchema, contextBuilder, dbConfig);
         this.contextBuilder = contextBuilder;
     }
@@ -107,7 +108,7 @@ class AppLoader extends types_1.AppLoader {
     }
     async initialize(dropIfExists) {
         await this.dbStore.initialize(dropIfExists);
-        const { data } = require(`${this.path}/lib/data/index`);
+        const data = require(`${this.path}/lib/data/index`);
         const context = await this.contextBuilder()(this.dbStore);
         await context.begin();
         for (const entity in data) {
@@ -134,5 +135,44 @@ class AppLoader extends types_1.AppLoader {
     startWatchers() {
         startWatchers(this.dbStore, this.path, this.contextBuilder);
     }
+    startTimers() {
+        const timers = require(`${this.path}/lib/timer/index`);
+        for (const timer of timers) {
+            const { cron, fn, name } = timer;
+            (0, node_schedule_1.scheduleJob)(name, cron, async (date) => {
+                const start = Date.now();
+                const context = await this.contextBuilder()(this.dbStore);
+                await context.begin();
+                console.log(`定时器【${name}】开始执行，时间是【${date.toLocaleTimeString()}】`);
+                try {
+                    const result = await fn(context);
+                    console.log(`定时器【${name}】执行完成，耗时${Date.now() - start}毫秒，结果是【${result}】`);
+                    await context.commit();
+                }
+                catch (err) {
+                    console.warn(`定时器【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                    await context.rollback();
+                }
+            });
+        }
+    }
+    async execStartRoutines() {
+        const routines = require(`${this.path}/lib/routines/start`);
+        for (const routine of routines) {
+            const { name, fn } = routine;
+            const context = await this.contextBuilder()(this.dbStore);
+            const start = Date.now();
+            await context.begin();
+            try {
+                const result = await fn(context);
+                console.log(`例程【${name}】执行完成，耗时${Date.now() - start}毫秒，结果是【${result}】`);
+                await context.commit();
+            }
+            catch (err) {
+                console.warn(`例程【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                await context.rollback();
+            }
+        }
+    }
 }
 exports.AppLoader = AppLoader;

package/lib/DbStore.js

@@ -44,16 +44,16 @@ class DbStore extends oak_db_1.MysqlStore {
         }
         let result;
         // select的trigger应加在根select之前，cascade的select不加处理
-        const selection2 = Object.assign({
+        Object.assign(selection, {
             action: 'select',
-        }, selection);
+        });
         if (!option.blockTrigger) {
-            await this.executor.preOperation(entity, selection2, context, option);
+            await this.executor.preOperation(entity, selection, context, option);
         }
         try {
             result = await super.select(entity, selection, context, option);
             if (!option.blockTrigger) {
-                await this.executor.postOperation(entity, selection2, context, option, result);
+                await this.executor.postOperation(entity, selection, context, option, result);
             }
         }
         catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oak-backend-base",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "oak-backend-base",
   "main": "lib/index",
   "author": {
@@ -15,12 +15,14 @@
     "build": "tsc && npm run copy-files"
   },
   "dependencies": {
+    "@types/node-schedule": "^2.1.0",
     "lodash": "^4.17.21",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
-    "oak-common-aspect": "^2.1.0",
+    "node-schedule": "^2.1.0",
+    "oak-common-aspect": "^2.1.1",
     "oak-db": "^2.1.1",
-    "oak-domain": "^2.1.0",
+    "oak-domain": "^2.2.0",
     "uuid": "^8.3.2"
   },
   "license": "ISC",