加载过程优化

hydro/entry/common.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 /* eslint-disable no-eval */
 const os = require('os');
 const fs = require('fs');
@@ -6,7 +7,7 @@ const builtinLib = [
     'axios', 'download', 'i18n', 'mail', 'markdown',
     'md5', 'misc', 'paginate', 'hash.hydro', 'rank',
     'template', 'validator', 'nav', 'sysinfo', 'testdata.convert.ini',
-    'readConfig',
+    'readConfig', 'logger',
 ];
 
 const builtinModel = [
@@ -59,6 +60,25 @@ async function locale(pending, fail) {
     }
 }
 
+async function config(pending, fail, system) {
+    for (const i of pending) {
+        const p = `${os.tmpdir()}/hydro/tmp/${i}/config.js`;
+        if (fs.existsSync(p) && !fail.includes(i)) {
+            try {
+                global.Hydro.config[i] = eval('require')(p);
+                for (const key in global.Hydro.config[i]) {
+                    if (global.Hydro.config[i][key].default) {
+                        const current = await system.get(`${i}.${key}`);
+                        if (!current) await system.set(`${i}.${key}`, global.Hydro.config[i][key].default);
+                    }
+                }
+            } catch (e) {
+                console.error(`Config Load Fail: ${i}`);
+            }
+        }
+    }
+}
+
 async function template(pending, fail) {
     for (const i of pending) {
         const p = `${os.tmpdir()}/hydro/tmp/${i}/template.json`;
@@ -157,4 +177,5 @@ module.exports = {
     script,
     service,
     template,
+    config,
 };

hydro/entry/master.js

@@ -4,8 +4,8 @@ const os = require('os');
 const fs = require('fs');
 const path = require('path');
 const {
-    lib, service, model, handler, script,
-    builtinLib, builtinScript, builtinHandler, builtinModel,
+    lib, service, model, config,
+    builtinLib, builtinHandler, builtinModel,
 } = require('./common');
 
 function ensureDir(dir) {
@@ -67,10 +67,7 @@ async function load(call) {
         const ins = require('../script/install');
         await ins.run({ username: 'Root', password: 'rootroot' });
     }
-    await handler(pending, fail);
-    for (const i in global.Hydro.handler) {
-        await global.Hydro.handler[i]();
-    }
+    await config(pending, fail);
     for (const i in global.Hydro.service) {
         if (global.Hydro.service[i].postInit) {
             try {
@@ -80,8 +77,6 @@ async function load(call) {
             }
         }
     }
-    for (const i of builtinScript) require(`../script/${i}`);
-    await script(pending, fail, active);
     pending = [];
     return { fail, active };
 }