egg 4.0.10 → 4.1.0-beta.3

package/dist/lib/loader/index.d.ts

@@ -0,0 +1,4 @@
+import { EggApplicationLoader } from "./EggApplicationLoader.js";
+import { AppWorkerLoader } from "./AppWorkerLoader.js";
+import { AgentWorkerLoader } from "./AgentWorkerLoader.js";
+export { AgentWorkerLoader, AppWorkerLoader, EggApplicationLoader };

package/dist/lib/loader/index.js

@@ -0,0 +1,5 @@
+import { EggApplicationLoader } from "./EggApplicationLoader.js";
+import { AppWorkerLoader } from "./AppWorkerLoader.js";
+import { AgentWorkerLoader } from "./AgentWorkerLoader.js";
+
+export { AgentWorkerLoader, AppWorkerLoader, EggApplicationLoader };

package/dist/lib/start.d.ts

@@ -0,0 +1,28 @@
+import { Agent } from "./agent.js";
+import { Application } from "./application.js";
+import { EggPlugin } from "./types.js";
+
+//#region src/lib/start.d.ts
+interface StartEggOptions {
+  /** specify framework that can be absolute path or npm package */
+  framework?: string;
+  /** directory of application, default to `process.cwd()` */
+  baseDir?: string;
+  /** ignore single process mode warning */
+  ignoreWarning?: boolean;
+  mode?: 'single';
+  env?: string;
+  plugins?: EggPlugin;
+}
+interface SingleModeApplication extends Application {
+  agent: SingleModeAgent;
+}
+interface SingleModeAgent extends Agent {
+  app: SingleModeApplication;
+}
+/**
+ * Start egg with single process
+ */
+declare function startEgg(options?: StartEggOptions): Promise<SingleModeApplication>;
+//#endregion
+export { SingleModeAgent, SingleModeApplication, StartEggOptions, startEgg };

package/dist/lib/start.js

@@ -0,0 +1,36 @@
+import { Agent } from "./agent.js";
+import { Application } from "./application.js";
+import "./types.js";
+import path from "node:path";
+import { readJSON } from "utility";
+import { importModule } from "@eggjs/utils";
+
+//#region src/lib/start.ts
+/**
+* Start egg with single process
+*/
+async function startEgg(options = {}) {
+	options.baseDir = options.baseDir ?? process.cwd();
+	options.mode = "single";
+	if (!options.framework) try {
+		options.framework = (await readJSON(path.join(options.baseDir, "package.json"))).egg.framework;
+	} catch {}
+	let AgentClass = Agent;
+	let ApplicationClass = Application;
+	if (options.framework) {
+		const framework = await importModule(options.framework, { paths: [options.baseDir] });
+		AgentClass = framework.Agent;
+		ApplicationClass = framework.Application;
+	}
+	const agent = new AgentClass({ ...options });
+	await agent.ready();
+	const application = new ApplicationClass({ ...options });
+	application.agent = agent;
+	agent.application = application;
+	await application.ready();
+	application.messenger.broadcast("egg-ready");
+	return application;
+}
+
+//#endregion
+export { startEgg };

package/{src/lib/types.ts → dist/lib/types.d.ts}

@@ -1,53 +1,39 @@
-import type { Socket } from 'node:net';
-import type {
-  RequestOptions as HttpClientRequestOptions,
-} from 'urllib';
-import type {
-  EggLoggerOptions, EggLoggersOptions,
-} from 'egg-logger';
-import type {
-  FileLoaderOptions,
-  EggAppConfig as EggCoreAppConfig,
-} from '@eggjs/core';
-import type {
-  EggApplicationCore, Context,
-} from './egg.js';
-import type { MetaMiddlewareOptions } from '../app/middleware/meta.js';
-import type { NotFoundMiddlewareOptions } from '../app/middleware/notfound.js';
-import type { SiteFileMiddlewareOptions } from '../app/middleware/site_file.js';
-
-// import plugins types
-import '@eggjs/watcher';
-import '@eggjs/development';
-import '@eggjs/jsonp';
-import '@eggjs/i18n';
-import '@eggjs/static';
-import '@eggjs/security';
-import '@eggjs/schedule';
-import '@eggjs/session';
-import '@eggjs/onerror';
-import '@eggjs/logrotator';
-import '@eggjs/multipart';
-import '@eggjs/view';
-
-export type {
-  EggAppInfo,
-} from '@eggjs/core';
-
-type IgnoreItem = string | RegExp | ((ctx: Context) => boolean);
+import Context$1 from "../app/extend/context.js";
+import { MetaMiddlewareOptions } from "../app/middleware/meta.js";
+import { NotFoundMiddlewareOptions } from "../app/middleware/notfound.js";
+import { SiteFileMiddlewareOptions } from "../app/middleware/site_file.js";
+import { EggApplicationCore } from "./egg.js";
+import { EggAppConfig as EggAppConfig$1, EggAppInfo, FileLoaderOptions } from "@eggjs/core";
+import { EggLoggerOptions, EggLoggersOptions } from "egg-logger";
+import { RequestOptions } from "urllib";
+import { Socket } from "node:net";
+import "@eggjs/watcher";
+import "@eggjs/development";
+import "@eggjs/jsonp";
+import "@eggjs/i18n";
+import "@eggjs/static";
+import "@eggjs/security";
+import "@eggjs/schedule";
+import "@eggjs/session";
+import "@eggjs/onerror";
+import "@eggjs/logrotator";
+import "@eggjs/multipart";
+import "@eggjs/view";
+
+//#region src/lib/types.d.ts
+type IgnoreItem = string | RegExp | ((ctx: Context$1) => boolean);
 type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
-
-export interface ClientErrorResponse {
+interface ClientErrorResponse {
   body: string | Buffer;
   status: number;
-  headers: { [key: string]: string };
+  headers: {
+    [key: string]: string;
+  };
 }
-
 /** egg env type */
-export type EggEnvType = 'local' | 'unittest' | 'prod' | string;
-
+type EggEnvType = 'local' | 'unittest' | 'prod' | string;
 /** logger config of egg */
-export interface EggLoggerConfig extends Omit<EggLoggersOptions, 'type'> {
+interface EggLoggerConfig extends Omit<EggLoggersOptions, 'type'> {
   /** custom config of coreLogger */
   coreLogger?: Partial<EggLoggerOptions>;
   /** allow debug log at prod, defaults to `false` */
@@ -59,9 +45,8 @@ export interface EggLoggerConfig extends Omit<EggLoggersOptions, 'type'> {
   /** using the app logger instead of EggContextLogger, defaults to `false` */
   enableFastContextLogger?: boolean;
 }
-
 /** Custom Loader Configuration */
-export interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | 'target'> {
+interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | 'target'> {
   /**
    * an object you wanner load to, value can only be 'ctx' or 'app'. default to app
    */
@@ -71,12 +56,11 @@ export interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | '
    */
   loadunit?: boolean;
 }
-
-export interface HttpClientConfig {
+interface HttpClientConfig {
   /** Request timeout */
   timeout?: number;
   /** Default request args for httpclient */
-  request?: HttpClientRequestOptions;
+  request?: RequestOptions;
   /**
    * @deprecated keep compatible with egg 3.x, no more used
    */
@@ -86,7 +70,6 @@ export interface HttpClientConfig {
    */
   allowH2?: boolean;
 }
-
 /**
  * Powerful Partial, Support adding ? modifier to a mapped property in deep level
  * @example
@@ -95,18 +78,12 @@ export interface HttpClientConfig {
  * // { view: { defaultEngines: string } } => { view?: { defaultEngines?: string } }
  * type EggConfig = PowerPartial<EggAppConfig>
  */
-export type PowerPartial<T> = {
-  [U in keyof T]?: T[U] extends object
-    ? PowerPartial<T[U]>
-    : T[U]
-};
-
-export interface EggAppConfig extends EggCoreAppConfig {
+type PowerPartial<T> = { [U in keyof T]?: T[U] extends object ? PowerPartial<T[U]> : T[U] };
+interface EggAppConfig extends EggAppConfig$1 {
   workerStartTimeout: number;
   baseDir: string;
   middleware: string[];
   coreMiddleware: string[];
-
   /**
    * The option of `bodyParser` middleware
    *
@@ -148,9 +125,8 @@ export interface EggAppConfig extends EggCoreAppConfig {
     };
     /** Default is `'error'`, it will return `400` response when `Prototype-Poisoning` happen. */
     onProtoPoisoning: 'error' | 'remove' | 'ignore';
-    onerror(err: any, ctx: Context): void;
+    onerror(err: any, ctx: Context$1): void;
   };
-
   /**
    * logger options
    * @member Config#logger
@@ -169,22 +145,15 @@ export interface EggAppConfig extends EggCoreAppConfig {
    * @property {Boolean} enableFastContextLogger - using the app logger instead of EggContextLogger, defaults to false
    */
   logger: EggLoggerConfig;
-
   /** custom logger of egg */
   customLogger: {
     [key: string]: EggLoggerOptions;
   };
-
   /** Configuration of httpclient in egg. */
   httpclient: HttpClientConfig;
-
   /**
    * customLoader config
    */
-  // customLoader: {
-  //   [key: string]: CustomLoaderConfig;
-  // };
-
   /**
    * It will ignore special keys when dumpConfig
    */
@@ -194,24 +163,19 @@ export interface EggAppConfig extends EggCoreAppConfig {
       slowBootActionMinDuration: number;
     };
   };
-
   /**
    * The environment of egg
    */
   env: EggEnvType;
-
   /**
    * The current HOME directory
    */
   HOME: string;
-
   hostHeaders: string;
-
   /**
    * Detect request' ip from specified headers, not case-sensitive. Only worked when config.proxy set to true.
    */
   ipHeaders: string;
-
   protocolHeaders: string;
   maxProxyCount: number;
   maxIpsCount: number;
@@ -220,24 +184,19 @@ export interface EggAppConfig extends EggCoreAppConfig {
     sameSite?: string;
     httpOnly?: boolean;
   };
-
   /**
    * The key that signing cookies. It can contain multiple keys separated by .
    */
   keys: string;
-
   /**
    * The name of the application
    */
   name: string;
-
   /**
    * package.json
    */
   pkg: Record<string, any>;
-
   rundir: string;
-
   siteFile: SiteFileMiddlewareOptions;
   meta: MetaMiddlewareOptions;
   notfound: NotFoundMiddlewareOptions;
@@ -245,9 +204,7 @@ export interface EggAppConfig extends EggCoreAppConfig {
     enable: boolean;
     allowedMethods: string[];
   };
-
   onClientError?(err: Error, socket: Socket, app: EggApplicationCore): ClientErrorResponse | Promise<ClientErrorResponse>;
-
   /**
    * server timeout in milliseconds, default to 0 (no timeout).
    *
@@ -256,41 +213,34 @@ export interface EggAppConfig extends EggCoreAppConfig {
    * @see https://nodejs.org/api/http.html#http_server_timeout
    */
   serverTimeout: number | null;
-
   cluster: {
     listen: {
-      path: string,
-      port: number,
-      hostname: string,
+      path: string;
+      port: number;
+      hostname: string;
     };
   };
-
   clusterClient: {
     maxWaitTime: number;
     responseTimeout: number;
   };
-
   [prop: string]: any;
 }
-
-export type RequestObjectBody = Record<string, any>;
-
+type RequestObjectBody = Record<string, any>;
 /**
  * plugin config item interface
  */
-export interface IEggPluginItem {
+interface IEggPluginItem {
   env?: EggEnvType[];
   path?: string;
   package?: string;
   enable?: boolean;
 }
-
-export type EggPluginItem = IEggPluginItem | boolean;
-
+type EggPluginItem = IEggPluginItem | boolean;
 /**
  * build-in plugin list
  */
-export interface EggPlugin {
+interface EggPlugin {
   [key: string]: EggPluginItem | undefined;
   onerror?: EggPluginItem;
   session?: EggPluginItem;
@@ -305,4 +255,5 @@ export interface EggPlugin {
   jsonp?: EggPluginItem;
   view?: EggPluginItem;
 }
-
+//#endregion
+export { ClientErrorResponse, CustomLoaderConfig, EggAppConfig, type EggAppInfo, EggEnvType, EggLoggerConfig, EggPlugin, EggPluginItem, HttpClientConfig, IEggPluginItem, PowerPartial, RequestObjectBody };

package/dist/lib/types.js

@@ -0,0 +1,14 @@
+import "@eggjs/watcher";
+import "@eggjs/development";
+import "@eggjs/jsonp";
+import "@eggjs/i18n";
+import "@eggjs/static";
+import "@eggjs/security";
+import "@eggjs/schedule";
+import "@eggjs/session";
+import "@eggjs/onerror";
+import "@eggjs/logrotator";
+import "@eggjs/multipart";
+import "@eggjs/view";
+
+export {  };

package/dist/lib/utils.d.ts

@@ -0,0 +1,5 @@
+//#region src/lib/utils.d.ts
+declare function getSourceDirname(): string;
+declare function getSourceFile(filename: string): string;
+//#endregion
+export { getSourceDirname, getSourceFile };

package/dist/lib/utils.js

@@ -0,0 +1,14 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+//#region src/lib/utils.ts
+function getSourceDirname() {
+	if (typeof __dirname !== "undefined") return path.dirname(__dirname);
+	return path.dirname(path.dirname(fileURLToPath(import.meta.url)));
+}
+function getSourceFile(filename) {
+	return path.join(getSourceDirname(), filename);
+}
+
+//#endregion
+export { getSourceDirname, getSourceFile };

package/dist/urllib.d.ts

@@ -0,0 +1 @@
+export * from "urllib";

package/dist/urllib.js

@@ -0,0 +1,3 @@
+export * from "urllib"
+
+export {  };

package/package.json

@@ -1,12 +1,64 @@
 {
   "name": "egg",
-  "version": "4.0.10",
+  "version": "4.1.0-beta.3",
   "engines": {
-    "node": ">= 18.19.0"
+    "node": ">= 20.19.0"
   },
   "publishConfig": {
+    "access": "public",
     "tag": "beta"
   },
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js",
+    "./agent": "./dist/agent.js",
+    "./app/extend/context": "./dist/app/extend/context.js",
+    "./app/extend/helper": "./dist/app/extend/helper.js",
+    "./app/extend/request": "./dist/app/extend/request.js",
+    "./app/extend/response": "./dist/app/extend/response.js",
+    "./app/middleware/body_parser": "./dist/app/middleware/body_parser.js",
+    "./app/middleware/meta": "./dist/app/middleware/meta.js",
+    "./app/middleware/notfound": "./dist/app/middleware/notfound.js",
+    "./app/middleware/override_method": "./dist/app/middleware/override_method.js",
+    "./app/middleware/site_file": "./dist/app/middleware/site_file.js",
+    "./config/config.default": "./dist/config/config.default.js",
+    "./config/config.local": "./dist/config/config.local.js",
+    "./config/config.unittest": "./dist/config/config.unittest.js",
+    "./config/plugin": "./dist/config/plugin.js",
+    "./lib/agent": "./dist/lib/agent.js",
+    "./lib/application": "./dist/lib/application.js",
+    "./lib/core/base_context_class": "./dist/lib/core/base_context_class.js",
+    "./lib/core/base_context_logger": "./dist/lib/core/base_context_logger.js",
+    "./lib/core/base_hook_class": "./dist/lib/core/base_hook_class.js",
+    "./lib/core/context_httpclient": "./dist/lib/core/context_httpclient.js",
+    "./lib/core/httpclient": "./dist/lib/core/httpclient.js",
+    "./lib/core/logger": "./dist/lib/core/logger.js",
+    "./lib/core/messenger": "./dist/lib/core/messenger/index.js",
+    "./lib/core/messenger/base": "./dist/lib/core/messenger/base.js",
+    "./lib/core/messenger/IMessenger": "./dist/lib/core/messenger/IMessenger.js",
+    "./lib/core/messenger/ipc": "./dist/lib/core/messenger/ipc.js",
+    "./lib/core/messenger/local": "./dist/lib/core/messenger/local.js",
+    "./lib/core/utils": "./dist/lib/core/utils.js",
+    "./lib/egg": "./dist/lib/egg.js",
+    "./lib/error": "./dist/lib/error/index.js",
+    "./lib/error/CookieLimitExceedError": "./dist/lib/error/CookieLimitExceedError.js",
+    "./lib/error/MessageUnhandledRejectionError": "./dist/lib/error/MessageUnhandledRejectionError.js",
+    "./lib/loader": "./dist/lib/loader/index.js",
+    "./lib/loader/AgentWorkerLoader": "./dist/lib/loader/AgentWorkerLoader.js",
+    "./lib/loader/AppWorkerLoader": "./dist/lib/loader/AppWorkerLoader.js",
+    "./lib/loader/EggApplicationLoader": "./dist/lib/loader/EggApplicationLoader.js",
+    "./lib/start": "./dist/lib/start.js",
+    "./lib/types": "./dist/lib/types.js",
+    "./lib/utils": "./dist/lib/utils.js",
+    "./urllib": "./dist/urllib.js",
+    "./package.json": "./package.json"
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "description": "A web application framework for Node.js",
   "keywords": [
     "web",
@@ -19,9 +71,8 @@
     "egg"
   ],
   "dependencies": {
-    "@eggjs/cluster": "^3.0.1",
+    "@eggjs/cluster": "",
     "@eggjs/cookies": "^3.1.0",
-    "@eggjs/core": "^6.3.1",
     "@eggjs/development": "^4.0.0",
     "@eggjs/i18n": "^3.0.1",
     "@eggjs/jsonp": "^3.0.0",
@@ -32,14 +83,12 @@
     "@eggjs/security": "^4.0.0",
     "@eggjs/session": "^4.0.1",
     "@eggjs/static": "^3.0.0",
-    "@eggjs/utils": "^4.2.5",
     "@eggjs/view": "^3.0.1",
     "@eggjs/watcher": "^4.0.4",
     "circular-json-for-egg": "^1.0.0",
     "cluster-client": "^3.7.0",
     "egg-errors": "^2.3.2",
-    "egg-logger": "^3.6.1",
-    "extend2": "^4.0.0",
+    "egg-logger": "^3.5.0",
     "graceful": "^2.0.0",
     "humanize-ms": "^2.0.0",
     "is-type-of": "^2.2.0",
@@ -49,116 +98,46 @@
     "performance-ms": "^1.1.0",
     "sendmessage": "^3.0.1",
     "urllib": "^4.6.11",
-    "utility": "^2.5.0"
+    "utility": "^2.5.0",
+    "@eggjs/core": "6.6.0-beta.3",
+    "@eggjs/utils": "4.5.0-beta.3",
+    "@eggjs/extend2": "4.1.0-beta.3"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.17.3",
-    "@eggjs/bin": "^7.0.2",
-    "@eggjs/koa": "^2.20.6",
-    "@eggjs/mock": "^6.0.7",
-    "@eggjs/supertest": "^8.2.0",
-    "@eggjs/tsconfig": "1",
+    "@eggjs/supertest": "",
     "@types/koa-bodyparser": "^4.3.12",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "22",
+    "@types/node": "24",
     "address": "2",
     "assert-file": "1",
     "coffee": "5",
-    "cross-env": "7",
-    "dumi": "^2.4.17",
     "egg-plugin-puml": "^2.4.0",
     "egg-tracer": "^2.1.0",
     "egg-view-nunjucks": "^2.3.0",
-    "eslint": "8",
-    "eslint-config-egg": "14",
     "formstream": "^1.5.1",
     "koa-static": "^5.0.0",
     "mm": "^4.0.2",
     "pedding": "^2.0.1",
-    "prettier": "^3.4.2",
-    "rimraf": "6",
     "runscript": "^2.0.1",
     "sdk-base": "^5.0.1",
     "spy": "^1.0.0",
-    "tsd": "^0.31.2",
-    "tshy": "^3.0.2",
-    "tshy-after": "1",
-    "typescript": "5"
-  },
-  "scripts": {
-    "clean": "rimraf dist",
-    "lint": "eslint src test --ext .ts",
-    "pretest": "npm run clean && npm run lint -- --fix",
-    "test": "egg-bin test",
-    "test-local": "egg-bin test",
-    "test:changed": "egg-bin test --changed",
-    "preci": "npm run clean && npm run lint",
-    "ci": "egg-bin cov",
-    "postci": "npm run prepublishOnly && npm run clean",
-    "prepublishOnly": "tshy && tshy-after && attw --pack --profile node16",
-    "ci:app": "npm run ci \"test/app/**/*.test.ts,test/*.test.ts\"",
-    "ci:cluster1": "npm run ci \"test/cluster1/**/*.test.ts\"",
-    "ci:cluster2": "npm run ci \"test/cluster2/**/*.test.ts\"",
-    "ci:lib/core": "npm run ci \"test/lib/core/**/*.test.ts\"",
-    "ci:lib/plugins": "npm run ci \"test/lib/plugins/**/*.test.ts\"",
-    "site:dev": "cross-env APP_ROOT=./site dumi dev",
-    "site:build": "cross-env APP_ROOT=./site dumi build",
-    "site:prettier": "prettier --config site/.prettierrc --ignore-path site/.prettierignore --write \"site/**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "puml": "puml . --dest ./site"
+    "tsd": "^0.33.0",
+    "tsdown": "^0.15.0",
+    "typescript": "5",
+    "@eggjs/koa": "3.1.0-beta.3",
+    "@eggjs/mock": "6.1.0-beta.3"
   },
-  "homepage": "https://github.com/eggjs/egg",
   "repository": {
     "type": "git",
-    "url": "git://github.com/eggjs/egg.git"
+    "url": "git://github.com/eggjs/egg.git",
+    "directory": "packages/egg"
   },
   "license": "MIT",
-  "tnpm": {
-    "mode": "npm"
-  },
   "egg": {
-    "framework": true,
-    "exports": {
-      "import": "./dist/esm",
-      "require": "./dist/commonjs",
-      "typescript": "./src"
-    }
+    "framework": true
   },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "type": "module",
-  "tshy": {
-    "exports": {
-      ".": "./src/index.ts",
-      "./urllib": "./src/urllib.ts",
-      "./package.json": "./package.json"
-    }
-  },
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/index.d.ts",
-        "default": "./dist/commonjs/index.js"
-      }
-    },
-    "./urllib": {
-      "import": {
-        "types": "./dist/esm/urllib.d.ts",
-        "default": "./dist/esm/urllib.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/urllib.d.ts",
-        "default": "./dist/commonjs/urllib.js"
-      }
-    },
-    "./package.json": "./package.json"
-  },
-  "types": "./dist/commonjs/index.d.ts",
-  "main": "./dist/commonjs/index.js",
-  "module": "./dist/esm/index.js"
-}
+  "scripts": {
+    "lint": "oxlint",
+    "build": "tsdown",
+    "test": "vitest run"
+  }
+}