@dooboostore/simple-boot-http-server 1.0.20 → 1.0.22

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dooboostore/simple-boot-http-server",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "typesVersions": {
-    ">=4.2": {
+    "*": {
       "*": [
         "dist/types/*"
       ]
@@ -62,17 +62,7 @@
     "url": "https://github.com/dooboostore-develop/packages"
   },
   "peerDependencies": {
-    "reflect-metadata": "^0.2.2",
-    "@dooboostore/core": "1.0.21",
-    "@dooboostore/simple-boot": "1.0.49",
-    "@dooboostore/core-node": "1.0.7",
-    "@dooboostore/dom-render": "1.0.108",
-    "@dooboostore/core-web": "1.0.6"
-  },
-  "dependencies": {
-    "fast-json-patch": "^3.1.0",
-    "mime-types": "^2.1.34",
-    "node-gzip": "^1.1.2"
+    "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",
@@ -95,19 +85,30 @@
     "typescript": "^5.9.2",
     "@types/node-gzip": "^1.1.0",
     "esbuild-plugin-tsc": "^0.5.0",
-    "esbuild": "^0.23.0"
+    "esbuild": "^0.23.0",
+    "@dooboostore/core": "1.0.26",
+    "@dooboostore/core-node": "1.0.9",
+    "@dooboostore/dom-render": "1.0.110",
+    "@dooboostore/core-web": "1.0.8",
+    "@dooboostore/simple-boot": "1.0.52"
+  },
+  "dependencies": {
+    "fast-json-patch": "^3.1.0",
+    "mime-types": "^2.1.34",
+    "node-gzip": "^1.1.2"
   },
   "scripts": {
     "clean": "rm -rf dist",
     "build:esm": "node build.mjs esm",
     "watch:esm": "pnpm run build:esm && node build.mjs esm --watch",
-    "build:cjs": "node build.mjs cjs && cp package.cjs.json dist/cjs/package.json",
+    "build:cjs": "node build.mjs cjs",
     "watch:cjs": "pnpm run build:cjs && node build.mjs cjs --watch",
     "build": "pnpm run clean && node build.mjs all",
     "build:umd-bundle": "node build.mjs umd-bundle",
     "watch:umd-bundle": "pnpm run build:umd-bundle && node build.mjs umd-bundle --watch",
     "build:esm-bundle": "node build.mjs esm-bundle",
     "watch:esm-bundle": "pnpm run build:esm-bundle && node build.mjs esm-bundle --watch",
+    "watch": "node build.mjs all --watch",
     "publish:npm": "pnpm run build && cp package.json package.json.back && pnpm pack && TARBALL_NAME=$(ls dooboostore-simple-boot-http-server-*.tgz | head -n 1) && tar -xzf \"$TARBALL_NAME\" -C . --strip-components=1 package/package.json && rm \"$TARBALL_NAME\" && (pnpm publish --no-git-checks || true) && cp package.json.back package.json && rm -rf package.json.back  ",
     "ts:clean": "find . -name '*.js' -o -name '*.map' -o -name '*.d.ts' | xargs rm -f",
     "typecheck": "tsc --noEmit",

package/src/SimpleBootHttpServer.ts

@@ -9,7 +9,6 @@ import { HttpStatus } from './codes/HttpStatus';
 import { HttpHeaders } from './codes/HttpHeaders';
 import { Mimes } from './codes/Mimes';
 import { Filter } from './filters/Filter';
-import { SimstanceManager } from '@dooboostore/simple-boot/simstance/SimstanceManager';
 import { ExceptionHandlerSituationType, targetExceptionHandler } from '@dooboostore/simple-boot/decorators/exception/ExceptionDecorator';
 import { getInject, SituationTypeContainer, SituationTypeContainers } from '@dooboostore/simple-boot/decorators/inject/Inject';
 import { EndPoint } from './endpoints/EndPoint';
@@ -39,12 +38,12 @@ export class SimpleBootHttpServer extends SimpleApplication {
 
 
     public run(otherInstanceSim?: Map<ConstructorType<any>, any>) {
-        const simstanceManager = super.run(otherInstanceSim);
+        super.run(otherInstanceSim);
         const targets = [...this.option.closeEndPoints ?? [], ...this.option.errorEndPoints ?? [], ...this.option.requestEndPoints ?? [], ...this.option.filters ?? []];
         Promise.all(targets.map(it => (typeof it === 'function' ? this.simstanceManager.getOrNewSim({target:it as ConstructorType<any>}) : it) as OnInit).map(it => it.onInit(this))).then(it => {
             this.startServer();
         });
-        return simstanceManager;
+        return this;
     }
 
     private startServer() {

package/src/filters/ResourceFilter.ts

@@ -1,17 +1,41 @@
 import { Filter } from '../filters/Filter';
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
 import mime from 'mime-types';
 import { HttpHeaders } from '../codes/HttpHeaders';
 import { HttpStatus } from '../codes/HttpStatus';
 import { SimpleBootHttpServer } from '../SimpleBootHttpServer';
 import { RequestResponse } from '../models/RequestResponse';
+import { Blob } from 'node:buffer';
 
 export type RequestFilterType = string | RegExp | ((rr: RequestResponse, app: SimpleBootHttpServer) => boolean) | ((rr: RequestResponse, app: SimpleBootHttpServer) => Promise<boolean>);
 
+type PathDist = RequestFilterType|{request: RequestFilterType, dist: string | ((rr: RequestResponse, app: SimpleBootHttpServer) => string)};
+
+type DataDist = {request: RequestFilterType, response: (rr: RequestResponse, app: SimpleBootHttpServer) => (string | Promise<Blob | ArrayBuffer | Response>)};
+export const isPathDist = (item: any): item is PathDist => {
+    return typeof item === 'object' && ('request' in item) && ('dist' in item);
+};
+export const isDataDist = (item: any): item is DataDist => {
+    return typeof item === 'object' && ('request' in item) && ('response' in item);
+};
 export class ResourceFilter implements Filter {
-    constructor(private resourceDistPath: string, private resourceRegex: (RequestFilterType | { request: RequestFilterType, dist: string })[] = []) {
+  // private requestFilter: RequestFilterType;
+  private resourceDistPath?: string;
+  private resources?: (DataDist|PathDist)[];
+  constructor(resourceDistPath: string, resourceRegex: PathDist[]);
+  constructor(resourceRegex: DataDist[]);
+  constructor(resourceDistPathOrResourceRegex: string |  DataDist[], resourceRegex?: PathDist[]) {
+    if (typeof resourceDistPathOrResourceRegex === 'string') {
+      this.resourceDistPath = resourceDistPathOrResourceRegex;
+      this.resources = resourceRegex;
+    } else {
+      this.resources = resourceDistPathOrResourceRegex;
+      // this.requestFilter = resourceDistPathOrResourceRegex
     }
+  }
+  //   constructor(private resourceDistPath: string, private resourceRegex: (RequestFilterType | { request: RequestFilterType, dist: string | ((rr: RequestResponse, app: SimpleBootHttpServer) => (string|Promise<Blob |ArrayBuffer| Response>)) })[] = []) {
+  //   }
 
     async onInit(app: SimpleBootHttpServer) {
     }
@@ -20,8 +44,9 @@ export class ResourceFilter implements Filter {
         const url = (rr.reqUrlPathName ?? '').replace(/\.\./g, '');
         const urlObj = rr.reqUrlObject;
         // const requestUrl = parse(rr.reqUrl ?? '', true);
+      // console.log('resource filter!!**-------', url);
         let sw = true;
-        const regExps = this.resourceRegex.filter(it => {
+        const regExps = this.resources?.filter(it => {
             if (it instanceof RegExp) {
                 return it.test(url);
             }
@@ -40,33 +65,55 @@ export class ResourceFilter implements Filter {
                 }
                 return RegExp(it.request).test(url);
             }
-        })
-        // console.log('regExps', regExps, url, this.resourceRegex);
+        })??[]
+        // console.log('regExps', regExps, url);
         // eslint-disable-next-line no-unused-vars
         for (const it of regExps) {
-            const resourcePath = path.join(this.resourceDistPath, typeof it === 'object' && 'dist' in it ? it.dist : urlObj.pathname);
-            // console.log('ResourceFilter', resourcePath, it, urlObj.pathname, url);
             sw = false;
-            // console.log('-----', resourcePath);
-            if (fs.existsSync(resourcePath)) {
-                // const header = {} as any;
-                // header[HttpHeaders.ContentType] = mime.lookup(resourcePath);
-                // res.writeHead(HttpStatus.Ok, header);
-                rr.resStatusCode(HttpStatus.Ok);
-                rr.resSetHeader(HttpHeaders.ContentType, mime.lookup(resourcePath).toString());
-                await rr.resEnd(fs.readFileSync(resourcePath));
-                break;
+            //DataDist
+            if (isDataDist(it)) {
+              let distValue = typeof it.response === 'function' ? it.response(rr,app) : it.response;
+              if (distValue instanceof Promise) {
+                const result = await distValue;
+                if (result instanceof Response) {
+                  await rr.resEnd(result);
+                  break;
+                } else if (result instanceof Blob) {
+                  rr.resStatusCode(HttpStatus.Ok);
+                  await rr.resEnd(result);
+                  break;
+                }
+              }
             } else {
-                rr.resStatusCode(HttpStatus.NotFound)
+              //PathDist or undefined
+              const dist = typeof it === 'object' && 'dist' in it ? it.dist : urlObj.pathname;
+              let distValue = typeof dist === 'function' ? dist(rr, app) : dist;
+              if (this.resourceDistPath) {
+                // It's a string path
+                const resourcePath = path.join(this.resourceDistPath, distValue);
+                if (fs.existsSync(resourcePath)) {
+                  rr.resStatusCode(HttpStatus.Ok);
+                  rr.resSetHeader(HttpHeaders.ContentType, mime.lookup(resourcePath).toString());
+                  await rr.resEnd(fs.readFileSync(resourcePath));
+                  break;
+                } else {
+                  rr.resStatusCode(HttpStatus.NotFound);
+                  await rr.resEnd();
+                  break;
+                }
+              } else {
+                rr.resStatusCode(HttpStatus.InternalServerError);
                 await rr.resEnd();
                 break;
+              }
             }
-            sw = false;
+          sw = true;
         }
         return sw;
     }
 
     async proceedAfter({rr, app}: {rr: RequestResponse, app: SimpleBootHttpServer, carrier: Map<string, any>}) {
+      // console.log('resource filter!!end@@**-------');
         return true;
     }
-}
+}

package/src/models/RequestResponse.ts

@@ -13,6 +13,7 @@ import { HttpStatus } from '../codes/HttpStatus';
 import { gzip } from 'node-gzip';
 import { SessionManager } from '../session/SessionManager';
 import { HttpServerOption } from '../option/HttpServerOption';
+import { Blob } from 'node:buffer';
 import * as fs from 'fs';
 import * as os from 'os';
 import { RandomUtils } from '@dooboostore/core/random/RandomUtils';
@@ -595,8 +596,31 @@ export class RequestResponse {
     this.res.end(data);
   }
 
-  async resEnd(chunk?: string | Buffer) {
-    this.resWriteChunk = chunk ?? this.resWriteChunk;
+  async resEnd(chunk?: string | Buffer | Blob | ArrayBuffer | Response) {
+    if (chunk instanceof Response) {
+      // 헤더를 직접 설정하여 체이닝 오버헤드 제거
+      chunk.headers.forEach((value, key) => {
+        this.res.setHeader(`ORIGIN-${key}`, value);
+      });
+      if (!this.resHeader(HttpHeaders.ContentType)) {
+        const contentType = chunk.headers.get(HttpHeaders.ContentType);
+        if (contentType) {
+          this.res.setHeader(HttpHeaders.ContentType, contentType);
+        }
+      }
+      this.res.statusCode = chunk.status;
+      this.resWriteChunk = Buffer.from(await chunk.arrayBuffer());
+    } else if (chunk instanceof Blob) {
+        this.resWriteChunk = Buffer.from(await chunk.arrayBuffer());
+        if (!this.resHeader(HttpHeaders.ContentType)) {
+            this.res.setHeader(HttpHeaders.ContentType, chunk.type);
+        }
+    } else if (chunk instanceof ArrayBuffer) {
+        this.resWriteChunk = Buffer.from(chunk);
+    } else {
+        this.resWriteChunk = chunk ?? this.resWriteChunk;
+    }
+
     if (this.req.readable) {
       await this.reqBodyData();
       await this.resEndChunk();