egg 4.1.0-beta.19 → 4.1.0-beta.20

package/dist/lib/loader/AppWorkerLoader.js

@@ -1,37 +1,4 @@
-import { EggApplicationLoader } from "./EggApplicationLoader.js";
+import "../../EggApplicationLoader-CMe1VQt1.js";
+import { AppWorkerLoader } from "../../AppWorkerLoader-CAtxJvGl.js";
 
-//#region src/lib/loader/AppWorkerLoader.ts
-/**
-* App worker process Loader, will load plugins
-* @see https://github.com/eggjs/egg-core/blob/master/src/loader/egg_loader.ts
-*/
-var AppWorkerLoader = class extends EggApplicationLoader {
-	/**
-	* loadPlugin first, then loadConfig
-	* @since 1.0.0
-	*/
-	async loadConfig() {
-		await this.loadPlugin();
-		await super.loadConfig();
-	}
-	/**
-	* Load all directories in convention
-	* @since 1.0.0
-	*/
-	async load() {
-		await this.loadApplicationExtend();
-		await this.loadRequestExtend();
-		await this.loadResponseExtend();
-		await this.loadContextExtend();
-		await this.loadHelperExtend();
-		await this.loadCustomLoader();
-		await this.loadCustomApp();
-		await this.loadService();
-		await this.loadMiddleware();
-		await this.loadController();
-		await this.loadRouter();
-	}
-};
-
-//#endregion
 export { AppWorkerLoader };

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

@@ -1,8 +1,2 @@
-import { EggLoader } from "@eggjs/core";
-
-//#region src/lib/loader/EggApplicationLoader.d.ts
-declare abstract class EggApplicationLoader extends EggLoader {
-  abstract load(): Promise<void>;
-}
-//#endregion
+import { EggApplicationLoader } from "../../EggApplicationLoader-PnIvd5oV.js";
 export { EggApplicationLoader };

package/dist/lib/loader/EggApplicationLoader.js

@@ -1,7 +1,3 @@
-import { EggLoader } from "@eggjs/core";
+import { EggApplicationLoader } from "../../EggApplicationLoader-CMe1VQt1.js";
 
-//#region src/lib/loader/EggApplicationLoader.ts
-var EggApplicationLoader = class extends EggLoader {};
-
-//#endregion
 export { EggApplicationLoader };

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

@@ -1,4 +1,5 @@
-import { EggApplicationLoader } from "./EggApplicationLoader.js";
-import { AppWorkerLoader } from "./AppWorkerLoader.js";
-import { AgentWorkerLoader } from "./AgentWorkerLoader.js";
+import { EggApplicationLoader } from "../../EggApplicationLoader-PnIvd5oV.js";
+import { AppWorkerLoader } from "../../AppWorkerLoader-CT875rYM.js";
+import { AgentWorkerLoader } from "../../AgentWorkerLoader-DG_hAClt.js";
+import "../../index-CUPkUUOR.js";
 export { AgentWorkerLoader, AppWorkerLoader, EggApplicationLoader };

package/dist/lib/loader/index.js

@@ -1,5 +1,6 @@
-import { EggApplicationLoader } from "./EggApplicationLoader.js";
-import { AppWorkerLoader } from "./AppWorkerLoader.js";
-import { AgentWorkerLoader } from "./AgentWorkerLoader.js";
+import { EggApplicationLoader } from "../../EggApplicationLoader-CMe1VQt1.js";
+import { AppWorkerLoader } from "../../AppWorkerLoader-CAtxJvGl.js";
+import { AgentWorkerLoader } from "../../AgentWorkerLoader-D_hceBRW.js";
+import "../../loader-3myZ-rpm.js";
 
 export { AgentWorkerLoader, AppWorkerLoader, EggApplicationLoader };

package/dist/lib/start.d.ts

@@ -1,28 +1,12 @@
-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
+import "../EggApplicationLoader-PnIvd5oV.js";
+import "../AppWorkerLoader-CT875rYM.js";
+import "../AgentWorkerLoader-DG_hAClt.js";
+import "../index-CUPkUUOR.js";
+import { SingleModeAgent, SingleModeApplication, StartEggOptions, startEgg } from "../base_hook_class-R8A8gm1s.js";
+import "../response-DlNYDj00.js";
+import "../types.plugin-C3D5I7VD.js";
+import "../IMessenger-C9g6ypSI.js";
+import "../CookieLimitExceedError-CAW0HYJw.js";
+import "../MessageUnhandledRejectionError-Lq5fWw24.js";
+import "../index-CkgLZdB4.js";
 export { SingleModeAgent, SingleModeApplication, StartEggOptions, startEgg };

package/dist/lib/start.js

@@ -1,36 +1,27 @@
-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";
+import "../base_hook_class-D0Gu2p8r.js";
+import "../base_context_logger-CZU59PGA.js";
+import "../base_context_class-Xc1OZql9.js";
+import "../context-D1Wg7CXs.js";
+import "../response-CDeQ9Sx2.js";
+import "../request-Cy_1DlaX.js";
+import "../CookieLimitExceedError-DLGakbeu.js";
+import "../MessageUnhandledRejectionError-oD_E1Ewl.js";
+import "../error-BYo_LRnd.js";
+import "../egg-DVo5e_lr.js";
+import "../context_httpclient-BpRMdJhf.js";
+import "../httpclient-C1QPc_R7.js";
+import "../logger-C4tIcO3S.js";
+import "../utils-B1Rjsoi9.js";
+import "../utils-BDoYg6z6.js";
+import "../EggApplicationLoader-CMe1VQt1.js";
+import "../AppWorkerLoader-CAtxJvGl.js";
+import "../AgentWorkerLoader-D_hceBRW.js";
+import "../loader-3myZ-rpm.js";
+import "../agent-BfFWeJj4.js";
+import "../helper-B3PKMPXq.js";
+import "../application-DVwFQSa9.js";
+import "../types.plugin-B2v0K0I8.js";
+import "../types-dKSyDnVp.js";
+import { startEgg } from "../start-4E84z796.js";
 
-//#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/dist/lib/types.d.ts

@@ -1,283 +1,12 @@
-import { Application } from "./application.js";
-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 { 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 { PartialDeep } from "type-fest";
-
-//#region src/lib/types.d.ts
-type IgnoreItem = string | RegExp | ((ctx: Context$1) => boolean);
-type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
-interface ClientErrorResponse {
-  body: string | Buffer;
-  status: number;
-  headers: {
-    [key: string]: string;
-  };
-}
-/** egg env type */
-type EggEnvType = 'local' | 'unittest' | 'prod' | string;
-/** logger config of egg */
-interface EggLoggerConfig extends Omit<EggLoggersOptions, 'type'> {
-  /** custom config of coreLogger */
-  coreLogger?: Partial<EggLoggerOptions>;
-  /** allow debug log at prod, defaults to `false` */
-  allowDebugAtProd?: boolean;
-  /** disable logger console after app ready. defaults to `false` on local and unittest env, others is `true`. */
-  disableConsoleAfterReady?: boolean;
-  /** [deprecated] Defaults to `true`. */
-  enablePerformanceTimer?: boolean;
-  /** using the app logger instead of EggContextLogger, defaults to `false` */
-  enableFastContextLogger?: boolean;
-}
-/** Custom Loader Configuration */
-interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | 'target'> {
-  /**
-   * an object you wanner load to, value can only be 'ctx' or 'app'. default to app
-   */
-  inject?: 'ctx' | 'app';
-  /**
-   * whether need to load files in plugins or framework, default to false
-   */
-  loadunit?: boolean;
-}
-interface HttpClientConfig {
-  /** Request timeout */
-  timeout?: number;
-  /** Default request args for httpclient */
-  request?: RequestOptions;
-  /**
-   * @deprecated keep compatible with egg 3.x, no more used
-   */
-  useHttpClientNext?: boolean;
-  /**
-   * Allow http2
-   */
-  allowH2?: boolean;
-}
-/**
- * Powerful Partial, Support adding ? modifier to a mapped property in deep level
- * @example
- * import { PowerPartial, EggAppConfig } from 'egg';
- *
- * // { view: { defaultEngines: string } } => { view?: { defaultEngines?: string } }
- * type EggConfig = PowerPartial<EggAppConfig>
- *
- * @deprecated use `PartialDeep` instead
- */
-type PowerPartial<T> = PartialDeep<T>;
-/**
- * Partial EggAppConfig
- */
-type PartialEggConfig = PartialDeep<EggAppConfig>;
-/**
- * Configuration factory function return type
- */
-type EggConfigFactory = (appInfo: EggAppInfo) => PartialEggConfig;
-/**
- * Define configuration with type safety
- * @example
- * ```ts
- * import { defineConfig } from 'egg';
- *
- * export default defineConfig({
- *   keys: 'my-keys',
- *   middleware: []
- * });
- * ```
- */
-declare function defineConfig(config: PartialEggConfig): PartialEggConfig;
-/**
- * Define configuration factory function with type safety
- * @example
- * ```ts
- * export default defineConfigFactory((appInfo): PartialEggConfig => ({
- *   keys: appInfo.name + '_keys',
- *   middleware: []
- * }));
- * ```
- */
-declare function defineConfigFactory(configFactory: EggConfigFactory): EggConfigFactory;
-interface EggAppConfig extends EggAppConfig$1 {
-  workerStartTimeout: number;
-  baseDir: string;
-  middleware: string[];
-  coreMiddleware: string[];
-  /**
-   * The option of `bodyParser` middleware
-   *
-   * @member Config#bodyParser
-   * @property {Boolean} enable - enable bodyParser or not, default to true
-   * @property {String | RegExp | Function | Array} ignore - won't parse request body when url path hit ignore pattern, can not set `ignore` when `match` presented
-   * @property {String | RegExp | Function | Array} match - will parse request body only when url path hit match pattern
-   * @property {String} encoding - body encoding config, default utf8
-   * @property {String} formLimit - form body size limit, default 1mb
-   * @property {String} jsonLimit - json body size limit, default 1mb
-   * @property {String} textLimit - json body size limit, default 1mb
-   * @property {Boolean} strict - json body strict mode, if set strict value true, then only receive object and array json body
-   * @property {Number} queryString.arrayLimit - from item array length limit, default 100
-   * @property {Number} queryString.depth - json value deep length, default 5
-   * @property {Number} queryString.parameterLimit - parameter number limit, default 1000
-   * @property {String[]} enableTypes - parser will only parse when request type hits enableTypes, default is ['json', 'form']
-   * @property {Object} extendTypes - support extend types
-   * @property {String} onProtoPoisoning - Defines what action must take when parsing a JSON object with `__proto__`. Possible values are `'error'`, `'remove'` and `'ignore'`. Default is `'error'`, it will return `400` response when `Prototype-Poisoning` happen.
-   */
-  bodyParser: {
-    enable: boolean;
-    encoding: string;
-    formLimit: string;
-    jsonLimit: string;
-    textLimit: string;
-    strict: boolean;
-    queryString: {
-      arrayLimit: number;
-      depth: number;
-      parameterLimit: number;
-    };
-    ignore?: IgnoreOrMatch;
-    match?: IgnoreOrMatch;
-    enableTypes?: string[];
-    extendTypes?: {
-      json: string[];
-      form: string[];
-      text: string[];
-    };
-    /** Default is `'error'`, it will return `400` response when `Prototype-Poisoning` happen. */
-    onProtoPoisoning: 'error' | 'remove' | 'ignore';
-    onerror(err: any, ctx: Context$1): void;
-  };
-  /**
-   * logger options
-   * @member Config#logger
-   * @property {String} dir - directory of log files
-   * @property {String} encoding - log file encoding, defaults to utf8
-   * @property {String} level - default log level, could be: DEBUG, INFO, WARN, ERROR or NONE, defaults to INFO in production
-   * @property {String} consoleLevel - log level of stdout, defaults to `INFO` in local serverEnv, defaults to `WARN` in unittest, others is `NONE`
-   * @property {Boolean} disableConsoleAfterReady - disable logger console after app ready. defaults to `false` on local and unittest env, others is `true`.
-   * @property {Boolean} outputJSON - log as JSON or not, defaults to `false`
-   * @property {Boolean} buffer - if enabled, flush logs to disk at a certain frequency to improve performance, defaults to true
-   * @property {String} errorLogName - file name of errorLogger
-   * @property {String} coreLogName - file name of coreLogger
-   * @property {String} agentLogName - file name of agent worker log
-   * @property {Object} coreLogger - custom config of coreLogger
-   * @property {Boolean} allowDebugAtProd - allow debug log at prod, defaults to false
-   * @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
-   */
-  /**
-   * It will ignore special keys when dumpConfig
-   */
-  dump: {
-    ignore: Set<string | RegExp>;
-    timing: {
-      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;
-  proxy: boolean;
-  cookies: {
-    sameSite?: string;
-    httpOnly?: boolean;
-  };
-  /**
-   * The key that signing cookies. It can contain multiple keys separated by `.`
-   * @requires Cookie secret key to sign and encrypt, see https://eggjs.org/core/cookie-and-session#cookie-secret-key
-   */
-  keys: string;
-  /**
-   * The name of the application
-   */
-  name: string;
-  /**
-   * package.json
-   */
-  pkg: Record<string, any>;
-  rundir: string;
-  siteFile: SiteFileMiddlewareOptions;
-  meta: MetaMiddlewareOptions;
-  notfound: NotFoundMiddlewareOptions;
-  overrideMethod: {
-    enable: boolean;
-    allowedMethods: string[];
-  };
-  onClientError?(err: Error, socket: Socket, app: Application): ClientErrorResponse | Promise<ClientErrorResponse>;
-  /**
-   * server timeout in milliseconds, default to 0 (no timeout).
-   *
-   * for special request, just use `ctx.req.setTimeout(ms)`
-   *
-   * @see https://nodejs.org/api/http.html#http_server_timeout
-   */
-  serverTimeout: number | null;
-  cluster: {
-    listen: {
-      path: string;
-      port: number;
-      hostname: string;
-    };
-  };
-  clusterClient: {
-    maxWaitTime: number;
-    responseTimeout: number;
-  };
-  [prop: string]: any;
-}
-type RequestObjectBody = Record<string, any>;
-/**
- * plugin config item interface
- */
-interface IEggPluginItem {
-  env?: EggEnvType[];
-  path?: string;
-  package?: string;
-  enable?: boolean;
-}
-type EggPluginItem = IEggPluginItem | boolean;
-/**
- * build-in plugin list
- */
-interface EggPlugin {
-  [key: string]: EggPluginItem | undefined;
-  onerror?: EggPluginItem;
-  session?: EggPluginItem;
-  i18n?: EggPluginItem;
-  watcher?: EggPluginItem;
-  multipart?: EggPluginItem;
-  security?: EggPluginItem;
-  development?: EggPluginItem;
-  logrotator?: EggPluginItem;
-  schedule?: EggPluginItem;
-  static?: EggPluginItem;
-  jsonp?: EggPluginItem;
-  view?: EggPluginItem;
-}
-//#endregion
-export { ClientErrorResponse, CustomLoaderConfig, EggAppConfig, type EggAppInfo, EggConfigFactory, EggEnvType, EggLoggerConfig, EggPlugin, EggPluginItem, HttpClientConfig, IEggPluginItem, type PartialDeep, PartialEggConfig, PowerPartial, RequestObjectBody, defineConfig, defineConfigFactory };
+import "../EggApplicationLoader-PnIvd5oV.js";
+import "../AppWorkerLoader-CT875rYM.js";
+import "../AgentWorkerLoader-DG_hAClt.js";
+import "../index-CUPkUUOR.js";
+import { ClientErrorResponse, CustomLoaderConfig, EggAppConfig, EggAppInfo, EggConfigFactory, EggEnvType, EggLoggerConfig, EggPlugin, EggPluginItem, HttpClientConfig, IEggPluginItem, PartialDeep, PartialEggConfig, PowerPartial, RequestObjectBody, defineConfig, defineConfigFactory } from "../base_hook_class-R8A8gm1s.js";
+import "../response-DlNYDj00.js";
+import "../types.plugin-C3D5I7VD.js";
+import "../IMessenger-C9g6ypSI.js";
+import "../CookieLimitExceedError-CAW0HYJw.js";
+import "../MessageUnhandledRejectionError-Lq5fWw24.js";
+import "../index-CkgLZdB4.js";
+export { ClientErrorResponse, CustomLoaderConfig, EggAppConfig, EggAppInfo, EggConfigFactory, EggEnvType, EggLoggerConfig, EggPlugin, EggPluginItem, HttpClientConfig, IEggPluginItem, PartialDeep, PartialEggConfig, PowerPartial, RequestObjectBody, defineConfig, defineConfigFactory };

package/dist/lib/types.js

@@ -1,34 +1,4 @@
-import "./types.plugin.js";
+import "../types.plugin-B2v0K0I8.js";
+import { defineConfig, defineConfigFactory } from "../types-dKSyDnVp.js";
 
-//#region src/lib/types.ts
-/**
-* Define configuration with type safety
-* @example
-* ```ts
-* import { defineConfig } from 'egg';
-*
-* export default defineConfig({
-*   keys: 'my-keys',
-*   middleware: []
-* });
-* ```
-*/
-function defineConfig(config) {
-	return config;
-}
-/**
-* Define configuration factory function with type safety
-* @example
-* ```ts
-* export default defineConfigFactory((appInfo): PartialEggConfig => ({
-*   keys: appInfo.name + '_keys',
-*   middleware: []
-* }));
-* ```
-*/
-function defineConfigFactory(configFactory) {
-	return configFactory;
-}
-
-//#endregion
 export { defineConfig, defineConfigFactory };

package/dist/lib/types.plugin.d.ts

@@ -1,12 +1 @@
-import "@eggjs/development/types";
-import "@eggjs/i18n/types";
-import "@eggjs/jsonp/types";
-import "@eggjs/logrotator/types";
-import "@eggjs/multipart/types";
-import "@eggjs/onerror/types";
-import "@eggjs/schedule/types";
-import "@eggjs/security/types";
-import "@eggjs/session/types";
-import "@eggjs/static/types";
-import "@eggjs/view/types";
-import "@eggjs/watcher/types";
+import "../types.plugin-C3D5I7VD.js";

package/dist/lib/types.plugin.js

@@ -1,14 +1,3 @@
-import "@eggjs/development/types";
-import "@eggjs/i18n/types";
-import "@eggjs/jsonp/types";
-import "@eggjs/logrotator/types";
-import "@eggjs/multipart/types";
-import "@eggjs/onerror/types";
-import "@eggjs/schedule/types";
-import "@eggjs/security/types";
-import "@eggjs/session/types";
-import "@eggjs/static/types";
-import "@eggjs/view/types";
-import "@eggjs/watcher/types";
+import "../types.plugin-B2v0K0I8.js";
 
 export {  };

package/dist/lib/utils.js

@@ -1,14 +1,3 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { getSourceDirname, getSourceFile } from "../utils-BDoYg6z6.js";
 
-//#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/loader-3myZ-rpm.js

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

package/dist/logger-C4tIcO3S.js

@@ -0,0 +1,31 @@
+import { EggLoggers } from "egg-logger";
+import { setCustomLogger } from "onelogger";
+
+//#region src/lib/core/logger.ts
+function createLoggers(app) {
+	const loggerOptions = {
+		...app.config.logger,
+		type: app.type,
+		localStorage: app.ctxStorage
+	};
+	if (app.config.env === "prod" && loggerOptions.level === "DEBUG" && !app.config.logger.allowDebugAtProd) loggerOptions.level = "INFO";
+	const loggers = new EggLoggers({
+		logger: loggerOptions,
+		customLogger: app.config.customLogger
+	});
+	app.ready(() => {
+		if (app.config.logger.disableConsoleAfterReady) {
+			loggers.disableConsole();
+			loggers.coreLogger.info("[egg:lib:core:logger] disable console log after app ready");
+		}
+	});
+	for (const loggerName of Object.keys(loggers)) setCustomLogger(loggerName, loggers[loggerName]);
+	app.lifecycle.registerBeforeClose(() => {
+		for (const loggerName of Object.keys(loggers)) setCustomLogger(loggerName, void 0);
+	});
+	loggers.coreLogger.info("[egg:lib:core:logger] init all loggers with options: %j", loggerOptions);
+	return loggers;
+}
+
+//#endregion
+export { createLoggers };