@dooboostore/simple-boot-http-server 1.0.26 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dooboostore/simple-boot-http-server",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -67,12 +67,7 @@
     "url": "https://github.com/dooboostore-develop/packages"
   },
   "peerDependencies": {
-    "reflect-metadata": "^0.2.2",
-    "@dooboostore/core": "1.0.32",
-    "@dooboostore/core-node": "1.0.13",
-    "@dooboostore/core-web": "1.0.13",
-    "@dooboostore/dom-render": "1.0.114",
-    "@dooboostore/simple-boot": "1.0.57"
+    "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",
@@ -102,7 +97,12 @@
     "fast-json-patch": "^3.1.0",
     "mime-types": "^2.1.34",
     "node-gzip": "^1.1.2",
-    "ws": "^8.18.3"
+    "ws": "^8.18.3",
+    "@dooboostore/core": "1.0.32",
+    "@dooboostore/core-node": "1.0.13",
+    "@dooboostore/core-web": "1.0.13",
+    "@dooboostore/simple-boot": "1.0.57",
+    "@dooboostore/dom-render": "1.0.114"
   },
   "scripts": {
     "clean": "rm -rf dist",

package/src/SimpleBootHttpServer.ts

@@ -326,23 +326,28 @@ export class SimpleBootHttpServer extends SimpleApplication {
                   여기에서 정해진 타입 리턴에 따른 조치
                   ...
                */
-              if (it.config?.resolver) {
-                const execute = typeof it.config.resolver === 'function' ? this.simstanceManager.getOrNewSim({target: it.config.resolver}) : it.config.resolver;
-                data = await execute?.resolve?.(data, rr);
-              }
-              const status = it.config?.res?.status ?? HttpStatus.Ok;
-              const headers = it.config?.res?.header ?? {};
-              if (it.config?.res?.contentType) {
-                headers[HttpHeaders.ContentType] = it.config?.res?.contentType;
-              }
-              if ((it.config?.res?.contentType?.toLowerCase().indexOf(Mimes.ApplicationJson.toLowerCase()) ?? -1) > -1) {
-                data = JSON.stringify(data);
-              } else if (data && typeof data === 'object') {
-                data = JSON.stringify(data);
+              const resConfig = it.config?.res;
+              if (resConfig?.manual === true) {
+                // 핸들러가 ServerResponse를 직접 주입받아 스스로 write/end를 제어한다 (예: SSE 스트리밍)
+              } else {
+                if (it.config?.resolver) {
+                  const execute = typeof it.config.resolver === 'function' ? this.simstanceManager.getOrNewSim({target: it.config.resolver}) : it.config.resolver;
+                  data = await execute?.resolve?.(data, rr);
+                }
+                const status = resConfig?.status ?? HttpStatus.Ok;
+                const headers = resConfig?.header ?? {};
+                if (resConfig?.contentType) {
+                  headers[HttpHeaders.ContentType] = resConfig.contentType;
+                }
+                if ((resConfig?.contentType?.toLowerCase().indexOf(Mimes.ApplicationJson.toLowerCase()) ?? -1) > -1) {
+                  data = JSON.stringify(data);
+                } else if (data && typeof data === 'object') {
+                  data = JSON.stringify(data);
+                }
+                rr.resSetHeaders(headers)
+                rr.resSetStatusCode(status);
+                rr.resWrite(data);
               }
-              rr.resSetHeaders(headers)
-              rr.resSetStatusCode(status);
-              rr.resWrite(data);
             }
           }
 

package/src/codes/Mimes.ts

@@ -24,6 +24,8 @@ export enum Mimes {
   ImageXpixmap = 'image/x-xpixmap',
   ImageXxbm = 'image/x-xbm',
   MultipartFormData = 'multipart/form-data',
+  TextEventStream = 'text/event-stream', // SSE 실시간 텍스트 스트리밍
+  ApplicationXndjson = 'application/x-ndjson',
   ApplicationJsonPostSimpleBootSsrIntentScheme = 'application/json-post+simple-boot-ssr-intent-scheme',
   Intent = 'intent'
 }

package/src/decorators/MethodMapping.ts

@@ -24,11 +24,18 @@ export type MappingConfig = {
         accept?: (Mimes|string)[];
     };
 
-    res?: {
-        status?: number;
-        header?: {[key: string]: string};
-        contentType?: Mimes | string;
-    }
+    res?:
+        | {
+              status?: number;
+              header?: {[key: string]: string};
+              contentType?: Mimes | string;
+              manual?: false;
+          }
+        /**
+         * manual: true — 리턴값을 이용한 자동 status/header/body 처리(및 resolver 호출)를 건너뛴다.
+         * SSE 등 핸들러가 ServerResponse를 직접 주입받아 writeHead/write/end를 스스로 제어하는 경우 사용.
+         */
+        | { manual: true };
     resolver?: Resolver|ConstructorType<Resolver>;
 }
 export type SaveMappingConfig = {propertyKey: string | symbol; config: MappingConfig}
@@ -156,7 +163,7 @@ export const getPATCH = (target: any, propertyKey: string | symbol): MappingConf
     return getUrlMapping(target, propertyKey);
 }
 export const getPATCHS = (target: any): SaveMappingConfig[] => {
-    return getUrlMappings(target)?.filter(it => it.config?.method.toUpperCase() === HttpMethod.GET);
+    return getUrlMappings(target)?.filter(it => it.config?.method.toUpperCase() === HttpMethod.PATCH);
 }
 export function OPTIONS(config: Omit<MappingConfig, 'method'>): ReflectMethod;
 export function OPTIONS(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
@@ -194,7 +201,7 @@ export const getHEAD = (target: any, propertyKey: string | symbol): MappingConfi
     return getUrlMapping(target, propertyKey);
 }
 export const getHEADS = (target: any): SaveMappingConfig[] => {
-    return getUrlMappings(target)?.filter(it => it.config?.method.toUpperCase() === HttpMethod.GET);
+    return getUrlMappings(target)?.filter(it => it.config?.method.toUpperCase() === HttpMethod.HEAD);
 }
 export function TRACE(config: Omit<MappingConfig, 'method'>): ReflectMethod;
 export function TRACE(target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;

package/src/filters/ResourceFilter.ts

@@ -54,7 +54,6 @@ export class ResourceFilter implements Filter {
             }
 
             if (typeof it === 'string') {
-              console.log('url!!!!!!!', url)
                 return it === url;
                 // return RegExp(it).test(url);
             }

package/src/websocket/WebSocketManager.ts

@@ -90,7 +90,9 @@ type RegisteredClientSet<T = any> = RegisteredClient<T> & { webSocketSet: WebSoc
 
 @Sim
 export class WebSocketManager implements WebSocketEndPoint {
-  private clients: Map<WebSocketSet, RegisteredClient[]> = new Map();
+  private connections: Map<WebSocketSet, Set<string>> = new Map();
+  private registrations: Map<string, RegisteredClientSet> = new Map();
+  private targets: Map<string, Set<string>> = new Map();
   private eventSubscriptions: Map<string, Map<string, EventResponseCallBack>> = new Map();
   private subject = new Subject<TopicRequest | TopicUnsubscribeRequest | TopicSubscribeRequest | TopicServerEventResponse>();
   constructor(
@@ -102,67 +104,82 @@ export class WebSocketManager implements WebSocketEndPoint {
     return this.subject.asObservable();
   }
   connect(wsSet: WebSocketSet) {
-    this.clients.set(wsSet, []);
+    this.connections.set(wsSet, new Set<string>());
     console.log('WebSocket connected:', wsSet.request.url);
   }
   close(wsSet: WebSocketSet) {
     this.removeAllClientsByWebSocketSet(wsSet);
-    this.clients.delete(wsSet);
+    this.connections.delete(wsSet);
     console.log('WebSocket disconnected:', wsSet.request.url);
   }
 
   setClientTopic(wsSet: WebSocketSet, uuid: string, target: string, subscribeBody?: any) {
-    const clientTopics = this.clients.get(wsSet);
-    if (clientTopics && !clientTopics.find(it => it.uuid === uuid)) {
-      clientTopics.push({ uuid, target, subscribeBody });
-      this.clients.set(wsSet, clientTopics);
-    } else if (clientTopics) {
-      throw { message: 'Already subscribed topic' };
+    const uuidSet = this.connections.get(wsSet);
+    if (!uuidSet) {
+      return;
+    }
+    if (this.registrations.has(uuid)) {
+      throw new Error('Already subscribed topic');
+    }
+    this.registrations.set(uuid, { uuid, target, subscribeBody, webSocketSet: wsSet });
+    uuidSet.add(uuid);
+    if (!this.targets.get(target)) {
+      this.targets.set(target, new Set<string>());
     }
+    this.targets.get(target)?.add(uuid);
   }
 
   findAllClientsByTarget(target: string): RegisteredClientSet[] {
+    const uuids = this.targets.get(target);
+    if (!uuids) {
+      return [];
+    }
     const results: RegisteredClientSet[] = [];
-    for (const [wsSet, topics] of Array.from(this.clients.entries())) {
-      const find = topics.find(it => it.target === target);
-      if (find) {
-        results.push({ ...find, webSocketSet: wsSet });
+    uuids.forEach(uuid => {
+      const reg = this.registrations.get(uuid);
+      if (reg) {
+        results.push({ ...reg });
       }
-    }
+    });
     return results;
   }
 
   findClientsByTarget(target: string): RegisteredClientSet {
-    for (const [wsSet, topics] of Array.from(this.clients.entries())) {
-      const find = topics.find(it => it.target === target);
-      if (find) {
-        return { ...find, webSocketSet: wsSet };
+    const uuids = this.targets.get(target);
+    if (!uuids) {
+      return undefined as any;
+    }
+    for (const uuid of Array.from(uuids)) {
+      const reg = this.registrations.get(uuid);
+      if (reg) {
+        return { ...reg };
       }
     }
+    return undefined as any;
   }
 
   removeClientByUUID(uuid: string) {
-    for (const [wsSet, topics] of Array.from(this.clients.entries())) {
-      const findIndex = topics.findIndex(it => it.uuid === uuid);
-      if (findIndex >= 0) {
-        topics.splice(findIndex, 1);
-        this.clients.set(wsSet, topics);
-        // 이벤트 구독도 함께 정리
-        this.eventSubscriptions.delete(uuid);
-        return true;
+    const reg = this.registrations.get(uuid);
+    if (!reg) {
+      return false;
+    }
+    this.registrations.delete(uuid);
+    this.connections.get(reg.webSocketSet)?.delete(uuid);
+    const targetSet = this.targets.get(reg.target);
+    if (targetSet) {
+      targetSet.delete(uuid);
+      if (targetSet.size <= 0) {
+        this.targets.delete(reg.target);
       }
     }
-    return false;
+    // 이벤트 구독도 함께 정리
+    this.eventSubscriptions.delete(uuid);
+    return true;
   }
 
   findClientByUUID(uuid: string): RegisteredClientSet | undefined {
-    for (const [wsSet, topics] of Array.from(this.clients.entries())) {
-      const find = topics.find(it => it.uuid === uuid);
-      if (find) {
-        return { ...find, webSocketSet: wsSet };
-      }
-    }
-    return undefined;
+    const reg = this.registrations.get(uuid);
+    return reg ? { ...reg } : undefined;
   }
 
   sendDataByUUID({ uuid, body }: { uuid: string; body?: any }) {
@@ -342,7 +359,7 @@ export class WebSocketManager implements WebSocketEndPoint {
   }
 
   getOpenClients() {
-    return Array.from(this.clients.keys()).filter(it => it.socket.readyState === WebSocket.OPEN);
+    return Array.from(this.connections.keys()).filter(it => it.socket.readyState === WebSocket.OPEN);
   }
 
   private isBinaryPayload(value: any) {
@@ -701,13 +718,24 @@ export class WebSocketManager implements WebSocketEndPoint {
   }
 
   private removeAllClientsByWebSocketSet(wsSet: WebSocketSet) {
-    const topics = this.clients.get(wsSet);
-    if (!topics) {
+    const uuidSet = this.connections.get(wsSet);
+    if (!uuidSet) {
       return;
     }
-    for (const topic of topics) {
-      this.eventSubscriptions.delete(topic.uuid);
-    }
-    this.clients.set(wsSet, []);
+    uuidSet.forEach(uuid => {
+      const reg = this.registrations.get(uuid);
+      if (reg) {
+        this.registrations.delete(uuid);
+        const targetSet = this.targets.get(reg.target);
+        if (targetSet) {
+          targetSet.delete(uuid);
+          if (targetSet.size <= 0) {
+            this.targets.delete(reg.target);
+          }
+        }
+      }
+      this.eventSubscriptions.delete(uuid);
+    });
+    uuidSet.clear();
   }
 }