@arkstack/http 0.12.20 → 0.12.21

package/dist/{index-De_2oJZT.d.ts → index-C-YhZgaG.d.ts}

@@ -2,6 +2,7 @@ import * as _$clear_router0 from "clear-router";
 import { ClearHttpContext, Request, Response } from "clear-router";
 import * as _$kanun from "kanun";
 import { MiddlewareClass, MiddlewareInstance, RequestData } from "clear-router/types/basic";
+import { User } from "@app/models/User";
 
 //#region src/Response.d.ts
 /**
@@ -413,6 +414,7 @@ type RequestSource<TUser = unknown> = {
   authToken?: string;
   req?: RequestSource<TUser>;
   request?: RequestSource<TUser>;
+  original?: RequestSource<TUser>;
 };
 type ResponseSource = {
   statusCode?: number;
@@ -435,6 +437,7 @@ type RequestOptions<TUser = unknown> = {
   authUser?: TUser;
   authToken?: string;
   source?: unknown;
+  original?: unknown;
 };
 interface RequestHelper<TUser = unknown> {
   (): Request$1;
@@ -459,20 +462,30 @@ interface OldHelper {
  *
  * @author 3m1n3nc3
  */
-declare class Request$1<TUser = unknown> extends Request {
+declare class Request$1<TUser = User> extends Request {
   readonly headers: HeaderMap;
   readonly ip: string | null;
   readonly source?: unknown;
-  user?: TUser;
-  auth?: unknown;
-  authUser?: TUser;
-  authToken?: string;
+  private currentUser?;
+  private currentAuth?;
+  private currentAuthUser?;
+  private currentAuthToken?;
+  get user(): TUser | undefined;
+  set user(user: TUser | undefined);
+  get auth(): unknown;
+  set auth(auth: unknown);
+  get authUser(): TUser | undefined;
+  set authUser(user: TUser | undefined);
+  get authToken(): string | undefined;
+  set authToken(token: string | undefined);
   constructor(options?: RequestOptions<TUser>);
   static from<TUser = unknown>(source?: Request$1<TUser> | RequestSource<TUser>): Request$1<TUser> | undefined;
   header(name: string): string;
   bearerToken(): string | null;
   setUser(user: TUser): this;
   setAuthentication<TAuth>(auth: TAuth, user: TUser, token?: string): this;
+  syncFromSource(): this;
+  private getSourceRequest;
   clearAuthentication(): this;
 }
 //#endregion

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 /// <reference path="./app.d.ts" />
-import { $ as arkstackHttpPlugin, A as CookieSessionDriver, B as generateSessionId, C as RequestHelper, D as SessionHelper, E as ResponseSource, F as encryptSessionValue, G as signValue, H as parseCookies, I as decodeJson, J as getSessionDriver, K as configureSession, L as decodeSignedValue, M as decodeSessionPayload, N as encodeSessionPayload, O as FileSessionDriver, P as decryptSessionValue, Q as registerResponseFlashSweep, R as encodeJson, S as RedirectHelper, T as RequestSource, U as serializeCookie, V as getCookie, W as setCookie, X as ensureSession, Y as attachViewState, Z as getSession, _ as FunctionMiddleware, _t as cookie_options, a as redirect, at as HttpContextLike, b as HeaderValue, c as isHeaders, ct as SessionDriver, d as normalizeHeaderValue, dt as SessionErrorRecord, et as kanunSessionPlugin, f as normalizeHeaders, ft as SessionErrorSource, g as ClassMiddleware, gt as SessionPayload, h as Request, ht as SessionMessageProvider, i as old, it as DatabaseSessionDriverOptions, j as BaseSessionDriver, k as DatabaseSessionDriver, l as isRecord, lt as SessionDriverResult, m as unwrapRequestSource, mt as SessionInitialState, n as web, nt as ErrorBag, o as redirectBackTarget, ot as PersistentSessionConfig, p as resolveMiddleware, pt as SessionErrorValue, q as createSessionDriver, r as webMiddlewareKey, rt as BaseSessionDriverOptions, s as resolveRedirectTarget, st as SessionConfig, t as isWebRequest, tt as Session, u as makeHeaders, ut as SessionDriverType, v as HeaderMap, vt as FlashBag, w as RequestOptions, x as OldHelper, y as HeaderSource, yt as Response, z as encodeSignedValue } from "./index-De_2oJZT.js";
+import { $ as arkstackHttpPlugin, A as CookieSessionDriver, B as generateSessionId, C as RequestHelper, D as SessionHelper, E as ResponseSource, F as encryptSessionValue, G as signValue, H as parseCookies, I as decodeJson, J as getSessionDriver, K as configureSession, L as decodeSignedValue, M as decodeSessionPayload, N as encodeSessionPayload, O as FileSessionDriver, P as decryptSessionValue, Q as registerResponseFlashSweep, R as encodeJson, S as RedirectHelper, T as RequestSource, U as serializeCookie, V as getCookie, W as setCookie, X as ensureSession, Y as attachViewState, Z as getSession, _ as FunctionMiddleware, _t as cookie_options, a as redirect, at as HttpContextLike, b as HeaderValue, c as isHeaders, ct as SessionDriver, d as normalizeHeaderValue, dt as SessionErrorRecord, et as kanunSessionPlugin, f as normalizeHeaders, ft as SessionErrorSource, g as ClassMiddleware, gt as SessionPayload, h as Request, ht as SessionMessageProvider, i as old, it as DatabaseSessionDriverOptions, j as BaseSessionDriver, k as DatabaseSessionDriver, l as isRecord, lt as SessionDriverResult, m as unwrapRequestSource, mt as SessionInitialState, n as web, nt as ErrorBag, o as redirectBackTarget, ot as PersistentSessionConfig, p as resolveMiddleware, pt as SessionErrorValue, q as createSessionDriver, r as webMiddlewareKey, rt as BaseSessionDriverOptions, s as resolveRedirectTarget, st as SessionConfig, t as isWebRequest, tt as Session, u as makeHeaders, ut as SessionDriverType, v as HeaderMap, vt as FlashBag, w as RequestOptions, x as OldHelper, y as HeaderSource, yt as Response, z as encodeSignedValue } from "./index-C-YhZgaG.js";
 export { BaseSessionDriver, BaseSessionDriverOptions, ClassMiddleware, CookieSessionDriver, DatabaseSessionDriver, DatabaseSessionDriverOptions, ErrorBag, FileSessionDriver, FlashBag, FunctionMiddleware, HeaderMap, HeaderSource, HeaderValue, HttpContextLike, OldHelper, PersistentSessionConfig, RedirectHelper, Request, RequestHelper, RequestOptions, RequestSource, Response, ResponseSource, Session, SessionConfig, SessionDriver, SessionDriverResult, SessionDriverType, SessionErrorRecord, SessionErrorSource, SessionErrorValue, SessionHelper, SessionInitialState, SessionMessageProvider, SessionPayload, arkstackHttpPlugin, attachViewState, configureSession, cookie_options, createSessionDriver, decodeJson, decodeSessionPayload, decodeSignedValue, decryptSessionValue, encodeJson, encodeSessionPayload, encodeSignedValue, encryptSessionValue, ensureSession, generateSessionId, getCookie, getSession, getSessionDriver, isHeaders, isRecord, isWebRequest, kanunSessionPlugin, makeHeaders, normalizeHeaderValue, normalizeHeaders, old, parseCookies, redirect, redirectBackTarget, registerResponseFlashSweep, resolveMiddleware, resolveRedirectTarget, serializeCookie, setCookie, signValue, unwrapRequestSource, web, webMiddlewareKey };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { A as registerResponseFlashSweep, B as normalizeHeaderValue, C as parseCookies, D as attachViewState, E as signValue, F as Response, H as resolveMiddleware, I as Request, L as isHeaders, M as Session, N as ErrorBag, O as ensureSession, P as FlashBag, R as isRecord, S as getCookie, T as setCookie, U as unwrapRequestSource, V as normalizeHeaders, _ as decodeJson, a as kanunSessionPlugin, b as encodeSignedValue, c as getSessionDriver, d as CookieSessionDriver, f as BaseSessionDriver, g as encodeSessionPayload, h as decodeSessionPayload, i as arkstackHttpPlugin, j as old, k as getSession, l as FileSessionDriver, m as encryptSessionValue, n as redirectBackTarget, o as configureSession, p as decryptSessionValue, r as resolveRedirectTarget, s as createSessionDriver, t as redirect, u as DatabaseSessionDriver, v as decodeSignedValue, w as serializeCookie, x as generateSessionId, y as encodeJson, z as makeHeaders } from "./redirect-C1DNCiO9.js";
+import { A as registerResponseFlashSweep, B as normalizeHeaderValue, C as parseCookies, D as attachViewState, E as signValue, F as Response, H as resolveMiddleware, I as Request, L as isHeaders, M as Session, N as ErrorBag, O as ensureSession, P as FlashBag, R as isRecord, S as getCookie, T as setCookie, U as unwrapRequestSource, V as normalizeHeaders, _ as decodeJson, a as kanunSessionPlugin, b as encodeSignedValue, c as getSessionDriver, d as CookieSessionDriver, f as BaseSessionDriver, g as encodeSessionPayload, h as decodeSessionPayload, i as arkstackHttpPlugin, j as old, k as getSession, l as FileSessionDriver, m as encryptSessionValue, n as redirectBackTarget, o as configureSession, p as decryptSessionValue, r as resolveRedirectTarget, s as createSessionDriver, t as redirect, u as DatabaseSessionDriver, v as decodeSignedValue, w as serializeCookie, x as generateSessionId, y as encodeJson, z as makeHeaders } from "./redirect-CFGcSkzk.js";
 //#region src/middlewares/web.ts
 const webMiddlewareKey = Symbol.for("arkstack:http:web");
 const markWebRequest = (target) => {

package/dist/{redirect-C1DNCiO9.js → redirect-CFGcSkzk.js}

@@ -9,6 +9,7 @@ import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { Arkstack } from "@arkstack/contract";
 //#region src/helpers.ts
 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;
@@ -65,22 +66,48 @@ var Request$1 = class Request$1 extends Request {
 	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) {
@@ -97,7 +124,7 @@ var Request$1 = class Request$1 extends Request {
 			auth: request.auth,
 			authUser: request.authUser,
 			authToken: request.authToken,
-			source
+			source: request
 		});
 	}
 	header(name) {
@@ -125,6 +152,18 @@ var Request$1 = class Request$1 extends Request {
 		}
 		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;
@@ -1245,7 +1284,7 @@ const arkstackHttpPlugin = definePlugin({
 			return session;
 		});
 		bind(Request$1, ({ request, ctx }) => {
-			return request instanceof Request$1 ? request : Request$1.from(request ?? ctx);
+			return (request instanceof Request$1 ? request : Request$1.from(request ?? ctx)).syncFromSource();
 		});
 		useHttpContext((context) => {
 			const session = getSession(context.ctx);

package/dist/setup.d.ts

@@ -1,4 +1,4 @@
-import { C as RequestHelper, D as SessionHelper, S as RedirectHelper, x as OldHelper, yt as Response } from "./index-De_2oJZT.js";
+import { C as RequestHelper, D as SessionHelper, S as RedirectHelper, x as OldHelper, yt as Response } from "./index-C-YhZgaG.js";
 //#region src/setup.d.ts
 declare global {
   var session: SessionHelper;

package/dist/setup.js

@@ -1,4 +1,4 @@
-import { F as Response$1, I as Request$1, a as kanunSessionPlugin, i as arkstackHttpPlugin, j as old, t as redirect } from "./redirect-C1DNCiO9.js";
+import { F as Response$1, I as Request$1, a as kanunSessionPlugin, i as arkstackHttpPlugin, j as old, t as redirect } from "./redirect-CFGcSkzk.js";
 import { CoreRouter } from "clear-router";
 import { Validator } from "kanun";
 import "dotenv/config";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/http",
-  "version": "0.12.20",
+  "version": "0.12.21",
   "type": "module",
   "description": "HTTP module for Arkstack, providing framework-agnostic request and response primitives.",
   "homepage": "https://arkstack.toneflix.net/guide/http",
@@ -30,8 +30,8 @@
   "dependencies": {
     "clear-router": "^2.8.6",
     "dotenv": "17.3.1",
-    "@arkstack/common": "^0.12.20",
-    "@arkstack/contract": "^0.12.20"
+    "@arkstack/contract": "^0.12.21",
+    "@arkstack/common": "^0.12.21"
   },
   "peerDependencies": {
     "arkormx": "^2.5.6",