@perspective-dev/client 5.3.1 → 5.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -70,25 +70,31 @@ async function _init(
70
70
  export async function worker(
71
71
  module: Promise<typeof psp>,
72
72
  server_wasm: Promise<WebAssembly.Module> | undefined,
73
- perspective_wasm_worker: Promise<
74
- SharedWorker | ServiceWorker | Worker | MessagePort
75
- >,
73
+ perspective_wasm_worker: Promise<SharedWorker | Worker | MessagePort>,
76
74
  ) {
77
- let [wasm, webworker]: [
75
+ const [wasm, webworker]: [
78
76
  WebAssembly.Module | undefined,
79
- SharedWorker | ServiceWorker | Worker | MessagePort,
77
+ SharedWorker | Worker | MessagePort,
80
78
  ] = await Promise.all([server_wasm, perspective_wasm_worker]);
81
79
 
82
80
  const { Client } = await module;
83
- let port: MessagePort;
81
+ let port: MessagePort | Worker;
82
+ let close: () => void;
84
83
  if (
85
84
  typeof SharedWorker !== "undefined" &&
86
85
  webworker instanceof SharedWorker
87
86
  ) {
88
- port = webworker.port;
87
+ const shared_port = webworker.port;
88
+ port = shared_port;
89
+ close = () => shared_port.close();
90
+ } else if (typeof Worker !== "undefined" && webworker instanceof Worker) {
91
+ port = webworker;
92
+ close = () => webworker.terminate();
93
+ } else if (webworker instanceof MessagePort) {
94
+ port = webworker;
95
+ close = () => webworker.close();
89
96
  } else {
90
- // Assume `MessagePort`
91
- port = webworker as MessagePort;
97
+ throw new Error("Unsupported worker type");
92
98
  }
93
99
 
94
100
  const client = new Client(
@@ -98,17 +104,14 @@ export async function worker(
98
104
  },
99
105
  async () => {
100
106
  console.debug("Closing WebWorker");
101
- port.close();
102
- if (webworker instanceof Worker) {
103
- webworker.terminate();
104
- }
107
+ close();
105
108
  },
106
109
  );
107
110
 
108
111
  await _init(port, wasm);
109
- port.addEventListener("message", (json: MessageEvent<Uint8Array>) => {
112
+ port.onmessage = (json: MessageEvent<Uint8Array>) => {
110
113
  client.handle_response(json.data);
111
- });
114
+ };
112
115
 
113
116
  return client;
114
117
  }