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

package/dist/umd-bundle/websocket-client.umd.js

@@ -182,6 +182,12 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
         return false;
       }
     };
+    ValidUtils2.isGenerator = (value) => {
+      return value !== null && typeof value === "object" && typeof value.next === "function" && typeof value[Symbol.iterator] === "function";
+    };
+    ValidUtils2.isAsyncGenerator = (value) => {
+      return value !== null && typeof value === "object" && typeof value.next === "function" && typeof value[Symbol.asyncIterator] === "function";
+    };
     ValidUtils2.isFrozen = (obj) => {
       return Object.isFrozen(obj);
     };
@@ -4626,87 +4632,64 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
   // ../core/dist/esm/promise/AbortablePromise.js
   var AbortablePromise = class _AbortablePromise {
     constructor(executor, signal) {
-      this.steps = [];
-      this.initialExecutor = executor;
       this.signal = signal;
+      if (typeof executor !== "function") {
+        this.source = Promise.resolve(executor);
+      } else if (signal?.aborted) {
+        this.source = Promise.reject(signal.reason);
+      } else {
+        this.source = Promise.resolve().then(executor);
+      }
+    }
+    /**
+     * source 를 abort 와 경쟁시킨 promise. 실제로 소비될 때(then/toPromise) 한 번만 만든다 —
+     * await 는 then() 이 돌려준 새 인스턴스를 버리므로, 미리 만들면 아무도 안 받는 reject 가 unhandled 로 남는다.
+     */
+    get promise() {
+      if (this.guarded) return this.guarded;
+      const signal = this.signal;
+      if (!signal) return this.guarded = this.source;
+      if (signal.aborted) {
+        this.source.catch(() => {
+        });
+        return this.guarded = Promise.reject(signal.reason);
+      }
+      return this.guarded = new Promise((resolve, reject) => {
+        const cleanup = () => signal.removeEventListener("abort", onAbort);
+        const onAbort = () => reject(signal.reason);
+        signal.addEventListener("abort", onAbort, { once: true });
+        this.source.then(
+          (value) => {
+            cleanup();
+            resolve(value);
+          },
+          (reason) => {
+            cleanup();
+            reject(reason);
+          }
+        );
+      });
     }
     then(onfulfilled, onrejected) {
-      const newPromise = new _AbortablePromise(
-        this.initialExecutor,
-        this.signal
+      const signal = this.signal;
+      const next = this.promise.then(
+        onfulfilled ? (value) => {
+          if (signal?.aborted) throw signal.reason;
+          return onfulfilled(value);
+        } : void 0,
+        onrejected
       );
-      newPromise.steps = [...this.steps];
-      if (onfulfilled) {
-        newPromise.steps.push(onfulfilled);
-      }
-      if (onrejected) {
-        newPromise.errorHandler = onrejected;
-      } else if (this.errorHandler) {
-        newPromise.errorHandler = this.errorHandler;
-      }
-      return newPromise;
+      return new _AbortablePromise(next, signal);
     }
     catch(onrejected) {
       return this.then(void 0, onrejected);
     }
     finally(onfinally) {
-      return this.then(
-        (value) => {
-          onfinally?.();
-          return value;
-        },
-        (reason) => {
-          onfinally?.();
-          throw reason;
-        }
-      );
+      return new _AbortablePromise(this.promise.finally(onfinally), this.signal);
     }
-    async execute() {
-      try {
-        if (this.signal?.aborted) {
-          throw new Error(this.signal.reason || "Aborted");
-        }
-        const abortPromise = new Promise((_, reject) => {
-          if (this.signal?.aborted) {
-            return reject(new Error(this.signal.reason || "Aborted"));
-          }
-          const callback = (e) => {
-            const target = e.target;
-            this.signal?.removeEventListener("abort", callback);
-            reject(new Error(target.reason || "Aborted"));
-          };
-          this.signal?.addEventListener("abort", callback, { once: true });
-        });
-        const pipelineRunner = async () => {
-          let lastResult;
-          if (typeof this.initialExecutor === "function") {
-            if (this.signal?.aborted) {
-              throw new Error(this.signal.reason || "Aborted");
-            }
-            lastResult = await this.initialExecutor();
-          } else {
-            lastResult = await this.initialExecutor;
-          }
-          for (let i = 0; i < this.steps.length; i++) {
-            if (this.signal?.aborted) {
-              throw new Error(this.signal.reason || "Aborted");
-            }
-            const step = this.steps[i];
-            lastResult = await step(lastResult);
-          }
-          return lastResult;
-        };
-        return await Promise.race([pipelineRunner(), abortPromise]);
-      } catch (error) {
-        if (this.errorHandler) {
-          return await this.errorHandler(error);
-        }
-        throw error;
-      }
-    }
-    // Convert to native Promise
+    // 네이티브 Promise 로 변환 (그냥 await 해도 된다)
     toPromise() {
-      return this.execute();
+      return this.promise;
     }
   };
 
@@ -5579,11 +5562,15 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
           resolve(gdata);
         }).catch(async (e) => {
           this.error(config, pipe, e);
-          config?.error?.();
+          config?.error?.(e);
           if (config?.errorTransform) {
             e = await config.errorTransform(e);
           }
-          e = await this.errorTransform(e);
+          try {
+            e = await this.errorTransform(e);
+          } catch (ee) {
+            e = ee;
+          }
           reject(e);
         }).finally(() => {
           this.finally(config, pipe);
@@ -5600,41 +5587,30 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
     return data instanceof HttpResponseError;
   };
   var HttpFetcher = class extends Fetcher {
+    // get/post/put/patch/head/delete가 전부 config.config.fetch.method를 세팅하려고 caller가
+    // 넘긴 config(.fetch) 객체를 직접 mutate했다 - 같은 config 객체를 여러 호출이 공유하면
+    // (예: Promise.all로 동시에 get/post) 서로의 method를 덮어쓰는 레이스가 생겼다. caller의
+    // 객체는 절대 건드리지 않고, 얕은 복사본 위에 method만 얹어서 반환한다.
+    withMethod(config, method) {
+      return { ...config, config: { ...config.config, fetch: { ...config.config?.fetch, method } } };
+    }
     get(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "GET";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "GET"));
     }
     post(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "POST";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "POST"));
     }
     patch(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "PATCH";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "PATCH"));
     }
     put(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "PUT";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "PUT"));
     }
     head(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "HEAD";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "HEAD"));
     }
     delete(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "DELETE";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "DELETE"));
     }
     async beforeProxyFetch(config) {
       return config;
@@ -5671,7 +5647,7 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
         }
       } else {
         httpResponseError.body = e;
-        httpResponseError.message = e.message;
+        httpResponseError.message = e?.message;
       }
       return httpResponseError;
     }
@@ -5681,7 +5657,7 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
       if (!(target instanceof URL) && typeof target !== "string") {
         const searchParams = ConvertUtils.toURLSearchParams(target.searchParams ?? {});
         try {
-          const url = typeof target.url === "string" ? new URL(target.url) : target.url;
+          const url = new URL(target.url);
           searchParams.forEach((value, key) => {
             url.searchParams.append(key, value);
           });
@@ -5696,43 +5672,30 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
         }
       }
       const beforeProxyData = { requestInfo: target, init: config?.fetch };
-      let beforeData = config?.beforeProxyFetch ? await config?.beforeProxyFetch(config) : beforeProxyData.requestInfo;
-      beforeData = config?.skipGlobalBeforeProxyFetch ? beforeProxyData : await this.beforeProxyFetch(beforeProxyData);
+      let beforeData = config?.beforeProxyFetch ? await config?.beforeProxyFetch(beforeProxyData) : beforeProxyData;
+      beforeData = config?.skipGlobalBeforeProxyFetch ? beforeData : await this.beforeProxyFetch(beforeData);
       target = beforeData.requestInfo;
       if (beforeData.init) {
         config ?? (config = {});
         config.fetch = beforeData.init;
       }
-      let abortedTimeout;
+      let requestInit = config?.fetch;
       if (config?.fetch && "timeout" in config.fetch) {
-        const abortController = new AbortController();
-        abortedTimeout = setTimeout(() => {
-          if (config?.fetch?.signal) {
-            const inputSignal = config.fetch.signal;
-            const listener = () => {
-              if (!abortController.signal.aborted) {
-                abortController.abort();
-              }
-              inputSignal.removeEventListener("abort", listener);
-            };
-            inputSignal.addEventListener("abort", listener);
-          }
-          if (!abortController.signal.aborted) {
-            abortController.abort();
-          }
-        }, config.fetch.timeout);
-        config.fetch.signal = abortController.signal;
+        const timeoutSignal = AbortSignal.timeout(config.fetch.timeout);
+        const signal = config.fetch.signal ? AbortSignal.any([timeoutSignal, config.fetch.signal]) : timeoutSignal;
+        requestInit = { ...config.fetch, signal };
       }
-      this.beforeFetch({ target, requestInit: config?.fetch });
-      return (config.fetcher ?? fetch)(target, config?.fetch).then(async (it) => {
-        this.afterFetch({ target, requestInit: config?.fetch }, it);
+      this.beforeFetch({ target, requestInit });
+      return (config.fetcher ?? fetch)(target, requestInit).then(async (it) => {
+        this.afterFetch({ target, requestInit }, it);
         const afterProxyData = {
-          fetch: { target, requestInit: config.fetch },
+          fetch: { target, requestInit },
           config: beforeData,
           response: it
         };
-        it = config?.afterProxyFetch ? await config.afterProxyFetch(afterProxyData) : it;
-        it = config?.skipGlobalAfterProxyFetch ? it : await this.afterProxyFetch(afterProxyData);
+        afterProxyData.response = config?.afterProxyFetch ? await config.afterProxyFetch(afterProxyData) : it;
+        afterProxyData.response = config?.skipGlobalAfterProxyFetch ? afterProxyData.response : await this.afterProxyFetch(afterProxyData);
+        it = afterProxyData.response;
         config?.fetchResponseAfterCallBack?.(it, config);
         if (!config?.allowedResponseNotOk && !it.ok) {
           throw it;
@@ -5742,30 +5705,31 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
           throw data;
         }
         return it;
-      }).finally(() => {
-        if (abortedTimeout) {
-          clearTimeout(abortedTimeout);
-        }
       });
     }
   };
 
   // ../core/dist/esm/fetch/HttpJsonFetcher.js
   var HttpJsonFetcher = class extends HttpFetcher {
+    // config.config/config.config.fetch를 직접 mutate하면(예전처럼) 같은 config 객체를 여러
+    // postJson/patchJson/putJson 호출이 동시에 공유할 때 서로의 headers/body를 덮어쓰는 레이스가
+    // 생긴다(HttpFetcher.get/post의 method 레이스랑 같은 문제). caller의 객체는 안 건드리고,
+    // 얕은 복사본을 만들어서 새 config 객체를 리턴한다.
     updateJsonFetchConfigAndData(config) {
-      var _a, _b;
       const headers = {
         "Content-Type": "application/json",
         Accept: "application/json, text/plain, */*"
       };
-      config.config ?? (config.config = {});
-      (_a = config.config).fetch ?? (_a.fetch = {});
-      (_b = config.config.fetch).headers ?? (_b.headers = {});
-      config.config.fetch.headers = { ...headers, ...config.config.fetch?.headers };
-      if (config.config?.fetch?.body && typeof config.config?.fetch?.body !== "string") {
-        config.config.fetch.body = JSON.stringify(config.config.fetch.body);
+      const fetchInit = { ...config.config?.fetch };
+      const merged = new Headers(headers);
+      if (fetchInit.headers) {
+        new Headers(fetchInit.headers).forEach((value, key) => merged.set(key, value));
       }
-      return config;
+      fetchInit.headers = merged;
+      if (fetchInit.body && typeof fetchInit.body !== "string") {
+        fetchInit.body = JSON.stringify(fetchInit.body);
+      }
+      return { ...config, config: { ...config.config, fetch: fetchInit } };
     }
     get(config) {
       return super.get(config);
@@ -7589,12 +7553,13 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
     ReflectUtils2.findMetadata = (metadataKey, target, propertyKey) => {
       if (target == null) return void 0;
       let searchTarget = typeof target === "object" && typeof target !== "function" ? target.constructor : target;
-      while (searchTarget && searchTarget !== Object) {
+      const seen = /* @__PURE__ */ new Set();
+      while (searchTarget && searchTarget !== Object && !seen.has(searchTarget)) {
+        seen.add(searchTarget);
         const data = propertyKey ? Reflect.getOwnMetadata(metadataKey, searchTarget, propertyKey) : Reflect.getOwnMetadata(metadataKey, searchTarget);
         if (data !== void 0) return data;
         const proto = Object.getPrototypeOf(searchTarget);
         searchTarget = proto && typeof proto === "function" ? proto : proto?.constructor || null;
-        if (searchTarget === target) break;
       }
       return void 0;
     };
@@ -7602,12 +7567,13 @@ var dooboostoreSimpleBootHttpServerWebSocketClient = (() => {
       const results = [];
       if (target == null) return results;
       let searchTarget = typeof target === "object" && typeof target !== "function" ? target.constructor : target;
-      while (searchTarget && searchTarget !== Object) {
+      const seen = /* @__PURE__ */ new Set();
+      while (searchTarget && searchTarget !== Object && !seen.has(searchTarget)) {
+        seen.add(searchTarget);
         const data = propertyKey ? Reflect.getOwnMetadata(metadataKey, searchTarget, propertyKey) : Reflect.getOwnMetadata(metadataKey, searchTarget);
         if (data !== void 0) results.unshift(data);
         const proto = Object.getPrototypeOf(searchTarget);
         searchTarget = proto && typeof proto === "function" ? proto : proto?.constructor || null;
-        if (searchTarget === target) break;
       }
       return results;
     };