oak-backend-base 4.0.1 → 4.0.2

package/lib/AppLoader.js

@@ -65,7 +65,7 @@ class AppLoader extends types_1.AppLoader {
         const { dbConfig } = this.getConfiguration();
         const { storageSchema } = require(`${path}/lib/oak-app-domain/Storage`);
         const depGraph = (0, dependencyBuilder_1.analyzeDepedency)(process.cwd());
-        this.externalDependencies = Object.keys(depGraph.nodeDict);
+        this.externalDependencies = depGraph.ascOrder;
         const { authDeduceRelationMap, selectFreeEntities, updateFreeDict } = this.requireSth('lib/configuration/relation');
         this.aspectDict = Object.assign({}, index_1.default, this.requireSth('lib/aspects/index'));
         this.dbStore = new DbStore_1.DbStore(storageSchema, () => this.contextBuilder(this.dbStore), dbConfig, authDeduceRelationMap, selectFreeEntities, updateFreeDict);
@@ -220,13 +220,15 @@ class AppLoader extends types_1.AppLoader {
                     }
                 }]);
         };
-        for (const router in endpoints) {
-            const item = endpoints[router];
-            if (item instanceof Array) {
-                item.forEach(ele => transformEndpointItem(router, ele));
-            }
-            else {
-                transformEndpointItem(router, item);
+        if (endpoints) {
+            for (const router in endpoints) {
+                const item = endpoints[router];
+                if (item instanceof Array) {
+                    item.forEach(ele => transformEndpointItem(router, ele));
+                }
+                else {
+                    transformEndpointItem(router, item);
+                }
             }
         }
         if (this.synchronizer) {
@@ -285,7 +287,7 @@ class AppLoader extends types_1.AppLoader {
         const watchers = this.requireSth('lib/watchers/index');
         const { ActionDefDict } = require(`${this.path}/lib/oak-app-domain/ActionDefDict`);
         const { watchers: adWatchers } = (0, IntrinsicLogics_1.makeIntrinsicLogics)(this.dbStore.getSchema(), ActionDefDict);
-        const totalWatchers = watchers.concat(adWatchers);
+        const totalWatchers = (watchers || []).concat(adWatchers);
         let count = 0;
         const execOne = async (watcher, start) => {
             try {
@@ -317,38 +319,40 @@ class AppLoader extends types_1.AppLoader {
     }
     startTimers() {
         const timers = this.requireSth('lib/timers/index');
-        for (const timer of timers) {
-            const { cron, name } = timer;
-            (0, node_schedule_1.scheduleJob)(name, cron, async (date) => {
-                const start = Date.now();
-                console.log(`定时器【${name}】开始执行，时间是【${date.toLocaleTimeString()}】`);
-                if (timer.hasOwnProperty('entity')) {
-                    try {
-                        const result = await this.execWatcher(timer);
-                        console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒】，结果是`, result);
-                    }
-                    catch (err) {
-                        console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒】，错误是`, err);
+        if (timers) {
+            for (const timer of timers) {
+                const { cron, name } = timer;
+                (0, node_schedule_1.scheduleJob)(name, cron, async (date) => {
+                    const start = Date.now();
+                    console.log(`定时器【${name}】开始执行，时间是【${date.toLocaleTimeString()}】`);
+                    if (timer.hasOwnProperty('entity')) {
+                        try {
+                            const result = await this.execWatcher(timer);
+                            console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒】，结果是`, result);
+                        }
+                        catch (err) {
+                            console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒】，错误是`, err);
+                        }
                     }
-                }
-                else {
-                    const context = await this.makeContext();
-                    try {
-                        const { timer: timerFn } = timer;
-                        const result = await timerFn(context);
-                        console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
-                        await context.commit();
+                    else {
+                        const context = await this.makeContext();
+                        try {
+                            const { timer: timerFn } = timer;
+                            const result = await timerFn(context);
+                            console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
+                            await context.commit();
+                        }
+                        catch (err) {
+                            console.warn(`定时器【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                            await context.rollback();
+                        }
                     }
-                    catch (err) {
-                        console.warn(`定时器【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
-                        await context.rollback();
-                    }
-                }
-            });
+                });
+            }
         }
     }
     async execStartRoutines() {
-        const routines = this.requireSth('lib/routines/start');
+        const routines = this.requireSth('lib/routines/start') || [];
         if (this.synchronizer) {
             const routine = this.synchronizer.getSyncRoutine();
             routines.push(routine);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.0.1",
+    "version": "4.0.2",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,8 +22,8 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.0",
         "oak-db": "^3.3.0",
-        "oak-domain": "^5.0.0",
-        "oak-frontend-base": "^5.0.0",
+        "oak-domain": "^5.0.3",
+        "oak-frontend-base": "^5.0.3",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"