@dooboostore/simple-boot-http-server-ssr 1.0.14 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dooboostore/simple-boot-http-server-ssr",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -38,6 +38,11 @@
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
     },
+    "./bundle-entry": {
+      "types": "./dist/types/bundle-entry.d.ts",
+      "import": "./dist/esm/bundle-entry.js",
+      "require": "./dist/cjs/bundle-entry.js"
+    },
     "./*": {
       "types": "./dist/types/*.d.ts",
       "import": "./dist/esm/*.js",
@@ -65,7 +70,6 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@types/jsdom": "^21.1.7",
     "@babel/core": "^7.24.0",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.24.0",
@@ -73,27 +77,30 @@
     "@babel/preset-env": "^7.24.0",
     "@babel/preset-typescript": "^7.24.0",
     "@types/jest": "^26.0.22",
-    "raw-loader": "^4.0.2",
+    "@types/jsdom": "^21.1.7",
+    "@types/node": "^20",
+    "@types/node-gzip": "^1.1.0",
     "@typescript-eslint/eslint-plugin": "^4.16.1",
     "@typescript-eslint/parser": "^4.16.1",
+    "esbuild": "^0.23.0",
+    "esbuild-plugin-tsc": "^0.5.0",
+    "raw-loader": "^4.0.2",
     "tslib": "^2.8.1",
-    "@types/node": "^20",
     "typescript": "^5.9.2",
-    "@types/node-gzip": "^1.1.0",
-    "esbuild-plugin-tsc": "^0.5.0",
-    "esbuild": "^0.23.0",
-    "@dooboostore/core-node": "1.0.10",
-    "@dooboostore/core-web": "1.0.9",
-    "@dooboostore/dom-render": "1.0.112",
-    "@dooboostore/simple-boot": "1.0.53",
-    "@dooboostore/core": "1.0.28",
-    "@dooboostore/simple-boot-front": "1.0.130",
-    "@dooboostore/simple-boot-http-server": "1.0.23"
+    "@dooboostore/core": "1.0.32",
+    "@dooboostore/core-web": "1.0.12",
+    "@dooboostore/simple-boot": "1.0.56",
+    "@dooboostore/dom-render": "1.0.113",
+    "@dooboostore/dom-parser": "1.0.7",
+    "@dooboostore/simple-boot-front": "1.0.131",
+    "@dooboostore/simple-boot-http-server": "1.0.25",
+    "@dooboostore/simple-web-component": "1.0.37",
+    "@dooboostore/core-node": "1.0.12"
   },
   "dependencies": {
     "jsdom": "^26.0.0",
     "linkedom": "0.18.12",
-    "@dooboostore/dom-parser": "1.0.1"
+    "playwright": "^1.59.1"
   },
   "scripts": {
     "clean": "rm -rf dist",

package/src/SimpleBootHttpSSRFactory.ts

@@ -1,5 +1,5 @@
 import { SimpleBootFront } from '@dooboostore/simple-boot-front/SimpleBootFront';
-import { ConstructorType } from '@dooboostore/core/types';
+import { ConstructorType } from '@dooboostore/core';
 import { SimFrontOption } from '@dooboostore/simple-boot-front/option/SimFrontOption';
 export abstract class SimpleBootHttpSSRFactory {
     public abstract factory(simFrontOption: SimFrontOption, using: (ConstructorType<any> | Function)[], domExcludes: ConstructorType<any>[]): Promise<SimpleBootFront> ;

package/src/SimpleBootHttpSSRServer.ts

@@ -1,15 +1,16 @@
 import { SimpleBootHttpServer } from '@dooboostore/simple-boot-http-server/SimpleBootHttpServer';
-// import { SimstanceManager } from '@dooboostore/simple-boot/simstance/SimstanceManager';
 import { HttpSSRServerOption } from './option/HttpSSRServerOption';
-import { ConstructorType } from '@dooboostore/core/types';
+import { ConstructorType } from '@dooboostore/core';
+import {SimConfig} from "@dooboostore/simple-boot/decorators/SimDecorator";
 
 export class SimpleBootHttpSSRServer extends SimpleBootHttpServer {
   constructor(option?: HttpSSRServerOption) {
     super(option)
   }
 
-  run(otherInstanceSim?: Map<ConstructorType<any>, any>) {
-    const oi = new Map<ConstructorType<any>, any>()
+  run(otherInstanceSim?: Map<ConstructorType<any> | Function | SimConfig | symbol, any>) {
+    const oi = new Map<ConstructorType<any> | Function | SimConfig | symbol, any>();
+    oi.set(SimpleBootHttpSSRServer, this);
     otherInstanceSim?.forEach((value, key) => oi.set(key, value));
     return super.run(oi);
   }

package/src/bundle-entry.ts

@@ -1,5 +1,3 @@
-export * from './codes';
-export * from './decorators';
 export * from './filters';
 export * from './initializers';
 export * from './option';

package/src/filters/SSRDomParserFilter.ts

@@ -1,36 +1,31 @@
 import { RequestResponse } from '@dooboostore/simple-boot-http-server/models/RequestResponse';
 import { HttpHeaders } from '@dooboostore/simple-boot-http-server/codes/HttpHeaders';
 import { SimpleBootHttpSSRFactory } from '../SimpleBootHttpSSRFactory';
-import { ConstructorType } from '@dooboostore/core/types';
+import { ConstructorType, AsyncBlockingQueue, RandomUtils, MessageOperator, MessageInternal, Promises } from '@dooboostore/core';
 import { Filter } from '@dooboostore/simple-boot-http-server/filters/Filter';
 import { Mimes } from '@dooboostore/simple-boot-http-server/codes/Mimes';
 import { HttpStatus } from '@dooboostore/simple-boot-http-server/codes/HttpStatus';
 import { SimpleBootHttpServer } from '@dooboostore/simple-boot-http-server/SimpleBootHttpServer';
 import { SimFrontOption } from '@dooboostore/simple-boot-front/option/SimFrontOption';
 import { SimpleBootFront } from '@dooboostore/simple-boot-front/SimpleBootFront';
-import { AsyncBlockingQueue } from '@dooboostore/core/queues/AsyncBlockingQueue';
-import { RandomUtils } from '@dooboostore/core/random/RandomUtils';
 import * as JSDOM from 'jsdom';
 import { NotFoundError } from '@dooboostore/simple-boot-http-server/errors/NotFoundError';
-import { DomRenderProxy } from '@dooboostore/dom-render/DomRenderProxy';
-import { filter } from '@dooboostore/core/message/operators/filter';
-import { first } from '@dooboostore/core/message/operators/first';
-import { delay } from '@dooboostore/core/message/operators/delay';
-import { firstValueFrom } from '@dooboostore/core/message/internal/firstValueFrom';
+import { DomRenderProxy } from '@dooboostore/dom-render';
 import { parseHTML } from 'linkedom';
-import {Promises} from '@dooboostore/core/promise/Promises';
 import { DomParserInitializer } from '../initializers/DomParserInitializer';
+import { JsdomInitializer } from '../initializers';
+import { SimConfig } from '@dooboostore/simple-boot/decorators/SimDecorator';
 
-export type FactoryAndParams = {
+export type DomParserFactoryAndParams = {
   frontDistPath: string;
   frontDistIndexFileName?: string;
   factorySimFrontOption: (window: any) => SimFrontOption;
   factory: SimpleBootHttpSSRFactory;
-  poolOption: {
-    max: number;
-    min: number;
-    clearIntervalTime?: number;
-  };
+  // poolOption: {
+  //   max: number;
+  //   min: number;
+  //   clearIntervalTime?: number;
+  // };
   using: ConstructorType<any>[];
   domExcludes?: ConstructorType<any>[];
   ssrExcludeFilter?: (rr: RequestResponse) => boolean;
@@ -40,150 +35,152 @@ export type FactoryAndParams = {
 };
 
 export class SSRDomParserFilter implements Filter {
-  private simpleBootFrontPool: SimpleBootFront[] = [];
-  private simpleBootFrontQueue = new AsyncBlockingQueue<SimpleBootFront>();
+  // private simpleBootFrontPool: SimpleBootFront[] = [];
+  // private simpleBootFrontQueue = new AsyncBlockingQueue<SimpleBootFront>();
   // private indexHTML: string;
   private welcomUrl = 'http://localhost';
-  private poolGeneration = 0;
-  private intervalId?: NodeJS.Timeout;
+  // private poolGeneration = 0;
+  // private intervalId?: NodeJS.Timeout;
 
   constructor(
-    public config: FactoryAndParams,
-    public otherInstanceSim?: Map<ConstructorType<any>, any>
+    public config: DomParserFactoryAndParams,
+    public otherInstanceSim?: Map<ConstructorType<any> | Function | SimConfig | Symbol, any>
   ) {
     config.frontDistIndexFileName = config.frontDistIndexFileName || 'index.html';
     // this.indexHTML = JsdomInitializer.loadFile(this.config.frontDistPath, config.frontDistIndexFileName);
   }
 
   async onInit(app: SimpleBootHttpServer) {
-    for (let i = 0; i < this.config.poolOption.min; i++) {
-      await this.pushQueue();
-    }
-
-    if (this.config.poolOption.clearIntervalTime && this.config.poolOption.clearIntervalTime > 0) {
-      this.intervalId = setInterval(() => {
-        this.poolGeneration++;
-      }, this.config.poolOption.clearIntervalTime);
-    }
+    // for (let i = 0; i < this.config.poolOption.min; i++) {
+    //   await this.pushQueue();
+    // }
+    // if (this.config.poolOption.clearIntervalTime && this.config.poolOption.clearIntervalTime > 0) {
+    //   this.intervalId = setInterval(() => {
+    //     this.poolGeneration++;
+    //   }, this.config.poolOption.clearIntervalTime);
+    // }
   }
 
   async onDestroy() {
-    if (this.intervalId) {
-      clearInterval(this.intervalId);
-    }
-    // this.simpleBootFrontQueue.clear();
-    this.simpleBootFrontPool.forEach(front => {
-      (front as any).jsdom?.window.close();
-    });
-    this.simpleBootFrontPool = [];
+    // if (this.intervalId) {
+    //   clearInterval(this.intervalId);
+    // }
+    // // this.simpleBootFrontQueue.clear();
+    // this.simpleBootFrontPool.forEach(front => {
+    //   // JSDOM도 정리 (하위 호환성)
+    //   (front as any).jsdom?.window.close();
+    //   // Window close - 이것만으로 WindowBase.close()가 호출되어 메모리 정리됨
+    //   (front.option.window as any)?.close?.();
+    // });
+    // this.simpleBootFrontPool = [];
   }
 
-  async makePage() {
-      let windowPromise = await new DomParserInitializer(
-          this.config.frontDistPath,
-          this.config.frontDistIndexFileName || 'index.html',
-          { url: this.welcomUrl }
-      ).run();
-      return windowPromise;
+  async makePage(url = this.welcomUrl) {
+    const domParserInitializer = new DomParserInitializer(this.config.frontDistPath, this.config.frontDistIndexFileName || 'index.html', { url: url });
+    const window = await domParserInitializer.run();
+    // window.document.querySelector('#app').setAttribute(('vvv'),'zzz')
+    // console.log('vvv', window.document.querySelector('#app'))
+    // console.log('------', window.document.documentElement.outerHTML);
+    return { window, domParserInitializer };
     // const jsdom = await new JsdomInitializer(
     //   this.config.frontDistPath,
     //   this.config.frontDistIndexFileName || 'index.html',
     //   { url: this.welcomUrl }
     // ).run();
+    // return { window: jsdom.window as any, domParserInitializer: {destroy: () => {jsdom.window.close()}} };
     // return jsdom;
   }
 
-  async makeFront(window: Window) {
+  async makeFront(window: Window, otherInstanceSim?: Map<Function | ConstructorType<any> | SimConfig | Symbol, any>) {
     const name = RandomUtils.uuid();
     (window as any).ssrUse = false;
     const option = this.config.factorySimFrontOption(DomRenderProxy.final(window));
-    const simpleBootFront = await this.config.factory.create(option, this.config.using, this.config.domExcludes);
-    simpleBootFront.run(this.otherInstanceSim);
-    (simpleBootFront as any).generation = this.poolGeneration;
+    const domExcludes = [RequestResponse, ...(this.config.domExcludes || [])];
+    const simpleBootFront = await this.config.factory.create(option, this.config.using, domExcludes);
+    otherInstanceSim ??= new Map<Function | ConstructorType<any> | SimConfig | symbol, any>();
+    this.otherInstanceSim?.forEach((v, k) => otherInstanceSim!.set(k, v));
+
+    simpleBootFront.run(otherInstanceSim as any);
+    // (simpleBootFront as any).generation = this.poolGeneration;
     return simpleBootFront;
   }
 
-  enqueueFrontApp(simpleBootFront: SimpleBootFront) {
-    // this.simpleBootFrontPool.set(simpleBootFront.option.name!, simpleBootFront);
-    this.simpleBootFrontPool.push(simpleBootFront);
-    this.simpleBootFrontQueue.enqueue(simpleBootFront);
-  }
-  async pushQueue() {
-    if (this.simpleBootFrontPool.length < this.config.poolOption.max) {
-      this.enqueueFrontApp(await this.makeFront(await this.makePage()));
-    }
-  }
+  // enqueueFrontApp(simpleBootFront: SimpleBootFront) {
+  //   // this.simpleBootFrontPool.set(simpleBootFront.option.name!, simpleBootFront);
+  //   this.simpleBootFrontPool.push(simpleBootFront);
+  //   this.simpleBootFrontQueue.enqueue(simpleBootFront);
+  // }
+  //
+  // async pushQueue() {
+  //   if (this.simpleBootFrontPool.length < this.config.poolOption.max) {
+  //     this.enqueueFrontApp(await this.makeFront(await this.makePage()));
+  //   }
+  // }
 
   async proceedBefore({ rr, app }: { rr: RequestResponse; app: SimpleBootHttpServer; carrier: Map<string, any> }) {
     if (this.config.ssrExcludeFilter?.(rr)) {
       return false;
     }
     if (rr.reqHasAcceptHeader(Mimes.TextHtml) || rr.reqHasAcceptHeader(Mimes.All)) {
-      if (this.simpleBootFrontQueue.isEmpty()) {
-        await this.pushQueue();
-      }
-      const simpleBootFront = await this.simpleBootFrontQueue.dequeue();
+      // if (this.simpleBootFrontQueue.isEmpty()) {
+      //   await this.pushQueue();
+      // }
+      // const simpleBootFront = await this.simpleBootFrontQueue.dequeue();
+      const url = rr.reqUrlObj({ host: 'localhost' });
+      const targetUrl = url.toString() ?? this.welcomUrl;
+      const { window, domParserInitializer } = await this.makePage(targetUrl);
+      const otherSim = new Map<Function | ConstructorType<any> | SimConfig | Symbol, any>();
+      otherSim.set(RequestResponse, rr);
+      const simpleBootFront = await this.makeFront(window, otherSim);
       try {
         (simpleBootFront.option.window as any).ssrUse = true;
-        delete (simpleBootFront.option.window as any).server_side_data;
-        const url = rr.reqUrlObj({ host: 'localhost' });
+        // console.log(simpleBootFront.routing)
         if (this.config.simpleBootFront?.notFoundError) {
           // intent router check first
-          const intent = await simpleBootFront.getIntent(url.pathname);
+          const intent = await simpleBootFront.routingRouterModule(url.pathname);
           // route를 못찾은상태에서 router path까지 안맞으면 404 처리한다.  route랑 router랑 다르니깐 헛갈리지말도록
           if (intent.module === undefined && !intent.getRouterPathData(rr.reqUrlPathName)) {
             throw new NotFoundError({ message: `Not Found: ${rr.reqUrlPathName}` });
           }
         }
 
-        // runRouting!!
-        const targetUrl = url.toString();
-        // console.log('runRoutingrunRouting', targetUrl);
-        await simpleBootFront.goRouting(targetUrl);
-        await Promises.sleep(0); // <--중요: 이거 넣어야지 두번불러지는게 없어지는듯? 뭐지 event loop 변경된건가?
-
-        // console.log('runRout22222ingrunRouting', targetUrl);
-
-        // simpleBootFront.routingSubjectObservable.subscribe(it=>{
-        //   console.log('zzzzzzzzzzzzzzzzzzz', it);
-        //   if (it.triggerPoint==='end') {
-        //     console.log('zzz@@', it.routerModule.intent);
-        //   }
-        // })
-
-        const data = await firstValueFrom(
-          simpleBootFront.routingSubjectObservable.pipe(
-            filter(
-              (it) =>
-                it.triggerPoint === 'end' &&
-                typeof it.routerModule.intent.uri === 'string' &&
-                targetUrl.endsWith(it.routerModule.intent.uri)
-            ),
+        const data = await MessageInternal.firstValueFrom(
+          simpleBootFront.routingObservable.pipe(
+            MessageOperator.filter(it => {
+
+              const sw = it.triggerPoint === 'end' && typeof it.routerModule.intent.uri === 'string' && targetUrl.endsWith(it.routerModule.intent.uri);
+              return sw;
+            }),
             // delay(1000),
-            first()
+            MessageOperator.first()
           )
         );
-        // console.log('???????done');
-        await Promises.sleep(0)
+
+        // [아키텍트님의 정석] 하이드레이션 데이터를 가상 윈도우의 body에 script 태그로 박제
+        // @ts-ignore: writeDataHydration is part of the 정석
+        simpleBootFront.writeDataHydration();
+        simpleBootFront.clearDataHydration();
+
         const html = this.makeHTML(simpleBootFront);
-        // console.log('---------',html);
         await this.writeOkHtmlAndEnd({ rr }, html);
       } finally {
-        (simpleBootFront.option.window as any).ssrUse = false;
-        delete (simpleBootFront.option.window as any).server_side_data;
-        if ((simpleBootFront as any).generation < this.poolGeneration) {
-          // Stale instance, destroy it
-          const jsdom = (simpleBootFront as any).jsdom as JSDOM.JSDOM | undefined;
-          jsdom?.window.close();
-          const index = this.simpleBootFrontPool.indexOf(simpleBootFront);
-          if (index > -1) {
-            this.simpleBootFrontPool.splice(index, 1);
-          }
-          this.pushQueue();
-        } else {
-          // Current instance, return to queue
-          this.simpleBootFrontQueue.enqueue(simpleBootFront);
+        try {
+          (simpleBootFront.option.window as any).ssrUse = false;
+          window.close();
+          simpleBootFront.onDestroy();
+
+          // window.close()만 호출하면 WindowBase.close()가 실행되어 메모리 정리됨
+          (simpleBootFront.option.window as any)?.close?.();
+          domParserInitializer.destroy();
+        } catch (e) {
+          console.log('eeeeee', e);
         }
+
+        // const index = this.simpleBootPool.indexOf(simpleBootFront);
+        // if (index > -1) {
+        //   this.simpleBootPool.splice(index, 1);
+        // }
+        // this.pushQueue();
       }
       return false;
     } else {
@@ -192,7 +189,7 @@ export class SSRDomParserFilter implements Filter {
   }
 
   makeHTML(simpleBootFront: SimpleBootFront) {
-    (simpleBootFront.option.window as any).document.querySelectorAll('*').forEach((el:HTMLElement )=> {
+    (simpleBootFront.option.window as any).document.querySelectorAll('*').forEach((el: HTMLElement) => {
       Array.from(el.attributes).forEach(attr => {
         if (/^dr-/.test(attr.name) || /^domstyle/.test(attr.name) || /this-path/.test(attr.name)) {
           el.removeAttribute(attr.name);
@@ -200,27 +197,17 @@ export class SSRDomParserFilter implements Filter {
       });
     });
     let html = simpleBootFront.option.window.document.documentElement.outerHTML;
-      if (!/^<!DOCTYPE html>/i.test(html)) {
-        html = '<!DOCTYPE html>' + html;
-      }
-    html = html.replace(/\$\{[\s\S]*?\}\$/g, '');
-    const serverSideData = (simpleBootFront.option.window as any).server_side_data;
-    if (serverSideData) {
-      const data = Object.entries(serverSideData)
-        .map(([k, v]) => {
-          if (typeof v === 'string') {
-            return `window.server_side_data.${k} = ${v}`;
-          } else {
-            return `window.server_side_data.${k} = ${JSON.stringify(v)}`;
-          }
-        })
-        .join(';');
-      if (data) {
-        html = html.replace('</head>', `<script> window.server_side_data={}; ${data}; </script></head>`);
-      }
+    if (!/^<!DOCTYPE html>/i.test(html)) {
+      html = '<!DOCTYPE html>' + html;
     }
+    html = html.replace(/\$\{[\s\S]*?\}\$/g, '');
+
+    // [아키텍트님의 정석]
+    // body에 직접 append된 script tag가 outerHTML에 이미 포함되어 있으므로 추가 조작은 불필요합니다.
+
     return html;
   }
+
   async writeOkHtmlAndEnd({ rr, status = HttpStatus.Ok }: { rr: RequestResponse; status?: HttpStatus }, html: string) {
     rr.resStatusCode(status);
     rr.resSetHeader(HttpHeaders.ContentType, Mimes.TextHtml);

package/src/filters/SSRFilter.ts

@@ -1,7 +1,7 @@
 import { RequestResponse } from '@dooboostore/simple-boot-http-server/models/RequestResponse';
 import { HttpHeaders } from '@dooboostore/simple-boot-http-server/codes/HttpHeaders';
 import { SimpleBootHttpSSRFactory } from '../SimpleBootHttpSSRFactory';
-import { ConstructorType } from '@dooboostore/core/types';
+import { ConstructorType, AsyncBlockingQueue, RandomUtils, MessageOperator, MessageInternal } from '@dooboostore/core';
 import { JsdomInitializer } from '../initializers/JsdomInitializer';
 import { Filter } from '@dooboostore/simple-boot-http-server/filters/Filter';
 import { Mimes } from '@dooboostore/simple-boot-http-server/codes/Mimes';
@@ -9,14 +9,9 @@ import { HttpStatus } from '@dooboostore/simple-boot-http-server/codes/HttpStatu
 import { SimpleBootHttpServer } from '@dooboostore/simple-boot-http-server/SimpleBootHttpServer';
 import { SimFrontOption } from '@dooboostore/simple-boot-front/option/SimFrontOption';
 import { SimpleBootFront } from '@dooboostore/simple-boot-front/SimpleBootFront';
-import { AsyncBlockingQueue } from '@dooboostore/core/queues/AsyncBlockingQueue';
-import { RandomUtils } from '@dooboostore/core/random/RandomUtils';
 import * as JSDOM from 'jsdom';
 import { NotFoundError } from '@dooboostore/simple-boot-http-server/errors/NotFoundError';
-import { DomRenderProxy } from '@dooboostore/dom-render/DomRenderProxy';
-import { filter } from '@dooboostore/core/message/operators/filter';
-import { first } from '@dooboostore/core/message/operators/first';
-import { firstValueFrom } from '@dooboostore/core/message/internal/firstValueFrom';
+import { DomRenderProxy } from '@dooboostore/dom-render';
 
 export type FactoryAndParams = {
   frontDistPath: string;
@@ -140,7 +135,7 @@ export class SSRFilter implements Filter {
         const url = rr.reqUrlObj({ host: 'localhost' });
         if (this.config.simpleBootFront?.notFoundError) {
           // intent router check first
-          const intent = await simpleBootFront.getIntent(url.pathname);
+          const intent = await simpleBootFront.routingRouterModule(url.pathname);
           // route를 못찾은상태에서 router path까지 안맞으면 404 처리한다.  route랑 router랑 다르니깐 헛갈리지말도록
           if (intent.module === undefined && !intent.getRouterPathData(rr.reqUrlPathName)) {
             throw new NotFoundError({ message: `Not Found: ${rr.reqUrlPathName}` });
@@ -167,18 +162,18 @@ export class SSRFilter implements Filter {
         //     // delay(1000),
         //     first()
         // );
-        const data = await firstValueFrom(
+        const data = await MessageInternal.firstValueFrom(
           // @ts-ignore
-          simpleBootFront.routingSubjectObservable.pipe(
+          simpleBootFront.routingObservable.pipe(
           // @ts-ignore
-            filter(
+            MessageOperator.filter(
               (it) =>
                 it.triggerPoint === 'end' &&
                 typeof it.routerModule.intent.uri === 'string' &&
                 targetUrl.endsWith(it.routerModule.intent.uri)
             ),
             // delay(1000),
-            first()
+            MessageOperator.first()
           )
         );
         // console.log('rrrrrssss');

package/src/filters/{SSRLinkDomDomFilter.ts → SSRLinkDomFilter.ts}

@@ -1,7 +1,7 @@
 import { RequestResponse } from '@dooboostore/simple-boot-http-server/models/RequestResponse';
 import { HttpHeaders } from '@dooboostore/simple-boot-http-server/codes/HttpHeaders';
 import { SimpleBootHttpSSRFactory } from '../SimpleBootHttpSSRFactory';
-import { ConstructorType } from '@dooboostore/core/types';
+import { ConstructorType, AsyncBlockingQueue, RandomUtils, MessageOperator, MessageInternal } from '@dooboostore/core';
 import { JsdomInitializer } from '../initializers/JsdomInitializer';
 import { Filter } from '@dooboostore/simple-boot-http-server/filters/Filter';
 import { Mimes } from '@dooboostore/simple-boot-http-server/codes/Mimes';
@@ -9,18 +9,13 @@ import { HttpStatus } from '@dooboostore/simple-boot-http-server/codes/HttpStatu
 import { SimpleBootHttpServer } from '@dooboostore/simple-boot-http-server/SimpleBootHttpServer';
 import { SimFrontOption } from '@dooboostore/simple-boot-front/option/SimFrontOption';
 import { SimpleBootFront } from '@dooboostore/simple-boot-front/SimpleBootFront';
-import { AsyncBlockingQueue } from '@dooboostore/core/queues/AsyncBlockingQueue';
-import { RandomUtils } from '@dooboostore/core/random/RandomUtils';
 import * as JSDOM from 'jsdom';
 import { NotFoundError } from '@dooboostore/simple-boot-http-server/errors/NotFoundError';
-import { DomRenderProxy } from '@dooboostore/dom-render/DomRenderProxy';
-import { filter } from '@dooboostore/core/message/operators/filter';
-import { first } from '@dooboostore/core/message/operators/first';
-import { firstValueFrom } from '@dooboostore/core/message/internal/firstValueFrom';
+import { DomRenderProxy } from '@dooboostore/dom-render';
 import { parseHTML } from 'linkedom';
 import { LinkedomInitializer } from '../initializers/LinkedomInitializer';
 
-export type FactoryAndParams = {
+export type LinkDomFactoryAndParams = {
   frontDistPath: string;
   frontDistIndexFileName?: string;
   factorySimFrontOption: (window: any) => SimFrontOption;
@@ -38,7 +33,7 @@ export type FactoryAndParams = {
   };
 };
 
-export class SSRLinkDomDomFilter implements Filter {
+export class SSRLinkDomFilter implements Filter {
   private simpleBootFrontPool: SimpleBootFront[] = [];
   private simpleBootFrontQueue = new AsyncBlockingQueue<SimpleBootFront>();
   // private indexHTML: string;
@@ -47,7 +42,7 @@ export class SSRLinkDomDomFilter implements Filter {
   private intervalId?: NodeJS.Timeout;
 
   constructor(
-    public config: FactoryAndParams,
+    public config: LinkDomFactoryAndParams,
     public otherInstanceSim?: Map<ConstructorType<any>, any>
   ) {
     config.frontDistIndexFileName = config.frontDistIndexFileName || 'index.html';
@@ -127,7 +122,7 @@ export class SSRLinkDomDomFilter implements Filter {
         const url = rr.reqUrlObj({ host: 'localhost' });
         if (this.config.simpleBootFront?.notFoundError) {
           // intent router check first
-          const intent = await simpleBootFront.getIntent(url.pathname);
+          const intent = await simpleBootFront.routingRouterModule(url.pathname);
           // route를 못찾은상태에서 router path까지 안맞으면 404 처리한다.  route랑 router랑 다르니깐 헛갈리지말도록
           if (intent.module === undefined && !intent.getRouterPathData(rr.reqUrlPathName)) {
             throw new NotFoundError({ message: `Not Found: ${rr.reqUrlPathName}` });
@@ -147,18 +142,18 @@ export class SSRLinkDomDomFilter implements Filter {
         //   }
         // })
 
-        const data = await firstValueFrom(
+        const data = await MessageInternal.firstValueFrom(
           // @ts-ignore
-          simpleBootFront.routingSubjectObservable.pipe(
+          simpleBootFront.routingObservable.pipe(
           // @ts-ignore
-            filter(
+            MessageOperator.filter(
               (it) =>
                 it.triggerPoint === 'end' &&
                 typeof it.routerModule.intent.uri === 'string' &&
                 targetUrl.endsWith(it.routerModule.intent.uri)
             ),
             // delay(1000),
-            first()
+            MessageOperator.first()
           )
         );
         // console.log('???????done');