@arkstack/driver-express 0.12.11 → 0.12.12

package/dist/index.js

@@ -62,7 +62,7 @@ const defaultErrorHandler = async (err, req, res, next) => {
 	}));
 };
 //#endregion
-//#region ../http/dist/redirect-Bwrh6IHq.js
+//#region ../http/dist/redirect-C1kZMywY.js
 const unwrapRequestSource = (source) => {
 	if (source.headers) return source;
 	if (source.req) return source.req;
@@ -730,7 +730,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;
 };
 const generateSessionId = () => randomBytes(32).toString("base64url");
@@ -1167,16 +1167,26 @@ const getSessionDriver = () => {
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/driver-express",
-  "version": "0.12.11",
+  "version": "0.12.12",
   "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.37",
     "resora": "^1.3.6",
-    "@arkstack/contract": "^0.12.11"
+    "@arkstack/contract": "^0.12.12"
   },
   "peerDependencies": {
     "express": "^5.2.1",
-    "@arkstack/auth": "^0.12.11",
-    "@arkstack/common": "^0.12.11",
-    "@arkstack/foundry": "^0.12.11"
+    "@arkstack/auth": "^0.12.12",
+    "@arkstack/common": "^0.12.12",
+    "@arkstack/foundry": "^0.12.12"
   },
   "peerDependenciesMeta": {
     "@arkstack/auth": {