ee-core 4.1.4 → 4.1.5

package/config/config_loader.js

@@ -1,66 +1,66 @@
-'use strict';
-
-const debug = require('debug')('ee-core:config:config_loader');
-const path = require('path');
-const { appName, env, getElectronDir, getBaseDir, getRootDir } = require('../ps');
-const { extend } = require('../utils/extend');
-const { loadFile } = require('../loader');
-const { Timing } = require('../core/utils/timing');
-const defaultConfig = require('./default_config');
-
-class ConfigLoader {
-  constructor() {
-    this.timing = new Timing();
-  }
-
-  /**
-   * Load config/config.xxx.js
-   */
-  load() {
-    this.timing.start('Load Config');
-
-    // Load Application config
-    const appConfig = this._AppConfig();
-    // debug("[load] appConfig: %O", appConfig);
-
-    const defaultConf = defaultConfig();
-    const config = extend(true, defaultConf, appConfig);
-    debug("[load] config: %o", config);
-
-    this.timing.end('Load Config');
-    return config;
-  }
-
-  _AppConfig() {
-    const names = [
-      'config.default',
-      `config.${env()}`,
-    ];
-    const target = {};
-    for (const filename of names) {
-      const config = this._loadConfig(getElectronDir(), filename);
-      extend(true, target, config);
-    }
-    return target;
-  }
-
-  _loadConfig(dirpath, filename) {
-    const appInfo = {
-      name: appName(),
-      baseDir: getBaseDir(),
-      electronDir: getElectronDir(),
-      env: env(),
-      root: getRootDir(),
-    }
-    const filepath = path.join(dirpath, 'config', filename);
-    const config = loadFile(filepath, appInfo);
-    debug("[_loadConfig] filepath: %s", filepath);
-    if (!config) return null;
-
-    return config;
-  }
-}
-
-module.exports = {
-  ConfigLoader
+'use strict';
+
+const debug = require('debug')('ee-core:config:config_loader');
+const path = require('path');
+const { appName, env, getElectronDir, getBaseDir, getRootDir } = require('../ps');
+const { extend } = require('../utils/extend');
+const { loadFile } = require('../loader');
+const { Timing } = require('../core/utils/timing');
+const defaultConfig = require('./default_config');
+
+class ConfigLoader {
+  constructor() {
+    this.timing = new Timing();
+  }
+
+  /**
+   * Load config/config.xxx.js
+   */
+  load() {
+    this.timing.start('Load Config');
+
+    // Load Application config
+    const appConfig = this._AppConfig();
+    // debug("[load] appConfig: %O", appConfig);
+
+    const defaultConf = defaultConfig();
+    const config = extend(true, defaultConf, appConfig);
+    debug("[load] config: %o", config);
+
+    this.timing.end('Load Config');
+    return config;
+  }
+
+  _AppConfig() {
+    const names = [
+      'config.default',
+      `config.${env()}`,
+    ];
+    const target = {};
+    for (const filename of names) {
+      const config = this._loadConfig(getElectronDir(), filename);
+      extend(true, target, config);
+    }
+    return target;
+  }
+
+  _loadConfig(dirpath, filename) {
+    const appInfo = {
+      name: appName(),
+      baseDir: getBaseDir(),
+      electronDir: getElectronDir(),
+      env: env(),
+      root: getRootDir(),
+    }
+    const filepath = path.join(dirpath, 'config', filename);
+    const config = loadFile(filepath, appInfo);
+    debug("[_loadConfig] filepath: %s", filepath);
+    if (!config) return null;
+
+    return config;
+  }
+}
+
+module.exports = {
+  ConfigLoader
 };

package/config/default_config.d.ts

@@ -1,95 +1,95 @@
-import { BrowserWindowConstructorOptions } from 'electron';
-
-export declare interface AppConfig {
-    openDevTools?: boolean | Object;
-    singleLock?: boolean;
-    windowsOption?: BrowserWindowConstructorOptions;
-    logger?: LoggerConfig;
-    socketServer?: SocketConfig;
-    httpServer?: HttpConfig;
-    remote?: RemoteConfig;
-    mainServer?: MainConfig;
-    exception?: ExceptionConfig;
-    job?: JobConfig;
-    cross?: CrossConfig;
-}
-export declare interface LoggerConfig {
-    type?: string;
-    dir?: string;
-    encoding?: string;
-    env?: string;
-    level?: string;
-    consoleLevel?: string;
-    disableConsoleAfterReady?: boolean;
-    outputJSON?: boolean;
-    buffer?: boolean;
-    appLogName: string;
-    coreLogName?: string;
-    agentLogName?: string;
-    errorLogName: string;
-    coreLogger?: {};
-    allowDebugAtProd?: boolean;
-    enablePerformanceTimer?: boolean;
-    rotator?: string;
-}
-export declare interface SocketConfig {
-    enable: boolean;
-    port: number;
-    path?: string;
-    connectTimeout?: number;
-    pingTimeout?: number;
-    pingInterval?: number;
-    maxHttpBufferSize?: number;
-    transports?: string[];
-    cors?: {
-        origin?: boolean;
-    };
-    channel?: string;
-}
-export declare interface HttpConfig {
-    enable: boolean;
-    https?: {
-        enable: boolean;
-        key: string;
-        cert: string;
-    };
-    protocol?: string;
-    host?: string;
-    port: number;
-    cors?: {
-        origin?: string;
-    };
-    body?: {
-        multipart?: boolean;
-        formidable?: {
-            keepExtensions?: boolean;
-        };
-    };
-    filterRequest?: {
-        uris?: string[];
-        returnData?: string;
-    };
-}
-export declare interface RemoteConfig {
-    enable: boolean;
-    url: string;
-}
-export declare interface MainConfig {
-    protocol?: string;
-    indexPath: string;
-    options?: {};
-    takeover?: string;
-    loadingPage?: string;
-    channelSeparator?: string;
-}
-export declare interface ExceptionConfig {
-    mainExit?: boolean;
-    childExit?: boolean;
-    rendererExit?: boolean;
-}
-export declare interface JobConfig {
-    messageLog: boolean;
-}
-export declare interface CrossConfig {}
-declare function config(): AppConfig;
-export = config;
+import { BrowserWindowConstructorOptions } from 'electron';
+
+export declare interface AppConfig {
+    openDevTools?: boolean | Object;
+    singleLock?: boolean;
+    windowsOption?: BrowserWindowConstructorOptions;
+    logger?: LoggerConfig;
+    socketServer?: SocketConfig;
+    httpServer?: HttpConfig;
+    remote?: RemoteConfig;
+    mainServer?: MainConfig;
+    exception?: ExceptionConfig;
+    job?: JobConfig;
+    cross?: CrossConfig;
+}
+export declare interface LoggerConfig {
+    type?: string;
+    dir?: string;
+    encoding?: string;
+    env?: string;
+    level?: string;
+    consoleLevel?: string;
+    disableConsoleAfterReady?: boolean;
+    outputJSON?: boolean;
+    buffer?: boolean;
+    appLogName: string;
+    coreLogName?: string;
+    agentLogName?: string;
+    errorLogName: string;
+    coreLogger?: {};
+    allowDebugAtProd?: boolean;
+    enablePerformanceTimer?: boolean;
+    rotator?: string;
+}
+export declare interface SocketConfig {
+    enable: boolean;
+    port: number;
+    path?: string;
+    connectTimeout?: number;
+    pingTimeout?: number;
+    pingInterval?: number;
+    maxHttpBufferSize?: number;
+    transports?: string[];
+    cors?: {
+        origin?: boolean;
+    };
+    channel?: string;
+}
+export declare interface HttpConfig {
+    enable: boolean;
+    https?: {
+        enable: boolean;
+        key: string;
+        cert: string;
+    };
+    protocol?: string;
+    host?: string;
+    port: number;
+    cors?: {
+        origin?: string;
+    };
+    body?: {
+        multipart?: boolean;
+        formidable?: {
+            keepExtensions?: boolean;
+        };
+    };
+    filterRequest?: {
+        uris?: string[];
+        returnData?: string;
+    };
+}
+export declare interface RemoteConfig {
+    enable: boolean;
+    url: string;
+}
+export declare interface MainConfig {
+    protocol?: string;
+    indexPath: string;
+    options?: {};
+    takeover?: string;
+    loadingPage?: string;
+    channelSeparator?: string;
+}
+export declare interface ExceptionConfig {
+    mainExit?: boolean;
+    childExit?: boolean;
+    rendererExit?: boolean;
+}
+export declare interface JobConfig {
+    messageLog: boolean;
+}
+export declare interface CrossConfig {}
+declare function config(): AppConfig;
+export = config;

package/config/default_config.js

@@ -1,111 +1,111 @@
-'use strict';
-
-const path = require('path');
-const { env, getBaseDir, getLogDir } = require('../ps');
-const { SocketIO } = require('../const/channel');
-
-/**
- * default
- */
-module.exports = () => {
-  return {
-    openDevTools: false,
-    singleLock: true,
-    windowsOption: {
-      title: 'electron-egg',
-      width: 980,
-      height: 650,
-      minWidth: 400,
-      minHeight: 300,
-      webPreferences: {
-        //webSecurity: false,
-        contextIsolation: false, // false -> 可在渲染进程中使用electron的api，true->需要bridge.js(contextBridge)
-        nodeIntegration: true,
-        //preload: path.join(appInfo.electronDir, 'preload', 'bridge.js'),
-      },
-      frame: true,
-      show: false,
-      icon: path.join(getBaseDir(), 'public', 'images', 'logo-32.png'),
-    },
-    logger: {
-      type: 'application',
-      dir: getLogDir(),
-      encoding: 'utf8',
-      env: env(),
-      level: 'INFO',
-      consoleLevel: 'INFO',
-      disableConsoleAfterReady: env() !== 'local',
-      outputJSON: false,
-      buffer: true,
-      appLogName: `ee.log`,
-      coreLogName: 'ee-core.log',
-      agentLogName: 'ee-agent.log',
-      errorLogName: `ee-error.log`,
-      coreLogger: {},
-      allowDebugAtProd: false,
-      enablePerformanceTimer: false,
-      rotator: 'day',
-    },
-    socketServer: {
-      enable: false, // is it enabled
-      port: 7070, // default port (if the port is in use, randomly select one)
-      path: "/socket.io/", // path
-      connectTimeout: 45000, // client connection timeout
-      pingTimeout: 30000, // heartbeat detection timeout
-      pingInterval: 25000, // heartbeat detection interval
-      maxHttpBufferSize: 1e8, // the data size of each message 1M
-      transports: ["polling", "websocket"], // http polling or websocket
-      cors: {
-        origin: true, // http协议时，要设置跨域 类型 Boolean String RegExp Array Function
-      },
-      channel: SocketIO.partySoftware
-    },
-    httpServer: {
-      enable: false, // Is it enabled
-      https: {
-        enable: false,
-        key: '/public/ssl/localhost+1.key',
-        cert: '/public/ssl/localhost+1.pem'
-      },
-      protocol: 'http://',
-      host: '127.0.0.1',
-      port: 7071, // Default port (if the port is in use, randomly select one)
-      cors: {
-        origin: "*"
-      },
-      body: {
-        multipart: true,
-        formidable: {
-          keepExtensions: true
-        }
-      },
-      filterRequest: {
-        uris:  [
-          'favicon.ico'
-        ],
-        returnData: ''
-      }
-    },
-    remote: {
-      enable: false,
-      url: ''
-    },
-    mainServer: {
-      protocol: 'file://', // file://
-      indexPath: '/public/dist/index.html',
-      options: {},
-      takeover: '',
-      loadingPage: '',
-      channelSeparator: '/',
-    },
-    exception: {
-      mainExit: false,
-      childExit: false,
-      rendererExit: true,
-    },
-    jobs: {
-      messageLog: false
-    },
-    cross: {}
-  }
-}
+'use strict';
+
+const path = require('path');
+const { env, getBaseDir, getLogDir } = require('../ps');
+const { SocketIO } = require('../const/channel');
+
+/**
+ * default
+ */
+module.exports = () => {
+  return {
+    openDevTools: false,
+    singleLock: true,
+    windowsOption: {
+      title: 'electron-egg',
+      width: 980,
+      height: 650,
+      minWidth: 400,
+      minHeight: 300,
+      webPreferences: {
+        //webSecurity: false,
+        contextIsolation: false, // false -> 可在渲染进程中使用electron的api，true->需要bridge.js(contextBridge)
+        nodeIntegration: true,
+        //preload: path.join(appInfo.electronDir, 'preload', 'bridge.js'),
+      },
+      frame: true,
+      show: false,
+      icon: path.join(getBaseDir(), 'public', 'images', 'logo-32.png'),
+    },
+    logger: {
+      type: 'application',
+      dir: getLogDir(),
+      encoding: 'utf8',
+      env: env(),
+      level: 'INFO',
+      consoleLevel: 'INFO',
+      disableConsoleAfterReady: env() !== 'local',
+      outputJSON: false,
+      buffer: true,
+      appLogName: `ee.log`,
+      coreLogName: 'ee-core.log',
+      agentLogName: 'ee-agent.log',
+      errorLogName: `ee-error.log`,
+      coreLogger: {},
+      allowDebugAtProd: false,
+      enablePerformanceTimer: false,
+      rotator: 'day',
+    },
+    socketServer: {
+      enable: false, // is it enabled
+      port: 7070, // default port (if the port is in use, randomly select one)
+      path: "/socket.io/", // path
+      connectTimeout: 45000, // client connection timeout
+      pingTimeout: 30000, // heartbeat detection timeout
+      pingInterval: 25000, // heartbeat detection interval
+      maxHttpBufferSize: 1e8, // the data size of each message 1M
+      transports: ["polling", "websocket"], // http polling or websocket
+      cors: {
+        origin: true, // http协议时，要设置跨域 类型 Boolean String RegExp Array Function
+      },
+      channel: SocketIO.partySoftware
+    },
+    httpServer: {
+      enable: false, // Is it enabled
+      https: {
+        enable: false,
+        key: '/public/ssl/localhost+1.key',
+        cert: '/public/ssl/localhost+1.pem'
+      },
+      protocol: 'http://',
+      host: '127.0.0.1',
+      port: 7071, // Default port (if the port is in use, randomly select one)
+      cors: {
+        origin: "*"
+      },
+      body: {
+        multipart: true,
+        formidable: {
+          keepExtensions: true
+        }
+      },
+      filterRequest: {
+        uris:  [
+          'favicon.ico'
+        ],
+        returnData: ''
+      }
+    },
+    remote: {
+      enable: false,
+      url: ''
+    },
+    mainServer: {
+      protocol: 'file://', // file://
+      indexPath: '/public/dist/index.html',
+      options: {},
+      takeover: '',
+      loadingPage: '',
+      channelSeparator: '/',
+    },
+    exception: {
+      mainExit: false,
+      childExit: false,
+      rendererExit: true,
+    },
+    jobs: {
+      messageLog: false
+    },
+    cross: {}
+  }
+}

package/config/index.d.ts

@@ -1,28 +1,28 @@
-import { 
-    AppConfig, 
-    WindowsConfig, 
-    LoggerConfig, 
-    SocketConfig, 
-    HttpConfig,
-    RemoteConfig,
-    MainConfig,
-    ExceptionConfig,
-    JobConfig,
-    CrossConfig 
-} from "./default_config";
-declare function loadConfig(): AppConfig;
-declare function getConfig(): AppConfig;
-export {
-    AppConfig, 
-    WindowsConfig, 
-    LoggerConfig, 
-    SocketConfig, 
-    HttpConfig,
-    RemoteConfig,
-    MainConfig,
-    ExceptionConfig,
-    JobConfig,
-    CrossConfig,
-    loadConfig,
-    getConfig
-}
+import { 
+    AppConfig, 
+    WindowsConfig, 
+    LoggerConfig, 
+    SocketConfig, 
+    HttpConfig,
+    RemoteConfig,
+    MainConfig,
+    ExceptionConfig,
+    JobConfig,
+    CrossConfig 
+} from "./default_config";
+declare function loadConfig(): AppConfig;
+declare function getConfig(): AppConfig;
+export {
+    AppConfig, 
+    WindowsConfig, 
+    LoggerConfig, 
+    SocketConfig, 
+    HttpConfig,
+    RemoteConfig,
+    MainConfig,
+    ExceptionConfig,
+    JobConfig,
+    CrossConfig,
+    loadConfig,
+    getConfig
+}

package/config/index.js

@@ -1,25 +1,25 @@
-'use strict';
-
-const { ConfigLoader } = require('./config_loader');
-
-const Instance = {
-  config: null,
-};
-
-function loadConfig() {
-  const configLoader = new ConfigLoader();
-  Instance["config"] = configLoader.load();
-  return Instance["config"];
-}
-
-function getConfig() {
-  if (!Instance["config"]) {
-    loadConfig();
-  };
-  return Instance["config"];
-}
-
-module.exports = {
-  loadConfig,
-  getConfig,
+'use strict';
+
+const { ConfigLoader } = require('./config_loader');
+
+const Instance = {
+  config: null,
+};
+
+function loadConfig() {
+  const configLoader = new ConfigLoader();
+  Instance["config"] = configLoader.load();
+  return Instance["config"];
+}
+
+function getConfig() {
+  if (!Instance["config"]) {
+    loadConfig();
+  };
+  return Instance["config"];
+}
+
+module.exports = {
+  loadConfig,
+  getConfig,
 };

package/const/channel.d.ts

@@ -1,16 +1,16 @@
-export declare namespace Processes {
-    let showException: string;
-    let sendToMain: string;
-}
-export declare namespace SocketIO {
-    let partySoftware: string;
-}
-export declare namespace Events {
-    let childProcessExit: string;
-    let childProcessError: string;
-}
-export declare namespace Receiver {
-    let childJob: string;
-    let forkProcess: string;
-    let all: string;
-}
+export declare namespace Processes {
+    let showException: string;
+    let sendToMain: string;
+}
+export declare namespace SocketIO {
+    let partySoftware: string;
+}
+export declare namespace Events {
+    let childProcessExit: string;
+    let childProcessError: string;
+}
+export declare namespace Receiver {
+    let childJob: string;
+    let forkProcess: string;
+    let all: string;
+}