ee-core 2.12.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.12.0",
+  "version": "4.0.0",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
+    "axios": "^1.7.9",
     "bytenode": "^1.3.6",
     "chalk": "^4.1.2",
     "cross-spawn": "^7.0.3",
     "dayjs": "^1.11.7",
     "debug": "^4.3.3",
-    "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
     "globby": "^10.0.0",
     "is-type-of": "^1.2.1",
@@ -34,5 +34,11 @@
     "socket.io": "^4.6.1",
     "socket.io-client": "^4.6.1",
     "urllib": "^2.38.0"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.12",
+    "@types/electron": "^1.4.38",
+    "@types/node": "^20.16.0",
+    "typescript": "^5.7.2"
   }
 }

package/ps/index.d.ts

@@ -0,0 +1,37 @@
+export declare function allEnv(): NodeJS.ProcessEnv;
+export declare function env(): string;
+export declare function isProd(): boolean;
+export declare function isDev(): boolean;
+export declare function isRenderer(): boolean;
+export declare function isMain(): boolean;
+export declare function isForkedChild(): boolean;
+export declare function processType(): string;
+export declare function appName(): string;
+export declare function appVersion(): string;
+export declare function getDataDir(): string;
+export declare function getLogDir(): string;
+export declare function getBundleDir(basePath: string): string;
+export declare function getRootDir(): string;
+export declare function getBaseDir(): string;
+export declare function getElectronDir(): string;
+export declare function getPublicDir(): string;
+export declare function getExtraResourcesDir(): string;
+export declare function getAppUserDataDir(): string;
+export declare function getExecDir(): string;
+export declare function getUserHomeDir(): string;
+export declare function getUserHomeAppDir(): string;
+export declare function getUserHomeHiddenAppDir(): string;
+export declare function getSocketPort(): number;
+export declare function getHttpPort(): number;
+export declare function isPackaged(): boolean;
+export declare function isHotReload(): boolean;
+export declare function exit(code?: number): never;
+export declare function makeMessage(msg?: {}): {
+    channel: string;
+    event: string;
+    data: {};
+};
+export declare function exitChildJob(code?: number): void;
+export declare function isChildJob(): boolean;
+export declare function isChildPoolJob(): boolean;
+export declare function getArgumentByName(name: string): string;

package/ps/index.js

@@ -1,223 +1,129 @@
-const path = require('path');
-const eis = require('../utils/is');
-
-/**
- * 初始化模式
- */
-exports.initMode = function(mode) {
-  if(process.env.EE_MODE !== undefined)return
-  return process.env.EE_MODE = mode ? mode : 'framework';
-}
-
-/**
- * 当前模式 - framework | module
- */
-exports.mode = function() {
-  return process.env.EE_MODE;
-}
-
-/**
- * 校验模式
- */
-exports.verifyMode = function(mode) {
-  if (['framework', 'module'].includes(mode)) {
-    return true;
-  }
-  return false;
-}
+'use strict';
 
-/**
- * 是否为框架模式
- */
-exports.isFrameworkMode = function() {
-  return (process.env.EE_MODE === 'framework');
-}
-
-/**
- * 是否为模块模式
- */
-exports.isModuleMode = function() {
-  return (process.env.EE_MODE === 'module');
-}
+const path = require('path');
+const is = require('../utils/is');
 
-/**
- * 当前进程的所有env
- */
-exports.allEnv = function() {
+// 当前进程的所有env
+function allEnv() {
   return process.env;
 }
 
-/**
- * 当前环境 - local | prod
- */
-exports.env = function() {
-  return process.env.EE_SERVER_ENV;
+// 当前环境 - local | prod
+function env() {
+  return process.env.EE_ENV;
 }
 
-/**
- * 获取 当前环境
- */
-exports.getEnv = this.env
-
-/**
- * 是否生产环境
- */
-exports.isProd = function() {
-  return (process.env.EE_SERVER_ENV === 'prod');
+// 是否生产环境
+function isProd() {
+  return (process.env.EE_ENV === 'prod');
 }
 
-/**
- * 是否为开发环境
- */
-exports.isDev = function() {
-  if ( process.env.EE_SERVER_ENV === 'development' ||
-    process.env.EE_SERVER_ENV === 'dev' ||
-    process.env.EE_SERVER_ENV === 'local'
-  ) {
-    return true;
-  }
-  
-  if ( process.env.NODE_ENV === 'development' ||
-    process.env.NODE_ENV === 'dev' ||
-    process.env.NODE_ENV === 'local'
-  ) {
+// 是否为开发环境
+function isDev() {
+  if (process.env.EE_ENV === 'dev' || process.env.EE_ENV === 'local') {
     return true;
   }
 
   return false;
 };
 
-/**
- * 是否为渲染进程
- */
-exports.isRenderer = function() {
+// 是否为渲染进程
+function isRenderer() {
   return (typeof process === 'undefined' ||
     !process ||
     process.type === 'renderer');
 };
 
-/**
- * 是否为主进程
- */
-exports.isMain = function() {
+// 是否为主进程
+function isMain() {
   return ( typeof process !== 'undefined' &&
     process.type === 'browser');
 };
 
-/**
- * 是否为node子进程
- */
-exports.isForkedChild = function() {
+// 是否为node子进程
+function isForkedChild() {
   return (Number(process.env.ELECTRON_RUN_AS_NODE) === 1);
 };
 
-/**
- * 当前进程类型
- */
-exports.processType = function() {
+// 当前进程类型
+function processType() {
   let type = '';
-  if (this.isMain()) {
+  if (isMain()) {
     type = 'browser';
-  } else if (this.isRenderer()) {
+  } else if (isRenderer()) {
     type = 'renderer';
-  } else if (this.isForkedChild()) {
+  } else if (isForkedChild()) {
     type = 'child';
   }
 
   return type;
 };
 
-/**
- * app name
- */
-exports.appName = function() {
+// app name
+function appName() {
   return process.env.EE_APP_NAME;
 }
 
-/**
- * app version
- */
-exports.appVersion = function() {
+// app version
+function appVersion() {
   return process.env.EE_APP_VERSION;
 }
 
-/**
- * 获取home路径
- */
-exports.getHomeDir = function () {
-  return process.env.EE_HOME;
-}
-
-/**
- * 获取数据存储路径
- */
-exports.getStorageDir = function () {
-  const storageDir = path.join(this.getRootDir(), 'data');
-  return storageDir;
+// 获取数据存储路径
+function getDataDir() {
+  const base = isDev() ? getBaseDir() : getUserHomeHiddenAppDir();
+  const dataDir = path.join(base, 'data');
+  return dataDir;
 }
 
-/**
- * 获取日志存储路径 
- */
-exports.getLogDir = function () {
-  const dir = path.join(this.getRootDir(), 'logs');
+// 获取日志存储路径 
+function getLogDir() {
+  const base = isDev() ? getBaseDir() : getUserHomeHiddenAppDir();
+  const dir = path.join(base, 'logs');
   return dir;
 }
 
-/**
- * 获取加密文件路径
- */
-exports.getEncryptDir = function (basePath) {
+// 获取bundle文件路径
+function getBundleDir(basePath) {
   const base = basePath || process.cwd();
   const dir = path.join(base, 'public', 'electron');
   return dir;
 }
 
-/**
- * 获取root目录  (dev-项目根目录，pro-app user data目录)
- */
-exports.getRootDir = function () {
-  const appDir = this.isDev() ? process.env.EE_HOME : process.env.EE_APP_USER_DATA;
+// 获取root目录  (dev-项目根目录，pro-app user data目录)
+function getRootDir() {
+  const appDir = isDev() ? getBaseDir() : getAppUserDataDir();
   return appDir;
 }
 
-/**
- * 获取base目录
- */
-exports.getBaseDir = function() {
+// 获取base目录
+function getBaseDir() {
   return process.env.EE_BASE_DIR;
 }
 
-/**
- * 获取electron目录
- */
-exports.getElectronDir = function() {
-  return process.env.EE_BASE_DIR;
+// 获取electron目录
+function getElectronDir() {
+  return process.env.EE_ELECTRON_DIR;
 }
 
-/**
- * 获取public目录
- */
-exports.getPublicDir = function() {
-  const dir = path.join(process.env.EE_HOME, "public");
+// 获取public目录
+function getPublicDir() {
+  const dir = path.join(getBaseDir(), "public");
   return dir;
 }
 
-/**
- * 获取 额外资源目录
- */
-exports.getExtraResourcesDir = function() {
-  const execDir = this.getExecDir();
-  const isPackaged = this.isPackaged();
-
+// 获取 额外资源目录
+function getExtraResourcesDir() {
+  const execDir = getExecDir();
+  const packaged = isPackaged();
 
   // 资源路径不同
   let dir = '';
-  if (isPackaged) {
+  if (packaged) {
     // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
     // windows和MacOs不一样
     dir = path.join(execDir, "resources", "extraResources");
-    if (eis.macOS()) {
+    if (is.macOS()) {
       dir = path.join(execDir, "..", "Resources", "extraResources");
     }
   } else {
@@ -227,105 +133,57 @@ exports.getExtraResourcesDir = function() {
   return dir;
 }
 
-/**
- * 获取 appUserData目录
- */
-exports.getAppUserDataDir = function() {
+// 获取 appUserData目录
+function getAppUserDataDir() {
   return process.env.EE_APP_USER_DATA;
 }
 
-/**
- * 获取 exec目录
- */
-exports.getExecDir = function() {
+// 获取 exec目录
+function getExecDir() {
   return process.env.EE_EXEC_DIR;
 }
 
-/**
- * 获取操作系统用户目录
- */
-exports.getUserHomeDir = function() {
+// 获取操作系统用户目录
+function getUserHomeDir() {
   return process.env.EE_USER_HOME;
 }
 
-/**
- * 获取用户配置数据目录
- */
-exports.getUserHomeConfigDir = function() {
-  // const filePath = path.join(this.getHomeDir(), 'package.json');
-  // if (!fs.existsSync(filePath)) {
-  //   throw new Error(filePath + ' is not found');
-  // }
-  // const pkg = JSON.parse(fs.readFileSync(filePath));
-  // if (!pkg.name || pkg.name == "") {
-  //   throw new Error(`name is required from ${filePath}`);
-  // }
-  const appname = this.appName();
-  const cfgDir = path.join(this.getUserHomeDir(), ".config", appname);
-  return cfgDir;
-}
-
-/**
- * 获取基础数据路径
- */
-exports.getUserHomeAppFilePath = function() {
-  const p = path.join(this.getUserHomeConfigDir(), "app.json");
-  return p;
+// 获取用户家目录中的隐藏的app目录
+function getUserHomeHiddenAppDir() {
+  const appnameDir = "." + appName();
+  const dir = path.join(getUserHomeDir(), appnameDir);
+  return dir;
 }
 
-/**
- * 获取主进程端口
- */
-exports.getMainPort = function () {
-  return parseInt(process.env.EE_MAIN_PORT) || 0;
+// 获取用户家目录中的app目录
+function getUserHomeAppDir() {
+  const appnameDir = appName();
+  const dir = path.join(getUserHomeDir(), appnameDir);
+  return dir;
 }
 
-/**
- * 获取内置socket端口
- */
-exports.getSocketPort = function () {
+// 获取内置socket端口
+function getSocketPort() {
   return parseInt(process.env.EE_SOCKET_PORT) || 0;
 }
 
-/**
- * 获取内置http端口
- */
-exports.getHttpPort = function () {
+// 获取内置http端口
+function getHttpPort() {
   return parseInt(process.env.EE_HTTP_PORT) || 0;
 }
 
-/**
- * 是否打包
- */
-exports.isPackaged = function () {
+// 是否打包
+function isPackaged() {
   return process.env.EE_IS_PACKAGED === 'true';
 }
 
-/**
- * 是否加密
- */
-exports.isEncrypted = function () {
-  return process.env.EE_IS_ENCRYPTED === 'true';
-}
-
-/**
- * 是否热重启
- */
-exports.isHotReload = function () {
-  return process.env.HOT_RELOAD === 'true';
-}
-
-/**
- * 进程退出
- */
-exports.exit = function(code = 0) {
+// 进程退出
+function exit(code = 0) {
   return process.exit(code);
 }
 
-/**
- * 格式化message
- */
-exports.makeMessage = function(msg = {}) {
+// 格式化message
+function makeMessage(msg = {}) {
   let message = Object.assign({
     channel: '',
     event: '', 
@@ -335,10 +193,8 @@ exports.makeMessage = function(msg = {}) {
   return message;
 }
 
-/**
- * 退出ChildJob进程
- */
-exports.exitChildJob = function(code = 0) {
+// 退出ChildJob进程
+function exitChildJob(code = 0) {
   try {
     let args = JSON.parse(process.argv[2]);
     if (args.type == 'childJob') {
@@ -349,11 +205,8 @@ exports.exitChildJob = function(code = 0) {
   }
 }
 
-
-/**
- * 任务类型 ChildJob
- */
-exports.isChildJob = function() {
+// 任务类型 ChildJob
+function isChildJob() {
   try {
     let args = JSON.parse(process.argv[2]);
     if (args.type == 'childJob') {
@@ -364,10 +217,8 @@ exports.isChildJob = function() {
   }
 }
 
-/**
- * 任务类型 ChildPoolJob
- */
-exports.isChildPoolJob = function() {
+// 任务类型 ChildPoolJob
+function isChildPoolJob() {
   try {
     let args = JSON.parse(process.argv[2]);
     if (args.type == 'childPoolJob') {
@@ -376,4 +227,50 @@ exports.isChildPoolJob = function() {
   } catch (e) {
     return false;
   }
+}
+
+// Get cmd parameter by name
+function getArgumentByName(name) {
+  for (let i = 0; i < process.argv.length; i++) {
+    const item = process.argv[i]
+    const prefixKey = `--${name}=`;
+    if (item.indexOf(prefixKey) !== -1) {
+      return item.substring(prefixKey.length);
+    }
+  }
+}
+
+module.exports = {
+  allEnv,
+  env,
+  isProd,
+  isDev,
+  isRenderer,
+  isMain,
+  isForkedChild,
+  processType,
+  appName,
+  appVersion,
+  getDataDir,
+  getLogDir,
+  getBundleDir,
+  getRootDir,
+  getBaseDir,
+  getElectronDir,
+  getPublicDir,
+  getExtraResourcesDir,
+  getAppUserDataDir,
+  getExecDir,
+  getUserHomeDir,
+  getUserHomeAppDir,
+  getUserHomeHiddenAppDir,
+  getSocketPort,
+  getHttpPort,
+  isPackaged,
+  exit,
+  makeMessage,
+  exitChildJob,
+  isChildJob,
+  isChildPoolJob,
+  getArgumentByName
 }

package/socket/httpServer.d.ts

@@ -0,0 +1,8 @@
+export declare class HttpServer {
+    config: any;
+    httpApp: any;
+    init(): Promise<void>;
+    _create(): void;
+    _dispatch(ctx: any, next: any): Promise<void>;
+    getHttpApp(): any;
+}