ee-core 4.0.0-beta.1 → 4.0.1

package/socket/index.d.ts

@@ -0,0 +1,10 @@
+import IoServer = require("socket.io");
+import IoClient = require("socket.io-client");
+import { HttpServer } from './httpServer';
+import { IpcServer } from './ipcServer';
+import { SocketServer } from './socketServer';
+export declare function loadSocket(): void;
+export declare function getSocketServer(): SocketServer;
+export declare function getHttpServer(): HttpServer;
+export declare function getIpcServer(): IpcServer;
+export { IoServer, IoClient };

package/socket/ipcServer.d.ts

@@ -0,0 +1,9 @@
+export declare class IpcServer {
+    directory: string;
+    loop(obj: any, pathname: string): void;
+    register(exportObj: any, propertyChain: any): void;
+    findFn(controller: any, c: any): {
+        controller: any;
+    };
+    init(): void;
+}

package/socket/ipcServer.js

@@ -6,12 +6,19 @@ const { ipcMain } = require('electron');
 const { coreLogger } = require('../log');
 const { getController } = require('../controller');
 const { EXPORTS } = require('../core/loader/file_loader');
+const { getConfig } = require('../config');
 
 class IpcServer {
   constructor () {
+    const { mainServer } = getConfig();
+    this.channelSeparator = mainServer.channelSeparator;
     this.directory = 'controller';
     this.init();
   }
+  init() {
+    const controller = getController();
+    this.loop(controller, this.directory);
+  }
 
   loop(obj, pathname) {
     const keys = Object.keys(obj);
@@ -35,7 +42,10 @@ class IpcServer {
     const controller = getController();
     const keys = Object.keys(exportObj);
     for (const key of keys) {
-      const channel = `${propertyChain}.${key}`;
+      // Supports two types of routing separators
+      // channel: controller.file.function | controller/file/function
+      const tmpChannel = `${propertyChain}.${key}`;
+      const channel = tmpChannel.split('.').join(this.channelSeparator);
       debug('[register] channel %s', channel);
 
       // send/on model
@@ -71,7 +81,8 @@ class IpcServer {
       const cmd = c;
       let fn = null;
       if (is.string(cmd)) {
-        const actions = cmd.split('.');
+        const actions = cmd.split(this.channelSeparator);
+        debug('[findFn] channel %o', actions);
         let obj = { controller };
         actions.forEach(key => {
           obj = obj[key];
@@ -88,10 +99,6 @@ class IpcServer {
     return null;
   }
 
-  init() {
-    const controller = getController();
-    this.loop(controller, this.directory);
-  }
 }
 
 module.exports = {

package/socket/socketServer.d.ts

@@ -0,0 +1,10 @@
+import { Server } from "socket.io";
+import { DefaultEventsMap } from "socket.io/dist/typed-events";
+export declare class SocketServer {
+    socket: import("socket.io").Socket<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
+    io: Server<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
+    config: any;
+    init(): Promise<void>;
+    connect(): void;
+}
+

package/socket/socketServer.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const debug = require('debug')('ee-core:socket:socketServer');
 const is = require('is-type-of');
 const { Server } = require('socket.io');
 const { coreLogger } = require('../log');
@@ -13,9 +14,11 @@ const { getPort } = require('../utils/port');
  */
 class SocketServer {
   constructor () {
+    const { socketServer, mainServer } = getConfig();
+    this.config = socketServer;
+    this.channelSeparator = mainServer.channelSeparator;
     this.socket = undefined;
     this.io = undefined;
-    this.config = getConfig().socketServer;
     this.init();
   }
 
@@ -49,8 +52,10 @@ class SocketServer {
           const cmd = message.cmd;
           const args = message.args;
           let fn = null;
+          debug('[socket] channel %s', cmd);
           if (is.string(cmd)) {
-            const actions = cmd.split('.');
+            const actions = cmd.split(this.channelSeparator);
+            debug('[findFn] channel %o', actions);
             let obj = { controller };
             actions.forEach(key => {
               obj = obj[key];

package/storage/index.d.ts

@@ -0,0 +1,5 @@
+import { SqliteStorage } from "./sqliteStorage";
+import { Database } from "better-sqlite3";
+
+export { Database };
+export { SqliteStorage };

package/storage/sqliteStorage.d.ts

@@ -0,0 +1,16 @@
+
+import { Database } from "better-sqlite3";
+export declare class SqliteStorage {
+    constructor(name: any, opt?: {});
+    name: string;
+    mode: string;
+    dbDir: string;
+    fileName: string;
+    db: Database;
+    _initDB(opt?: {}): any;
+    _formatFileName(name: string): string;
+    _createDatabaseDir(): string;
+    getMode(name: string): string;
+    getDbDir(): string;
+    getFilePath(): string;
+}

package/storage/sqliteStorage.js

@@ -3,7 +3,7 @@
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
-const Database = require('better-sqlite3');
+const BSqlite = require('better-sqlite3');
 const { mkdir } = require('../utils/helper');
 const { getDataDir } = require('../ps');
 
@@ -32,7 +32,7 @@ class SqliteStorage {
       dbPath = this.getFilePath();
     }
 
-    const db = new Database(dbPath, options);
+    const db = new BSqlite(dbPath, options);
 
     // 如果是文件类型，判断文件是否创建成功
     if (this.mode != 'memory') {

package/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "skipLibCheck": true,
+    "allowJs": true,
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "outDir": "types", 
+  },
+  "include": [
+    "index.js", "app", "config", "const", "controller", "core", "cross", "electron", "exception",
+    "html", "jobs", "loader", "log", "message", "ps", "socket", "storage", "utils",
+  ]
+}
+  

package/utils/extend.d.ts

@@ -0,0 +1,2 @@
+export declare function extend(...args: any[]): any;
+export declare function isPlainObject(obj: any): any;

package/utils/helper.d.ts

@@ -0,0 +1,14 @@
+export declare function fnDebounce(): (fn: any, delayTime: any, isImediate: any, args: any) => any;
+export declare function getRandomString(): string;
+export declare function mkdir(filepath: string, opt?: {}): void;
+export declare function chmodPath(path: string, mode: number | string): void;
+export declare function compareVersion(v1: string, v2: string): 0 | 1 | -1;
+export declare function middleware(fn: Function): any;
+export declare function stringify(obj: any, ignore?: any[]): string;
+export declare function validValue(value: any): boolean;
+export declare function checkConfig(prop: any): boolean;
+export declare function loadConfig(prop: any): any;
+export declare function sleep(ms: number): Promise<any>;
+export declare function replaceArgsValue(argv: any, key: any, value: any): any;
+export declare function getValueFromArgv(argv: any, key: any): any;
+export declare function fileIsExist(filepath: string): boolean;

package/utils/helper.js

@@ -8,14 +8,6 @@ const { parseArgv } = require('./pargv');
 
 const _basePath = process.cwd();
 
-/**
- * fnDebounce
- * 
- * @param  {Function} fn - 回调函数
- * @param  {Time} delayTime - 延迟时间(ms)
- * @param  {Boolean} isImediate - 是否需要立即调用
- * @param  {type} args - 回调函数传入参数
-*/
 function fnDebounce() {
   const fnObject = {};
   let timer;
@@ -112,9 +104,7 @@ function stringify(obj, ignore = []) {
   return JSON.stringify(result);
 }
 
-/**
- * 是否有效值
- */
+// 是否有效值
 function validValue(value) {
   return (
     value !== undefined &&

package/utils/index.d.ts

@@ -0,0 +1,10 @@
+export declare function getPackage(): any;
+export declare function getMAC(iface: any): string;
+export declare function isMAC(macAddress: string): boolean;
+export declare function isFileProtocol(protocol: string): boolean;
+export declare function isWebProtocol(protocol: string): boolean;
+export declare function isJsProject(baseDir: string): boolean;
+export declare function machineIdSync(original: boolean): any;
+export declare function machineId(original: boolean): Promise<any>;
+import is = require("./is");
+export { is };

package/utils/index.js

@@ -24,19 +24,15 @@ const MachineGuid = {
   freebsd: 'kenv -q smbios.system.uuid || sysctl -n kern.hostuuid'
 };
 
-/**
- * 获取项目根目录package.json
- */
+// 获取项目根目录package.json
 function getPackage() {
   const json = readSync(path.join(getBaseDir(), 'package.json'));
   
   return json;
 };
 
-/**
- * Get the first proper MAC address
- * @param iface If provided, restrict MAC address fetching to this interface
- */
+// Get the first proper MAC address
+// iface: If provided, restrict MAC address fetching to this interface
 function getMAC(iface) {
   const zeroRegex = /(?:[0]{1,2}[:-]){5}[0]{1,2}/;
   const list = os.networkInterfaces();
@@ -68,9 +64,7 @@ function getMAC(iface) {
   throw new Error('failed to get the MAC address');
 }
 
-/**
- * Check if the input is a valid MAC address
- */
+// Check if the input is a valid MAC address
 function isMAC(macAddress) {
   const macRegex = /(?:[a-z0-9]{1,2}[:-]){5}[a-z0-9]{1,2}/i;
   return macRegex.test(macAddress);
@@ -93,18 +87,14 @@ function isJsProject(baseDir) {
   return false;
 }
 
-/**
- * get machine id
- */
+// get machine id
 function machineIdSync(original) {
   let id = _expose(execSync(MachineGuid[platform]).toString());
   return original ? id : _hash(id);
 }
 
-/**
- * get machine id (promise)
- * original <Boolean>, If true return original value of machine id, otherwise return hashed value (sha-256), default: false
- */
+// get machine id (promise)
+// original <Boolean>, If true return original value of machine id, otherwise return hashed value (sha-256), default: false
 function machineId(original) {
   return new Promise((resolve, reject) => {
     return exec(MachineGuid[platform], {}, (err, stdout, stderr) => {

package/utils/ip.d.ts

@@ -0,0 +1,2 @@
+export declare function publicIpv4(options: any): Promise<any>;
+export declare function publicIpv6(options: any): Promise<any>;

package/utils/is.d.ts

@@ -0,0 +1,14 @@
+export declare function renderer(): boolean;
+export declare function main(): boolean;
+export declare function osx(): boolean;
+export declare function macOS(): boolean;
+export declare function windows(): boolean;
+export declare function linux(): boolean;
+export declare function x86(): boolean;
+export declare function x64(): boolean;
+export declare function sandbox(): boolean;
+export declare function mas(): boolean;
+export declare function windowsStore(): boolean;
+export declare function all(...args: any[]): boolean;
+export declare function none(...args: any[]): boolean;
+export declare function one(...args: any[]): boolean;

package/utils/json.d.ts

@@ -0,0 +1,5 @@
+export declare function strictParse(str: string): {};
+export declare function readSync(filepath: string): any;
+export declare function writeSync(filepath: string, str: string, options: any): void;
+export declare function read(filepath: string): any;
+export declare function write(filepath: string, str: string, options: any): Promise<void>;

package/utils/pargv.d.ts

@@ -0,0 +1,3 @@
+export declare function parseArgv(args: any, opts: any): {
+    _: any[];
+};

package/utils/port/index.d.ts

@@ -0,0 +1 @@
+export declare function getPort(options?: any): Promise<any>;

package/utils/wrap.d.ts

@@ -0,0 +1,4 @@
+export declare function getProperties(filepath: any, { caseStyle }: {
+    caseStyle: any;
+}): any;
+export declare function defaultCamelize(filepath: any, caseStyle: any): any;

package/const/index.js

@@ -1,5 +0,0 @@
-module.exports = {
-  jobs: {
-    inspectStartIndex: 5858
-  }
-};