egg 4.1.0-beta.2 → 4.1.0-beta.20

package/dist/request-Cy_1DlaX.js

@@ -0,0 +1,225 @@
+import { Request } from "@eggjs/core";
+import querystring from "node:querystring";
+
+//#region src/app/extend/request.ts
+const QUERY_CACHE = Symbol("request query cache");
+const QUERIES_CACHE = Symbol("request queries cache");
+const PROTOCOL = Symbol("request protocol");
+const HOST = Symbol("request host");
+const IPS = Symbol("request ips");
+const RE_ARRAY_KEY = /[^[\]]+\[\]$/;
+var Request$1 = class extends Request {
+	/**
+	* Parse the "Host" header field host
+	* and support X-Forwarded-Host when a
+	* proxy is enabled.
+	* @member {String} Request#host
+	* @example
+	* ip + port
+	* ```js
+	* this.request.host
+	* => '127.0.0.1:7001'
+	* ```
+	* or domain
+	* ```js
+	* this.request.host
+	* => 'demo.eggjs.org'
+	* ```
+	*/
+	get host() {
+		let host = this[HOST];
+		if (host) return host;
+		if (this.app.config.proxy) host = getFromHeaders(this, this.app.config.hostHeaders);
+		host = host || this.get("host") || "";
+		this[HOST] = host = host.split(",")[0].trim();
+		return host;
+	}
+	/**
+	* @member {String} Request#protocol
+	* @example
+	* ```js
+	* this.request.protocol
+	* => 'https'
+	* ```
+	*/
+	get protocol() {
+		let protocol = this[PROTOCOL];
+		if (protocol) return protocol;
+		if (this.socket?.encrypted) {
+			this[PROTOCOL] = protocol = "https";
+			return protocol;
+		}
+		if (this.app.config.proxy) {
+			const proto = getFromHeaders(this, this.app.config.protocolHeaders);
+			if (proto) {
+				this[PROTOCOL] = protocol = proto.split(/\s*,\s*/)[0];
+				return protocol;
+			}
+		}
+		this[PROTOCOL] = protocol = this.app.config.protocol || "http";
+		return protocol;
+	}
+	/**
+	* Get all pass through ip addresses from the request.
+	* Enable only on `app.config.proxy = true`
+	*
+	* @member {Array} Request#ips
+	* @example
+	* ```js
+	* this.request.ips
+	* => ['100.23.1.2', '201.10.10.2']
+	* ```
+	*/
+	get ips() {
+		let ips = this[IPS];
+		if (ips) return ips;
+		if (!this.app.config.proxy) {
+			this[IPS] = ips = [];
+			return ips;
+		}
+		const val = getFromHeaders(this, this.app.config.ipHeaders);
+		this[IPS] = ips = val ? val.split(/\s*,\s*/) : [];
+		let maxIpsCount = this.app.config.maxIpsCount;
+		if (!maxIpsCount && this.app.config.maxProxyCount) maxIpsCount = this.app.config.maxProxyCount + 1;
+		if (maxIpsCount > 0) this[IPS] = ips = ips.slice(-maxIpsCount);
+		return ips;
+	}
+	/**
+	* Get the request remote IPv4 address
+	* @member {String} Request#ip
+	* @return {String} IPv4 address
+	* @example
+	* ```js
+	* this.request.ip
+	* => '127.0.0.1'
+	* => '111.10.2.1'
+	* ```
+	*/
+	get ip() {
+		if (this._ip) return this._ip;
+		const ip = this.ips[0] ?? this.socket.remoteAddress;
+		this._ip = ip && ip.startsWith("::ffff:") ? ip.substring(7) : ip;
+		return this._ip;
+	}
+	/**
+	* Set the request remote IPv4 address
+	* @member {String} Request#ip
+	* @param {String} ip - IPv4 address
+	* @example
+	* ```js
+	* this.request.ip
+	* => '127.0.0.1'
+	* => '111.10.2.1'
+	* ```
+	*/
+	set ip(ip) {
+		this._ip = ip;
+	}
+	/**
+	* detect if response should be json
+	* 1. url path ends with `.json`
+	* 2. response type is set to json
+	* 3. detect by request accept header
+	*
+	* @member {Boolean} Request#acceptJSON
+	* @since 1.0.0
+	*/
+	get acceptJSON() {
+		if (this.path.endsWith(".json")) return true;
+		if (this.response.type && this.response.type.indexOf("json") >= 0) return true;
+		if (this.accepts("html", "text", "json") === "json") return true;
+		return false;
+	}
+	_customQuery(cacheName, filter) {
+		const str = this.querystring || "";
+		let c = this[cacheName];
+		if (!c) c = this[cacheName] = {};
+		let cacheQuery = c[str];
+		if (!cacheQuery) {
+			cacheQuery = c[str] = {};
+			const isQueries = cacheName === QUERIES_CACHE;
+			const query = str ? querystring.parse(str) : {};
+			for (const key in query) {
+				if (!key) continue;
+				const value = filter(query[key]);
+				cacheQuery[key] = value;
+				if (isQueries && RE_ARRAY_KEY.test(key)) {
+					const subKey = key.substring(0, key.length - 2);
+					if (!cacheQuery[subKey]) cacheQuery[subKey] = value;
+				}
+			}
+		}
+		return cacheQuery;
+	}
+	/**
+	* get params pass by querystring, all values are of string type.
+	* @member {Object} Request#query
+	* @example
+	* ```js
+	* GET http://127.0.0.1:7001?name=Foo&age=20&age=21
+	* this.query
+	* => { 'name': 'Foo', 'age': '20' }
+	*
+	* GET http://127.0.0.1:7001?a=b&a=c&o[foo]=bar&b[]=1&b[]=2&e=val
+	* this.query
+	* =>
+	* {
+	*   "a": "b",
+	*   "o[foo]": "bar",
+	*   "b[]": "1",
+	*   "e": "val"
+	* }
+	* ```
+	*/
+	get query() {
+		return this._customQuery(QUERY_CACHE, firstValue);
+	}
+	/**
+	* get params pass by querystring, all value are Array type. {@link Request#query}
+	* @member {Array} Request#queries
+	* @example
+	* ```js
+	* GET http://127.0.0.1:7001?a=b&a=c&o[foo]=bar&b[]=1&b[]=2&e=val
+	* this.queries
+	* =>
+	* {
+	*   "a": ["b", "c"],
+	*   "o[foo]": ["bar"],
+	*   "b[]": ["1", "2"],
+	*   "e": ["val"]
+	* }
+	* ```
+	*/
+	get queries() {
+		return this._customQuery(QUERIES_CACHE, arrayValue);
+	}
+	/**
+	* Set query-string as an object.
+	*
+	* @function Request#query
+	* @param {Object} obj set querystring and query object for request.
+	*/
+	set query(obj) {
+		this.querystring = querystring.stringify(obj);
+	}
+};
+function firstValue(value) {
+	if (Array.isArray(value)) value = value[0];
+	return value;
+}
+function arrayValue(value) {
+	if (!Array.isArray(value)) value = [value];
+	return value;
+}
+function getFromHeaders(request, names) {
+	if (!names) return "";
+	const fields = names.split(/\s*,\s*/);
+	for (const name of fields) {
+		const value = request.get(name);
+		if (value) return value;
+	}
+	return "";
+}
+
+//#endregion
+export { Request$1 as Request };

package/dist/response-CDeQ9Sx2.js

@@ -0,0 +1,36 @@
+import { Response } from "@eggjs/core";
+
+//#region src/app/extend/response.ts
+const REAL_STATUS = Symbol("response realStatus");
+var Response$1 = class extends Response {
+	/**
+	* 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;
+	}
+};
+
+//#endregion
+export { Response$1 as Response };

package/dist/response-DlNYDj00.d.ts

@@ -0,0 +1,29 @@
+import { Response } from "@eggjs/core";
+
+//#region src/app/extend/response.d.ts
+declare class Response$1 extends Response {
+  /**
+   * 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(): number;
+  /**
+   * 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: number);
+}
+//#endregion
+export { Response$1 as Response };

package/dist/src-BuOjXSrB.js

@@ -0,0 +1,3 @@
+import { Singleton } from "@eggjs/core";
+
+export { Singleton };

package/dist/start-4E84z796.js

@@ -0,0 +1,35 @@
+import { Agent } from "./agent-BfFWeJj4.js";
+import { Application } from "./application-DVwFQSa9.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/dist/types-dKSyDnVp.js

@@ -0,0 +1,32 @@
+//#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/types.plugin-B2v0K0I8.js

@@ -0,0 +1,14 @@
+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";
+
+export {  };

package/dist/types.plugin-C3D5I7VD.d.ts

@@ -0,0 +1,12 @@
+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";

package/dist/urllib.d.ts

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

package/dist/utils-B1Rjsoi9.js

@@ -0,0 +1,48 @@
+import util from "node:util";
+import { isAsyncFunction, isClass, isFunction, isGeneratorFunction, isPrimitive, isRegExp, isSymbol } from "is-type-of";
+
+//#region src/lib/core/utils.ts
+function convertObject(obj, ignore = []) {
+	if (!Array.isArray(ignore)) ignore = [ignore];
+	for (const key of Object.keys(obj)) obj[key] = convertValue(key, obj[key], ignore);
+	return obj;
+}
+function convertValue(key, value, ignore) {
+	if (value === null || value === void 0) return value;
+	let hit = false;
+	for (const matchKey of ignore) if (typeof matchKey === "string" && matchKey === key) {
+		hit = true;
+		break;
+	} else if (isRegExp(matchKey) && matchKey.test(key)) {
+		hit = true;
+		break;
+	}
+	if (!hit) {
+		if (isSymbol(value) || isRegExp(value) || value instanceof URL) return value.toString();
+		if (isPrimitive(value) || Array.isArray(value)) return value;
+	}
+	if (Object.getPrototypeOf(value) === Object.prototype) return convertObject(value, ignore);
+	const name = value.name || "anonymous";
+	if (isClass(value)) return `<Class ${name}>`;
+	if (isFunction(value)) {
+		if (isGeneratorFunction(value)) return `<GeneratorFunction ${name}>`;
+		if (isAsyncFunction(value)) return `<AsyncFunction ${name}>`;
+		return `<Function ${name}>`;
+	}
+	const typeName = value.constructor.name;
+	if (typeName) {
+		if (Buffer.isBuffer(value) || typeof value === "string") return `<${typeName} len: ${value.length}>`;
+		return `<${typeName}>`;
+	}
+	return util.format(value);
+}
+function safeParseURL(url) {
+	try {
+		return new URL(url);
+	} catch {
+		return null;
+	}
+}
+
+//#endregion
+export { convertObject, safeParseURL };

package/dist/utils-BDoYg6z6.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/package.json

@@ -1,8 +1,8 @@
 {
   "name": "egg",
-  "version": "4.1.0-beta.2",
+  "version": "4.1.0-beta.20",
   "engines": {
-    "node": ">= 20.19.0"
+    "node": ">=22.18.0"
   },
   "publishConfig": {
     "access": "public",
@@ -52,6 +52,7 @@
     "./lib/loader/EggApplicationLoader": "./dist/lib/loader/EggApplicationLoader.js",
     "./lib/start": "./dist/lib/start.js",
     "./lib/types": "./dist/lib/types.js",
+    "./lib/types.plugin": "./dist/lib/types.plugin.js",
     "./lib/utils": "./dist/lib/utils.js",
     "./urllib": "./dist/urllib.js",
     "./package.json": "./package.json"
@@ -71,23 +72,8 @@
     "egg"
   ],
   "dependencies": {
-    "@eggjs/cluster": "",
-    "@eggjs/cookies": "^3.1.0",
-    "@eggjs/development": "^4.0.0",
-    "@eggjs/i18n": "^3.0.1",
-    "@eggjs/jsonp": "^3.0.0",
-    "@eggjs/logrotator": "^4.0.0",
-    "@eggjs/multipart": "^4.0.0",
-    "@eggjs/onerror": "^3.0.0",
-    "@eggjs/schedule": "^5.0.2",
-    "@eggjs/security": "^4.0.0",
-    "@eggjs/session": "^4.0.1",
-    "@eggjs/static": "^3.0.0",
-    "@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.5.0",
     "graceful": "^2.0.0",
     "humanize-ms": "^2.0.0",
@@ -97,46 +83,60 @@
     "onelogger": "^1.0.1",
     "performance-ms": "^1.1.0",
     "sendmessage": "^3.0.1",
-    "urllib": "^4.6.11",
+    "type-fest": "^5.0.1",
+    "urllib": "^4.8.2",
     "utility": "^2.5.0",
-    "@eggjs/core": "6.6.0-beta.2",
-    "@eggjs/extend2": "4.1.0-beta.2",
-    "@eggjs/utils": "4.5.0-beta.2"
+    "@eggjs/cluster": "4.0.0-beta.20",
+    "@eggjs/cookies": "4.0.0-beta.20",
+    "@eggjs/development": "5.0.0-beta.20",
+    "@eggjs/extend2": "5.0.0-beta.20",
+    "@eggjs/core": "7.0.0-beta.20",
+    "@eggjs/i18n": "4.0.0-beta.20",
+    "@eggjs/logrotator": "5.0.0-beta.20",
+    "@eggjs/jsonp": "4.0.0-beta.20",
+    "@eggjs/multipart": "5.0.0-beta.20",
+    "@eggjs/schedule": "6.0.0-beta.20",
+    "@eggjs/onerror": "4.0.0-beta.20",
+    "@eggjs/security": "5.0.0-beta.20",
+    "@eggjs/static": "4.0.0-beta.20",
+    "@eggjs/session": "5.0.0-beta.20",
+    "@eggjs/utils": "5.0.0-beta.20",
+    "@eggjs/view": "4.0.0-beta.20",
+    "@eggjs/watcher": "5.0.0-beta.20"
   },
   "devDependencies": {
-    "@eggjs/supertest": "",
     "@types/koa-bodyparser": "^4.3.12",
-    "@types/node": "24",
     "address": "2",
     "assert-file": "1",
     "coffee": "5",
     "egg-plugin-puml": "^2.4.0",
-    "egg-tracer": "^2.1.0",
     "egg-view-nunjucks": "^2.3.0",
     "formstream": "^1.5.1",
     "koa-static": "^5.0.0",
     "mm": "^4.0.2",
-    "pedding": "^2.0.1",
     "runscript": "^2.0.1",
     "sdk-base": "^5.0.1",
     "spy": "^1.0.0",
-    "tsd": "^0.33.0",
-    "tsdown": "^0.14.2",
-    "typescript": "5",
-    "@eggjs/koa": "3.1.0-beta.2",
-    "@eggjs/mock": "6.1.0-beta.2"
+    "tsdown": "^0.15.4",
+    "typescript": "^5.9.3",
+    "@eggjs/koa": "3.1.0-beta.20",
+    "@eggjs/supertest": "9.0.0-beta.20",
+    "@eggjs/tracer": "4.0.0-beta.20",
+    "@eggjs/mock": "7.0.0-beta.20"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/eggjs/egg.git",
     "directory": "packages/egg"
   },
+  "homepage": "https://github.com/eggjs/egg/tree/next/packages/egg",
   "license": "MIT",
   "egg": {
     "framework": true
   },
   "scripts": {
     "lint": "oxlint",
+    "typecheck": "tsc --noEmit",
     "build": "tsdown",
     "test": "vitest run"
   }