@arkstack/driver-express 0.12.20 → 0.12.21

package/dist/index.js

@@ -62,8 +62,9 @@ const defaultErrorHandler = async (err, req, res, next) => {
 	}));
 };
 //#endregion
-//#region ../http/dist/redirect-C1DNCiO9.js
+//#region ../http/dist/redirect-CFGcSkzk.js
 const unwrapRequestSource = (source) => {
+	if (source.original) return unwrapRequestSource(source.original);
 	if (source.headers) return source;
 	if (source.req) return source.req;
 	if (source.request) return source.request;
@@ -115,22 +116,48 @@ var Request$1$1 = class Request$1$2 extends Request$1 {
 	headers;
 	ip;
 	source;
-	user;
-	auth;
-	authUser;
-	authToken;
+	currentUser;
+	currentAuth;
+	currentAuthUser;
+	currentAuthToken;
+	get user() {
+		return this.getSourceRequest()?.user ?? this.currentUser;
+	}
+	set user(user) {
+		this.currentUser = user;
+	}
+	get auth() {
+		return this.getSourceRequest()?.auth ?? this.currentAuth;
+	}
+	set auth(auth) {
+		this.currentAuth = auth;
+	}
+	get authUser() {
+		return this.getSourceRequest()?.authUser ?? this.currentAuthUser;
+	}
+	set authUser(user) {
+		this.currentAuthUser = user;
+	}
+	get authToken() {
+		return this.getSourceRequest()?.authToken ?? this.currentAuthToken;
+	}
+	set authToken(token) {
+		this.currentAuthToken = token;
+	}
 	constructor(options = {}) {
 		super(options);
+		const source = options.source ?? options.original;
+		const sourceRequest = isRecord(source) ? source : void 0;
 		this.headers = normalizeHeaders(options.headers);
 		if (this.method) this.method = options.method;
 		if (this.url) this.url = options.url;
 		if (this.path) this.path = options.path;
-		this.ip = options.ip ?? null;
-		this.user = options.user;
-		this.auth = options.auth;
-		this.authUser = options.authUser;
-		this.authToken = options.authToken;
-		this.source = options.source;
+		this.ip = options.ip ?? sourceRequest?.ip ?? null;
+		this.user = options.user ?? sourceRequest?.user;
+		this.auth = options.auth ?? sourceRequest?.auth;
+		this.authUser = options.authUser ?? sourceRequest?.authUser;
+		this.authToken = options.authToken ?? sourceRequest?.authToken;
+		this.source = source;
 		globalThis.request = (key) => key ? this.input(key) : this;
 	}
 	static from(source) {
@@ -147,7 +174,7 @@ var Request$1$1 = class Request$1$2 extends Request$1 {
 			auth: request.auth,
 			authUser: request.authUser,
 			authToken: request.authToken,
-			source
+			source: request
 		});
 	}
 	header(name) {
@@ -175,6 +202,18 @@ var Request$1$1 = class Request$1$2 extends Request$1 {
 		}
 		return this;
 	}
+	syncFromSource() {
+		if (!isRecord(this.source)) return this;
+		const source = this.source;
+		this.user = source.user ?? this.user;
+		this.auth = source.auth ?? this.auth;
+		this.authUser = source.authUser ?? this.authUser;
+		this.authToken = source.authToken ?? this.authToken;
+		return this;
+	}
+	getSourceRequest() {
+		return isRecord(this.source) ? this.source : void 0;
+	}
 	clearAuthentication() {
 		this.auth = void 0;
 		this.authUser = void 0;
@@ -1208,7 +1247,7 @@ definePlugin({
 			return session;
 		});
 		bind(Request$1$1, ({ request, ctx }) => {
-			return request instanceof Request$1$1 ? request : Request$1$1.from(request ?? ctx);
+			return (request instanceof Request$1$1 ? request : Request$1$1.from(request ?? ctx)).syncFromSource();
 		});
 		useHttpContext((context) => {
 			const session = getSession(context.ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/driver-express",
-  "version": "0.12.20",
+  "version": "0.12.21",
   "type": "module",
   "description": "Express driver for Arkstack, providing Express-based runtime integration for the framework.",
   "homepage": "https://arkstack.toneflix.net",
@@ -42,13 +42,13 @@
     "express-rate-limit": "^8.4.1",
     "@resora/plugin-clear-router": "^1.0.48",
     "resora": "^1.3.16",
-    "@arkstack/contract": "^0.12.20"
+    "@arkstack/contract": "^0.12.21"
   },
   "peerDependencies": {
     "express": "^5.2.1",
-    "@arkstack/foundry": "^0.12.20",
-    "@arkstack/auth": "^0.12.20",
-    "@arkstack/common": "^0.12.20"
+    "@arkstack/auth": "^0.12.21",
+    "@arkstack/common": "^0.12.21",
+    "@arkstack/foundry": "^0.12.21"
   },
   "peerDependenciesMeta": {
     "@arkstack/auth": {