@simplysm/service-client 14.0.47 → 14.0.49

package/src/protocol/client-protocol-wrapper.ts

@@ -5,7 +5,18 @@ import type {
   ServiceMessage,
   ServiceProtocol,
 } from "@simplysm/service-common";
-import { isWorkerSupported } from "../types/browser-compat";
+import type { BrowserWorker } from "../types/browser-compat";
+import {
+  isBrowserWorkerSupported,
+  isNodeWorkerSupported,
+  isWorkerSupported,
+} from "../types/browser-compat";
+
+// node env typecheck에서 DOM Worker 생성자가 없으므로 모듈 스코프 선언으로 보완
+// browser env에서는 global Worker를 shadow (구조적 호환). 컴파일 시 제거됨.
+declare const Worker: {
+  new (scriptURL: string | URL, options?: { type?: string }): BrowserWorker;
+};
 
 export interface ClientProtocolWrapper {
   encode(uuid: string, message: ServiceMessage): Promise<{ chunks: Bytes[]; totalSize: number }>;
@@ -13,16 +24,13 @@ export interface ClientProtocolWrapper {
   dispose(): void;
 }
 
-// 공유 worker 상태 (싱글턴 패턴)
-let worker: Worker | undefined;
 const workerResolvers = new LazyGcMap<
   string,
   { resolve: (res: unknown) => void; reject: (err: Error) => void }
 >({
-  gcInterval: 5 * 1000, // 5초마다 만료된 항목 확인
-  expireTime: 60 * 1000, // 60초 후 만료 (타임아웃)
+  gcInterval: 5 * 1000,
+  expireTime: 60 * 1000,
   onExpire: (key, item) => {
-    // 만료 시 reject (메모리 누수 방지에 필수)
     item.reject(new Error(`Worker 작업 시간 초과 (uuid: ${key})`));
   },
 });
@@ -36,72 +44,124 @@ function isWorkerAvailable(): boolean {
   return workerAvailable;
 }
 
-function getWorker(): Worker | undefined {
+function setupWorkerHandlers(w: BrowserWorker): void {
+  w.onmessage = (event: MessageEvent) => {
+    const { id, type, result, error } = event.data as {
+      id: string;
+      type: "success" | "error";
+      result?: unknown;
+      error?: { message: string; stack?: string };
+    };
+
+    const resolver = workerResolvers.get(id);
+    if (resolver != null) {
+      if (type === "success") {
+        resolver.resolve(result);
+      } else {
+        const err = new Error(error?.message ?? "알 수 없는 worker 에러");
+        err.stack = error?.stack;
+        resolver.reject(err);
+      }
+      workerResolvers.delete(id);
+    }
+  };
+
+  w.onerror = () => {
+    const workerErr = new Error("Worker 초기화 실패");
+    for (const resolver of workerResolvers.values()) {
+      resolver.reject(workerErr);
+    }
+    workerResolvers.clear();
+
+    workerInitPromise = undefined;
+    workerAvailable = false;
+  };
+}
+
+function createNodeWorkerAdapter(nodeWorker: import("worker_threads").Worker): BrowserWorker {
+  const adapter: BrowserWorker = {
+    onmessage: null,
+    onerror: null,
+    postMessage(message: unknown, transferItems?: unknown[]) {
+      nodeWorker.postMessage(message, transferItems as import("worker_threads").TransferListItem[]);
+    },
+    terminate() {
+      void nodeWorker.terminate();
+    },
+  };
+
+  nodeWorker.on("message", (data: unknown) => {
+    adapter.onmessage?.({ data } as MessageEvent);
+  });
+  nodeWorker.on("error", (err: Error) => {
+    adapter.onerror?.(err as unknown as Event);
+  });
+
+  return adapter;
+}
+
+let workerInitPromise: Promise<BrowserWorker | undefined> | undefined;
+
+async function initWorker(): Promise<BrowserWorker | undefined> {
+  try {
+    if (isBrowserWorkerSupported()) {
+      // esbuild Worker 번들링 플러그인(sd-worker-bundle)이 이 패턴을 AST에서 인식
+      const w: BrowserWorker = new Worker(
+        new URL("../workers/client-protocol.worker.js", import.meta.url),
+        { type: "module" },
+      );
+      setupWorkerHandlers(w);
+      return w;
+    }
+
+    if (isNodeWorkerSupported()) {
+      // esbuild Worker 번들링 플러그인이 import.meta.resolve 패턴을 인식
+      const workerUrl = import.meta.resolve("../workers/client-protocol.worker.js");
+      const workerThreadsId = "worker_threads";
+      const { Worker: NodeWorker } = await import(/* @vite-ignore */ workerThreadsId);
+      const nodeWorker = new NodeWorker(new URL(workerUrl)) as import("worker_threads").Worker;
+      const adapter = createNodeWorkerAdapter(nodeWorker);
+      setupWorkerHandlers(adapter);
+      return adapter;
+    }
+  } catch {
+    workerAvailable = false;
+  }
+
+  return undefined;
+}
+
+async function getWorker(): Promise<BrowserWorker | undefined> {
   if (!isWorkerAvailable()) {
     return undefined;
   }
 
-  if (!worker) {
-    // 모던 번들러 (Vite/Esbuild/Webpack)가 이 구문을 사용하여 Worker를 별도 파일로 분리/로드함
-    // 참고: import.meta.resolve 대신 상대 경로 사용 (Vite 호환성)
-    worker = new Worker(
-      new URL("../workers/client-protocol.worker.js", import.meta.url),
-      { type: "module" },
-    );
-
-    worker.onmessage = (event: MessageEvent) => {
-      const { id, type, result, error } = event.data as {
-        id: string;
-        type: "success" | "error";
-        result?: unknown;
-        error?: { message: string; stack?: string };
-      };
-
-      const resolver = workerResolvers.get(id);
-      if (resolver != null) {
-        if (type === "success") {
-          resolver.resolve(result);
-        } else {
-          const err = new Error(error?.message ?? "알 수 없는 worker 에러");
-          err.stack = error?.stack;
-          resolver.reject(err);
-        }
-        workerResolvers.delete(id);
+  if (workerInitPromise == null) {
+    workerInitPromise = initWorker().then((w) => {
+      if (w == null) {
+        workerAvailable = false;
       }
-    };
-
-    worker.onerror = () => {
-      // Worker 로드 실패 또는 초기화 에러 시
-      // 대기 중인 모든 요청 즉시 reject
-      const workerErr = new Error("Worker 초기화 실패");
-      for (const resolver of workerResolvers.values()) {
-        resolver.reject(workerErr);
-      }
-      workerResolvers.clear();
-
-      // 이후 메인 스레드로 fallback
-      worker = undefined;
-      workerAvailable = false;
-    };
+      return w;
+    });
   }
-  return worker;
+
+  return workerInitPromise;
 }
 
-/**
- * Worker에 작업을 위임하고 결과를 대기
- * 참고: workerAvailable이 true일 때만 호출할 것
- */
 async function runWorker(
   type: "encode" | "decode",
   data: unknown,
   transferables: ArrayBuffer[] = [],
-): Promise<unknown> {
+): Promise<unknown | undefined> {
+  const w = await getWorker();
+  if (w == null) {
+    return undefined;
+  }
+
   return new Promise((resolve, reject) => {
     const id = Uuid.generate().toString();
-
     workerResolvers.set(id, { resolve, reject });
-    // workerAvailable 확인 후 호출되므로 worker는 항상 존재
-    getWorker()!.postMessage({ id, type, data }, transferables);
+    w.postMessage({ id, type, data }, transferables);
   });
 }
 
@@ -132,13 +192,11 @@ export function createClientProtocolWrapper(protocol: ServiceProtocol): ClientPr
       return protocol.encode(uuid, message);
     }
 
-    // [Worker]
-    // 인코딩은 객체 전송이 필요하므로 Structured Clone이 발생함.
-    // 하지만 메인 스레드에서 JSON.stringify 비용을 오프로드하는 이점이 더 큼.
-    return (await runWorker("encode", { uuid, message })) as {
-      chunks: Bytes[];
-      totalSize: number;
-    };
+    const workerResult = await runWorker("encode", { uuid, message });
+    if (workerResult == null) {
+      return protocol.encode(uuid, message);
+    }
+    return workerResult as { chunks: Bytes[]; totalSize: number };
   }
 
   async function decode(bytes: Bytes): Promise<ServiceMessageDecodeResult<ServiceMessage>> {
@@ -149,11 +207,10 @@ export function createClientProtocolWrapper(protocol: ServiceProtocol): ClientPr
       return protocol.decode(bytes);
     }
 
-    // [Worker]
-    // Zero-copy 전송 (버퍼 소유권이 Worker로 이동)
     const rawResult = await runWorker("decode", bytes, [bytes.buffer as ArrayBuffer]);
-
-    // Worker의 plain object 결과에서 클래스 인스턴스 복원 (DateTime 등)
+    if (rawResult == null) {
+      return protocol.decode(bytes);
+    }
     return transfer.decode(rawResult) as ServiceMessageDecodeResult<ServiceMessage>;
   }
 

package/src/types/browser-compat.ts

@@ -18,7 +18,29 @@ export interface FileCollection {
   [Symbol.iterator](): IterableIterator<File>;
 }
 
-/** Web Worker API 지원 여부 확인 */
-export function isWorkerSupported(): boolean {
+/** Web Worker 최소 인터페이스 (DOM lib 없이도 타입체크 통과용) */
+export interface BrowserWorker {
+  onmessage: ((event: MessageEvent) => void) | null;
+  onerror: ((event: Event) => void) | null;
+  postMessage(message: unknown, transfer?: unknown[]): void;
+  terminate(): void;
+}
+
+/** DOM Worker API 지원 여부 확인 (browser 환경) */
+export function isBrowserWorkerSupported(): boolean {
   return "Worker" in globalThis;
 }
+
+/** Node.js worker_threads 지원 여부 확인 */
+export function isNodeWorkerSupported(): boolean {
+  const proc = (globalThis as Record<string, unknown>)["process"] as
+    | { versions?: { node?: string } }
+    | undefined;
+  return proc?.versions?.node != null;
+}
+
+/** Worker 오프로딩 지원 여부 (browser DOM Worker 또는 Node.js worker_threads) */
+export function isWorkerSupported(): boolean {
+  return isBrowserWorkerSupported() || isNodeWorkerSupported();
+}
+

package/src/types/node-worker-compat.d.ts

@@ -0,0 +1,23 @@
+// browser env typecheck에서 @types/node가 제외될 때 worker_threads 최소 타입 제공
+// node env에서는 @types/node의 선언과 병합됨
+declare module "worker_threads" {
+  class Worker {
+    constructor(filename: string | URL);
+    on(event: "message", listener: (value: unknown) => void): this;
+    on(event: "error", listener: (err: Error) => void): this;
+    postMessage(value: unknown, transferList?: unknown[]): void;
+    terminate(): Promise<number>;
+  }
+
+  const parentPort: {
+    on(event: "message", listener: (value: unknown) => void): void;
+    on(event: "error", listener: (err: Error) => void): void;
+    postMessage(value: unknown, transferList?: unknown[]): void;
+  } | null;
+}
+
+// import.meta.resolve — Node.js 20+ 표준 API
+// browser env에서 @types/node 없이도 typecheck 통과용
+interface ImportMeta {
+  resolve(specifier: string): string;
+}

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

@@ -5,53 +5,65 @@ import { transfer } from "@simplysm/core-common";
 
 const protocol = createServiceProtocol();
 
-self.onmessage = (event: MessageEvent) => {
-  const { id, type, data } = event.data as {
-    id: string;
-    type: "encode" | "decode";
-    data: unknown;
-  };
+interface WorkerRequest {
+  id: string;
+  type: "encode" | "decode";
+  data: unknown;
+}
 
+function handleRequest(msg: WorkerRequest): {
+  response: { id: string; type: "success" | "error"; result?: unknown; error?: { message: string; stack?: string } };
+  transferList: Transferable[];
+} {
   try {
     let result: unknown;
     let transferList: Transferable[] = [];
 
-    if (type === "encode") {
-      // [Main -> Worker] 인코딩 요청 (data: { uuid, message })
-      // message는 이미 Plain Object임 (Structured Clone을 통해 전달)
-      const { uuid, message } = data as {
+    if (msg.type === "encode") {
+      const { uuid, message } = msg.data as {
         uuid: string;
         message: Parameters<typeof protocol.encode>[1];
       };
       const { chunks } = protocol.encode(uuid, message);
-
-      // Buffer[]는 전송 가능하므로 결과로 반환
       result = chunks;
-      // 결과 chunk의 내부 ArrayBuffer를 전송 목록에 추가
       transferList = chunks.map((chunk) => chunk.buffer as ArrayBuffer);
     } else {
-      // [Main -> Worker] 디코딩 요청 (data: Uint8Array)
-      // data는 Uint8Array로 전달됨
-      const bytes = new Uint8Array(data as ArrayBuffer);
+      const bytes = new Uint8Array(msg.data as ArrayBuffer);
       const decodeResult = protocol.decode(bytes);
-
-      // 결과 객체를 전송 가능한 형태로 변환 (zero-copy 준비)
       const encoded = transfer.encode(decodeResult);
       result = encoded.result;
       transferList = encoded.transferList;
     }
 
-    // [Worker -> Main] 성공 응답
-    self.postMessage({ id, type: "success", result }, transferList);
+    return { response: { id: msg.id, type: "success", result }, transferList };
   } catch (err) {
-    // [Worker -> Main] 에러 응답
-    self.postMessage({
-      id,
-      type: "error",
-      error:
-        err instanceof Error
+    return {
+      response: {
+        id: msg.id,
+        type: "error",
+        error: err instanceof Error
           ? { message: err.message, stack: err.stack }
           : { message: String(err) },
+      },
+      transferList: [],
+    };
+  }
+}
+
+if (typeof self !== "undefined" && typeof self.postMessage === "function") {
+  // Browser Worker
+  self.onmessage = (event: MessageEvent) => {
+    const { response, transferList } = handleRequest(event.data as WorkerRequest);
+    self.postMessage(response, transferList);
+  };
+} else {
+  // Node.js worker_threads
+  const workerThreadsId = "worker_threads";
+  const { parentPort } = await import(workerThreadsId);
+  if (parentPort != null) {
+    parentPort.on("message", (data: unknown) => {
+      const { response, transferList } = handleRequest(data as WorkerRequest);
+      parentPort.postMessage(response, transferList as ArrayBuffer[]);
     });
   }
-};
+}