fix: node transferrables (#83)

src/parts/GetTransferrables/GetTransferrables.ts

@@ -1,7 +1,8 @@
 import * as WalkValue from '../WalkValue/WalkValue.ts'
+import * as IsTransferrable from '../IsTransferrable/IsTransferrable.ts'
 
 export const getTransferrables = (value: unknown): any => {
   const transferrables: Transferable[] = []
-  WalkValue.walkValue(value, transferrables)
+  WalkValue.walkValue(value, transferrables, IsTransferrable.isTransferrable)
   return transferrables
 }

src/parts/GetTransferrablesNode/GetTransferrablesNode.ts

@@ -0,0 +1,9 @@
+import * as GetTransferrables from '../GetTransferrables/GetTransferrables.ts'
+
+export const getTransferrablesNode = (value: unknown): any => {
+  const transferrables = GetTransferrables.getTransferrables(value)
+  if (transferrables.length === 0) {
+    throw new Error(`no transferrables found`)
+  }
+  return transferrables[0]
+}

src/parts/IpcChildWithNodeForkedProcess/IpcChildWithNodeForkedProcess.ts

@@ -1,7 +1,7 @@
+import * as GetTransferrablesNode from '../GetTransferrablesNode/GetTransferrablesNode.ts'
 import { Ipc } from '../Ipc/Ipc.ts'
 import type { NodeJsProcess } from '../NodeJsProcess/NodeJsProcess.ts'
 import * as ReadyMessage from '../ReadyMessage/ReadyMessage.ts'
-import * as GetTransferrables from '../GetTransferrables/GetTransferrables.ts'
 
 export const listen = async () => {
   if (!process.send) {
@@ -46,7 +46,7 @@ class IpcChildWithNodeForkedProcess extends Ipc<NodeJsProcess> {
   }
 
   override sendAndTransfer(message: any): void {
-    const transfer = GetTransferrables.getTransferrables(message)
+    const transfer = GetTransferrablesNode.getTransferrablesNode(message)
     this._rawIpc.send(message, transfer)
   }
 

src/parts/IpcParentWithNodeForkedProcess/IpcParentWithNodeForkedProcess.ts

@@ -3,9 +3,9 @@ import * as Assert from '../Assert/Assert.ts'
 import { ChildProcessError } from '../ChildProcessError/ChildProcessError.ts'
 import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.ts'
 import * as GetFirstNodeChildProcessEvent from '../GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.ts'
+import * as GetTransferrablesNode from '../GetTransferrablesNode/GetTransferrablesNode.ts'
 import { Ipc } from '../Ipc/Ipc.ts'
 import { VError } from '../VError/VError.ts'
-import * as GetTransferrables from '../GetTransferrables/GetTransferrables.ts'
 
 // @ts-ignore
 export const create = async ({ path, argv = [], env, execArgv = [], stdio = 'inherit', name = 'child process' }) => {
@@ -52,7 +52,7 @@ class IpcParentWithNodeForkedProcess extends Ipc<ChildProcess> {
   }
 
   override sendAndTransfer(message: any): void {
-    const transfer = GetTransferrables.getTransferrables(message)
+    const transfer = GetTransferrablesNode.getTransferrablesNode(message)
     this._rawIpc.send(message, transfer)
   }
 

src/parts/IpcParentWithNodeWorker/IpcParentWithNodeWorker.ts

@@ -1,9 +1,9 @@
 import * as Assert from '../Assert/Assert.ts'
 import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.ts'
 import * as GetFirstNodeWorkerEvent from '../GetFirstNodeWorkerEvent/GetFirstNodeWorkerEvent.ts'
+import * as GetTransferrablesNode from '../GetTransferrablesNode/GetTransferrablesNode.ts'
 import { IpcError } from '../IpcError/IpcError.ts'
 import * as ReadyMessage from '../ReadyMessage/ReadyMessage.ts'
-import * as GetTransferrables from '../GetTransferrables/GetTransferrables.ts'
 
 // @ts-ignore
 export const create = async ({ path, argv = [], env = process.env, execArgv = [] }) => {
@@ -55,7 +55,7 @@ export const wrap = (worker) => {
     },
     // @ts-ignore
     sendAndTransfer(message) {
-      const transfer = GetTransferrables.getTransferrables(message)
+      const transfer = GetTransferrablesNode.getTransferrablesNode(message)
       this.worker.postMessage(message, transfer)
     },
     dispose() {

src/parts/WalkValue/WalkValue.ts

@@ -1,25 +1,21 @@
-import * as IsTransferrable from '../IsTransferrable/IsTransferrable.ts'
-
-export const walkValue = (value: unknown, transferrables: unknown[]) => {
+export const walkValue = (value: unknown, transferrables: unknown[], isTransferrable: (value: any) => boolean) => {
   if (!value) {
-    return value
+    return
   }
-  if (IsTransferrable.isTransferrable(value)) {
+  if (isTransferrable(value)) {
     transferrables.push(value)
     return
   }
   if (Array.isArray(value)) {
     for (const item of value) {
-      walkValue(item, transferrables)
+      walkValue(item, transferrables, isTransferrable)
     }
     return
   }
   if (typeof value === 'object') {
-    const newObject = Object.create(null)
     for (const property of Object.values(value)) {
-      walkValue(property, transferrables)
+      walkValue(property, transferrables, isTransferrable)
     }
-    return newObject
+    return
   }
-  return value
 }

test/GetTransferrablesNode.test.ts

@@ -0,0 +1,19 @@
+import { expect, test } from '@jest/globals'
+import * as GetTransferrablesNode from '../src/parts/GetTransferrablesNode/GetTransferrablesNode.js'
+
+test('socket inside object', () => {
+  class Socket {}
+  const socket = new Socket()
+  const message = {
+    jsonrpc: '2.0',
+    method: 'HandleWebSocket.handleWebSocket',
+    params: [socket],
+    id: 1,
+  }
+  expect(GetTransferrablesNode.getTransferrablesNode(message)).toBe(socket)
+})
+
+test('no transferrables', () => {
+  const value: any[] = []
+  expect(() => GetTransferrablesNode.getTransferrablesNode(value)).toThrow(new Error('no transferrables found'))
+})