app cleanup

Author: nstfkc

packages/gemi/app/App.ts

@@ -3,7 +3,6 @@ import { ViewRouter } from "../http/ViewRouter";
 import type { WebSocketHandler } from "bun";
 import { ComponentType } from "react";
 import { Kernel } from "../kernel";
-import { I18nServiceContainer } from "../http/I18nServiceContainer";
 import { KernelContext } from "../kernel/KernelContext";
 
 interface AppParams {
@@ -20,46 +19,40 @@ export class App {
   private viewRouter: new () => ViewRouter;
   private Root: ComponentType;
   private kernel: Kernel;
-  private i18nServiceContainer: I18nServiceContainer;
 
   constructor(params: AppParams) {
     this.apiRouter = params.apiRouter;
     this.viewRouter = params.viewRouter;
     this.Root = params.root;
     this.kernel = new params.kernel();
 
-    this.prepare();
-
-    this.i18nServiceContainer = this.kernel.getServices().i18nServiceContainer;
-    this.i18nServiceContainer.boot();
-  }
-
-  private prepare() {
     const kernelServices = this.kernel.getServices();
 
     const authBasePath =
       kernelServices.authenticationServiceContainer.provider.basePath;
 
-    let viewRouters = {
+    const viewRouters = {
       "/": this.viewRouter,
       [authBasePath]:
         kernelServices.authenticationServiceContainer.provider.routers.view,
     };
-    let apiRouters = {
+
+    const apiRouters = {
       "/": this.apiRouter,
       [authBasePath]:
         kernelServices.authenticationServiceContainer.provider.routers.api,
       "/__gemi__/services/i18n":
         kernelServices.i18nServiceContainer.routers.api,
     };
 
-    this.kernel
-      .getServices()
-      .apiRouterServiceContainer.service.boot(apiRouters);
+    kernelServices.apiRouterServiceContainer.service.boot(apiRouters);
+
+    kernelServices.viewRouterServiceContainer.service.boot(
+      viewRouters,
+      this.Root,
+    );
 
-    this.kernel
-      .getServices()
-      .viewRouterServiceContainer.service.boot(viewRouters, this.Root);
+    kernelServices.i18nServiceContainer.boot();
   }
 
   public getComponentTree() {
@@ -72,12 +65,10 @@ export class App {
       .flatComponentTree;
   }
 
-  async fetch(req: Request): Promise<Response> {
+  public async fetch(req: Request): Promise<Response> {
     const url = new URL(req.url);
 
-    const kernelRun = this.kernel.run.bind(this.kernel);
-
-    return kernelRun(async () => {
+    return this.kernel.run.call(this.kernel, async () => {
       if (url.pathname.startsWith("/api")) {
         return await this.kernel.services.apiRouterServiceContainer.handleApiRequest(
           req,

packages/gemi/http/I18nServiceContainer.ts

@@ -5,7 +5,8 @@ import { I18nServiceProvider } from "./I18nServiceProvider";
 
 class Router extends ApiRouter {
   routes = {
-    "/translations": this.get(async (req = new HttpRequest()) => {
+    "/translations": this.get(async () => {
+      const req = new HttpRequest<any, any>();
       const { scope, locale: forcedLocale } = req.search.toJSON() as {
         scope: string;
         locale: string;
@@ -50,8 +51,6 @@ export class I18nServiceContainer {
   };
 
   boot() {
-    // await this.service.init();
-
     const tmpStore = new Map<string, Map<string, string>>();
 
     for (const [scope, translations] of Object.entries(

packages/gemi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemi",
-  "version": "0.4.92",
+  "version": "0.4.93",
   "devDependencies": {
     "@babel/parser": "^7.25.4",
     "@repo/eslint-config": "*",