steedos-cli 3.0.0-beta.7 → 3.0.0-beta.70

package/bin/run

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-console.log('111')
 require('@oclif/command').run()
 .then(require('@oclif/command/flush'))
 .catch(require('@oclif/errors/handle'))

package/dist/commands/start.js

@@ -32,376 +32,43 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const { Command, flags } = require('@oclif/command');
-console.log('========>');
-const path = require("path");
-const moleculer_1 = require("moleculer");
-const fs_1 = __importDefault(require("fs"));
-const glob_1 = __importDefault(require("glob"));
-const lodash_1 = __importDefault(require("lodash"));
-const os_1 = __importDefault(require("os"));
-const cluster_1 = __importDefault(require("cluster"));
-const kleur_1 = __importDefault(require("kleur"));
-const start_1 = require("../start");
-const stopSignals = [
-    "SIGHUP",
-    "SIGINT",
-    "SIGQUIT",
-    "SIGILL",
-    "SIGTRAP",
-    "SIGABRT",
-    "SIGBUS",
-    "SIGFPE",
-    "SIGUSR1",
-    "SIGSEGV",
-    "SIGUSR2",
-    "SIGTERM"
-];
-const logger = {
-    info(message) {
-        console.log(kleur_1.default.grey("[Runner]"), kleur_1.default.green().bold(message));
-    },
-    error(err) {
-        if (err instanceof Error)
-            console.error(kleur_1.default.grey("[Runner]"), kleur_1.default.red().bold(err.message), err);
-        else
-            console.error(kleur_1.default.grey("[Runner]"), kleur_1.default.red().bold(err));
-    }
-};
-class StartCommand extends Command {
-    async loadEnvFile() {
-        if (this.flags.env || this.flags.envfile) {
-            try {
-                const dotenv = await Promise.resolve().then(() => __importStar(require("dotenv")));
-                if (this.flags.envfile)
-                    dotenv.config({ path: this.flags.envfile });
-                else
-                    dotenv.config();
-            }
-            catch (err) {
-                throw new Error("The 'dotenv' package is missing! Please install it with 'npm install dotenv --save' command.");
-            }
-        }
-    }
-    fixDriveLetterCase(s) {
-        if (s && process.platform === "win32" && s.match(/^[A-Z]:/g)) {
-            return s.charAt(0).toLowerCase() + s.slice(1);
-        }
-        return s;
-    }
-    async loadConfigFile() {
-        let filePath;
-        if (process.env["MOLECULER_CONFIG"]) {
-            filePath = path.isAbsolute(process.env["MOLECULER_CONFIG"])
-                ? process.env["MOLECULER_CONFIG"]
-                : path.resolve(process.cwd(), process.env["MOLECULER_CONFIG"]);
-        }
-        else if (this.flags.config) {
-            filePath = path.isAbsolute(this.flags.config)
-                ? this.flags.config
-                : path.resolve(process.cwd(), this.flags.config);
-            if (!fs_1.default.existsSync(filePath)) {
-                filePath = null;
-            }
-        }
-        if (!filePath && fs_1.default.existsSync(path.resolve(process.cwd(), "moleculer.config.mjs"))) {
-            filePath = path.resolve(process.cwd(), "moleculer.config.mjs");
-        }
-        if (!filePath && fs_1.default.existsSync(path.resolve(process.cwd(), "moleculer.config.js"))) {
-            filePath = path.resolve(process.cwd(), "moleculer.config.js");
-        }
-        if (!filePath && fs_1.default.existsSync(path.resolve(process.cwd(), "moleculer.config.json"))) {
-            filePath = path.resolve(process.cwd(), "moleculer.config.json");
-        }
-        if (filePath) {
-            if (!fs_1.default.existsSync(filePath))
-                return Promise.reject(new Error(`Config file not found: ${filePath}`));
-            const ext = path.extname(filePath);
-            switch (ext) {
-                case ".json":
-                case ".js":
-                case ".mjs":
-                case ".ts": {
-                    let content = require(filePath);
-                    if (moleculer_1.Utils.isFunction(content))
-                        content = await content.call(this);
-                    this.configFile = await start_1.Start.mergeConfig(content);
-                    break;
-                }
-                default:
-                    return Promise.reject(new Error(`Not supported file extension: ${ext}`));
-            }
-        }
-        return;
-    }
-    normalizeEnvValue(value) {
-        if (value.toLowerCase() === "true" || value.toLowerCase() === "false") {
-            value = value === "true";
-        }
-        else if (!isNaN(value)) {
-            value = Number(value);
-        }
-        return value;
-    }
-    overwriteFromEnv(obj, prefix) {
-        Object.keys(obj).forEach(key => {
-            const envName = ((prefix ? prefix + "_" : "") + key).toUpperCase();
-            if (process.env[envName]) {
-                obj[key] = this.normalizeEnvValue(process.env[envName]);
-            }
-            if (moleculer_1.Utils.isPlainObject(obj[key]))
-                obj[key] = this.overwriteFromEnv(obj[key], (prefix ? prefix + "_" : "") + key);
-        });
-        if (prefix == null) {
-            const moleculerPrefix = "MOL_";
-            Object.keys(process.env)
-                .filter(key => key.startsWith(moleculerPrefix))
-                .map(key => ({
-                key,
-                withoutPrefix: key.substring(moleculerPrefix.length)
-            }))
-                .forEach(variable => {
-                const dotted = variable.withoutPrefix
-                    .split("__")
-                    .map(level => level.toLocaleLowerCase())
-                    .map(level => level
-                    .split("_")
-                    .map((value, index) => {
-                    if (index == 0) {
-                        return value;
-                    }
-                    else {
-                        return value[0].toUpperCase() + value.substring(1);
-                    }
-                })
-                    .join(""))
-                    .join(".");
-                obj = moleculer_1.Utils.dotSet(obj, dotted, this.normalizeEnvValue(process.env[variable.key]));
-            });
-        }
-        return obj;
-    }
-    mergeOptions() {
-        this.config = lodash_1.default.defaultsDeep(this.configFile, moleculer_1.ServiceBroker.defaultOptions);
-        this.config = this.overwriteFromEnv(this.config);
-        if (this.flags.silent)
-            this.config.logger = false;
-        if (this.flags.hot)
-            this.config.steedosHotReload = true;
-    }
-    isDirectory(p) {
+const command_1 = require("@oclif/command");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+class StartCommand extends command_1.Command {
+    async run() {
         try {
-            return fs_1.default.lstatSync(p).isDirectory();
-        }
-        catch (_) {
-        }
-        return false;
-    }
-    isServiceFile(p) {
+            this.checkModuleExists("@builder6/server");
+            this.checkModuleExists("@steedos/server");
+            const serverPath = require.resolve("@builder6/server");
+            const steedosPath = require.resolve("@steedos/server");
+            const appConfig = require(steedosPath);
+            const server = require(serverPath);
+            const { version } = require("@steedos/server/package.json");
+            const i18n = require("@steedos/i18n");
+            global.t = i18n.t;
+            global._ = require("underscore");
+            process.env.STEEDOS_VERSION = version;
+            server.bootstrap(appConfig);
+        }
+        catch (error) {
+            this.error(error.message, { exit: 1 });
+        }
+    }
+    checkModuleExists(moduleName) {
         try {
-            return !fs_1.default.lstatSync(p).isDirectory();
-        }
-        catch (_) {
-        }
-        return false;
-    }
-    async loadServices() {
-        this.watchFolders.length = 0;
-        const fileMask = this.flags.mask || "**/*.service.js";
-        const serviceDir = process.env.SERVICEDIR || "";
-        const svcDir = path.isAbsolute(serviceDir)
-            ? serviceDir
-            : path.resolve(process.cwd(), serviceDir);
-        let patterns = this.servicePaths;
-        if (process.env.SERVICES || process.env.SERVICEDIR) {
-            if (this.isDirectory(svcDir) && !process.env.SERVICES) {
-                this.broker.loadServices(svcDir, fileMask);
-                if (this.config.hotReload) {
-                    this.watchFolders.push(svcDir);
-                }
-            }
-            else if (process.env.SERVICES) {
-                patterns = Array.isArray(process.env.SERVICES)
-                    ? process.env.SERVICES
-                    : process.env.SERVICES.split(",");
-            }
-        }
-        if (patterns.length > 0) {
-            let serviceFiles = [];
-            patterns
-                .map(s => s.trim())
-                .forEach(p => {
-                const skipping = p[0] == "!";
-                if (skipping)
-                    p = p.slice(1);
-                if (p.startsWith("npm:")) {
-                    this.loadNpmModule(p.slice(4));
-                }
-                else {
-                    let files;
-                    const svcPath = path.isAbsolute(p) ? p : path.resolve(svcDir, p);
-                    if (this.isDirectory(svcPath)) {
-                        if (this.config.hotReload) {
-                            this.watchFolders.push(svcPath);
-                        }
-                        files = glob_1.default.sync(svcPath + "/" + fileMask, { absolute: true });
-                        if (files.length == 0)
-                            return this.broker.logger.warn(kleur_1.default
-                                .yellow()
-                                .bold(`There is no service files in directory: '${svcPath}'`));
-                    }
-                    else if (this.isServiceFile(svcPath)) {
-                        files = [svcPath.replace(/\\/g, "/")];
-                    }
-                    else if (this.isServiceFile(svcPath + ".service.js")) {
-                        files = [svcPath.replace(/\\/g, "/") + ".service.js"];
-                    }
-                    else {
-                        files = glob_1.default.sync(p, { cwd: svcDir, absolute: true });
-                        if (files.length == 0)
-                            this.broker.logger.warn(kleur_1.default
-                                .yellow()
-                                .bold(`There is no matched file for pattern: '${p}'`));
-                    }
-                    if (files && files.length > 0) {
-                        if (skipping)
-                            serviceFiles = serviceFiles.filter(f => files.indexOf(f) === -1);
-                        else
-                            serviceFiles.push(...files);
-                    }
-                }
-            });
-            await Promise.all(lodash_1.default.uniq(serviceFiles).map(async (f) => {
-                const content = require(f);
-                const svc = this.broker.createService(content);
-                svc.__filename = f;
-            }));
+            require.resolve(moduleName);
         }
-    }
-    startWorkers(instances) {
-        let stopping = false;
-        cluster_1.default.on("exit", function (worker, code) {
-            if (!stopping) {
-                if (process.env.NODE_ENV === "production" && code !== 0) {
-                    logger.info(`The worker #${worker.id} has disconnected`);
-                    logger.info(`Worker #${worker.id} restarting...`);
-                    cluster_1.default.fork();
-                    logger.info(`Worker #${worker.id} restarted`);
-                }
-                else {
-                    process.exit(code);
-                }
+        catch (err) {
+            const modulePath = path.join(process.cwd(), "node_modules", moduleName);
+            if (!fs.existsSync(modulePath)) {
+                throw new Error(`Required module '${moduleName}' is not installed. Please run 'npm install ${moduleName}'`);
             }
-        });
-        const workerCount = Number.isInteger(instances) && instances > 0 ? instances : os_1.default.cpus().length;
-        logger.info(`Starting ${workerCount} workers...`);
-        for (let i = 0; i < workerCount; i++) {
-            cluster_1.default.fork();
-        }
-        stopSignals.forEach(function (signal) {
-            process.on(signal, () => {
-                logger.info(`Got ${signal}, stopping workers...`);
-                stopping = true;
-                cluster_1.default.disconnect(function () {
-                    logger.info("All workers stopped, exiting.");
-                    process.exit(0);
-                });
-            });
-        });
-    }
-    async loadHotReloadService() {
-        if (this.config.steedosHotReload) {
-            const content = require('../start/hotReload');
-            this.broker.createService(content);
+            throw new Error(`Failed to resolve module '${moduleName}'. ${err.message}`);
         }
     }
-    loadNpmModule(name) {
-        let svc = require(name);
-        return this.broker.createService(svc);
-    }
-    async startBroker() {
-        this.worker = cluster_1.default.worker;
-        if (this.worker) {
-            Object.assign(this.config, {
-                nodeID: (this.config.nodeID || moleculer_1.Utils.getNodeID()) + "-" + this.worker.id
-            });
-        }
-        this.broker = new moleculer_1.ServiceBroker(Object.assign({}, this.config));
-        this.broker.runner = this;
-        global.broker = this.broker;
-        await this.loadServices();
-        await this.loadHotReloadService();
-        if (this.watchFolders.length > 0)
-            this.broker.runner.folders = this.watchFolders;
-        return this.broker.start().then(() => {
-            if (this.flags.repl && (!this.worker || this.worker.id === 1))
-                this.broker.repl();
-            return this.broker;
-        });
-    }
-    _runMoleculer() {
-        return Promise.resolve()
-            .then(() => this.loadConfigFile())
-            .then(() => this.mergeOptions())
-            .then(() => this.startBroker())
-            .catch(err => {
-            logger.error(err);
-            process.exit(1);
-        });
-    }
-    restartBroker() {
-        if (this.broker && this.broker.started) {
-            return this.broker
-                .stop()
-                .catch(err => {
-                logger.error("Error while stopping ServiceBroker.");
-                logger.error(err);
-            })
-                .then(() => this._runMoleculer());
-        }
-        else {
-            return this._runMoleculer();
-        }
-    }
-    async run() {
-        const { args, flags } = this.parse(StartCommand);
-        this.watchFolders = [];
-        this.flags = null;
-        this.configFile = null;
-        this.config = null;
-        this.servicePaths = null;
-        this.broker = null;
-        this.worker = null;
-        this.flags = flags;
-        this.servicePaths = lodash_1.default.compact(Object.values(args));
-        if (this.flags.instances !== undefined && cluster_1.default.isMaster) {
-            this.instances = Number.parseInt(this.flags.instances) ? Number.parseInt(this.flags.instances) : 'max';
-            return this.startWorkers(this.instances);
-        }
-        return this._runMoleculer();
-    }
 }
-StartCommand.args = [
-    {
-        name: 'servicePaths',
-        required: false,
-        default: '',
-        description: 'service files or directories or glob masks',
-    }
-];
-StartCommand.description = `run steedos projects`;
-StartCommand.flags = {
-    repl: flags.boolean({ char: 'r', default: false, description: 'If true, it switches to REPL mode after broker started.' }),
-    silent: flags.boolean({ char: 's', default: false, description: 'Disable the broker logger. It prints nothing to the console.' }),
-    hot: flags.boolean({ char: 'h', default: false, description: 'Hot reload services when they change.' }),
-    config: flags.string({ char: 'c', default: 'steedos.config.js', description: 'Load configuration file from a different path or a different filename.' }),
-    env: flags.boolean({ char: 'e', default: false, description: 'Load environment variables from the ‘.env’ file from the current folder.' }),
-    envfile: flags.string({ char: 'E', description: 'Load environment variables from the specified file.' }),
-    instances: flags.string({ char: 'i', description: 'Launch [number] node instances or max for all cpu cores (with cluster module)' })
-};
+StartCommand.description = `Run Steedos projects`;
 module.exports = StartCommand;
 //# sourceMappingURL=start.js.map

package/dist/commands/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAClD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;AACxB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,yCAAwD;AACxD,4CAAoB;AACpB,gDAAwB;AACxB,oDAAuB;AACvB,4CAAoB;AACpB,sDAA8B;AAC9B,kDAA0B;AAC1B,oCAAiC;AAEjC,MAAM,WAAW,GAAG;IACnB,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,SAAS;IACT,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;CACT,CAAC;AAQF,MAAM,MAAM,GAAG;IACd,IAAI,CAAC,OAAO;QACX,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,eAAK,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,CAAC;IACD,KAAK,CAAC,GAAG;QACR,IAAI,GAAG,YAAY,KAAK;YACvB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,eAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;;YACtE,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,eAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;CACD,CAAC;AAEF,MAAM,YAAa,SAAQ,OAAO;IAK/B,KAAK,CAAC,WAAW;QAClB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC1C,IAAI,CAAC;gBACJ,MAAM,MAAM,GAAG,wDAAa,QAAQ,GAAC,CAAC;gBAEtC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO;oBAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;;oBAC/D,MAAM,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACd,8FAA8F,CAC9F,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IAUD,kBAAkB,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9D,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAYD,KAAK,CAAC,cAAc;QACnB,IAAI,QAAQ,CAAC;QAEb,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACrC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAC1D,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;gBACjC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC9B,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC5C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;gBACnB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAClD,IAAG,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,CAAC;gBAC5B,QAAQ,GAAG,IAAI,CAAC;YACjB,CAAC;QACF,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,sBAAsB,CAAC,CAAC,EAAE,CAAC;YACrF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,qBAAqB,CAAC,CAAC,EAAE,CAAC;YACpF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,qBAAqB,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC;YACtF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,uBAAuB,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAC,CAAC;YAExE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,QAAQ,GAAG,EAAE,CAAC;gBACb,KAAK,OAAO,CAAC;gBACb,KAAK,KAAK,CAAC;gBACX,KAAK,MAAM,CAAC;gBACZ,KAAK,KAAK,CAAC,CAAC,CAAC;oBAEZ,IAAI,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAGhC,IAAI,iBAAK,CAAC,UAAU,CAAC,OAAO,CAAC;wBAAE,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAElE,IAAI,CAAC,UAAU,GAAG,MAAM,aAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAE;oBACpD,MAAM;gBACP,CAAC;gBACD;oBACC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC3E,CAAC;QACF,CAAC;QAEC,OAAO;IACV,CAAC;IAED,iBAAiB,CAAC,KAAK;QACtB,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;YAEvE,KAAK,GAAG,KAAK,KAAK,MAAM,CAAC;QAC1B,CAAC;aAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAE1B,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,GAAG,EAAE,MAAO;QAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;YAEnE,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YACzD,CAAC;YAED,IAAI,iBAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAChC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;QAGH,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACpB,MAAM,eAAe,GAAG,MAAM,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;iBACtB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;iBAC9C,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACZ,GAAG;gBACH,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC;aACpD,CAAC,CAAC;iBACF,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACnB,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa;qBACnC,KAAK,CAAC,IAAI,CAAC;qBACX,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC;qBACvC,GAAG,CAAC,KAAK,CAAC,EAAE,CACZ,KAAK;qBACH,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBACrB,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;wBAChB,OAAO,KAAK,CAAC;oBACd,CAAC;yBAAM,CAAC;wBACP,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBACpD,CAAC;gBACF,CAAC,CAAC;qBACD,IAAI,CAAC,EAAE,CAAC,CACV;qBACA,IAAI,CAAC,GAAG,CAAC,CAAC;gBACZ,GAAG,GAAG,iBAAK,CAAC,MAAM,CACjB,GAAG,EACH,MAAM,EACN,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACjD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,GAAG,CAAC;IACZ,CAAC;IAoBD,YAAY;QACX,IAAI,CAAC,MAAM,GAAG,gBAAC,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,yBAAa,CAAC,cAAc,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEjD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QAIlD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAGzD,CAAC;IAQD,WAAW,CAAC,CAAC;QACZ,IAAI,CAAC;YACJ,OAAO,YAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QAEb,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAQD,aAAa,CAAC,CAAC;QACd,IAAI,CAAC;YACJ,OAAO,CAAC,YAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QAEb,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAmBD,KAAK,CAAC,YAAY;QACjB,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,iBAAiB,CAAC;QAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YACzC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;QAE3C,IAAI,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC;QAEjC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YACpD,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAEvD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAE3C,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;oBAC3B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAChC,CAAC;YACF,CAAC;iBAAM,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAEjC,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC7C,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;oBACtB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,CAAC;QACF,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,YAAY,GAAS,EAAE,CAAC;YAE5B,QAAQ;iBACN,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBAClB,OAAO,CAAC,CAAC,CAAC,EAAE;gBACZ,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;gBAC7B,IAAI,QAAQ;oBAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBAE1B,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACP,IAAI,KAAK,CAAC;oBACV,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;oBAEjE,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;4BAC3B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBACjC,CAAC;wBACD,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,GAAG,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;wBAChE,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;4BACpB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAC7B,eAAK;iCACH,MAAM,EAAE;iCACR,IAAI,CACJ,4CAA4C,OAAO,GAAG,CACtD,CACF,CAAC;oBACJ,CAAC;yBAAM,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;wBACxC,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;oBACvC,CAAC;yBAAM,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,aAAa,CAAC,EAAE,CAAC;wBACxD,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;oBACvD,CAAC;yBAAM,CAAC;wBAEP,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;wBACtD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;4BACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CACtB,eAAK;iCACH,MAAM,EAAE;iCACR,IAAI,CAAC,0CAA0C,CAAC,GAAG,CAAC,CACtD,CAAC;oBACJ,CAAC;oBAED,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC/B,IAAI,QAAQ;4BACX,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;;4BAC7D,YAAY,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;oBAClC,CAAC;gBACF,CAAC;YACF,CAAC,CAAC,CAAC;YAEJ,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;gBAGpD,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBAE1B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC/C,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC,CAAC;QACL,CAAC;IACF,CAAC;IAKD,YAAY,CAAC,SAAS;QACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,iBAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,MAAM,EAAE,IAAI;YACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAEf,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACzD,MAAM,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,EAAE,mBAAmB,CAAC,CAAC;oBACzD,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;oBAClD,iBAAO,CAAC,IAAI,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;gBAC/C,CAAC;qBAAM,CAAC;oBACP,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAChB,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;QAE7E,MAAM,CAAC,IAAI,CAAC,YAAY,WAAW,aAAa,CAAC,CAAC;QAElD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,iBAAO,CAAC,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,WAAW,CAAC,OAAO,CAAC,UAAU,MAAM;YACnC,OAAO,CAAC,EAAE,CAAC,MAAa,EAAE,GAAG,EAAE;gBAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,uBAAuB,CAAC,CAAC;gBAClD,QAAQ,GAAG,IAAI,CAAC;gBAChB,iBAAO,CAAC,UAAU,CAAC;oBAClB,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;oBAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAKD,KAAK,CAAC,oBAAoB;QACzB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;IACF,CAAC;IAQD,aAAa,CAAC,IAAI;QACjB,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAKD,KAAK,CAAC,WAAW;QAChB,IAAI,CAAC,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC1B,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,iBAAK,CAAC,SAAS,EAAE,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE;aACxE,CAAC,CAAC;QACJ,CAAC;QAGD,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAa,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QAC1B,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE5B,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAE1B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAElC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;QAEjF,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACpC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;gBAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAElF,OAAO,IAAI,CAAC,MAAM,CAAC;QACpB,CAAC,CAAC,CAAC;IACJ,CAAC;IAKD,aAAa;QACZ,OAAO,OAAO,CAAC,OAAO,EAAE;aAEtB,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;aACjC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;aAC/B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aAC9B,KAAK,CAAC,GAAG,CAAC,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;QACZ,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,MAAM;iBAChB,IAAI,EAAE;iBACN,KAAK,CAAC,GAAG,CAAC,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACpD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACP,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;QAC7B,CAAC;IACF,CAAC;IAEA,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEnD,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAElD,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,iBAAO,CAAC,QAAQ,EAAE,CAAC;YAC3D,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA,CAAC,CAAA,KAAK,CAAA;YACpG,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;CACF;AAED,YAAY,CAAC,IAAI,GAAG;IACnB;QACC,IAAI,EAAS,cAAc;QAC3B,QAAQ,EAAK,KAAK;QAClB,OAAO,EAAM,EAAE;QACf,WAAW,EAAE,4CAA4C;KACzD;CACD,CAAC;AAEF,YAAY,CAAC,WAAW,GAAG,sBAAsB,CAAA;AAEjD,YAAY,CAAC,KAAK,GAAG;IACjB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,yDAAyD,EAAC,CAAC;IACxH,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,8DAA8D,EAAC,CAAC;IAC/H,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,uCAAuC,EAAC,CAAC;IACpG,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAC,GAAG,EAAE,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAC,wEAAwE,EAAC,CAAC;IACpJ,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,0EAA0E,EAAC,CAAC;IACxI,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,qDAAqD,EAAC,CAAC;IACtG,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,+EAA+E,EAAC,CAAC;CACrI,CAAA;AAED,MAAM,CAAC,OAAO,GAAG,YAAY,CAAA"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAyC;AACzC,uCAAyB;AACzB,2CAA6B;AAE7B,MAAM,YAAa,SAAQ,iBAAO;IAChC,KAAK,CAAC,GAAG;QACP,IAAI,CAAC;YAEH,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;YAC3C,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;YAE1C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAEvD,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAEvD,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;YAEvC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YAGnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;YAG5D,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;YACtC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;YAElB,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;YAEjC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,OAAO,CAAC;YAEtC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,UAAkB;QAC1C,IAAI,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CACb,oBAAoB,UAAU,+CAA+C,UAAU,GAAG,CAC3F,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,KAAK,CACb,6BAA6B,UAAU,MAAM,GAAG,CAAC,OAAO,EAAE,CAC3D,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,YAAY,CAAC,WAAW,GAAG,sBAAsB,CAAC;AAElD,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.70",
   "description": "Develop and run your enterprise apps in miniutes",
   "main": "dist/index.js",
   "scripts": {
@@ -33,8 +33,8 @@
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.8.3",
     "@oclif/plugin-help": "^5.1.12",
-    "@steedos/metadata-core": "3.0.0-beta.7",
-    "@steedos/metadata-registrar": "3.0.0-beta.7",
+    "@steedos/metadata-core": "3.0.0-beta.70",
+    "@steedos/metadata-registrar": "3.0.0-beta.70",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -77,5 +77,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b68a33d2fa33b380aa7ec401b63315886f7de861"
+  "gitHead": "597f124ef73efa97a2da52b4de3c7d733ebd6887"
 }

package/default.steedos.config.js

@@ -1,356 +0,0 @@
-"use strict";
-const _ = require("lodash")
-
-global.__startDate = new Date();
-
-require('dotenv-flow').config(
-	{
-		path: process.cwd(),
-		silent: true
-	});
-
-if (_.isEmpty(process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN)) {
-	process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN = 'true';
-}
-
-if (_.isEmpty(process.env.STEEDOS_UNPKG_URL)) {
-	process.env.STEEDOS_UNPKG_URL = 'https://unpkg.steedos.cn';
-}
-process.env.STEEDOS_UNPKG_URL = process.env.STEEDOS_UNPKG_URL.replace(/\/+$/, "");
-
-if (_.isEmpty(process.env.STEEDOS_BUILDER_URL)) {
-	process.env.STEEDOS_BUILDER_URL = 'https://6-3.builder.steedos.com';
-}
-process.env.STEEDOS_BUILDER_URL = process.env.STEEDOS_BUILDER_URL.replace(/\/+$/, "");
-
-
-if (_.isEmpty(process.env.STEEDOS_AMIS_VERSION)) {
-	process.env.STEEDOS_AMIS_VERSION = '6.3.0-patch.3';
-}
-
-if (_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
-	// process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_UNPKG_URL + '/amis@' + process.env.STEEDOS_AMIS_VERSION;
-	// 默认加载 https://unpkg.steedos.cn/@steedos-widgets/amis@3.6.3-patch.2， STEEDOS_AMIS_VERSION可变更版本号
-	process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_UNPKG_URL + '/@steedos-widgets/amis@' + process.env.STEEDOS_AMIS_VERSION;
-} else {
-	process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace("https://unpkg.com", process.env.STEEDOS_UNPKG_URL)
-}
-process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");
-
-if (_.isEmpty(process.env.STEEDOS_WIDGETS_VERSION)) {
-	process.env.STEEDOS_WIDGETS_VERSION = 'v6.10.1-beta.13';
-}
-
-if (_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {
-	const widgetsVersion = process.env.STEEDOS_WIDGETS_VERSION;
-	const unpkgUrl = process.env.STEEDOS_UNPKG_URL;
-	let steedosPublicPageAsseturls = `${unpkgUrl}/@steedos-widgets/amis-object@${widgetsVersion}/dist/assets.json`;
-	if (!_.isEmpty(process.env.STEEDOS_WIDGETS_ADDITIONAL)) {
-		process.env.STEEDOS_WIDGETS_ADDITIONAL.split(',').forEach(additional => {
-			const lastAtIndex = additional.lastIndexOf('@');
-            let packageName = additional;
-            let versionToUse = widgetsVersion;
-
-            // 只有当 '@' 不在字符串开头（即大于0的位置）才视为存在版本信息
-            if (lastAtIndex > 0) {
-                packageName = additional.substring(0, lastAtIndex);
-                versionToUse = additional.substring(lastAtIndex + 1) || widgetsVersion;
-            }
-			steedosPublicPageAsseturls += `,${unpkgUrl}/${packageName}@${versionToUse}/dist/assets.json`;
-		})
-	}
-	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = steedosPublicPageAsseturls
-}
-
-if (_.isEmpty(process.env.SERIALIZER)) {
-	process.env.SERIALIZER = 'JSON'
-}
-
-if (_.isEmpty(process.env.ROOT_URL)) {
-	console.error("ERROR: Environment variable ROOT_URL is not defined.")
-	process.env.ROOT_URL = "http://localhost"
-}
-
-process.env.ROOT_URL = process.env.ROOT_URL.replace(/\/+$/, "");
-
-/**
- * Steedos ServiceBroker configuration file
- *
- * More info about options:
- *     https://moleculer.services/docs/0.14/configuration.html
- *
- *
- * Overwriting options in production:
- * ================================
- * 	You can overwrite any option with environment variables.
- * 	For example to overwrite the "logLevel" value, use `LOGLEVEL=warn` env var.
- * 	To overwrite a nested parameter, e.g. retryPolicy.retries, use `RETRYPOLICY_RETRIES=10` env var.
- *
- * 	To overwrite broker’s deeply nested default options, which are not presented in "steedos.config.js",
- * 	use the `MOL_` prefix and double underscore `__` for nested properties in .env file.
- * 	For example, to set the cacher prefix to `MYCACHE`, you should declare an env var as `MOL_CACHER__OPTIONS__PREFIX=mycache`.
- *  It will set this:
- *  {
- *    cacher: {
- *      options: {
- *        prefix: "mycache"
- *      }
- *    }
- *  }
- */
-module.exports = {
-	// Namespace of nodes to segment your nodes on the same network.
-	namespace: "steedos",
-	// Unique node identifier. Must be unique in a namespace.
-	nodeID: process.env.STEEDOS_NODEID,
-	// Custom metadata store. Store here what you want. Accessing: `this.broker.metadata`
-	metadata: {},
-
-	// Enable/disable logging or use custom logger. More info: https://moleculer.services/docs/0.14/logging.html
-	// Available logger types: "Console", "File", "Pino", "Winston", "Bunyan", "debug", "Log4js", "Datadog"
-	logger: [{
-		type: "Console",
-		options: {
-			// level: "warn",
-			// Using colors on the output
-			colors: true,
-			// Print module names with different colors (like docker-compose for containers)
-			moduleColors: false,
-			// Line formatter. It can be "json", "short", "simple", "full", a `Function` or a template string like "{timestamp} {level} {nodeID}/{mod}: {msg}"
-			formatter: "full",
-			// Custom object printer. If not defined, it uses the `util.inspect` method.
-			objectPrinter: null,
-			// Auto-padding the module name in order to messages begin at the same column.
-			autoPadding: false
-		}
-	},
-	{
-		type: "File",
-		options: {
-			// Logging level
-			// level: "warn",
-			// Folder path to save files. You can use {nodeID} & {namespace} variables.
-			folder: "./logs",
-			// Filename template. You can use {date}, {nodeID} & {namespace} variables.
-			filename: "{nodeID}-{date}.log",
-			// Line formatter. It can be "json", "short", "simple", "full", a `Function` or a template string like "{timestamp} {level} {nodeID}/{mod}: {msg}"
-			formatter: "json",
-			// Custom object printer. If not defined, it uses the `util.inspect` method.
-			objectPrinter: null,
-			// End of line. Default values comes from the OS settings.
-			eol: "\n",
-			// File appending interval in milliseconds.
-			interval: 1 * 1000
-		},
-	},
-	],
-
-	// Default log level for built-in console logger. It can be overwritten in logger options above.
-	// Available values: trace, debug, info, warn, error, fatal
-	logLevel: process.env.STEEDOS_LOG_LEVEL || "warn",
-
-	// Define transporter.
-	// More info: https://moleculer.services/docs/0.14/networking.html
-	// Note: During the development, you don't need to define it because all services will be loaded locally.
-	// In production you can set it via `TRANSPORTER=nats://localhost:4222` environment variable.
-	transporter: function () {
-		try {
-			return JSON.parse(process.env.STEEDOS_TRANSPORTER);
-		} catch (error) {
-			return process.env.STEEDOS_TRANSPORTER;
-		}
-	}(), //process.env.STEEDOS_TRANSPORTER,
-
-	// Define a cacher.
-	// More info: https://moleculer.services/docs/0.14/caching.html
-	cacher: function () {
-		try {
-			return JSON.parse(process.env.STEEDOS_CACHER);
-		} catch (error) {
-			return process.env.STEEDOS_CACHER;
-		}
-	}(),
-
-	// Define a serializer.
-	// Available values: "JSON", "Avro", "ProtoBuf", "MsgPack", "Notepack", "Thrift".
-	// More info: https://moleculer.services/docs/0.14/networking.html#Serialization
-	serializer: process.env.SERIALIZER || "JSON",
-
-	// Number of milliseconds to wait before reject a request with a RequestTimeout error. Disabled: 0
-	requestTimeout: 0,
-
-	// Retry policy settings. More info: https://moleculer.services/docs/0.14/fault-tolerance.html#Retry
-	retryPolicy: {
-		// Enable feature
-		enabled: false,
-		// Count of retries
-		retries: 5,
-		// First delay in milliseconds.
-		delay: 100,
-		// Maximum delay in milliseconds.
-		maxDelay: 1000,
-		// Backoff factor for delay. 2 means exponential backoff.
-		factor: 2,
-		// A function to check failed requests.
-		check: err => err && !!err.retryable
-	},
-
-	// Limit of calling level. If it reaches the limit, broker will throw an MaxCallLevelError error. (Infinite loop protection)
-	maxCallLevel: 100,
-
-	// Number of seconds to send heartbeat packet to other nodes.
-	heartbeatInterval: 10,
-	// Number of seconds to wait before setting node to unavailable status.
-	heartbeatTimeout: 30,
-
-	// Cloning the params of context if enabled. High performance impact, use it with caution!
-	contextParamsCloning: false,
-
-	// Tracking requests and waiting for running requests before shuting down. More info: https://moleculer.services/docs/0.14/context.html#Context-tracking
-	tracking: {
-		// Enable feature
-		enabled: false,
-		// Number of milliseconds to wait before shuting down the process.
-		shutdownTimeout: 5000,
-	},
-
-	// Disable built-in request & emit balancer. (Transporter must support it, as well.). More info: https://moleculer.services/docs/0.14/networking.html#Disabled-balancer
-	disableBalancer: false,
-
-	// Settings of Service Registry. More info: https://moleculer.services/docs/0.14/registry.html
-	registry: {
-		// Define balancing strategy. More info: https://moleculer.services/docs/0.14/balancing.html
-		// Available values: "RoundRobin", "Random", "CpuUsage", "Latency", "Shard"
-		strategy: "RoundRobin",
-		// Enable local action call preferring. Always call the local action instance if available.
-		preferLocal: true
-	},
-
-	// Settings of Circuit Breaker. More info: https://moleculer.services/docs/0.14/fault-tolerance.html#Circuit-Breaker
-	circuitBreaker: {
-		// Enable feature
-		enabled: false,
-		// Threshold value. 0.5 means that 50% should be failed for tripping.
-		threshold: 0.5,
-		// Minimum request count. Below it, CB does not trip.
-		minRequestCount: 20,
-		// Number of seconds for time window.
-		windowTime: 60,
-		// Number of milliseconds to switch from open to half-open state
-		halfOpenTime: 10 * 1000,
-		// A function to check failed requests.
-		check: err => err && err.code >= 500
-	},
-
-	// Settings of bulkhead feature. More info: https://moleculer.services/docs/0.14/fault-tolerance.html#Bulkhead
-	bulkhead: {
-		// Enable feature.
-		enabled: false,
-		// Maximum concurrent executions.
-		concurrency: 10,
-		// Maximum size of queue
-		maxQueueSize: 100,
-	},
-
-	// Enable action & event parameter validation. More info: https://moleculer.services/docs/0.14/validating.html
-	validator: true,
-
-	errorHandler: null,
-
-	// Enable/disable built-in metrics function. More info: https://moleculer.services/docs/0.14/metrics.html
-	metrics: {
-		enabled: false,
-		// Available built-in reporters: "Console", "CSV", "Event", "Prometheus", "Datadog", "StatsD"
-		reporter: [
-			{
-				type: "Prometheus",
-				options: {
-					// HTTP port
-					port: 3030,
-					// HTTP URL path
-					path: "/metrics",
-					// Default labels which are appended to all metrics labels
-					defaultLabels: registry => ({
-						namespace: registry.broker.namespace,
-						nodeID: registry.broker.nodeID
-					})
-				}
-			}
-		]
-	},
-
-
-	tracing: {
-		enabled: true,
-		tags: {
-			action: {
-				// Add `user.userId` value from `ctx.meta`
-				meta: ["user.userId", "user.spaceId"],
-			},
-		},
-		exporter: {
-			type: "Event",
-			options: {
-				// Name of event
-				eventName: "$tracing.spans",
-				// Send event when a span started
-				sendStartSpan: false,
-				// Send event when a span finished
-				sendFinishSpan: true,
-				// Broadcast or emit event
-				broadcast: false,
-				// Event groups
-				groups: null,
-				// Sending time interval in seconds
-				interval: 5,
-				// Custom span object converter before sending
-				spanConverter: null,
-				// Default tags. They will be added into all span tags.
-				defaultTags: null
-			}
-		}
-	},
-
-	// Register custom middlewares
-	middlewares: [],
-
-	// Register custom REPL commands.
-	replCommands: null,
-
-	skipProcessEventRegistration: true,
-
-	// Called after broker created.
-	created(broker) {
-		// Clear all cache entries
-		broker.logger.warn('Clear all cache entries on startup.')
-		broker.cacher.clean();
-		console.log(`Clear all cache entries on startup===1>`)
-		const objectql = require(require.resolve('@steedos/objectql', { paths: [process.cwd()] }));
-		console.log(`Clear all cache entries on startup===2>`)
-		objectql.broker.init(broker);
-		console.log(`Clear all cache entries on startup===init>`)
-		//TODO 此处不考虑多个node服务模式.
-		process.on('SIGTERM', close.bind(broker, 'SIGTERM'));
-		process.on('SIGINT', close.bind(broker, 'SIGINT'));
-		async function close(signal) {
-			try {
-				await this.cacher.clean(); //TODO 此clean 有问题，如果在启动过程中就停止服务，则会清理不干净。尝试试用reids client 原生clean（flushdb）。
-				await this.cacher.close();
-			} catch (error) {
-				// console.log(`error`, error)
-			}
-			console.log(`[${signal}]服务已停止: namespace: ${this.namespace}, nodeID: ${this.nodeID}`);
-			process.exit(0);
-		}
-	},
-
-	// Called after broker started.
-	started(broker) {
-
-	},
-
-	// Called after broker stopped.
-	stopped(broker) {
-
-	}
-};

package/default.steedos.settings.yml

@@ -1,148 +0,0 @@
-datasources:
-  default:
-    connection:
-      url: ${MONGO_URL}
-    objectFiles:
-      - "./steedos-app/**"
-public:
-  NODE_ENV: ${NODE_ENV}
-  amis:
-    map_ak: ${STEEDOS_AMIS_MAP_KEY}
-    map_vendor: ${STEEDOS_AMIS_MAP_VENDER}
-  cfs:
-    store: ${STEEDOS_CFS_STORE}
-  templateSpaceId: 'template'
-  enable_saas: ${STEEDOS_TENANT_ENABLE_SAAS}
-  use_open_api: ${STEEDOS_PUBLIC_USE_OPEN_API}
-  webservices:
-    jsreport:
-      url: ${JSREPORT_URL}
-      urlProvideForJsreport: ${JSREPORT_TO_ACQUIRE_DATA_URL}
-    app_exchange:
-      url: ${STEEDOS_APP_EXCHANGE_URL}
-  analytics:
-    enabled: ${STEEDOS_PUBLIC_ANALYTICS_ENABLED}
-    baidu:
-      id: ${STEEDOS_PUBLIC_ANALYTICS_BAIDU_ID}
-    posthog:
-      id: ${STEEDOS_PUBLIC_ANALYTICS_POSTHOG_ID}
-      api_host: ${STEEDOS_PUBLIC_ANALYTICS_POSTHOG_API_HOST}
-  workflow:
-    traceShowSignImage: ${STEEDOS_WORKFLOW_TRACE_SHOW_SIGN_IMAGE}
-  sentry:
-    enabled: ${STEEDOS_SENTRY_ENABLED}
-    dsn: ${STEEDOS_SENTRY_DSN}
-  vconsole:
-    url: ${STEEDOS_PUBLIC_SCRIPT_VCONSOLE}
-  accounts:
-    username_min_length: ${STEEDOS_ACCOUNT_USERNAME_MIN_LENGTH}
-    UTF8_Names_Validation: ${STEEDOS_ACCOUNT_NAME_VALIDATION}
-    enable_query_auth: ${STEEDOS_ENABLE_QUERY_AUTH}
-cfs:
-  store: ${STEEDOS_CFS_STORE}
-  local:
-    folder: ${STEEDOS_STORAGE_DIR}
-  aliyun:
-    region: ${STEEDOS_CFS_ALIYUN_REGION}
-    bucket: ${STEEDOS_CFS_ALIYUN_BUCKET}
-    folder: ${STEEDOS_CFS_ALIYUN_FOLDER}
-    accessKeyId: ${STEEDOS_CFS_ALIYUN_ACCESSKEYID}
-    secretAccessKey: ${STEEDOS_CFS_ALIYUN_SECRETACCESSKEY}
-  aws:
-    region: ${STEEDOS_CFS_AWS_S3_REGION}
-    endpoint: ${STEEDOS_CFS_AWS_S3_ENDPOINT}
-    bucket: ${STEEDOS_CFS_AWS_S3_BUCKET}
-    accessKeyId: ${STEEDOS_CFS_AWS_S3_ACCESS_KEY_ID}
-    secretAccessKey: ${STEEDOS_CFS_AWS_S3_SECRET_ACCESS_KEY}
-    s3ForcePathStyle: ${STEEDOS_CFS_AWS_S3_FORCE_PATH_STYLE}
-    signatureVersion: ${STEEDOS_CFS_AWS_S3_SIGNATURE_VERSION}
-  steedosCloud:
-    region: ${STEEDOS_CFS_CLOUD_REGION}
-    bucket: ${STEEDOS_CFS_CLOUD_BUCKET}
-    endpoint: ${STEEDOS_CFS_CLOUD_ENDPOINT}
-    accessKeyId: ${STEEDOS_CFS_CLOUD_ACCESSKEYID}
-    secretAccessKey: ${STEEDOS_CFS_CLOUD_SECRETACCESSKEY}
-tenant:
-  _id: ${STEEDOS_TENANT_ID}
-  name: 华炎魔方
-  logo_url: ${STEEDOS_TENANT_LOGO_URL}
-  logo_square_url: ${STEEDOS_TENANT_LOGO_SQUARE_URL}
-  background_url: ${STEEDOS_TENANT_BACKGROUND_URL}
-  enable_activation: ${STEEDOS_TENANT_ENABLE_ACTIVATION} # 启用初始化向导
-  enable_register: ${STEEDOS_TENANT_ENABLE_REGISTER} # 启用注册功能 true / false
-  enable_forget_password: ${STEEDOS_TENANT_ENABLE_FORGET_PASSWORD}
-  enable_create_tenant: ${STEEDOS_TENANT_ENABLE_SAAS}
-  enable_password_login: ${STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN}
-  enable_mobile_code_login: ${STEEDOS_TENANT_ENABLE_MOBILE_CODE_LOGIN}
-  enable_email_code_login: ${STEEDOS_TENANT_ENABLE_EMAIL_CODE_LOGIN}
-  enable_bind_email: ${STEEDOS_TENANT_ENABLE_BIND_EMAIL}
-  enable_bind_mobile: ${STEEDOS_TENANT_ENABLE_BIND_MOBILE}
-  tokenSecret: ${STEEDOS_TENANT_TOKEN_SECRET} # 默认值 43位字符串, 每次重启服务时生成新的值
-  accessTokenExpiresIn: ${STEEDOS_TENANT_ACCESS_TOKEN_EXPIRES_IN} # 默认值 90d
-  refreshTokenExpiresIn: ${STEEDOS_TENANT_REFRESH_TOKEN_EXPIRES_IN} # 默认值 7d
-sms:
-  qcloud:
-    smsqueue_interval: ${STEEDOS_CRON_SMSQUEUE_INTERVAL}
-    sdkappid: ${STEEDOS_SMS_QCLOUD_SDKAPPID}
-    appkey: ${STEEDOS_SMS_QCLOUD_APPKEY}
-    signname: ${STEEDOS_SMS_QCLOUD_SIGNNAME}
-email:
-  from: ${STEEDOS_EMAIL_FROM}
-  url: ${STEEDOS_EMAIL_URL}
-  host: ${STEEDOS_EMAIL_HOST}
-  port: ${STEEDOS_EMAIL_PORT}
-  username: ${STEEDOS_EMAIL_USERNAME}
-  password: ${STEEDOS_EMAIL_PASSWORD}
-  secure: ${STEEDOS_EMAIL_PASSWORD}
-  signname: ${STEEDOS_EMAIL_SIGNNAME}
-cron:
-  enabled: ${STEEDOS_CRON_ENABLED}
-  instancerecordqueue_interval: ${STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL}
-  mailqueue_interval: ${STEEDOS_CRON_MAILQUEUE_INTERVAL}
-  push_interval: ${STEEDOS_CRON_PUSH_INTERVAL}
-  webhookqueue_interval: ${STEEDOS_CRON_WEBHOOKQUEUE_INTERVAL}
-  build_index: ${STEEDOS_CRON_BUILD_INDEX}
-  objectwebhooksqueue_interval: ${STEEDOS_CRON_OBJECTWEBHOOKSQUEUE_INTERVAL}
-  workflow_rule_interval: ${STEEDOS_CRON_WORKFLOW_RULE}
-instances_stat:
-  schedule: ${STEEDOS_INSTANCES_STAT_SCHEDULE}
-dingtalk:
-  api_Key: ${APIKEY}
-  log_path: ${DING_LOGPATH}
-qywx:
-  api_Key: ${APIKEY}
-  log_path: ${QYWX_LOGPATH}
-push:
-  apn:
-    keyData: ${STEEDOS_PUSH_APN_DATA}
-    certData: ${STEEDOS_PUSH_APN_DATA}
-  gcm:
-    apiKey: ${STEEDOS_GCM_APIKEY}
-    projectNumber: ${STEEDOS_GCM_PROJECT_NUMBER}
-  xinge:
-    accessId: ${STEEDOS_PUSH_XINGE_ACCESSID}
-    secretKey: ${STEEDOS_PUSH_XINGE_SECRETKEY}
-  huawei:
-    appId: ${STEEDOS_PUSH_HUAWEI_APPID}
-    appSecret: ${STEEDOS_PUSH_HUAWEI_APPSECRET}
-    appPkgName: ${STEEDOS_PUSH_HUAWEI_APPPKGNAME}
-    debug: ${STEEDOS_PUSH_HUAWEI_DEBUG}
-  mi:
-    appSecret: ${STEEDOS_PUSH_MI_APPSECRET}
-    production: ${STEEDOS_PUSH_MI_PRODUCTION}
-pay:
-  weixin:
-    appid: ${PAY_WEIXIN_APPID}
-    mch_id: ${PAY_WEIXIN_MCH_ID}
-    partner_key: ${PAY_WEIXIN_PARTNER_KEY}
-sso:
-  oidc:
-    config_url: ${STEEDOS_IDENTITY_OIDC_CONFIG_URL}
-    client_id: ${STEEDOS_IDENTITY_OIDC_CLIENT_ID}
-    client_secret: ${STEEDOS_IDENTITY_OIDC_CLIENT_SECRET}
-    name: ${STEEDOS_IDENTITY_OIDC_NAME}
-    label: ${STEEDOS_IDENTITY_OIDC_LABEL}
-    logo: ${STEEDOS_IDENTITY_OIDC_LOGO}
-    require_local_account: ${STEEDOS_IDENTITY_OIDC_REQUIRE_LOCAL_ACCOUNT}
-db:
-  auto_migrate: ${STEEDOS_DB_AUTO_MIGRATE}

package/dist/start/hotReload.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/start/hotReload.js

@@ -1,48 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require('path');
-const chokidar = require('chokidar');
-const underscore_1 = __importDefault(require("underscore"));
-let changePackages = [];
-let timeoutId = null;
-const reloadPackage = (broker, packagePath) => {
-    changePackages.push(packagePath);
-    if (!timeoutId) {
-        clearTimeout(timeoutId);
-    }
-    timeoutId = setTimeout(() => {
-        const _changePackages = underscore_1.default.clone(changePackages);
-        changePackages = [];
-        underscore_1.default.each(underscore_1.default.uniq(underscore_1.default.compact(_changePackages)), (_packagePath) => {
-            const packageJson = require(path.join(_packagePath, 'package.json'));
-            if (packageJson) {
-                const servicePath = path.join(_packagePath, 'package.service.js');
-                const serviceJson = require(servicePath);
-                if (serviceJson) {
-                    delete require.cache[require.resolve(servicePath)];
-                }
-                broker.call(`@steedos/service-project.reloadPackage`, { module: packageJson.name });
-            }
-        });
-    }, 3000);
-};
-module.exports = {
-    name: "steedos-dx-develop",
-    namespace: "steedos",
-    started() {
-        const appPath = path.join(process.cwd(), 'steedos-app');
-        chokidar.watch(appPath).on('change', (_path, stats) => {
-            reloadPackage(this.broker, appPath);
-        });
-        const packagesPath = path.join(process.cwd(), 'steedos-packages');
-        chokidar.watch(packagesPath).on('change', (_path, stats) => {
-            const rP = path.relative(packagesPath, _path);
-            const packagePath = path.join(packagesPath, rP.split(path.sep)[0]);
-            reloadPackage(this.broker, packagePath);
-        });
-    }
-};
-//# sourceMappingURL=hotReload.js.map

package/dist/start/hotReload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hotReload.js","sourceRoot":"","sources":["../../src/start/hotReload.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;AACb,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACrC,4DAA2B;AAC3B,IAAI,cAAc,GAAa,EAAE,CAAC;AAElC,IAAI,SAAS,GAAQ,IAAI,CAAC;AAE1B,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;IAC1C,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjC,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,YAAY,CAAC,SAAS,CAAC,CAAA;IAC3B,CAAC;IACD,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;QACxB,MAAM,eAAe,GAAG,oBAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAChD,cAAc,GAAG,EAAE,CAAA;QACnB,oBAAC,CAAC,IAAI,CAAC,oBAAC,CAAC,IAAI,CAAC,oBAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE;YACxD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;YACrE,IAAI,WAAW,EAAE,CAAC;gBACd,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAA;gBACjE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;gBACzC,IAAI,WAAW,EAAE,CAAC;oBACd,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;gBACvD,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAA;YACvF,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC,EAAE,IAAI,CAAC,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,OAAO,GAAG;IACb,IAAI,EAAE,oBAAoB;IAC1B,SAAS,EAAE,SAAS;IACpB,OAAO;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAA;QACvD,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAClD,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACvC,CAAC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAClE,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAClE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC"}

package/dist/start/index.d.ts

@@ -1,9 +0,0 @@
-export declare class Start {
-    static loadSettings: (filePath: string) => any;
-    static loadDefaultSettings(): any;
-    static loadProjectSettings(): any;
-    static loadDefaultConfig(): Promise<any>;
-    static mergeConfig(projectConfig: any): Promise<any>;
-    static mergeSchemaLifecycleHandlers(src: any, target: any): unknown[];
-    static flatten(arr: any): any;
-}

package/dist/start/index.js

@@ -1,143 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Start = void 0;
-const lodash_1 = require("lodash");
-const util_1 = require("../util");
-const path = require("path");
-const fs = require("fs");
-const clone = require("clone");
-const validator = require('validator');
-const yaml = require('js-yaml');
-function calcString(str, content = process.env) {
-    if (!(0, lodash_1.isString)(str)) {
-        return str;
-    }
-    let calcFun = null;
-    var reg = /(\${[^{}]*\})/g;
-    let rev = str.replace(reg, function (m, $1) {
-        return $1.replace(/\{\s*/, "{args[\"").replace(/\s*\}/, "\"]}");
-    });
-    eval(`calcFun = function(args){return \`${rev}\`}`);
-    let val = calcFun.call({}, content);
-    if ((0, lodash_1.isString)(val) && val) {
-        return val.replace(/\\r/g, '\r').replace(/\\n/g, '\n').replace(/undefined/g, '');
-    }
-    else {
-        return null;
-    }
-}
-function calcSteedosConfig(config) {
-    (0, lodash_1.each)(config, (v, k) => {
-        if ((0, util_1.isJsonMap)(v)) {
-            let _d = (0, lodash_1.get)(config, k);
-            if ((0, util_1.isJsonMap)(_d)) {
-                config[k] = calcSteedosConfig(clone(_d));
-            }
-            else {
-                config[k] = calcString(v);
-                if (k && (0, lodash_1.isString)(k) && k.startsWith('enable_') && config[k] && (0, lodash_1.isString)(config[k])) {
-                    config[k] = validator.toBoolean(config[k], true);
-                }
-            }
-        }
-        else {
-            config[k] = calcString(v);
-            if (k && (0, lodash_1.isString)(k) && k.startsWith('enable_') && config[k] && (0, lodash_1.isString)(config[k])) {
-                config[k] = validator.toBoolean(config[k], true);
-            }
-        }
-    });
-    return config;
-}
-class Start {
-    static loadDefaultSettings() {
-        const filePath = path.join(__dirname, '../', '../', "default.steedos.settings.yml");
-        if (fs.existsSync(filePath) && !fs.statSync(filePath).isDirectory()) {
-            return Start.loadSettings(filePath);
-        }
-        else {
-            return null;
-        }
-    }
-    static loadProjectSettings() {
-        let configPath = path.join((0, util_1.getBaseDirectory)(), 'steedos-config.yml');
-        if (fs.existsSync(configPath) && !fs.statSync(configPath).isDirectory()) {
-            return Start.loadSettings(configPath);
-        }
-    }
-    static async loadDefaultConfig() {
-        const filePath = path.join(__dirname, '../', '../', "default.steedos.config.js");
-        if (filePath) {
-            if (!fs.existsSync(filePath))
-                return Promise.reject(new Error(`Config file not found: ${filePath}`));
-            return require(filePath);
-        }
-    }
-    static async mergeConfig(projectConfig) {
-        const loadProjectSettings = Start.loadProjectSettings();
-        const _projectConfig = (0, lodash_1.defaultsDeep)(projectConfig, { settings: loadProjectSettings });
-        const defaultConfig = await Start.loadDefaultConfig();
-        const defaultSettings = Start.loadDefaultSettings();
-        const _defaultConfig = (0, lodash_1.defaultsDeep)(defaultConfig, { settings: defaultSettings });
-        const res = (0, lodash_1.cloneDeep)(_defaultConfig);
-        const mods = (0, lodash_1.cloneDeep)(_projectConfig);
-        Object.keys(mods).forEach(key => {
-            if (["created", "started", "stopped"].indexOf(key) !== -1) {
-                const functionArray = Start.mergeSchemaLifecycleHandlers(mods[key], res[key]);
-                if (functionArray.length > 0) {
-                    res[key] = function (broker) {
-                        functionArray.forEach((fn) => fn.call(this, broker));
-                    };
-                }
-            }
-            else if (["tracing", "metrics", "logger"].indexOf(key) !== -1) {
-                res[key] = mods[key];
-            }
-            else {
-                res[key] = (0, lodash_1.defaultsDeep)({ [key]: mods[key] }, { [key]: res[key] })[key];
-            }
-        });
-        return res;
-    }
-    static mergeSchemaLifecycleHandlers(src, target) {
-        return (0, lodash_1.compact)(Start.flatten([target, src]));
-    }
-    static flatten(arr) {
-        return Array.prototype.reduce.call(arr, (a, b) => a.concat(b), []);
-    }
-}
-exports.Start = Start;
-Start.loadSettings = (filePath) => {
-    try {
-        const settings = yaml.load(fs.readFileSync(filePath, 'utf8'));
-        if (settings.env) {
-            (0, lodash_1.each)(settings.env, function (item, key) {
-                process.env[key] = calcString(item);
-            });
-        }
-        let emailConfig = settings.email;
-        if (emailConfig) {
-            if (!emailConfig.url && emailConfig.host && emailConfig.port && emailConfig.username && emailConfig.password) {
-                let url = `smtps://${emailConfig.username}:${emailConfig.password}@${emailConfig.host}:${emailConfig.port}/`;
-                emailConfig.url = url;
-            }
-            if (emailConfig.url) {
-                process.env["MAIL_URL"] = calcString(emailConfig.url);
-            }
-            if (emailConfig.from) {
-                process.env["MAIL_FROM"] = calcString(emailConfig.from);
-            }
-        }
-        const res = calcSteedosConfig(settings);
-        if (res) {
-            res.setTenant = (tenant) => {
-                res.tenant = (0, lodash_1.defaultsDeep)(tenant, res.tenant);
-            };
-        }
-        return res;
-    }
-    catch (error) {
-        console.error('loadFile error', filePath, error);
-    }
-};
-//# sourceMappingURL=index.js.map

package/dist/start/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/start/index.ts"],"names":[],"mappings":"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"}