@simplysm/service-server 14.0.86 → 14.0.88

package/dist/protocol/protocol-wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-wrapper.d.ts","sourceRoot":"","sources":["../../src/protocol/protocol-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI3F;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAE/F;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC,CAAC;IAE1E;;OAEG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB;AAiBD;;;;;GAKG;AACH,wBAAgB,2BAA2B,IAAI,qBAAqB,CA8DnE"}
+{"version":3,"file":"protocol-wrapper.d.ts","sourceRoot":"","sources":["../../src/protocol/protocol-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI3F;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAE/F;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC,CAAC;IAE1E;;OAEG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB;AAiBD;;;;;GAKG;AACH,wBAAgB,2BAA2B,IAAI,qBAAqB,CAsEnE"}

package/dist/protocol/protocol-wrapper.js

@@ -55,13 +55,19 @@ export function createServerProtocolWrapper() {
             }
         },
         async decode(bytes) {
-            const totalSize = bytes.length;
-            if (totalSize > SIZE_THRESHOLD) {
-                return getWorker().decode(bytes);
+            // 청크 재조립(stateful)은 항상 메인 스레드 단일 누적기에서 수행한다.
+            // 청크별로 worker/메인을 분기하면 한 메시지의 청크가 서로 다른 누적기로 흩어져
+            // 재조립이 영원히 완성되지 못한다 (#35).
+            const acc = protocol.accumulate(bytes);
+            if (acc.type === "progress") {
+                return acc;
             }
-            else {
-                return protocol.decode(bytes);
+            // 재조립 완료. 무거운 JSON 파싱(stateless)만 크기 기준으로 worker 에 위임한다.
+            const resultBytes = acc.resultBytes;
+            if (resultBytes.length > SIZE_THRESHOLD) {
+                return { type: "complete", uuid: acc.uuid, message: await getWorker().parseMessage(resultBytes) };
             }
+            return { type: "complete", uuid: acc.uuid, message: protocol.parseMessage(resultBytes) };
         },
         dispose() {
             protocol.dispose();

package/dist/protocol/protocol-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-wrapper.js","sourceRoot":"","sources":["../../src/protocol/protocol-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AA0BjE,0BAA0B;AAC1B,IAAI,YAAyE,CAAC;AAE9E,SAAS,SAAS;IAChB,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,YAAY,GAAG,MAAM,CAAC,MAAM,CAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,oCAAoC,CAAC,EACzD;YACE,cAAc,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE;SACjD,CACF,CAAC;IACJ,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B;IACzC,sEAAsE;IACtE,KAAK;IACL,sEAAsE;IAEtE,MAAM,QAAQ,GAAG,qBAAqB,EAAE,CAAC;IACzC,MAAM,cAAc,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO;IAEzC,sEAAsE;IACtE,KAAK;IACL,sEAAsE;IAEtE;;OAEG;IACH,SAAS,wBAAwB,CAAC,GAAmB;QACnD,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAEnC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAEtB,2BAA2B;QAC3B,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wCAAwC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,UAAU,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sEAAsE;IACtE,SAAS;IACT,sEAAsE;IAEtE,OAAO;QACL,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,OAAuB;YAEvB,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtC,OAAO,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,MAAM,CAAC,KAAY;YACvB,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC;YAC/B,IAAI,SAAS,GAAG,cAAc,EAAE,CAAC;gBAC/B,OAAO,SAAS,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;QAED,OAAO;YACL,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"protocol-wrapper.js","sourceRoot":"","sources":["../../src/protocol/protocol-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AA0BjE,0BAA0B;AAC1B,IAAI,YAAyE,CAAC;AAE9E,SAAS,SAAS;IAChB,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,YAAY,GAAG,MAAM,CAAC,MAAM,CAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,oCAAoC,CAAC,EACzD;YACE,cAAc,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE;SACjD,CACF,CAAC;IACJ,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B;IACzC,sEAAsE;IACtE,KAAK;IACL,sEAAsE;IAEtE,MAAM,QAAQ,GAAG,qBAAqB,EAAE,CAAC;IACzC,MAAM,cAAc,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO;IAEzC,sEAAsE;IACtE,KAAK;IACL,sEAAsE;IAEtE;;OAEG;IACH,SAAS,wBAAwB,CAAC,GAAmB;QACnD,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAEnC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAEtB,2BAA2B;QAC3B,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wCAAwC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,UAAU,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sEAAsE;IACtE,SAAS;IACT,sEAAsE;IAEtE,OAAO;QACL,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,OAAuB;YAEvB,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtC,OAAO,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,MAAM,CAAC,KAAY;YACvB,6CAA6C;YAC7C,iDAAiD;YACjD,2BAA2B;YAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC5B,OAAO,GAAG,CAAC;YACb,CAAC;YAED,yDAAyD;YACzD,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;YACpC,IAAI,WAAW,CAAC,MAAM,GAAG,cAAc,EAAE,CAAC;gBACxC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,SAAS,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;YACpG,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;QAC3F,CAAC;QAED,OAAO;YACL,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/workers/service-protocol.worker.d.ts

@@ -1,5 +1,5 @@
 import type { Bytes } from "@simplysm/core-common";
-import type { ServiceMessageDecodeResult, ServiceMessage } from "@simplysm/service-common";
+import type { ServiceMessage } from "@simplysm/service-common";
 declare const _default: {
     send<TEventName extends string>(event: TEventName, data?: undefined): void;
     __methods: {
@@ -7,7 +7,7 @@ declare const _default: {
             chunks: Bytes[];
             totalSize: number;
         };
-        decode: (bytes: Bytes) => ServiceMessageDecodeResult<ServiceMessage>;
+        parseMessage: (resultBytes: Bytes) => ServiceMessage;
     };
     __events: Record<string, never>;
 };

package/dist/workers/service-protocol.worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-protocol.worker.d.ts","sourceRoot":"","sources":["../../src/workers/service-protocol.worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;;;;uBAM1E,MAAM,WAAW,cAAc,KAAG;YAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE;wBAGvE,KAAK,KAAG,0BAA0B,CAAC,cAAc,CAAC;;;;AAJpE,wBAOG"}
+{"version":3,"file":"service-protocol.worker.d.ts","sourceRoot":"","sources":["../../src/workers/service-protocol.worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;;;;uBAM9C,MAAM,WAAW,cAAc,KAAG;YAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE;oCAI3D,KAAK,KAAG,cAAc;;;;AALpD,wBAQG"}

package/dist/workers/service-protocol.worker.js

@@ -5,8 +5,9 @@ export default createWorker({
     encode: (uuid, message) => {
         return protocol.encode(uuid, message);
     },
-    decode: (bytes) => {
-        return protocol.decode(bytes);
+    // 재조립 완료된 raw 바이트의 무거운 JSON 파싱만 worker 에서 수행 (stateless)
+    parseMessage: (resultBytes) => {
+        return protocol.parseMessage(resultBytes);
     },
 });
 //# sourceMappingURL=service-protocol.worker.js.map

package/dist/workers/service-protocol.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-protocol.worker.js","sourceRoot":"","sources":["../../src/workers/service-protocol.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,QAAQ,GAAG,qBAAqB,EAAE,CAAC;AAEzC,eAAe,YAAY,CAAC;IAC1B,MAAM,EAAE,CAAC,IAAY,EAAE,OAAuB,EAA0C,EAAE;QACxF,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,EAAE,CAAC,KAAY,EAA8C,EAAE;QACnE,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"service-protocol.worker.js","sourceRoot":"","sources":["../../src/workers/service-protocol.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,QAAQ,GAAG,qBAAqB,EAAE,CAAC;AAEzC,eAAe,YAAY,CAAC;IAC1B,MAAM,EAAE,CAAC,IAAY,EAAE,OAAuB,EAA0C,EAAE;QACxF,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IACD,yDAAyD;IACzD,YAAY,EAAE,CAAC,WAAkB,EAAkB,EAAE;QACnD,OAAO,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/service-server",
-  "version": "14.0.86",
+  "version": "14.0.88",
   "description": "심플리즘 패키지 - 서비스 (server)",
   "author": "심플리즘",
   "license": "Apache-2.0",
@@ -29,11 +29,11 @@
     "semver": "^7.8.1",
     "utf-8-validate": "^6.0.6",
     "ws": "^8.21.0",
-    "@simplysm/core-node": "14.0.86",
-    "@simplysm/core-common": "14.0.86",
-    "@simplysm/orm-common": "14.0.86",
-    "@simplysm/service-common": "14.0.86",
-    "@simplysm/orm-node": "14.0.86"
+    "@simplysm/core-node": "14.0.88",
+    "@simplysm/orm-node": "14.0.88",
+    "@simplysm/orm-common": "14.0.88",
+    "@simplysm/core-common": "14.0.88",
+    "@simplysm/service-common": "14.0.88"
   },
   "devDependencies": {
     "@types/semver": "^7.7.1",

package/src/protocol/protocol-wrapper.ts

@@ -98,12 +98,20 @@ export function createServerProtocolWrapper(): ServerProtocolWrapper {
     },
 
     async decode(bytes: Bytes): Promise<ServiceMessageDecodeResult<ServiceMessage>> {
-      const totalSize = bytes.length;
-      if (totalSize > SIZE_THRESHOLD) {
-        return getWorker().decode(bytes);
-      } else {
-        return protocol.decode(bytes);
+      // 청크 재조립(stateful)은 항상 메인 스레드 단일 누적기에서 수행한다.
+      // 청크별로 worker/메인을 분기하면 한 메시지의 청크가 서로 다른 누적기로 흩어져
+      // 재조립이 영원히 완성되지 못한다 (#35).
+      const acc = protocol.accumulate(bytes);
+      if (acc.type === "progress") {
+        return acc;
+      }
+
+      // 재조립 완료. 무거운 JSON 파싱(stateless)만 크기 기준으로 worker 에 위임한다.
+      const resultBytes = acc.resultBytes;
+      if (resultBytes.length > SIZE_THRESHOLD) {
+        return { type: "complete", uuid: acc.uuid, message: await getWorker().parseMessage(resultBytes) };
       }
+      return { type: "complete", uuid: acc.uuid, message: protocol.parseMessage(resultBytes) };
     },
 
     dispose(): void {

package/src/workers/service-protocol.worker.ts

@@ -1,6 +1,6 @@
 import { createWorker } from "@simplysm/core-node";
 import type { Bytes } from "@simplysm/core-common";
-import type { ServiceMessageDecodeResult, ServiceMessage } from "@simplysm/service-common";
+import type { ServiceMessage } from "@simplysm/service-common";
 import { createServiceProtocol } from "@simplysm/service-common";
 
 const protocol = createServiceProtocol();
@@ -9,7 +9,8 @@ export default createWorker({
   encode: (uuid: string, message: ServiceMessage): { chunks: Bytes[]; totalSize: number } => {
     return protocol.encode(uuid, message);
   },
-  decode: (bytes: Bytes): ServiceMessageDecodeResult<ServiceMessage> => {
-    return protocol.decode(bytes);
+  // 재조립 완료된 raw 바이트의 무거운 JSON 파싱만 worker 에서 수행 (stateless)
+  parseMessage: (resultBytes: Bytes): ServiceMessage => {
+    return protocol.parseMessage(resultBytes);
   },
 });