egg 4.0.0-beta.5 → 4.0.0-beta.7

package/src/lib/core/messenger/ipc.ts

@@ -3,24 +3,28 @@ import { debuglog } from 'node:util';
 import workerThreads from 'node:worker_threads';
 import { sendmessage } from 'sendmessage';
 import type { IMessenger } from './IMessenger.js';
+import type { EggApplicationCore } from '../../egg.js';
 
-const debug = debuglog('egg:lib:core:messenger:ipc');
+const debug = debuglog('egg/lib/core/messenger/ipc');
 
 /**
  * Communication between app worker and agent worker by IPC channel
  */
 export class Messenger extends EventEmitter implements IMessenger {
   readonly pid: string;
+  readonly egg: EggApplicationCore;
   opids: string[] = [];
 
-  constructor() {
+  constructor(egg: EggApplicationCore) {
     super();
     this.pid = String(process.pid);
+    this.egg = egg;
     // pids of agent or app managed by master
     // - retrieve app worker pids when it's an agent worker
     // - retrieve agent worker pids when it's an app worker
-    this.on('egg-pids', pids => {
-      this.opids = pids;
+    this.on('egg-pids', workerIds => {
+      debug('[%s:%s] got egg-pids %j', this.egg.type, this.pid, workerIds);
+      this.opids = workerIds.map((workerId: number) => String(workerId));
     });
     this.onMessage = this.onMessage.bind(this);
     process.on('message', this.onMessage);
@@ -36,7 +40,7 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   broadcast(action: string, data?: unknown): Messenger {
-    debug('[%s] broadcast %s with %j', this.pid, action, data);
+    debug('[%s:%s] broadcast %s with %j', this.egg.type, this.pid, action, data);
     this.send(action, data, 'app');
     this.send(action, data, 'agent');
     return this;
@@ -44,21 +48,21 @@ export class Messenger extends EventEmitter implements IMessenger {
 
   /**
    * send message to the specified process
-   * @param {String} pid - the process id of the receiver
+   * @param {String} workerId - the workerId of the receiver
    * @param {String} action - message key
    * @param {Object} data - message value
    * @return {Messenger} this
    */
-  sendTo(pid: string, action: string, data?: unknown): Messenger {
-    debug('[%s] send %s with %j to %s', this.pid, action, data, pid);
+  sendTo(workerId: string, action: string, data?: unknown): Messenger {
+    debug('[%s:%s] send %s with %j to workerId:%s', this.egg.type, this.pid, action, data, workerId);
     sendmessage(process, {
       action,
       data,
       /**
        * @deprecated Keep compatible, please use receiverWorkerId instead
        */
-      receiverPid: String(pid),
-      receiverWorkerId: String(pid),
+      receiverPid: String(workerId),
+      receiverWorkerId: String(workerId),
     });
     return this;
   }
@@ -72,13 +76,13 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   sendRandom(action: string, data?: unknown): Messenger {
-    /* istanbul ignore if */
     if (this.opids.length === 0) {
+      debug('[%s:%s] no pids, ignore sendRandom %s with %j', this.egg.type, this.pid, action, data);
       return this;
     }
     const index = Math.floor(Math.random() * this.opids.length);
-    const pid = this.opids[index];
-    this.sendTo(String(pid), action, data);
+    const workerId = this.opids[index];
+    this.sendTo(workerId, action, data);
     return this;
   }
 
@@ -89,7 +93,7 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   sendToApp(action: string, data?: unknown): Messenger {
-    debug('[%s] send %s with %j to all app', this.pid, action, data);
+    debug('[%s:%s] send %s with %j to all app', this.egg.type, this.pid, action, data);
     this.send(action, data, 'app');
     return this;
   }
@@ -101,7 +105,7 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   sendToAgent(action: string, data?: unknown): Messenger {
-    debug('[%s] send %s with %j to all agent', this.pid, action, data);
+    debug('[%s:%s] send %s with %j to all agent', this.egg.type, this.pid, action, data);
     this.send(action, data, 'agent');
     return this;
   }
@@ -123,9 +127,11 @@ export class Messenger extends EventEmitter implements IMessenger {
 
   onMessage(message: any) {
     if (typeof message?.action === 'string') {
-      debug('[%s] got message %s with %j, receiverWorkerId: %s',
-        this.pid, message.action, message.data, message.receiverWorkerId ?? message.receiverPid);
+      debug('[%s:%s] got message %s with %j, receiverWorkerId: %s',
+        this.egg.type, this.pid, message.action, message.data, message.receiverWorkerId ?? message.receiverPid);
       this.emit(message.action, message.data);
+    } else {
+      debug('[%s:%s] got an invalid message %j', this.egg.type, this.pid, message);
     }
   }
 

package/src/lib/core/messenger/local.ts

@@ -3,7 +3,7 @@ import EventEmitter from 'node:events';
 import type { IMessenger } from './IMessenger.js';
 import type { EggApplicationCore } from '../../egg.js';
 
-const debug = debuglog('egg:lib:core:messenger:local');
+const debug = debuglog('egg/lib/core/messenger/local');
 
 /**
  * Communication between app worker and agent worker with EventEmitter
@@ -25,7 +25,7 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   broadcast(action: string, data?: unknown): Messenger {
-    debug('[%s] broadcast %s with %j', this.pid, action, data);
+    debug('[%s:%s] broadcast %s with %j', this.egg.type, this.pid, action, data);
     this.send(action, data, 'both');
     return this;
   }
@@ -34,14 +34,14 @@ export class Messenger extends EventEmitter implements IMessenger {
    * send message to the specified process
    * Notice: in single process mode, it only can send to self process,
    * and it will send to both agent and app's messengers.
-   * @param {String} pid - the process id of the receiver
+   * @param {String} workerId - the workerId of the receiver
    * @param {String} action - message key
    * @param {Object} data - message value
    * @return {Messenger} this
    */
-  sendTo(pid: string, action: string, data?: unknown): Messenger {
-    debug('[%s] send %s with %j to %s', this.pid, action, data, pid);
-    if (String(pid) !== this.pid) {
+  sendTo(workerId: string, action: string, data?: unknown): Messenger {
+    debug('[%s:%s] send %s with %j to %s', this.egg.type, this.pid, action, data, workerId);
+    if (String(workerId) !== this.pid) {
       return this;
     }
     this.send(action, data, 'both');
@@ -58,7 +58,7 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   sendRandom(action: string, data?: unknown): Messenger {
-    debug('[%s] send %s with %j to opposite', this.pid, action, data);
+    debug('[%s:%s] send %s with %j to opposite', this.egg.type, this.pid, action, data);
     this.send(action, data, 'opposite');
     return this;
   }
@@ -70,7 +70,7 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   sendToApp(action: string, data?: unknown): Messenger {
-    debug('[%s] send %s with %j to all app', this.pid, action, data);
+    debug('[%s:%s] send %s with %j to all app', this.egg.type, this.pid, action, data);
     this.send(action, data, 'application');
     return this;
   }
@@ -82,7 +82,7 @@ export class Messenger extends EventEmitter implements IMessenger {
    * @return {Messenger} this
    */
   sendToAgent(action: string, data?: unknown): Messenger {
-    debug('[%s] send %s with %j to all agent', this.pid, action, data);
+    debug('[%s:%s] send %s with %j to all agent', this.egg.type, this.pid, action, data);
     this.send(action, data, 'agent');
     return this;
   }
@@ -130,8 +130,10 @@ export class Messenger extends EventEmitter implements IMessenger {
 
   onMessage(message: any) {
     if (typeof message?.action === 'string') {
-      debug('[%s] got message %s with %j', this.pid, message.action, message.data);
+      debug('[%s:%s] got message %s with %j', this.egg.type, this.pid, message.action, message.data);
       this.emit(message.action, message.data);
+    } else {
+      debug('[%s:%s] got an invalid message %j', this.egg.type, this.pid, message);
     }
   }
 

package/src/lib/egg.ts

@@ -3,8 +3,18 @@ import path from 'node:path';
 import fs from 'node:fs';
 import http, { type IncomingMessage, type ServerResponse } from 'node:http';
 import inspector from 'node:inspector';
-import { fileURLToPath } from 'node:url';
-import { EggCore, type EggCoreContext, type EggCoreOptions } from '@eggjs/core';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import {
+  EggCore,
+  Request as EggCoreRequest,
+  Response as EggCoreResponse,
+  Router,
+} from '@eggjs/core';
+import type {
+  EggCoreOptions,
+  Next, MiddlewareFunc as EggCoreMiddlewareFunc,
+  ILifecycleBoot,
+} from '@eggjs/core';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import createClusterClient, { close as closeClusterClient } from 'cluster-client';
@@ -16,6 +26,7 @@ import { Cookies as ContextCookies } from '@eggjs/cookies';
 import CircularJSON from 'circular-json-for-egg';
 import type { Agent } from './agent.js';
 import type { Application } from './application.js';
+import Context, { type ContextDelegation } from '../app/extend/context.js';
 import type { EggAppConfig } from './type.js';
 import { create as createMessenger, IMessenger } from './core/messenger/index.js';
 import { ContextHttpClient } from './core/context_httpclient.js';
@@ -30,6 +41,9 @@ import { convertObject } from './core/utils.js';
 import { BaseContextClass } from './core/base_context_class.js';
 import { BaseHookClass } from './core/base_hook_class.js';
 import type { EggApplicationLoader } from './loader/index.js';
+import { getSourceDirname } from './utils.js';
+
+import './egg.types.js';
 
 const EGG_PATH = Symbol.for('egg#eggPath');
 
@@ -39,20 +53,35 @@ export interface EggApplicationCoreOptions extends Omit<EggCoreOptions, 'baseDir
   baseDir?: string;
 }
 
-export interface EggContext extends EggCoreContext {
-  app: EggApplicationCore;
-  /**
-   * Request start time
-   * @member {Number} Context#starttime
-   */
-  starttime: number;
-  /**
-   * Request start timer using `performance.now()`
-   * @member {Number} Context#performanceStarttime
-   */
-  performanceStarttime: number;
+// export egg classes
+export {
+  Context,
+  Router,
+  EggLogger,
+};
+
+export class Request extends EggCoreRequest {
+  declare app: EggCore;
+  declare response: Response;
+  declare ctx: ContextDelegation;
+}
+
+export class Response extends EggCoreResponse {
+  declare app: EggCore;
+  declare request: Request;
+  declare ctx: ContextDelegation;
 }
 
+// export egg types
+export type {
+  ContextDelegation,
+  ILifecycleBoot,
+  Next,
+};
+// keep compatible with egg version 3.x
+export type EggContext = ContextDelegation;
+export type MiddlewareFunc<T extends ContextDelegation = ContextDelegation> = EggCoreMiddlewareFunc<T>;
+
 /**
  * Based on koa's Application
  * @see https://github.com/eggjs/egg-core
@@ -60,6 +89,7 @@ export interface EggContext extends EggCoreContext {
  * @augments EggCore
  */
 export class EggApplicationCore extends EggCore {
+  declare ctxStorage: AsyncLocalStorage<ContextDelegation>;
   // export context base classes, let framework can impl sub class and over context extend easily.
   ContextCookies = ContextCookies;
   ContextLogger = ContextLogger;
@@ -412,7 +442,6 @@ export class EggApplicationCore extends EggCore {
     if (!(err instanceof Error)) {
       const newError = new Error(String(err));
       // err maybe an object, try to copy the name, message and stack to the new error instance
-      /* istanbul ignore else */
       if (err) {
         if (err.name) newError.name = err.name;
         if (err.message) newError.message = err.message;
@@ -420,7 +449,6 @@ export class EggApplicationCore extends EggCore {
       }
       err = newError;
     }
-    /* istanbul ignore else */
     if (err.name === 'Error') {
       err.name = 'unhandledRejectionError';
     }
@@ -500,12 +528,7 @@ export class EggApplicationCore extends EggCore {
   }
 
   get [EGG_PATH]() {
-    if (typeof __dirname !== 'undefined') {
-      return path.dirname(__dirname);
-    }
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    return path.dirname(path.dirname(fileURLToPath(import.meta.url)));
+    return getSourceDirname();
   }
 
   #setupTimeoutTimer() {
@@ -589,7 +612,7 @@ export class EggApplicationCore extends EggCore {
    * @param {Request} [req] - if you want to mock request like querystring, you can pass an object to this function.
    * @return {Context} context
    */
-  createAnonymousContext(req?: any): EggCoreContext {
+  createAnonymousContext(req?: any): EggContext {
     const request: any = {
       headers: {
         host: '127.0.0.1',
@@ -633,7 +656,7 @@ export class EggApplicationCore extends EggCore {
     const context = Object.create(this.context) as EggContext;
     const request = context.request = Object.create(this.request);
     const response = context.response = Object.create(this.response);
-    context.app = request.app = response.app = this;
+    context.app = request.app = response.app = this as any;
     context.req = request.req = response.req = req;
     context.res = request.res = response.res = res;
     request.ctx = response.ctx = context;

package/src/lib/egg.types.ts

@@ -0,0 +1,6 @@
+declare module '@eggjs/core' {
+  // add EggApplicationCore overrides types
+  interface EggCore {
+    inspect(): any;
+  }
+}

package/src/lib/type.ts

@@ -1,5 +1,4 @@
 import type { Socket } from 'node:net';
-import type { EggCoreContext } from '@eggjs/core';
 import type {
   RequestOptions as HttpClientRequestOptions,
 } from 'urllib';
@@ -10,16 +9,17 @@ import type {
   FileLoaderOptions,
 } from '@eggjs/core';
 import type {
-  EggApplicationCore,
+  EggApplicationCore, ContextDelegation,
 } 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';
 
-type IgnoreItem = string | RegExp | ((ctx: EggCoreContext) => boolean);
-type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
+// import @eggjs/watcher types
+// import '@eggjs/watcher';
 
-export type Next = () => Promise<void>;
+type IgnoreItem = string | RegExp | ((ctx: ContextDelegation) => boolean);
+type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
 
 export interface ClientErrorResponse {
   body: string | Buffer;
@@ -103,7 +103,7 @@ export interface EggAppConfig {
     };
     /** Default is `'error'`, it will return `400` response when `Prototype-Poisoning` happen. */
     onProtoPoisoning: 'error' | 'remove' | 'ignore';
-    onerror(err: any, ctx: EggCoreContext): void;
+    onerror(err: any, ctx: ContextDelegation): void;
   };
 
   /**
@@ -327,10 +327,3 @@ export interface EggAppConfig {
 
   [prop: string]: any;
 }
-
-export type {
-  EggLogger,
-} from 'egg-logger';
-export type {
-  ILifecycleBoot,
-} from '@eggjs/core';

package/src/lib/utils.ts

@@ -0,0 +1,16 @@
+
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+export function getSourceDirname() {
+  if (typeof __dirname !== 'undefined') {
+    return path.dirname(__dirname);
+  }
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  return path.dirname(path.dirname(fileURLToPath(import.meta.url)));
+}
+
+export function getSourceFile(filename: string) {
+  return path.join(getSourceDirname(), filename);
+}

package/src/app/extend/response.js

@@ -1,101 +0,0 @@
-'use strict';
-
-const getType = require('cache-content-type');
-const isJSON = require('koa-is-json');
-
-const REAL_STATUS = Symbol('Context#realStatus');
-
-module.exports = {
-
-  /**
-   * Get or set the length of content.
-   *
-   * For Get: If the original content length is null or undefined, it will read out
-   * the body's content length as the return value.
-   *
-   * @member {Number} Response#type
-   * @param {Number} len The content-length to be set.
-   */
-  set length(len) {
-    // copy from koa
-    // change header name to lower case
-    this.set('content-length', len);
-  },
-
-  get length() {
-    // copy from koa
-    const len = this.header['content-length'];
-    const body = this.body;
-
-    if (len == null) {
-      if (!body) return;
-      if (typeof body === 'string') return Buffer.byteLength(body);
-      if (Buffer.isBuffer(body)) return body.length;
-      if (isJSON(body)) return Buffer.byteLength(JSON.stringify(body));
-      return;
-    }
-
-    return parseInt(len, 10);
-  },
-
-  /**
-   * Get or set the content-type.
-   *
-   * For Set: If type is null or undefined, this property will be removed.
-   *
-   * For Get: If the value is null or undefined, an empty string will be returned;
-   * if you have multiple values seperated by `;`, ONLY the first one will be returned.
-   *
-   * @member {String} Response#type
-   * @param {String} type The content-type to be set.
-   */
-  set type(type) {
-    // copy from koa
-    // Different:
-    //  - change header name to lower case
-    type = getType(type);
-    if (type) {
-      this.set('content-type', type);
-    } else {
-      this.remove('content-type');
-    }
-  },
-
-  get type() {
-    // copy from koa
-    const type = this.get('content-type');
-    if (!type) return '';
-    return type.split(';')[0];
-  },
-
-  /**
-   * Get or set a real status code.
-   *
-   * e.g.: Using 302 status redirect to the global error page
-   * instead of show current 500 status page.
-   * And access log should save 500 not 302,
-   * then the `realStatus` can help us find out the real status code.
-   * @member {Number} Response#realStatus
-   * @return {Number} The status code to be set.
-   */
-  get realStatus() {
-    if (this[REAL_STATUS]) {
-      return this[REAL_STATUS];
-    }
-    return this.status;
-  },
-
-  /**
-   * Set a real status code.
-   *
-   * e.g.: Using 302 status redirect to the global error page
-   * instead of show current 500 status page.
-   * And access log should save 500 not 302,
-   * then the `realStatus` can help us find out the real status code.
-   * @member {Number} Response#realStatus
-   * @param {Number} status The status code to be set.
-   */
-  set realStatus(status) {
-    this[REAL_STATUS] = status;
-  },
-};