@dooboostore/simple-boot-http-server 1.0.31 → 1.0.32

package/dist/esm-bundle/dooboostore-simple-boot-http-server.esm.js

@@ -25584,26 +25584,45 @@ var SimstanceManager = class _SimstanceManager {
       return registed.instance;
     }
     if (this.storage.has(targetKey) && void 0 === registed?.instance) {
-      newInstanceCarrier.depth++;
-      const newSim = this.newSim({
-        target: registed?.type ?? targetKey,
-        newInstanceCarrier,
-        simCreateAfter: (data) => {
-          if (getSim(registed?.type ?? target ?? targetKey)?.scope === Lifecycle.Singleton) {
-            this.setStoreSet(targetKey, data, target);
+      const resolving = newInstanceCarrier.resolving ??= [];
+      if (resolving.includes(targetKey)) {
+        const nameOf = (t) => typeof t === "symbol" ? t.toString() : t?.name ?? String(t);
+        throw new Error(
+          `Circular dependency detected: ${[...resolving.map(nameOf), nameOf(targetKey)].join(" -> ")}`
+        );
+      }
+      resolving.push(targetKey);
+      let settled = false;
+      try {
+        newInstanceCarrier.depth++;
+        const newSim = this.newSim({
+          target: registed?.type ?? targetKey,
+          newInstanceCarrier,
+          simCreateAfter: (data) => {
+            if (getSim(registed?.type ?? target ?? targetKey)?.scope === Lifecycle.Singleton) {
+              this.setStoreSet(targetKey, data, target);
+            }
           }
-        }
-      });
-      newInstanceCarrier.depth--;
-      if (newInstanceCarrier.depth === 0) {
-        newInstanceCarrier.newInstances.forEach((it) => {
-          this.callBindPostConstruct(it);
         });
+        newInstanceCarrier.depth--;
+        resolving.pop();
+        settled = true;
+        if (newInstanceCarrier.depth === 0) {
+          newInstanceCarrier.newInstances.forEach((it) => {
+            this.callBindPostConstruct(it);
+          });
+        }
+        if (isOnSimCreate(newSim)) {
+          newSim.onSimCreate();
+        }
+        return newSim;
+      } finally {
+        if (!settled) {
+          newInstanceCarrier.depth--;
+          const idx = resolving.lastIndexOf(targetKey);
+          if (idx !== -1) resolving.splice(idx, 1);
+        }
       }
-      if (isOnSimCreate(newSim)) {
-        newSim.onSimCreate();
-      }
-      return newSim;
     }
     const simNoSuch = new SimNoSuch("SimNoSuch: no simple instance(resolve) name:" + targetKey?.prototype?.constructor?.name + "," + targetKey);
     console.error(simNoSuch);
@@ -28851,7 +28870,12 @@ var RequestResponse = class _RequestResponse {
     return data;
   }
   async reqBodyJsonData() {
-    return JSON.parse(await this.reqBodyStringData());
+    const raw = await this.reqBodyStringData();
+    try {
+      return JSON.parse(raw);
+    } catch (e) {
+      throw new BadRequestError({ message: `Invalid JSON body: ${e?.message ?? e}` });
+    }
   }
   async reqBodyFormUrlData() {
     const data = await this.reqBodyStringData();
@@ -28874,7 +28898,14 @@ var RequestResponse = class _RequestResponse {
   }
   async reqBodyReqJsonBody() {
     const data = await this.reqBodyStringData();
-    return Object.assign(new ReqJsonBody(), data ? JSON.parse(data) : {});
+    if (!data) {
+      return Object.assign(new ReqJsonBody(), {});
+    }
+    try {
+      return Object.assign(new ReqJsonBody(), JSON.parse(data));
+    } catch (e) {
+      throw new BadRequestError({ message: `Invalid JSON body: ${e?.message ?? e}` });
+    }
   }
   resBodyJsonData() {
     const data = ConvertUtils2.toString(this.resBodyData());
@@ -29213,7 +29244,7 @@ var HttpServerOption = class _HttpServerOption extends SimOption {
     );
     this.globalAdvice = globalAdvice;
     this.fileUploadTempPath = fileUploadTempPath;
-    this.noSuchRouteEndPointMappingThrow = noSuchRouteEndPointMappingThrow;
+    this.noSuchRouteEndPointMappingThrow = noSuchRouteEndPointMappingThrow ?? ((rr) => new NotFoundError({ message: `no route ${rr.reqMethod?.() ?? ""} ${rr.reqUrlPathName ?? ""}`.trim() }));
     this.transactionManagerFactory = transactionManagerFactory;
   }
   get hostname() {
@@ -29957,12 +29988,12 @@ var ElementApply = class _ElementApply {
       const endPrefix = `${eaPrefix}:${eaId}:end:${type}`;
       let next = node.nextSibling;
       while (next) {
-        if (next.nodeType === Node.COMMENT_NODE && next.data?.trim?.()?.startsWith(endPrefix)) {
+        if (next.nodeType === this.window.Node.COMMENT_NODE && next.data?.trim?.()?.startsWith(endPrefix)) {
           return { nodeType: "comment", type, start: node, end: next, script: script ?? "", variables: this.findVariables(script) };
         }
         next = next.nextSibling;
       }
-    } else if (node.nodeType === Node.ELEMENT_NODE) {
+    } else if (node.nodeType === this.window.Node.ELEMENT_NODE) {
       const aa = node.getAttributeNames().filter((name) => {
         return name.startsWith(`ea:${id}:attribute:`) || name.startsWith(`ea:${id}:event:`) || name.startsWith(`ea:${id}:property:`);
       });