@dooboostore/simple-boot-http-server 1.0.23 → 1.0.24

package/src/codes/HttpHeaders.ts

@@ -1,3 +1,5 @@
+import { Mimes } from './Mimes';
+
 export const HttpHeaders = {
     ContentLength : 'Content-Length',
     ContentType : 'Content-Type',
@@ -38,6 +40,15 @@ export const HttpHeaders = {
     IfNoneMatch : 'If-None-Match',
     IfRange : 'If-Range',
     Allow : 'Allow',
-    Server : 'Server'
+    Server : 'Server',
+  XSimpleBootSsrIntentScheme: 'x-simple-boot-ssr-intent-scheme',
+  XSimpleBootHttpTopicProtocol: 'x-simple-boot-http-topic-protocol'
 }
-export type HttpHeadersType = keyof typeof HttpHeaders;
+export type HttpHeadersType = keyof typeof HttpHeaders;
+
+export const makeIntentHeaderBySymbolFor = (symbol: Symbol): HeadersInit => {
+  return {
+    [HttpHeaders.Accept]: Mimes.ApplicationJsonPostSimpleBootSsrIntentScheme,
+    [HttpHeaders.XSimpleBootSsrIntentScheme]: `Symbol.for(${symbol.description})`
+  }
+};

package/src/codes/Mimes.ts

@@ -1,27 +1,29 @@
 export enum Mimes {
-    ApplicationJson = 'application/json',
-    ApplicationOctetStream = 'application/octet-stream',
-    ApplicationXml = 'application/xml',
-    ApplicationJsonPatch = 'application/json-patch+json',
-    ApplicationXWwwFormUrlencoded = 'application/x-www-form-urlencoded',
-    TextPlain = 'text/plain',
-    TextHtml = 'text/html',
-    All = '*/*',
-    TextCss = 'text/css',
-    TextJavascript = 'text/javascript',
-    TextXml = 'text/xml',
-    TextXslt = 'text/xslt',
-    TextXmlDtd = 'text/xml-dtd',
-    TextPlainUtf8 = 'text/plain; charset=utf-8',
-    ImagePng = 'image/png',
-    ImageGif = 'image/gif',
-    ImageJpeg = 'image/jpeg',
-    ImageSvg = 'image/svg+xml',
-    ImageBmp = 'image/bmp',
-    ImageTiff = 'image/tiff',
-    ImagePdf = 'application/pdf',
-    ImageXBmp = 'image/x-bmp',
-    ImageXpixmap = 'image/x-xpixmap',
-    ImageXxbm = 'image/x-xbm',
-    MultipartFormData = 'multipart/form-data',
+  ApplicationJson = 'application/json',
+  ApplicationOctetStream = 'application/octet-stream',
+  ApplicationXml = 'application/xml',
+  ApplicationJsonPatch = 'application/json-patch+json',
+  ApplicationXWwwFormUrlencoded = 'application/x-www-form-urlencoded',
+  TextPlain = 'text/plain',
+  TextHtml = 'text/html',
+  All = '*/*',
+  TextCss = 'text/css',
+  TextJavascript = 'text/javascript',
+  TextXml = 'text/xml',
+  TextXslt = 'text/xslt',
+  TextXmlDtd = 'text/xml-dtd',
+  TextPlainUtf8 = 'text/plain; charset=utf-8',
+  ImagePng = 'image/png',
+  ImageGif = 'image/gif',
+  ImageJpeg = 'image/jpeg',
+  ImageSvg = 'image/svg+xml',
+  ImageBmp = 'image/bmp',
+  ImageTiff = 'image/tiff',
+  ImagePdf = 'application/pdf',
+  ImageXBmp = 'image/x-bmp',
+  ImageXpixmap = 'image/x-xpixmap',
+  ImageXxbm = 'image/x-xbm',
+  MultipartFormData = 'multipart/form-data',
+  ApplicationJsonPostSimpleBootSsrIntentScheme = 'application/json-post+simple-boot-ssr-intent-scheme',
+  Intent = 'intent'
 }

package/src/decorators/MethodMapping.ts

@@ -1,12 +1,13 @@
-import { ConstructorType } from '@dooboostore/core/types';
-import { ReflectMethod } from '@dooboostore/simple-boot/types/Types';
-import { ReflectUtils } from '@dooboostore/core/reflect/ReflectUtils';
+import { ConstructorType } from '@dooboostore/core';
+import { ReflectMethod } from '@dooboostore/simple-boot';
+import { ReflectUtils } from '@dooboostore/core';
 import { Resolver } from '../resolvers/Resolver';
 import { Mimes } from '../codes/Mimes';
 import { HttpMethod } from '../codes/HttpMethod';
 
 export enum UrlMappingSituationType {
     REQ_JSON_BODY = 'SIMPLE_BOOT_HTTP_SERVER://URLMAPPING/REQ_JSON_BODY',
+    REQ_PATH_DATA = 'SIMPLE_BOOT_HTTP_SERVER://URLMAPPING/REQ_PATH_DATA',
     // REQ_URL_SEARCH_PARAMS = 'SIMPLE_BOOT_HTTP_SERVER://URLMAPPING/REQ_URL_SEARCH_PARAMS',
     REQ_URL_SEARCH_PARAMS_OBJ = 'SIMPLE_BOOT_HTTP_SERVER://URLMAPPING/REQ_URL_SEARCH_PARAMS_OBJ',
     REQ_FORM_URL_BODY = 'SIMPLE_BOOT_HTTP_SERVER://URLMAPPING/REQ_FORM_URL_BODY'

package/src/endpoints/WebSocketEndPoint.ts

@@ -0,0 +1,12 @@
+import { RawData, WebSocket } from 'ws';
+import { IncomingMessage } from 'http';
+
+export type WebSocketSet ={ socket: WebSocket, request: IncomingMessage };
+export interface WebSocketEndPoint {
+
+  connect?(wsSet: WebSocketSet): void;
+  ping?(wsSet: WebSocketSet): void;
+  close?(wsSet: WebSocketSet): void;
+  message(wsSet: WebSocketSet, data: {data: RawData, isBinary: boolean}): void;
+  error?(wsSet: WebSocketSet, error: Error): void;
+}

package/src/filters/CacheFilter.ts

@@ -4,85 +4,63 @@ import { RequestResponse } from '../models/RequestResponse';
 import { SimpleBootHttpServer } from '../SimpleBootHttpServer';
 import * as fs from 'fs';
 import * as path from 'path';
-import {  FileUtils } from '@dooboostore/core-node/file/FileUtils';
-import { ConvertUtils } from '@dooboostore/core-node/convert/ConvertUtils';
-import { RandomUtils } from '@dooboostore/core/random/RandomUtils';
+import { FileUtils } from '@dooboostore/core-node';
+import { ConvertUtils } from '@dooboostore/core-node';
+import { RandomUtils } from '@dooboostore/core';
 
-export type CacheFilterSessionType = { key: string, lifeTime: number, isUpdate: boolean, responseHeaders?: string[] };
+export type CacheFilterSessionType = { key: string; lifeTime: number; isUpdate: boolean; responseHeaders?: string[] };
 
-type CacheConfigCacheItemType = { path: string, createTime: number, lifeTime: number, responseHeader: { [key: string]: string | number | string[] } };
+type CacheConfigCacheItemType = { path: string; createTime: number; lifeTime: number; responseHeader: { [key: string]: string | number | string[] } };
 
-type KeyAndConfig = { key: string, lifeTime?: number, responseHeaders?: string[] } ;
+type KeyAndConfig = { key: string; lifeTime?: number; responseHeaders?: string[] };
 
 export class CacheFilter implements Filter {
+  public static readonly SYMBOL = Symbol.for('CacheFilter');
   public static readonly CARRIER_KEY_NAME = '_CARRIER_CACHE_FILTER_KEY_NAME';
   private storage = new Map<string, string | Buffer>();
   private cacheConfig: {
     createDate: string;
     updateDate: string;
-    caches: { [key: string]: CacheConfigCacheItemType }
-  }
-
-  constructor(private config: {
-    config: {
-      cacheDir?: string;
-      lifeTime: number;
-      startUpClean?: boolean;
-    },
-    filter?: (rr: RequestResponse, app: SimpleBootHttpServer) => boolean;
-    key: (rr: RequestResponse, app: SimpleBootHttpServer) => KeyAndConfig;
-  }) {
-
+    caches: { [key: string]: CacheConfigCacheItemType };
+  };
+
+  constructor(
+    private config: {
+      config: {
+        cacheDir?: string;
+        lifeTime: number;
+        startUpClean?: boolean;
+      };
+      filter?: (rr: RequestResponse, app: SimpleBootHttpServer) => boolean;
+      key: (rr: RequestResponse, app: SimpleBootHttpServer) => KeyAndConfig;
+    }
+  ) {
     if (config.config.cacheDir && config.config.startUpClean) {
-      FileUtils.deleteSync(config.config.cacheDir, {options: {recursive: true}});
+      FileUtils.deleteSync(config.config.cacheDir, { options: { recursive: true } });
     }
   }
 
-  async onInit(app: SimpleBootHttpServer) {
-  }
+  async onInit(app: SimpleBootHttpServer) {}
 
-  async proceedBefore({rr, app, carrier}: {rr: RequestResponse, app: SimpleBootHttpServer, carrier: Map<string, any>}) {
+  async proceedBefore({ rr, app, carrier }: { rr: RequestResponse; app: SimpleBootHttpServer; carrier: Map<string, any> }) {
     // this.key = undefined;
     // this.lifeTime = undefined;
     // this.isUpdate = false;
-    const filter = this.config.filter?.(rr,app);
+    const filter = this.config.filter?.(rr, app);
     if (!filter) {
       return true;
     }
-    if (this.config.config.cacheDir) {
-      FileUtils.mkdirSync(this.config.config.cacheDir, {recursive: true});
-    }
-    if (!this.cacheConfig && this.config.config.cacheDir) {
-      try {
-        this.cacheConfig = JSON.parse(ConvertUtils.toString(FileUtils.readSync([this.config.config.cacheDir, 'cacheConfig.json'], { option: {encoding: 'utf-8'}})));
-      } catch (e) {
-      }
-    }
-    const date = new Date().toISOString();
-    this.cacheConfig ??= {
-      createDate: date,
-      updateDate: date,
-      // accessDate: date,
-      caches: {}
-    };
-    this.cacheConfig.createDate ??= date;
-    this.cacheConfig.updateDate ??= date;
-    // this.cacheConfig.accessDate ??= date;
-    this.cacheConfig.caches ??= {};
-
-
+    this.initCacheConfig();
     const rkey = this.config.key(rr, app);
     // console.log('--path filter', rr.reqMethod(), rr.reqUrlPathName, filter, rkey)
-    const sessionData: CacheFilterSessionType = {key: rkey.key, lifeTime: rkey.lifeTime ?? this.config.config.lifeTime, isUpdate: false, responseHeaders: rkey.responseHeaders};
-
+    const sessionData: CacheFilterSessionType = { key: rkey.key, lifeTime: rkey.lifeTime ?? this.config.config.lifeTime, isUpdate: false, responseHeaders: rkey.responseHeaders };
 
     const cache = this.cacheConfig.caches[sessionData.key];
     if (cache) {
       const existes = this.config.config.cacheDir ? FileUtils.existsSync(cache.path) : this.storage.has(cache.path);
       const diffTime = Date.now() - cache.createTime;
       if (!existes || diffTime > cache.lifeTime) {
-        delete this.cacheConfig[sessionData.key];
-        this.deleteChunk(cache.path);
+        this.clear(sessionData.key);
         sessionData.isUpdate = true;
       } else {
         rr.resSetHeaders({
@@ -92,10 +70,10 @@ export class CacheFilter implements Filter {
         // console.log('chunk--->',  cache.path);
         try {
           const chunk = this.getChunk(cache.path);
-        // console.log('chunk--->',  chunk);
-        await rr.resEnd(chunk);
+          // console.log('chunk--->',  chunk);
+          await rr.resEnd(chunk);
         } catch (e) {
-          console.log('--------e', e)
+          console.log('--------e', e);
         }
       }
     } else {
@@ -105,6 +83,73 @@ export class CacheFilter implements Filter {
     return sessionData.isUpdate;
   }
 
+  public async refresh(path: string, app: SimpleBootHttpServer) {
+    // 1. 기존 캐시 파일 삭제
+    this.clear(path);
+
+    // 2. HTTP Fetch를 통한 외부 호출 (GET)
+    // 아키텍트님의 지시에 따라 네트워크 레이어를 통해 정석대로 호출합니다.
+    const url = `${app.option.protocol}://${app.option.hostname}:${app.option.port}${path}`;
+    try {
+      await fetch(url, {
+        method: 'GET',
+        headers: {
+          'x-cache-force-refresh': 'true',
+          'User-Agent': 'SimpleBootHttpServer-Internal-Refresh'
+        }
+      });
+    } catch (e) {
+      console.error('CacheFilter.refresh fetch error:', e);
+    }
+  }
+
+  public clear(key: string) {
+    this.initCacheConfig();
+    const cache = this.cacheConfig.caches[key];
+    if (cache) {
+      this.deleteChunk(cache.path);
+      delete this.cacheConfig.caches[key];
+      this.saveCacheConfig();
+    }
+  }
+
+  public clearAll() {
+    this.initCacheConfig();
+    Object.keys(this.cacheConfig.caches).forEach(key => {
+      this.deleteChunk(this.cacheConfig.caches[key].path);
+    });
+    this.cacheConfig.caches = {};
+    this.saveCacheConfig();
+  }
+
+  private initCacheConfig() {
+    if (this.config.config.cacheDir) {
+      FileUtils.mkdirSync(this.config.config.cacheDir, { recursive: true });
+    }
+    if (!this.cacheConfig && this.config.config.cacheDir) {
+      try {
+        this.cacheConfig = JSON.parse(ConvertUtils.toString(FileUtils.readSync([this.config.config.cacheDir, 'cacheConfig.json'], { option: { encoding: 'utf-8' } })));
+      } catch (e) {}
+    }
+    const date = new Date().toISOString();
+    this.cacheConfig ??= {
+      createDate: date,
+      updateDate: date,
+      // accessDate: date,
+      caches: {}
+    };
+    this.cacheConfig.createDate ??= date;
+    this.cacheConfig.updateDate ??= date;
+    // this.cacheConfig.accessDate ??= date;
+    this.cacheConfig.caches ??= {};
+  }
+
+  private saveCacheConfig() {
+    if (this.config.config.cacheDir && this.cacheConfig) {
+      FileUtils.write(JSON.stringify(this.cacheConfig), { path: [this.config.config.cacheDir, 'cacheConfig.json'] });
+    }
+  }
+
   private deleteChunk(path: string) {
     if (this.config.config.cacheDir && FileUtils.existsSync(path)) {
       FileUtils.deleteFileSync(path);
@@ -117,29 +162,31 @@ export class CacheFilter implements Filter {
     return this.config.config.cacheDir ? FileUtils.readSync(path) : this.storage.get(path);
   }
 
-  async proceedAfter({rr, app, carrier}: {rr: RequestResponse, app: SimpleBootHttpServer, carrier: Map<string, any>}) {
+  async proceedAfter({ rr, app, carrier }: { rr: RequestResponse; app: SimpleBootHttpServer; carrier: Map<string, any> }) {
     // const data = await rr.resBodyStringData()
-    const sessionData = carrier.get(CacheFilter.CARRIER_KEY_NAME) as CacheFilterSessionType ;
+    const sessionData = carrier.get(CacheFilter.CARRIER_KEY_NAME) as CacheFilterSessionType;
     if (sessionData && sessionData.isUpdate) {
       try {
         if (this.config.config.cacheDir) {
-          FileUtils.mkdirSync([this.config.config.cacheDir, 'caches'], {recursive: true});
+          FileUtils.mkdirSync([this.config.config.cacheDir, 'caches'], { recursive: true });
         }
         const resBody = rr.resBodyData();
         if (!resBody) {
           return true;
         }
-        let  p: string | undefined = undefined;
+        let p: string | undefined = undefined;
         const destFileUUID = RandomUtils.uuid4();
         p = this.writeChunk(destFileUUID, resBody);
         const updateDateNow = Date.now();
         const updateDate = new Date(updateDateNow).toISOString();
         this.cacheConfig.createDate ??= updateDate;
         this.cacheConfig.updateDate = updateDate;
-        const responseHeaders: {[key: string]: string | number | string[]} = {}
-        sessionData.responseHeaders?.map(it=>it.toLowerCase()).forEach(it => {
-          responseHeaders[it] = rr.resHeader(it);
-        })
+        const responseHeaders: { [key: string]: string | number | string[] } = {};
+        sessionData.responseHeaders
+          ?.map(it => it.toLowerCase())
+          .forEach(it => {
+            responseHeaders[it] = rr.resHeader(it);
+          });
         this.cacheConfig.caches[sessionData.key] = {
           path: p,
           createTime: updateDateNow,
@@ -147,20 +194,18 @@ export class CacheFilter implements Filter {
           responseHeader: responseHeaders
         };
 
-        if (this.config.config.cacheDir) {
-          FileUtils.write(JSON.stringify(this.cacheConfig), {path: [this.config.config.cacheDir, 'cacheConfig.json']});
-        }
+        this.saveCacheConfig();
       } catch (e) {
-        console.log('---', e)
+        console.log('---', e);
       }
     }
 
     return true;
   }
 
-  private writeChunk(destFileUUID: string, resBody: string | Buffer ) {
+  private writeChunk(destFileUUID: string, resBody: string | Buffer) {
     if (this.config.config.cacheDir) {
-      return FileUtils.write(resBody, {path: [this.config.config.cacheDir, 'caches', destFileUUID]});
+      return FileUtils.write(resBody, { path: [this.config.config.cacheDir, 'caches', destFileUUID] });
     } else {
       this.storage.set(destFileUUID, resBody);
       return destFileUUID;

package/src/filters/IntentSchemeFilter.ts

@@ -0,0 +1,69 @@
+import { Filter } from './Filter';
+import { HttpHeaders } from '../codes/HttpHeaders';
+import { Intent } from '@dooboostore/simple-boot';
+import { IntentManager } from '@dooboostore/simple-boot';
+import { Sim } from '@dooboostore/simple-boot';
+import { HttpStatus } from '../codes/HttpStatus';
+import { RequestResponse } from '../models/RequestResponse';
+import { SimpleBootHttpServer } from '../SimpleBootHttpServer';
+import { Mimes } from '../codes/Mimes';
+import { NotFoundError } from '../errors/NotFoundError';
+
+@Sim
+export class IntentSchemeFilter implements Filter {
+  constructor(private intentManager: IntentManager) {}
+
+  async onInit(app: SimpleBootHttpServer) {}
+
+  async proceedBefore({ rr, app }: { rr: RequestResponse; app: SimpleBootHttpServer; carrier: Map<string, any> }) {
+    // const rr = rrr;
+    const url = rr.reqUrl;
+    const contentLength = Number(rr.reqHeader(HttpHeaders.ContentLength.toLowerCase() ?? '0'));
+    const acceptType = rr.reqHeader(HttpHeaders.Accept);
+    const contentType = rr.reqHeader(HttpHeaders.ContentType);
+    const intentScheme = rr.reqHeader(HttpHeaders.XSimpleBootSsrIntentScheme);
+    if (acceptType === Mimes.ApplicationJsonPostSimpleBootSsrIntentScheme && intentScheme) {
+      let intent = new Intent(`${intentScheme}:/${url}`);
+      // console.log('---------1--intent request', intentScheme, url, contentLength, contentType );
+      // const responseHeader = {} as any;
+      // responseHeader[HttpHeaders.ContentType] = Mimes.ApplicationJson;
+      if (contentLength > 0) {
+        if (contentType.includes(Mimes.ApplicationJson)) {
+          intent.data = [await rr.reqBodyJsonData(), rr];
+        } else if (contentType.includes(Mimes.MultipartFormData)) {
+          intent.data = [await rr.reqBodyMultipartFormDataObject(), rr];
+        }
+        // console.log('---------2--intent request',intent);
+        const { return: rdatas, target } = await this.intentManager.publishMeta(intent);
+        if (target.length <= 0) {
+          throw new NotFoundError({ message: 'Not found intent target' });
+        }
+        const rdata = rdatas[0];
+        const wdata = rdata instanceof Promise ? await rdata : rdata;
+        rr.resStatusCode(HttpStatus.Ok);
+        rr.resSetHeader(HttpHeaders.ContentType, [Mimes.ApplicationJson]);
+        await rr.resEnd(wdata ? JSON.stringify(wdata) : undefined);
+      } else {
+        intent.data = rr.reqUrlSearchParamTuples.length > 0 ? [rr.reqUrlSearchParamsObj, rr] : [rr];
+        const { return: rdatas, target } = await this.intentManager.publishMeta(intent);
+        if (target.length <= 0) {
+          throw new NotFoundError({ message: 'Not found intent target' });
+        }
+        const rdata = rdatas[0];
+        const wdata = rdata instanceof Promise ? await rdata : rdata;
+        // const wdata =undefined;
+        rr.resStatusCode(HttpStatus.Ok);
+        rr.resSetHeader(HttpHeaders.ContentType, [Mimes.ApplicationJson]);
+        await rr.resEnd(wdata ? JSON.stringify(wdata) : undefined);
+      }
+      // console.log('---------3--intent request', rr.req.readable, rr.req.readableLength);
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  async proceedAfter({ rr, app }: { rr: RequestResponse; app: SimpleBootHttpServer; carrier: Map<string, any> }) {
+    return true;
+  }
+}

package/src/filters/ResourceFilter.ts

@@ -47,7 +47,9 @@ export class ResourceFilter implements Filter {
       // console.log('resource filter!!**-------', url);
         let sw = true;
         const regExps = this.resources?.filter(it => {
+          // console.log('---it', it, it instanceof RegExp, typeof it)
             if (it instanceof RegExp) {
+              // console.log('--------', it.test(url))
                 return it.test(url);
             }
 
@@ -62,8 +64,11 @@ export class ResourceFilter implements Filter {
             if (typeof it === 'object' && 'request' in it) {
                 if (typeof it.request === 'function') {
                     return it.request(rr, app);
+                } else if (it .request instanceof RegExp) {
+                    return it.request.test(url);
+                } else {
+                  return RegExp(it.request).test(url);
                 }
-                return RegExp(it.request).test(url);
             }
         })??[]
         // console.log('regExps', regExps, url);