@arkstack/http 0.12.11 → 0.12.12

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-Bwrh6IHq.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-C1kZMywY.js";
 //#region src/middlewares/web.ts
 const webMiddlewareKey = Symbol.for("arkstack:http:web");
 const markWebRequest = (target) => {

package/dist/{redirect-Bwrh6IHq.js → redirect-C1kZMywY.js}

@@ -744,7 +744,7 @@ const ensureSession = (ctx, initial, persistent) => {
 */
 const getSession = (ctx) => {
 	if (!isRecord(ctx)) return;
-	const session = ctx[sessionKey] ?? ctx.session;
+	const session = ctx[sessionKey] ?? (ctx.httpSession instanceof Session ? ctx.httpSession : void 0) ?? (ctx.session instanceof Session ? ctx.session : void 0) ?? (isRecord(ctx.req) && ctx.req.httpSession instanceof Session ? ctx.req.httpSession : void 0) ?? (isRecord(ctx.context) && ctx.context.httpSession instanceof Session ? ctx.context.httpSession : void 0);
 	return session instanceof Session ? session : void 0;
 };
 //#endregion
@@ -1204,16 +1204,26 @@ const getSessionDriver = () => {
 const arkstackHttpPlugin = definePlugin({
 	name: "arkstack-http",
 	setup: ({ bind, useHttpContext }) => {
-		bind(Session, ({ ctx }) => ensureSession(ctx));
-		useHttpContext(async (context) => {
+		bind(Session, async ({ ctx }) => {
+			const existing = getSession(ctx);
+			if (existing) return existing;
+			const persistent = await getSessionDriver().start(ctx);
+			const session = ensureSession(ctx, persistent.state, persistent);
+			attachViewState(ctx, session);
+			registerResponseFlashSweep(ctx, session);
+			return session;
+		});
+		useHttpContext((context) => {
+			const session = getSession(context.ctx);
+			if (session) {
+				context.httpSession = session;
+				if (!("session" in context) || context.session instanceof Session) context.session = session;
+				context.errors = session.errors;
+				attachViewState(context.ctx, session);
+				attachViewState(context, session);
+				registerResponseFlashSweep(context, session);
+			} else delete globalThis.session;
 			globalThis.request = (key) => key ? context.request.input(key) : context.request;
-			const persistent = await getSessionDriver().start(context);
-			const session = ensureSession(context.ctx, persistent.state, persistent);
-			context.httpSession = session;
-			if (!("session" in context) || context.session instanceof Session) context.session = session;
-			context.errors = session.errors;
-			attachViewState(context, session);
-			registerResponseFlashSweep(context, session);
 		});
 	}
 });

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-Bwrh6IHq.js";
+import { F as Response$1, I as Request$1, a as kanunSessionPlugin, i as arkstackHttpPlugin, j as old, t as redirect } from "./redirect-C1kZMywY.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.11",
+  "version": "0.12.12",
   "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/contract": "^0.12.11",
-    "@arkstack/common": "^0.12.11"
+    "@arkstack/contract": "^0.12.12",
+    "@arkstack/common": "^0.12.12"
   },
   "peerDependencies": {
     "arkormx": "^2.4.1",