@moostjs/event-http 0.6.41 → 0.6.42

package/dist/index.cjs

@@ -540,6 +540,11 @@ function _define_property(obj, key, value) {
 	else obj[key] = value;
 	return obj;
 }
+const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
+	const res = (0, _wooksjs_event_http.useResponse)().getRawRes(true);
+	if (res.closed) unscope();
+	else res.once("close", unscope);
+} };
 const LOGGER_TITLE = "moost-http";
 /**
 * ## Moost HTTP Adapter
@@ -604,14 +609,17 @@ const LOGGER_TITLE = "moost-http";
 		return this.httpApp.listen(port, hostname, backlog, listeningListener);
 	}
 	async onNotFound() {
-		return (0, moost.defineMoostEventHandler)({
+		this.notFoundHandler ?? (this.notFoundHandler = (0, moost.defineMoostEventHandler)({
 			loggerTitle: LOGGER_TITLE,
 			getIterceptorHandler: () => this.moost?.getGlobalInterceptorHandler(),
 			getControllerInstance: () => this.moost,
 			callControllerMethod: () => new _wooksjs_event_http.HttpError(404, "Resource Not Found"),
+			manualUnscope: true,
+			hooks: holdScopeUntilResponseCloses,
 			targetPath: "",
 			handlerType: "__SYSTEM__"
-		})();
+		}));
+		return this.notFoundHandler();
 	}
 	onInit(moost$1) {
 		this.moost = moost$1;
@@ -642,6 +650,7 @@ const LOGGER_TITLE = "moost-http";
 			const httpPath = handler.path;
 			const path = typeof httpPath === "string" ? httpPath : typeof opts.method === "string" ? opts.method : "";
 			const targetPath = `${`${opts.prefix || ""}/${path}`.replaceAll(/\/\/+/g, "/")}${path.endsWith("//") ? "/" : ""}`;
+			const isUpgrade = handler.method === "UPGRADE";
 			fn = (0, moost.defineMoostEventHandler)({
 				loggerTitle: LOGGER_TITLE,
 				getIterceptorHandler: opts.getIterceptorHandler,
@@ -649,19 +658,13 @@ const LOGGER_TITLE = "moost-http";
 				controllerMethod: opts.method,
 				controllerName: opts.controllerName,
 				resolveArgs: opts.resolveArgs,
-				manualUnscope: true,
-				hooks: { init: ({ unscope }) => {
-					if (handler.method === "UPGRADE") {
-						(0, _wooksjs_event_http.useRequest)().raw.on("end", unscope);
-						return;
-					}
-					(0, _wooksjs_event_http.useResponse)().getRawRes(true).once("close", unscope);
-				} },
+				manualUnscope: !isUpgrade,
+				hooks: isUpgrade ? void 0 : holdScopeUntilResponseCloses,
 				targetPath,
 				controllerPrefix: opts.prefix,
 				handlerType: handler.type
 			});
-			const routerBinding = handler.method === "UPGRADE" ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
+			const routerBinding = isUpgrade ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
 			const { getPath: pathBuilder } = routerBinding;
 			const id = ((0, moost.getMoostMate)().read(opts.fakeInstance, opts.method) || {}).id || opts.method;
 			if (id) {
@@ -686,11 +689,12 @@ const LOGGER_TITLE = "moost-http";
 		_define_property(this, "httpApp", void 0);
 		_define_property(this, "pathBuilders", {});
 		_define_property(this, "moost", void 0);
+		_define_property(this, "notFoundHandler", void 0);
 		_wooksjs_event_http.WooksHttpResponse.registerFramework({
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.41"
+			version: "0.6.42"
 		});
 		if (httpApp && httpApp instanceof _wooksjs_event_http.WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = (0, _wooksjs_event_http.createHttpApp)({

package/dist/index.d.ts

@@ -448,6 +448,7 @@ declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
     }>;
     onNotFound(): Promise<unknown>;
     protected moost?: Moost;
+    private notFoundHandler?;
     onInit(moost: Moost): void;
     /**
      * Called by `Moost.dispose()` before any `@MoostDispose` hook runs: stops the

package/dist/index.mjs

@@ -539,6 +539,11 @@ function _define_property(obj, key, value) {
 	else obj[key] = value;
 	return obj;
 }
+const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
+	const res = useResponse().getRawRes(true);
+	if (res.closed) unscope();
+	else res.once("close", unscope);
+} };
 const LOGGER_TITLE = "moost-http";
 /**
 * ## Moost HTTP Adapter
@@ -603,14 +608,17 @@ const LOGGER_TITLE = "moost-http";
 		return this.httpApp.listen(port, hostname, backlog, listeningListener);
 	}
 	async onNotFound() {
-		return defineMoostEventHandler({
+		this.notFoundHandler ?? (this.notFoundHandler = defineMoostEventHandler({
 			loggerTitle: LOGGER_TITLE,
 			getIterceptorHandler: () => this.moost?.getGlobalInterceptorHandler(),
 			getControllerInstance: () => this.moost,
 			callControllerMethod: () => new HttpError$1(404, "Resource Not Found"),
+			manualUnscope: true,
+			hooks: holdScopeUntilResponseCloses,
 			targetPath: "",
 			handlerType: "__SYSTEM__"
-		})();
+		}));
+		return this.notFoundHandler();
 	}
 	onInit(moost) {
 		this.moost = moost;
@@ -641,6 +649,7 @@ const LOGGER_TITLE = "moost-http";
 			const httpPath = handler.path;
 			const path = typeof httpPath === "string" ? httpPath : typeof opts.method === "string" ? opts.method : "";
 			const targetPath = `${`${opts.prefix || ""}/${path}`.replaceAll(/\/\/+/g, "/")}${path.endsWith("//") ? "/" : ""}`;
+			const isUpgrade = handler.method === "UPGRADE";
 			fn = defineMoostEventHandler({
 				loggerTitle: LOGGER_TITLE,
 				getIterceptorHandler: opts.getIterceptorHandler,
@@ -648,19 +657,13 @@ const LOGGER_TITLE = "moost-http";
 				controllerMethod: opts.method,
 				controllerName: opts.controllerName,
 				resolveArgs: opts.resolveArgs,
-				manualUnscope: true,
-				hooks: { init: ({ unscope }) => {
-					if (handler.method === "UPGRADE") {
-						useRequest().raw.on("end", unscope);
-						return;
-					}
-					useResponse().getRawRes(true).once("close", unscope);
-				} },
+				manualUnscope: !isUpgrade,
+				hooks: isUpgrade ? void 0 : holdScopeUntilResponseCloses,
 				targetPath,
 				controllerPrefix: opts.prefix,
 				handlerType: handler.type
 			});
-			const routerBinding = handler.method === "UPGRADE" ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
+			const routerBinding = isUpgrade ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
 			const { getPath: pathBuilder } = routerBinding;
 			const id = (getMoostMate().read(opts.fakeInstance, opts.method) || {}).id || opts.method;
 			if (id) {
@@ -685,11 +688,12 @@ const LOGGER_TITLE = "moost-http";
 		_define_property(this, "httpApp", void 0);
 		_define_property(this, "pathBuilders", {});
 		_define_property(this, "moost", void 0);
+		_define_property(this, "notFoundHandler", void 0);
 		WooksHttpResponse.registerFramework({
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.41"
+			version: "0.6.42"
 		});
 		if (httpApp && httpApp instanceof WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = createHttpApp({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-http",
-  "version": "0.6.41",
+  "version": "0.6.42",
   "description": "@moostjs/event-http",
   "keywords": [
     "composables",
@@ -38,16 +38,16 @@
     }
   },
   "dependencies": {
-    "@wooksjs/event-http": "^0.7.24",
-    "@wooksjs/http-body": "^0.7.24"
+    "@wooksjs/event-http": "^0.7.25",
+    "@wooksjs/http-body": "^0.7.25"
   },
   "devDependencies": {
     "vitest": "3.2.7"
   },
   "peerDependencies": {
     "@prostojs/infact": "^0.6.0",
-    "@wooksjs/event-core": "^0.7.24",
-    "moost": "^0.6.41"
+    "@wooksjs/event-core": "^0.7.25",
+    "moost": "^0.6.42"
   },
   "scripts": {
     "pub": "pnpm publish --access public",