@arkstack/driver-h3 0.12.11 → 0.12.12

package/dist/index-BLhGjrmA.d.ts

@@ -0,0 +1,79 @@
+import { n as MiddlewareConfig, t as Middleware$2 } from "./types-C4wkZQOC.js";
+import { ArkstackKitDriver, ArkstackRouteListOptions, PromiseOrValue } from "@arkstack/contract";
+import { H3, H3Event, HTTPError } from "h3";
+import { Route } from "clear-router";
+import { Router } from "clear-router/h3";
+import { H3App, Handler, HttpContext, Middleware as Middleware$1 } from "clear-router/types/h3";
+
+//#region src/error-handler.d.ts
+declare const defaultErrorHandler: (err: HTTPError | Error | string, event: H3Event) => Promise<any>;
+//#endregion
+//#region src/Router.d.ts
+declare class Router$1 extends Router {
+  static bind(app: H3): Promise<H3App>;
+  static list(_options: ArkstackRouteListOptions | undefined, app: H3): Promise<Route<HttpContext, Middleware$1, Handler>[]>;
+}
+//#endregion
+//#region src/index.d.ts
+type H3Middleware = Middleware$1 | [Middleware$1, Record<string, any>];
+interface H3DriverOptions {
+  bindRouter: (app: H3) => PromiseOrValue<void>;
+  mountPublicAssets?: (app: H3, publicPath: string) => PromiseOrValue<void>;
+  createApp?: () => H3;
+  onError?: (err: Error | string, event: H3Event) => unknown;
+}
+declare class H3EventResponse {
+  response: Response;
+  status: number;
+  statusText?: string;
+  constructor(response: Response);
+  get headers(): Headers;
+}
+/**
+ * The H3Driver class implements the ArkstackKitDriver contract for the H3 framework.
+ */
+declare class H3Driver extends ArkstackKitDriver<H3, H3Middleware> {
+  readonly name = "h3";
+  private readonly options;
+  /**
+   * Creates an instance of H3Driver.
+   *
+   * @param options
+   */
+  constructor(options: H3DriverOptions);
+  /**
+   * Creates an H3 application instance.
+   *
+   * @returns
+   */
+  createApp(): H3;
+  /**
+   * Mounts static assets from the specified public path to the H3 application.
+   *
+   * @param app
+   * @param publicPath
+   */
+  mountPublicAssets(app: H3, publicPath: string): PromiseOrValue<void>;
+  /**
+   * Binds the router to the H3 application using the provided bindRouter function.
+   *
+   * @param app
+   */
+  bindRouter(app: H3): PromiseOrValue<void>;
+  /**
+   * Applies middleware to the H3 application.
+   *
+   * @param app
+   * @param middleware
+   */
+  applyMiddleware(app: H3, middleware: H3Middleware | Middleware$2 | MiddlewareConfig): void;
+  /**
+   * Starts the H3 server on the specified port.
+   *
+   * @param app
+   * @param port
+   */
+  start(app: H3, port: number): void;
+}
+//#endregion
+export { Router$1 as a, H3Middleware as i, H3DriverOptions as n, defaultErrorHandler as o, H3EventResponse as r, H3Driver as t };

package/dist/{index-DIJtwwZP.d.ts → index-Dls9g_8I.d.ts}

@@ -1,19 +1,12 @@
 import { n as MiddlewareConfig, t as Middleware$2 } from "./types-DWUchLdg.js";
 import { ArkstackKitDriver, ArkstackRouteListOptions, PromiseOrValue } from "@arkstack/contract";
-import { H3, H3Event, HTTPError, HTTPResponse } from "h3";
+import { H3, H3Event, HTTPError } from "h3";
 import { Route } from "clear-router";
 import { Router } from "clear-router/h3";
 import { H3App, Handler, HttpContext, Middleware as Middleware$1 } from "clear-router/types/h3";
 
 //#region src/error-handler.d.ts
-declare const defaultErrorHandler: (err: HTTPError | Error | string, event: H3Event) => Promise<HTTPResponse | {
-  error: boolean;
-  message: string;
-  status: "error";
-  code: number;
-  errors?: unknown;
-  stack?: string;
-}>;
+declare const defaultErrorHandler: (err: HTTPError | Error | string, event: H3Event) => Promise<any>;
 //#endregion
 //#region src/Router.d.ts
 declare class Router$1 extends Router {

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 /// <reference path="./app.d.ts" />
-import { a as Router, i as H3Middleware, n as H3DriverOptions, o as defaultErrorHandler, r as H3EventResponse, t as H3Driver } from "./index-DIJtwwZP.js";
+import { a as Router, i as H3Middleware, n as H3DriverOptions, o as defaultErrorHandler, r as H3EventResponse, t as H3Driver } from "./index-BLhGjrmA.js";
 export { H3Driver, H3DriverOptions, H3EventResponse, H3Middleware, Router, defaultErrorHandler };

package/dist/index.js

@@ -65,7 +65,7 @@ const defaultErrorHandler = async (err, event) => {
 	});
 };
 //#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;
@@ -733,7 +733,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");
@@ -1170,16 +1170,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/dist/middlewares/index.d.ts

@@ -1,4 +1,4 @@
-import { i as H3Middleware } from "../index-DIJtwwZP.js";
+import { i as H3Middleware } from "../index-BLhGjrmA.js";
 import * as _$h3 from "h3";
 import { EventHandlerRequest, H3Event } from "h3";
 import { NextFunction } from "clear-router/types/h3";

package/dist/types-C4wkZQOC.d.ts

@@ -0,0 +1,18 @@
+/// <reference path="./app.d.ts" />
+import { ArkstackKitDriver, ArkstackMiddlewareConfig, ArkstackRouteListOptions, PromiseOrValue } from "@arkstack/contract";
+import { H3, H3Event, HTTPError, Middleware } from "h3";
+import { Route } from "clear-router";
+import { Router } from "clear-router/h3";
+import { ClassMiddleware } from "clear-router/types/basic";
+import { H3App, Handler, HttpContext, Middleware as Middleware$1 } from "clear-router/types/h3";
+
+//#region dist/index-Dls9g_8I.d.ts
+//#endregion
+//#region src/index.d.ts
+type H3Middleware = Middleware$1 | [Middleware$1, Record<string, any>];
+//#endregion
+//#region src/types.d.ts
+type Middleware$2 = Middleware | ClassMiddleware<Middleware>;
+type MiddlewareConfig = ArkstackMiddlewareConfig<Middleware$2> | ArkstackMiddlewareConfig<H3Middleware>;
+//#endregion
+export { MiddlewareConfig as n, Middleware$2 as t };

package/dist/types.d.ts

@@ -1,2 +1,2 @@
-import { n as MiddlewareConfig, t as Middleware } from "./types-DWUchLdg.js";
+import { n as MiddlewareConfig, t as Middleware } from "./types-C4wkZQOC.js";
 export { Middleware, MiddlewareConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/driver-h3",
-  "version": "0.12.11",
+  "version": "0.12.12",
   "type": "module",
   "description": "H3 driver for Arkstack, providing H3-based runtime integration for the framework.",
   "homepage": "https://arkstack.toneflix.net",
@@ -40,13 +40,13 @@
     "clear-router": "^2.8.6",
     "@resora/plugin-clear-router": "^1.0.37",
     "resora": "^1.3.6",
-    "@arkstack/contract": "^0.12.11"
+    "@arkstack/contract": "^0.12.12"
   },
   "peerDependencies": {
     "h3": "2.0.1-rc.22",
-    "@arkstack/auth": "^0.12.11",
-    "@arkstack/foundry": "^0.12.11",
-    "@arkstack/common": "^0.12.11"
+    "@arkstack/foundry": "^0.12.12",
+    "@arkstack/auth": "^0.12.12",
+    "@arkstack/common": "^0.12.12"
   },
   "peerDependenciesMeta": {
     "@arkstack/auth": {