@dxos/rpc 0.6.12 → 0.6.13-main.548ca8d

package/dist/lib/node-esm/index.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/rpc.ts", "../../../src/errors.ts", "../../../src/service.ts", "../../../src/testing.ts", "../../../src/trace.ts"],
+  "sourcesContent": ["//\n// Copyright 2021 DXOS.org\n//\n\nimport { asyncTimeout, synchronized, Trigger } from '@dxos/async';\nimport { type Any, Stream, type RequestOptions, type ProtoCodec } from '@dxos/codec-protobuf';\nimport { StackTrace } from '@dxos/debug';\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\nimport { encodeError, RpcClosedError, RpcNotOpenError } from '@dxos/protocols';\nimport { schema } from '@dxos/protocols/proto';\nimport { type Request, type Response, type RpcMessage } from '@dxos/protocols/proto/dxos/rpc';\nimport { exponentialBackoffInterval } from '@dxos/util';\n\nimport { decodeRpcError } from './errors';\n\nconst DEFAULT_TIMEOUT = 3_000;\nconst BYE_SEND_TIMEOUT = 2_000;\n\nconst DEBUG_CALLS = true;\n\ntype MaybePromise<T> = Promise<T> | T;\n\nexport interface RpcPeerOptions {\n  port: RpcPort;\n\n  /**\n   * Time to wait for a response to an RPC call.\n   */\n  timeout?: number;\n\n  callHandler: (method: string, request: Any, options?: RequestOptions) => MaybePromise<Any>;\n  streamHandler?: (method: string, request: Any, options?: RequestOptions) => Stream<Any>;\n\n  /**\n   * Do not require or send handshake messages.\n   */\n  noHandshake?: boolean;\n\n  /**\n   * What options get passed to the `callHandler` and `streamHandler`.\n   */\n  handlerRpcOptions?: RequestOptions;\n}\n\n/**\n * Interface for a transport-agnostic port to send/receive binary messages.\n */\nexport interface RpcPort {\n  send: (msg: Uint8Array, timeout?: number) => MaybePromise<void>;\n  subscribe: (cb: (msg: Uint8Array) => void) => (() => void) | void;\n}\n\nconst CLOSE_TIMEOUT = 3_000;\n\nexport type CloseOptions = {\n  /**\n   * Time to wait for the other side to confirm close.\n   */\n  timeout?: number;\n};\n\nclass PendingRpcRequest {\n  constructor(\n    public readonly resolve: (response: Response) => void,\n    public readonly reject: (error?: Error) => void,\n    public readonly stream: boolean,\n  ) {}\n}\n\n// NOTE: Lazy so that code that doesn't use indexing doesn't need to load the codec (breaks in workerd).\nlet RpcMessageCodec!: ProtoCodec<RpcMessage>;\nconst getRpcMessageCodec = () => (RpcMessageCodec ??= schema.getCodecForType('dxos.rpc.RpcMessage'));\n\nenum RpcState {\n  INITIAL = 'INITIAL',\n\n  OPENING = 'OPENING',\n\n  OPENED = 'OPENED',\n\n  /**\n   * Bye message sent, waiting for the other side to close.\n   * Not possible to send requests.\n   * All pending requests will be rejected.\n   */\n  CLOSING = 'CLOSING',\n\n  /**\n   * Connection fully closed.\n   * The underlying transport can be disposed.\n   */\n  CLOSED = 'CLOSED',\n}\n\n/**\n * A remote procedure call peer.\n *\n * Provides a away to make RPC calls and get a response back as a promise.\n * Does not handle encoding/decoding and only works with byte buffers.\n * For type safe approach see `createRpcClient` and `createRpcServer`.\n *\n * Must be connected with another instance on the other side via `send`/`receive` methods.\n * Both sides must be opened before making any RPC calls.\n *\n * Errors inside the handler get serialized and sent to the other side.\n *\n * Inspired by JSON-RPC 2.0 https://www.jsonrpc.org/specification.\n */\nexport class RpcPeer {\n  private readonly _params: RpcPeerOptions;\n\n  private readonly _outgoingRequests = new Map<number, PendingRpcRequest>();\n  private readonly _localStreams = new Map<number, Stream<any>>();\n  private readonly _remoteOpenTrigger = new Trigger();\n\n  /**\n   * Triggered when the peer starts closing.\n   */\n  private readonly _closingTrigger = new Trigger();\n\n  /**\n   * Triggered when peer receives a bye message.\n   */\n  private readonly _byeTrigger = new Trigger();\n\n  private _nextId = 0;\n  private _state: RpcState = RpcState.INITIAL;\n  private _unsubscribeFromPort: (() => void) | undefined = undefined;\n  private _clearOpenInterval: (() => void) | undefined = undefined;\n\n  constructor(params: RpcPeerOptions) {\n    this._params = {\n      timeout: undefined,\n      streamHandler: undefined,\n      noHandshake: false,\n      ...params,\n    };\n  }\n\n  /**\n   * Open the peer. Required before making any calls.\n   *\n   * Will block before the other peer calls `open`.\n   */\n  @synchronized\n  async open() {\n    if (this._state !== RpcState.INITIAL) {\n      return;\n    }\n\n    this._unsubscribeFromPort = this._params.port.subscribe(async (msg) => {\n      try {\n        await this._receive(msg);\n      } catch (err: any) {\n        log.catch(err);\n      }\n    }) as any;\n\n    this._state = RpcState.OPENING;\n\n    if (this._params.noHandshake) {\n      this._state = RpcState.OPENED;\n      this._remoteOpenTrigger.wake();\n      return;\n    }\n\n    log('sending open message', { state: this._state });\n    await this._sendMessage({ open: true });\n\n    if (this._state !== RpcState.OPENING) {\n      return;\n    }\n\n    // Retry sending.\n    this._clearOpenInterval = exponentialBackoffInterval(() => {\n      void this._sendMessage({ open: true }).catch((err) => log.warn(err));\n    }, 50);\n\n    await Promise.race([this._remoteOpenTrigger.wait(), this._closingTrigger.wait()]);\n\n    this._clearOpenInterval?.();\n\n    if ((this._state as RpcState) !== RpcState.OPENED) {\n      // Closed while opening.\n      return; // TODO(dmaretskyi): Throw error?\n    }\n\n    // TODO(burdon): This seems error prone.\n    // Send an \"open\" message in case the other peer has missed our first \"open\" message and is still waiting.\n    log('sending second open message', { state: this._state });\n    await this._sendMessage({ openAck: true });\n  }\n\n  /**\n   * Close the peer.\n   * Stop taking or making requests.\n   * Will wait for confirmation from the other side.\n   * Any responses for RPC calls made before close will be delivered.\n   */\n  async close({ timeout = CLOSE_TIMEOUT }: CloseOptions = {}) {\n    if (this._state === RpcState.CLOSED) {\n      return;\n    }\n\n    this._abortRequests();\n\n    if (this._state === RpcState.OPENED && !this._params.noHandshake) {\n      try {\n        this._state = RpcState.CLOSING;\n        await this._sendMessage({ bye: {} }, BYE_SEND_TIMEOUT);\n      } catch (err: any) {\n        log('error closing peer, sending bye', { err });\n      }\n      try {\n        log('closing waiting on bye');\n        await this._byeTrigger.wait({ timeout });\n      } catch (err: any) {\n        log('error closing peer', { err });\n        return;\n      }\n    }\n\n    this._disposeAndClose();\n  }\n\n  /**\n   * Dispose the connection without waiting for the other side.\n   */\n  async abort() {\n    if (this._state === RpcState.CLOSED) {\n      return;\n    }\n\n    this._abortRequests();\n    this._disposeAndClose();\n  }\n\n  private _abortRequests() {\n    // Abort open\n    this._clearOpenInterval?.();\n    this._closingTrigger.wake();\n\n    // Abort pending requests\n    for (const req of this._outgoingRequests.values()) {\n      req.reject(new RpcClosedError());\n    }\n    this._outgoingRequests.clear();\n  }\n\n  private _disposeAndClose() {\n    this._unsubscribeFromPort?.();\n    this._unsubscribeFromPort = undefined;\n    this._clearOpenInterval?.();\n    this._state = RpcState.CLOSED;\n  }\n\n  /**\n   * Handle incoming message. Should be called as the result of other peer's `send` callback.\n   */\n  private async _receive(msg: Uint8Array): Promise<void> {\n    const decoded = getRpcMessageCodec().decode(msg, { preserveAny: true });\n    DEBUG_CALLS && log('received message', { type: Object.keys(decoded)[0] });\n\n    if (decoded.request) {\n      if (this._state !== RpcState.OPENED && this._state !== RpcState.OPENING) {\n        log('received request while closed');\n        await this._sendMessage({\n          response: {\n            id: decoded.request.id,\n            error: encodeError(new RpcClosedError()),\n          },\n        });\n        return;\n      }\n\n      const req = decoded.request;\n      if (req.stream) {\n        log('stream request', { method: req.method });\n        this._callStreamHandler(req, (response) => {\n          log('sending stream response', {\n            method: req.method,\n            response: response.payload?.type_url,\n            error: response.error,\n            close: response.close,\n          });\n\n          void this._sendMessage({ response }).catch((err) => {\n            log.warn('failed during close', err);\n          });\n        });\n      } else {\n        DEBUG_CALLS && log('request', { method: req.method });\n        const response = await this._callHandler(req);\n        DEBUG_CALLS &&\n          log('sending response', {\n            method: req.method,\n            response: response.payload?.type_url,\n            error: response.error,\n          });\n        await this._sendMessage({ response });\n      }\n    } else if (decoded.response) {\n      if (this._state !== RpcState.OPENED) {\n        log('received response while closed');\n        return; // Ignore when not open.\n      }\n\n      const responseId = decoded.response.id;\n      invariant(typeof responseId === 'number');\n      if (!this._outgoingRequests.has(responseId)) {\n        log('received response with invalid id', { responseId });\n        return; // Ignore requests with incorrect id.\n      }\n\n      const item = this._outgoingRequests.get(responseId)!;\n      // Delete the request record if no more responses are expected.\n      if (!item.stream) {\n        this._outgoingRequests.delete(responseId);\n      }\n\n      DEBUG_CALLS && log('response', { type_url: decoded.response.payload?.type_url });\n      item.resolve(decoded.response);\n    } else if (decoded.open) {\n      log('received open message', { state: this._state });\n      if (this._params.noHandshake) {\n        return;\n      }\n\n      await this._sendMessage({ openAck: true });\n    } else if (decoded.openAck) {\n      log('received openAck message', { state: this._state });\n      if (this._params.noHandshake) {\n        return;\n      }\n\n      this._state = RpcState.OPENED;\n      this._remoteOpenTrigger.wake();\n    } else if (decoded.streamClose) {\n      if (this._state !== RpcState.OPENED) {\n        log('received stream close while closed');\n        return; // Ignore when not open.\n      }\n\n      log('received stream close', { id: decoded.streamClose.id });\n      invariant(typeof decoded.streamClose.id === 'number');\n      const stream = this._localStreams.get(decoded.streamClose.id);\n      if (!stream) {\n        log('no local stream', { id: decoded.streamClose.id });\n        return; // Ignore requests with incorrect id.\n      }\n\n      this._localStreams.delete(decoded.streamClose.id);\n      await stream.close();\n    } else if (decoded.bye) {\n      this._byeTrigger.wake();\n      // If we haven't already started closing, close now.\n      if (this._state !== RpcState.CLOSING && this._state !== RpcState.CLOSED) {\n        log('replying to bye');\n        this._state = RpcState.CLOSING;\n        await this._sendMessage({ bye: {} });\n\n        this._abortRequests();\n        this._disposeAndClose();\n      }\n    } else {\n      log.error('received malformed message', { msg });\n      throw new Error('Malformed message.');\n    }\n  }\n\n  /**\n   * Make RPC call. Will trigger a handler on the other side.\n   * Peer should be open before making this call.\n   */\n  async call(method: string, request: Any, options?: RequestOptions): Promise<Any> {\n    DEBUG_CALLS && log('calling', { method });\n    throwIfNotOpen(this._state);\n\n    let response: Response;\n    try {\n      // Set-up response listener.\n      const id = this._nextId++;\n      const responseReceived = new Promise<Response>((resolve, reject) => {\n        this._outgoingRequests.set(id, new PendingRpcRequest(resolve, reject, false));\n      });\n\n      // Send request call.\n      const sending = this._sendMessage({\n        request: {\n          id,\n          method,\n          payload: request,\n          stream: false,\n        },\n      });\n\n      // Wait until send completes or throws an error (or response throws a timeout), the resume waiting.\n      const timeout = options?.timeout ?? this._params.timeout;\n      const waiting =\n        timeout === 0 ? responseReceived : asyncTimeout<any>(responseReceived, timeout ?? DEFAULT_TIMEOUT);\n\n      await Promise.race([sending, waiting]);\n      response = await waiting;\n      invariant(response.id === id);\n    } catch (err) {\n      if (err instanceof RpcClosedError) {\n        // Rethrow the error here to have the correct stack-trace.\n        const error = new RpcClosedError();\n        error.stack += `\\n\\n info: RPC client was closed at:\\n${err.stack?.split('\\n').slice(1).join('\\n')}`;\n        throw error;\n      }\n\n      throw err;\n    }\n\n    if (response.payload) {\n      return response.payload;\n    } else if (response.error) {\n      throw decodeRpcError(response.error, method);\n    } else {\n      throw new Error('Malformed response.');\n    }\n  }\n\n  /**\n   * Make RPC call with a streaming response.\n   * Will trigger a handler on the other side.\n   * Peer should be open before making this call.\n   */\n  callStream(method: string, request: Any, options?: RequestOptions): Stream<Any> {\n    throwIfNotOpen(this._state);\n    const id = this._nextId++;\n\n    return new Stream(({ ready, next, close }) => {\n      const onResponse = (response: Response) => {\n        if (response.streamReady) {\n          ready();\n        } else if (response.close) {\n          close();\n        } else if (response.error) {\n          // TODO(dmaretskyi): Stack trace might be lost because the stream producer function is called asynchronously.\n          close(decodeRpcError(response.error, method));\n        } else if (response.payload) {\n          next(response.payload);\n        } else {\n          throw new Error('Malformed response.');\n        }\n      };\n\n      const stack = new StackTrace();\n      const closeStream = (err?: Error) => {\n        if (!err) {\n          close();\n        } else {\n          err.stack += `\\n\\nError happened in the stream at:\\n${stack.getStack()}`;\n          close(err);\n        }\n      };\n\n      this._outgoingRequests.set(id, new PendingRpcRequest(onResponse, closeStream, true));\n\n      this._sendMessage({\n        request: {\n          id,\n          method,\n          payload: request,\n          stream: true,\n        },\n      }).catch((err) => {\n        close(err);\n      });\n\n      return () => {\n        this._sendMessage({\n          streamClose: { id },\n        }).catch((err) => {\n          log.catch(err);\n        });\n        this._outgoingRequests.delete(id);\n      };\n    });\n  }\n\n  private async _sendMessage(message: RpcMessage, timeout?: number) {\n    DEBUG_CALLS && log('sending message', { type: Object.keys(message)[0] });\n    await this._params.port.send(getRpcMessageCodec().encode(message, { preserveAny: true }), timeout);\n  }\n\n  private async _callHandler(req: Request): Promise<Response> {\n    try {\n      invariant(typeof req.id === 'number');\n      invariant(req.payload);\n      invariant(req.method);\n\n      const response = await this._params.callHandler(req.method, req.payload, this._params.handlerRpcOptions);\n      return {\n        id: req.id,\n        payload: response,\n      };\n    } catch (err) {\n      return {\n        id: req.id,\n        error: encodeError(err),\n      };\n    }\n  }\n\n  private _callStreamHandler(req: Request, callback: (response: Response) => void) {\n    try {\n      invariant(this._params.streamHandler, 'Requests with streaming responses are not supported.');\n      invariant(typeof req.id === 'number');\n      invariant(req.payload);\n      invariant(req.method);\n\n      const responseStream = this._params.streamHandler(req.method, req.payload, this._params.handlerRpcOptions);\n      responseStream.onReady(() => {\n        callback({\n          id: req.id,\n          streamReady: true,\n        });\n      });\n\n      responseStream.subscribe(\n        (msg) => {\n          callback({\n            id: req.id,\n            payload: msg,\n          });\n        },\n        (error) => {\n          if (error) {\n            callback({\n              id: req.id,\n              error: encodeError(error),\n            });\n          } else {\n            callback({\n              id: req.id,\n              close: true,\n            });\n          }\n        },\n      );\n\n      this._localStreams.set(req.id, responseStream);\n    } catch (err: any) {\n      callback({\n        id: req.id,\n        error: encodeError(err),\n      });\n    }\n  }\n}\n\nconst throwIfNotOpen = (state: RpcState) => {\n  switch (state) {\n    case RpcState.OPENED: {\n      return;\n    }\n    case RpcState.INITIAL: {\n      throw new RpcNotOpenError();\n    }\n    case RpcState.CLOSED: {\n      throw new RpcClosedError();\n    }\n  }\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { StackTrace } from '@dxos/debug';\nimport { decodeError } from '@dxos/protocols';\nimport { type Error as ErrorResponse } from '@dxos/protocols/proto/dxos/error';\n\nexport const decodeRpcError = (err: ErrorResponse, rpcMethod: string): Error =>\n  decodeError(err, {\n    appendStack: `\\n    at RPC ${rpcMethod} \\n` + new StackTrace().getStack(1),\n  });\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport {\n  type EncodingOptions,\n  type ServiceDescriptor,\n  type ServiceHandler,\n  type ServiceProvider,\n} from '@dxos/codec-protobuf';\nimport { invariant } from '@dxos/invariant';\n\nimport { RpcPeer, type RpcPeerOptions } from './rpc';\n\n/**\n * Map of service definitions.\n */\n// TODO(burdon): Rename ServiceMap.\nexport type ServiceBundle<Services> = { [Key in keyof Services]: ServiceDescriptor<Services[Key]> };\n\nexport type ServiceHandlers<Services> = { [ServiceName in keyof Services]: ServiceProvider<Services[ServiceName]> };\n\nexport type ServiceTypesOf<Bundle extends ServiceBundle<any>> =\n  Bundle extends ServiceBundle<infer Services> ? Services : never;\n\n/**\n * Groups multiple services together to be served by a single RPC peer.\n */\nexport const createServiceBundle = <Service>(services: ServiceBundle<Service>): ServiceBundle<Service> => services;\n\n/**\n * Type-safe RPC peer.\n */\nexport class ProtoRpcPeer<Service> {\n  constructor(\n    public readonly rpc: Service,\n    private readonly _peer: RpcPeer,\n  ) {}\n\n  async open() {\n    await this._peer.open();\n  }\n\n  async close() {\n    await this._peer.close();\n  }\n\n  async abort() {\n    await this._peer.abort();\n  }\n}\n\nexport interface ProtoRpcPeerOptions<Client, Server> extends Omit<RpcPeerOptions, 'callHandler' | 'streamHandler'> {\n  /**\n   * Services that are expected to be implemented by the counter-space.\n   */\n  // TODO(burdon): Rename proxy.\n  requested?: ServiceBundle<Client>;\n\n  /**\n   * Services exposed to the counter-space.\n   */\n  // TODO(burdon): Rename service.\n  exposed?: ServiceBundle<Server>;\n\n  /**\n   * Handlers for the exposed services\n   */\n  handlers?: ServiceHandlers<Server>;\n\n  /**\n   * Encoding options passed to the underlying proto codec.\n   */\n  encodingOptions?: EncodingOptions;\n}\n\n/**\n * Create type-safe RPC peer from a service bundle.\n * Can both handle and issue requests.\n */\n// TODO(burdon): Currently assumes that the proto service name is unique.\n//  Support multiple instances services definitions (e.g., halo/space invitations).\nexport const createProtoRpcPeer = <Client = {}, Server = {}>({\n  requested,\n  exposed,\n  handlers,\n  encodingOptions,\n  ...rest\n}: ProtoRpcPeerOptions<Client, Server>): ProtoRpcPeer<Client> => {\n  // Create map of RPCs.\n  const exposedRpcs: Record<string, ServiceHandler<any>> = {};\n  if (exposed) {\n    invariant(handlers);\n    for (const serviceName of Object.keys(exposed) as (keyof Server)[]) {\n      // Get full service name with the package name without '.' at the beginning.\n      const serviceFqn = exposed[serviceName].serviceProto.fullName.slice(1);\n      const serviceProvider = handlers[serviceName];\n      exposedRpcs[serviceFqn] = exposed[serviceName].createServer(serviceProvider, encodingOptions);\n    }\n  }\n\n  // Create peer.\n  const peer = new RpcPeer({\n    ...rest,\n\n    callHandler: (method, request, options) => {\n      const [serviceName, methodName] = parseMethodName(method);\n      if (!exposedRpcs[serviceName]) {\n        throw new Error(`Service not supported: ${serviceName}`);\n      }\n\n      return exposedRpcs[serviceName].call(methodName, request, options);\n    },\n\n    streamHandler: (method, request, options) => {\n      const [serviceName, methodName] = parseMethodName(method);\n      if (!exposedRpcs[serviceName]) {\n        throw new Error(`Service not supported: ${serviceName}`);\n      }\n\n      return exposedRpcs[serviceName].callStream(methodName, request, options);\n    },\n  });\n\n  const requestedRpcs: Client = {} as Client;\n  if (requested) {\n    for (const serviceName of Object.keys(requested) as (keyof Client)[]) {\n      // Get full service name with the package name without '.' at the beginning.\n      const serviceFqn = requested[serviceName].serviceProto.fullName.slice(1);\n\n      requestedRpcs[serviceName] = requested[serviceName].createClient(\n        {\n          call: (method, req, options) => peer.call(`${serviceFqn}.${method}`, req, options),\n          callStream: (method, req, options) => peer.callStream(`${serviceFqn}.${method}`, req, options),\n        },\n        encodingOptions,\n      );\n    }\n  }\n\n  return new ProtoRpcPeer(requestedRpcs, peer);\n};\n\nexport const parseMethodName = (method: string): [serviceName: string, methodName: string] => {\n  const separator = method.lastIndexOf('.');\n  const serviceName = method.slice(0, separator);\n  const methodName = method.slice(separator + 1);\n  if (serviceName.length === 0 || methodName.length === 0) {\n    throw new Error(`Invalid method: ${method}`);\n  }\n\n  return [serviceName, methodName];\n};\n\n//\n// TODO(burdon): Remove deprecated (only bot factory).\n//\n\n/**\n * Create a type-safe RPC client.\n * @deprecated Use createProtoRpcPeer instead.\n */\nexport const createRpcClient = <S>(\n  serviceDef: ServiceDescriptor<S>,\n  options: Omit<RpcPeerOptions, 'callHandler'>,\n): ProtoRpcPeer<S> => {\n  const peer = new RpcPeer({\n    ...options,\n    callHandler: () => {\n      throw new Error('Requests to client are not supported.');\n    },\n  });\n\n  const client = serviceDef.createClient({\n    call: peer.call.bind(peer),\n    callStream: peer.callStream.bind(peer),\n  });\n\n  return new ProtoRpcPeer(client, peer);\n};\n\n/**\n * @deprecated\n */\nexport interface RpcServerOptions<S> extends Omit<RpcPeerOptions, 'callHandler'> {\n  service: ServiceDescriptor<S>;\n  handlers: S;\n}\n\n/**\n * Create a type-safe RPC server.\n * @deprecated Use createProtoRpcPeer instead.\n */\nexport const createRpcServer = <S>({ service, handlers, ...rest }: RpcServerOptions<S>): RpcPeer => {\n  const server = service.createServer(handlers);\n  return new RpcPeer({\n    ...rest,\n    callHandler: server.call.bind(server),\n    streamHandler: server.callStream.bind(server),\n  });\n};\n\n/**\n * Create type-safe RPC client from a service bundle.\n * @deprecated Use createProtoRpcPeer instead.\n */\nexport const createBundledRpcClient = <S>(\n  descriptors: ServiceBundle<S>,\n  options: Omit<RpcPeerOptions, 'callHandler' | 'streamHandler'>,\n): ProtoRpcPeer<S> => {\n  return createProtoRpcPeer({\n    requested: descriptors,\n    ...options,\n  });\n};\n\n/**\n * @deprecated\n */\nexport interface RpcBundledServerOptions<S> extends Omit<RpcPeerOptions, 'callHandler'> {\n  services: ServiceBundle<S>;\n  handlers: S;\n}\n\n/**\n * Create type-safe RPC server from a service bundle.\n * @deprecated Use createProtoRpcPeer instead.\n */\n// TODO(burdon): Support late-binding via providers.\nexport const createBundledRpcServer = <S>({ services, handlers, ...rest }: RpcBundledServerOptions<S>): RpcPeer => {\n  const rpc: Record<string, ServiceHandler<any>> = {};\n  for (const serviceName of Object.keys(services) as (keyof S)[]) {\n    // Get full service name with the package name without '.' at the beginning.\n    const serviceFqn = services[serviceName].serviceProto.fullName.slice(1);\n    rpc[serviceFqn] = services[serviceName].createServer(handlers[serviceName] as any);\n  }\n\n  return new RpcPeer({\n    ...rest,\n\n    callHandler: (method, request) => {\n      const [serviceName, methodName] = parseMethodName(method);\n      if (!rpc[serviceName]) {\n        throw new Error(`Service not supported: ${serviceName}`);\n      }\n\n      return rpc[serviceName].call(methodName, request);\n    },\n\n    streamHandler: (method, request) => {\n      const [serviceName, methodName] = parseMethodName(method);\n      if (!rpc[serviceName]) {\n        throw new Error(`Service not supported: ${serviceName}`);\n      }\n\n      return rpc[serviceName].callStream(methodName, request);\n    },\n  });\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { isNode } from '@dxos/util';\n\nimport { type RpcPort } from './rpc';\n\nexport type CreateLinkedPortsOptions = {\n  delay?: number;\n};\n\n/**\n * Create bi-directionally linked ports.\n */\nexport const createLinkedPorts = ({ delay }: CreateLinkedPortsOptions = {}): [RpcPort, RpcPort] => {\n  let port1Received: RpcPort['send'] | undefined;\n  let port2Received: RpcPort['send'] | undefined;\n\n  const send = (handler: RpcPort['send'] | undefined, msg: Uint8Array) => {\n    if (delay) {\n      setTimeout(() => handler?.(msg), delay);\n    } else {\n      void handler?.(msg);\n    }\n  };\n\n  const port1: RpcPort = {\n    send: (msg) => send(port2Received, msg),\n    subscribe: (cb) => {\n      port1Received = cb;\n    },\n  };\n\n  const port2: RpcPort = {\n    send: (msg) => send(port1Received, msg),\n    subscribe: (cb) => {\n      port2Received = cb;\n    },\n  };\n\n  return [port1, port2];\n};\n\nexport const encodeMessage = (msg: string): Uint8Array => (isNode() ? Buffer.from(msg) : new TextEncoder().encode(msg));\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { Event } from '@dxos/async';\nimport { MessageTrace } from '@dxos/protocols/proto/dxos/rpc';\n\nimport { type RpcPort } from './rpc';\n\nexport class PortTracer {\n  readonly message = new Event<MessageTrace>();\n\n  private readonly _port: RpcPort;\n\n  constructor(private readonly _wrappedPort: RpcPort) {\n    this._port = {\n      send: (msg: Uint8Array) => {\n        this.message.emit({\n          direction: MessageTrace.Direction.OUTGOING,\n          data: msg,\n        });\n\n        return this._wrappedPort.send(msg);\n      },\n      subscribe: (cb: (msg: Uint8Array) => void) => {\n        return this._wrappedPort.subscribe((msg) => {\n          this.message.emit({\n            direction: MessageTrace.Direction.INCOMING,\n            data: msg,\n          });\n          cb(msg);\n        });\n      },\n    };\n  }\n\n  public get port() {\n    return this._port;\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["asyncTimeout", "synchronized", "Trigger", "Stream", "StackTrace", "invariant", "log", "encodeError", "RpcClosedError", "RpcNotOpenError", "schema", "exponentialBackoffInterval", "StackTrace", "decodeError", "decodeRpcError", "err", "rpcMethod", "decodeError", "appendStack", "StackTrace", "getStack", "DEFAULT_TIMEOUT", "BYE_SEND_TIMEOUT", "DEBUG_CALLS", "CLOSE_TIMEOUT", "PendingRpcRequest", "constructor", "resolve", "reject", "stream", "RpcMessageCodec", "getRpcMessageCodec", "schema", "getCodecForType", "RpcState", "RpcPeer", "params", "_outgoingRequests", "Map", "_localStreams", "_remoteOpenTrigger", "Trigger", "_closingTrigger", "_byeTrigger", "_nextId", "_state", "_unsubscribeFromPort", "undefined", "_clearOpenInterval", "_params", "timeout", "streamHandler", "noHandshake", "open", "port", "subscribe", "msg", "_receive", "err", "log", "catch", "wake", "state", "_sendMessage", "exponentialBackoffInterval", "warn", "Promise", "race", "wait", "openAck", "close", "_abortRequests", "bye", "_disposeAndClose", "abort", "req", "values", "RpcClosedError", "clear", "decoded", "decode", "preserveAny", "type", "Object", "keys", "request", "response", "id", "error", "encodeError", "method", "_callStreamHandler", "payload", "type_url", "_callHandler", "responseId", "invariant", "has", "item", "get", "delete", "streamClose", "Error", "call", "options", "throwIfNotOpen", "responseReceived", "set", "sending", "waiting", "asyncTimeout", "stack", "split", "slice", "join", "decodeRpcError", "callStream", "Stream", "ready", "next", "onResponse", "streamReady", "StackTrace", "closeStream", "getStack", "message", "send", "encode", "callHandler", "handlerRpcOptions", "callback", "responseStream", "onReady", "synchronized", "RpcNotOpenError", "invariant", "createServiceBundle", "services", "ProtoRpcPeer", "constructor", "rpc", "_peer", "open", "close", "abort", "createProtoRpcPeer", "requested", "exposed", "handlers", "encodingOptions", "rest", "exposedRpcs", "invariant", "serviceName", "Object", "keys", "serviceFqn", "serviceProto", "fullName", "slice", "serviceProvider", "createServer", "peer", "RpcPeer", "callHandler", "method", "request", "options", "methodName", "parseMethodName", "Error", "call", "streamHandler", "callStream", "requestedRpcs", "createClient", "req", "separator", "lastIndexOf", "length", "createRpcClient", "serviceDef", "client", "bind", "createRpcServer", "service", "server", "createBundledRpcClient", "descriptors", "createBundledRpcServer", "isNode", "createLinkedPorts", "delay", "port1Received", "port2Received", "send", "handler", "msg", "setTimeout", "port1", "subscribe", "cb", "port2", "encodeMessage", "isNode", "Buffer", "from", "TextEncoder", "encode", "Event", "MessageTrace", "PortTracer", "constructor", "_wrappedPort", "message", "Event", "_port", "send", "msg", "emit", "direction", "MessageTrace", "Direction", "OUTGOING", "data", "subscribe", "cb", "INCOMING", "port"]
+}

package/dist/lib/node-esm/meta.json

@@ -0,0 +1 @@
+{"inputs":{"packages/core/mesh/rpc/src/errors.ts":{"bytes":1518,"imports":[{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/rpc.ts":{"bytes":63406,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc/src/errors.ts","kind":"import-statement","original":"./errors"}],"format":"esm"},"packages/core/mesh/rpc/src/service.ts":{"bytes":22633,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc/src/rpc.ts","kind":"import-statement","original":"./rpc"}],"format":"esm"},"packages/core/mesh/rpc/src/testing.ts":{"bytes":3638,"imports":[{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/trace.ts":{"bytes":3615,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/rpc","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/index.ts":{"bytes":822,"imports":[{"path":"packages/core/mesh/rpc/src/rpc.ts","kind":"import-statement","original":"./rpc"},{"path":"packages/core/mesh/rpc/src/errors.ts","kind":"import-statement","original":"./errors"},{"path":"packages/core/mesh/rpc/src/service.ts","kind":"import-statement","original":"./service"},{"path":"packages/core/mesh/rpc/src/testing.ts","kind":"import-statement","original":"./testing"},{"path":"packages/core/mesh/rpc/src/trace.ts","kind":"import-statement","original":"./trace"}],"format":"esm"}},"outputs":{"packages/core/mesh/rpc/dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":43533},"packages/core/mesh/rpc/dist/lib/node-esm/index.mjs":{"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/rpc","kind":"import-statement","external":true}],"exports":["PortTracer","ProtoRpcPeer","RpcPeer","createBundledRpcClient","createBundledRpcServer","createLinkedPorts","createProtoRpcPeer","createRpcClient","createRpcServer","createServiceBundle","decodeRpcError","encodeMessage","parseMethodName"],"entryPoint":"packages/core/mesh/rpc/src/index.ts","inputs":{"packages/core/mesh/rpc/src/rpc.ts":{"bytesInOutput":18131},"packages/core/mesh/rpc/src/errors.ts":{"bytesInOutput":228},"packages/core/mesh/rpc/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/rpc/src/service.ts":{"bytesInOutput":4242},"packages/core/mesh/rpc/src/testing.ts":{"bytesInOutput":655},"packages/core/mesh/rpc/src/trace.ts":{"bytesInOutput":732}},"bytes":24618}}}

package/dist/types/src/testing.d.ts

@@ -6,4 +6,5 @@ export type CreateLinkedPortsOptions = {
  * Create bi-directionally linked ports.
  */
 export declare const createLinkedPorts: ({ delay }?: CreateLinkedPortsOptions) => [RpcPort, RpcPort];
+export declare const encodeMessage: (msg: string) => Uint8Array;
 //# sourceMappingURL=testing.d.ts.map

package/dist/types/src/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,eAAe,wBAAwB,KAAQ,CAAC,OAAO,EAAE,OAAO,CA2B7F,CAAC"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,eAAe,wBAAwB,KAAQ,CAAC,OAAO,EAAE,OAAO,CA2B7F,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,MAAM,KAAG,UAA2E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/rpc",
-  "version": "0.6.12",
+  "version": "0.6.13-main.548ca8d",
   "description": "A lightweight, transport-agnostic RPC implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,7 +10,8 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
-        "default": "./dist/lib/node/index.cjs"
+        "require": "./dist/lib/node/index.cjs",
+        "default": "./dist/lib/node-esm/index.mjs"
       },
       "types": "./dist/types/src/index.d.ts"
     }
@@ -24,18 +25,14 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "0.6.12",
-    "@dxos/debug": "0.6.12",
-    "@dxos/invariant": "0.6.12",
-    "@dxos/codec-protobuf": "0.6.12",
-    "@dxos/log": "0.6.12",
-    "@dxos/protocols": "0.6.12",
-    "@dxos/node-std": "0.6.12",
-    "@dxos/util": "0.6.12"
-  },
-  "devDependencies": {
-    "earljs": "~0.1.10",
-    "typescript": "^5.5.4"
+    "@dxos/async": "0.6.13-main.548ca8d",
+    "@dxos/codec-protobuf": "0.6.13-main.548ca8d",
+    "@dxos/debug": "0.6.13-main.548ca8d",
+    "@dxos/invariant": "0.6.13-main.548ca8d",
+    "@dxos/log": "0.6.13-main.548ca8d",
+    "@dxos/node-std": "0.6.13-main.548ca8d",
+    "@dxos/util": "0.6.13-main.548ca8d",
+    "@dxos/protocols": "0.6.13-main.548ca8d"
   },
   "publishConfig": {
     "access": "public"

package/src/rpc.test.ts

@@ -2,22 +2,21 @@
 // Copyright 2021 DXOS.org
 //
 
-import { expect } from 'earljs';
+import { describe, expect, test } from 'vitest';
 
 import { Trigger, sleep } from '@dxos/async';
 import { type Any, Stream, type TaggedType } from '@dxos/codec-protobuf';
 import { log } from '@dxos/log';
 import { SystemError } from '@dxos/protocols';
 import { type TYPES } from '@dxos/protocols/proto';
-import { describe, test } from '@dxos/test';
 
 import { RpcPeer } from './rpc';
-import { createLinkedPorts } from './testing';
+import { createLinkedPorts, encodeMessage } from './testing';
 
 const createPayload = (value = ''): TaggedType<TYPES, 'google.protobuf.Any'> => ({
   '@type': 'google.protobuf.Any',
   type_url: 'dxos.test',
-  value: Buffer.from(value),
+  value: encodeMessage(value),
 });
 
 // TODO(dmaretskyi): Rename alice and bob to peer1 and peer2.
@@ -184,7 +183,7 @@ describe('RpcPeer', () => {
       const alice = new RpcPeer({
         callHandler: async (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value).toEqual(Buffer.from('request'));
+          expect(msg.value).toEqual(encodeMessage('request'));
           return createPayload('response');
         },
         port: alicePort,
@@ -202,7 +201,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.close(), bob.close()]);
     });
 
-    test('can send multiple requests', async () => {
+    test.skip('can send multiple requests', async () => {
       const [alicePort, bobPort] = createLinkedPorts();
 
       const alice: RpcPeer = new RpcPeer({
@@ -227,7 +226,7 @@ describe('RpcPeer', () => {
 
       await Promise.all([alice.open(), bob.open()]);
 
-      expect((await bob.call('method', createPayload('request'))).value).toEqual(Buffer.from('request'));
+      expect((await bob.call('method', createPayload('request'))).value).toEqual(encodeMessage('request'));
 
       const parallel1 = bob.call('method', createPayload('p1'));
       const parallel2 = bob.call('method', createPayload('p2'));
@@ -235,8 +234,8 @@ describe('RpcPeer', () => {
 
       await expect(await parallel1).toEqual(createPayload('p1'));
       await expect(await parallel2).toEqual(createPayload('p2'));
-      await expect(error).toBeRejected();
-    }).tag('flaky');
+      await expect(error).rejects.toBeInstanceOf(Error);
+    });
 
     test('errors get serialized', async () => {
       const [alicePort, bobPort] = createLinkedPorts();
@@ -267,7 +266,7 @@ describe('RpcPeer', () => {
         error = err;
       }
 
-      expect(error).toBeA(SystemError);
+      expect(error).toBeInstanceOf(SystemError);
       expect(error.message).toEqual('My error');
       expect(error.stack?.includes('handlerFn')).toEqual(true);
       expect(error.stack?.includes('RpcMethodName')).toEqual(true);
@@ -295,7 +294,7 @@ describe('RpcPeer', () => {
       const req = bob.call('method', createPayload('request'));
       await bob.close();
 
-      await expect(req).toBeRejected();
+      await expect(req).rejects.toBeInstanceOf(Error);
     });
 
     test('closing remote endpoint stops pending requests on timeout', async () => {
@@ -321,7 +320,7 @@ describe('RpcPeer', () => {
       await alice.close();
       const req = bob.call('method', createPayload('request'));
 
-      await expect(req).toBeRejected();
+      await expect(req).rejects.toBeInstanceOf(Error);
     });
 
     test('requests failing on timeout', async () => {
@@ -345,7 +344,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const req = bob.call('method', createPayload('request'));
-      await expect(req).toBeRejected();
+      await expect(req).rejects.toBeInstanceOf(Error);
     });
   });
 
@@ -357,7 +356,7 @@ describe('RpcPeer', () => {
         callHandler: async (msg) => createPayload(),
         streamHandler: (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value!).toEqual(Buffer.from('request'));
+          expect(msg.value!).toEqual(encodeMessage('request'));
           return new Stream<Any>(({ next, close }) => {
             next(createPayload('res1'));
             next(createPayload('res2'));
@@ -375,7 +374,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeA(Stream);
+      expect(stream).toBeInstanceOf(Stream);
 
       expect(await Stream.consume(stream)).toEqual([
         { ready: true },
@@ -392,7 +391,7 @@ describe('RpcPeer', () => {
         callHandler: async (msg) => createPayload(),
         streamHandler: (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value).toEqual(Buffer.from('request'));
+          expect(msg.value).toEqual(encodeMessage('request'));
           return new Stream<Any>(({ next, close }) => {
             close(new Error('Test error'));
           });
@@ -408,11 +407,12 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeA(Stream);
+      expect(stream).toBeInstanceOf(Stream);
 
       const msgs = await Stream.consume(stream);
-      expect(msgs).toEqual([{ closed: true, error: expect.a(Error) }]);
-
+      expect(msgs.length).toEqual(1);
+      expect((msgs[0] as any).closed).toEqual(true);
+      expect((msgs[0] as any).error).toBeInstanceOf(Error);
       expect((msgs[0] as any).error.message).toEqual('Test error');
     });
 
@@ -451,7 +451,7 @@ describe('RpcPeer', () => {
         callHandler: async (msg) => createPayload(),
         streamHandler: (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value!).toEqual(Buffer.from('request'));
+          expect(msg.value!).toEqual(encodeMessage('request'));
           return new Stream<Any>(({ ready, close }) => {
             ready();
             close();
@@ -468,7 +468,7 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeA(Stream);
+      expect(stream).toBeInstanceOf(Stream);
 
       await stream.waitUntilReady();
 
@@ -494,10 +494,12 @@ describe('RpcPeer', () => {
       await Promise.all([alice.open(), bob.open()]);
 
       const stream = await bob.callStream('method', createPayload('request'));
-      expect(stream).toBeA(Stream);
+      expect(stream).toBeInstanceOf(Stream);
 
       const msgs = await Stream.consume(stream);
-      expect(msgs).toEqual([{ closed: true, error: expect.a(Error) }]);
+      expect(msgs.length).toEqual(1);
+      expect((msgs[0] as any).closed).toEqual(true);
+      expect((msgs[0] as any).error).toBeInstanceOf(Error);
       expect((msgs[0] as any).error.message).toEqual('Test error');
     });
   });
@@ -521,7 +523,7 @@ describe('RpcPeer', () => {
       const alice = new RpcPeer({
         callHandler: async (method, msg) => {
           expect(method).toEqual('method');
-          expect(msg.value).toEqual(Buffer.from('request'));
+          expect(msg.value).toEqual(encodeMessage('request'));
           return createPayload('response');
         },
         port: alicePort,

package/src/service.test.ts

@@ -2,8 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import { expect } from 'earljs';
-import expectJest from 'expect';
+import { beforeEach, describe, expect, test } from 'vitest';
 
 import { sleep, latch } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
@@ -14,10 +13,9 @@ import {
   type TestRpcResponse,
   type TestService,
 } from '@dxos/protocols/proto/example/testing/rpc';
-import { describe, test } from '@dxos/test';
 
 import { createProtoRpcPeer, type ProtoRpcPeer, createServiceBundle } from './service';
-import { createLinkedPorts } from './testing';
+import { createLinkedPorts, encodeMessage } from './testing';
 
 // TODO(dmaretskyi): Rename alice and bob to peer1 and peer2.
 
@@ -96,7 +94,7 @@ describe('Protobuf service', () => {
       error = err;
     }
 
-    expect(error).toBeA(SystemError);
+    expect(error).toBeInstanceOf(SystemError);
     expect(error.message).toEqual('TestError');
     expect(error.stack?.includes('handlerFn')).toEqual(true);
     expect(error.stack?.includes('TestCall')).toEqual(true);
@@ -449,7 +447,7 @@ describe('Protobuf service', () => {
       const stream = await client.rpc.TestStreamService.testCall({
         data: 'requestData',
       });
-      expect(await Stream.consume(stream)).toEqual([expect.objectWith({ closed: true })]);
+      expect(await Stream.consume(stream)).toEqual([expect.objectContaining({ closed: true })]);
     });
   });
 
@@ -510,11 +508,11 @@ describe('Protobuf service', () => {
             testCall: async (req) => {
               expect(req.payload['@type']).toEqual('google.protobuf.Any');
               expect(req.payload.type_url).toEqual('example.testing.Example');
-              expect(req.payload.value).toEqual(Buffer.from('hello'));
+              expect(req.payload.value).toEqual(encodeMessage('hello'));
               return {
                 payload: {
                   type_url: 'example.testing.Example',
-                  value: Buffer.from('world'),
+                  value: encodeMessage('world'),
                 },
               };
             },
@@ -541,12 +539,12 @@ describe('Protobuf service', () => {
       const response = await client.rpc.TestAnyService.testCall({
         payload: {
           type_url: 'example.testing.Example',
-          value: Buffer.from('hello'),
+          value: encodeMessage('hello'),
         },
       });
 
       expect(response.payload.type_url).toEqual('example.testing.Example');
-      expect(response.payload.value).toEqual(Buffer.from('world'));
+      expect(response.payload.value).toEqual(encodeMessage('world'));
     });
   });
 
@@ -585,6 +583,6 @@ describe('Protobuf service', () => {
       },
       { timeout: 1 },
     );
-    await expectJest(promise).rejects.toThrow(/Timeout/);
+    await expect(promise).rejects.toThrow(/Timeout/);
   });
 });

package/src/testing.ts

@@ -2,6 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
+import { isNode } from '@dxos/util';
+
 import { type RpcPort } from './rpc';
 
 export type CreateLinkedPortsOptions = {
@@ -39,3 +41,5 @@ export const createLinkedPorts = ({ delay }: CreateLinkedPortsOptions = {}): [Rp
 
   return [port1, port2];
 };
+
+export const encodeMessage = (msg: string): Uint8Array => (isNode() ? Buffer.from(msg) : new TextEncoder().encode(msg));