@dxos/rpc 2.19.5 → 2.19.7-dev.3aa68bc8

package/src/rpc.ts

@@ -12,6 +12,7 @@ import { StackTrace } from '@dxos/debug';
 import { RpcClosedError, RpcNotOpenError, SerializedRpcError } from './errors';
 import { schema } from './proto/gen';
 import { Request, Response, Error as ErrorResponse, RpcMessage } from './proto/gen/dxos/rpc';
+import { Any } from './proto/gen/google/protobuf';
 
 const DEFAULT_TIMEOUT = 3000;
 
@@ -20,8 +21,8 @@ const log = debug('dxos:rpc');
 type MaybePromise<T> = Promise<T> | T
 
 export interface RpcPeerOptions {
-  messageHandler: (method: string, request: Uint8Array) => MaybePromise<Uint8Array>
-  streamHandler?: (method: string, request: Uint8Array) => Stream<Uint8Array>
+  messageHandler: (method: string, request: Any) => MaybePromise<Any>
+  streamHandler?: (method: string, request: Any) => Stream<Any>
   port: RpcPort,
   timeout?: number,
 }
@@ -169,7 +170,7 @@ export class RpcPeer {
    *
    * Peer should be open before making this call.
    */
-  async call (method: string, request: Uint8Array): Promise<Uint8Array> {
+  async call (method: string, request: Any): Promise<Any> {
     if (!this._open) {
       throw new RpcNotOpenError();
     }
@@ -223,7 +224,7 @@ export class RpcPeer {
    *
    * Peer should be open before making this call.
    */
-  callStream (method: string, request: Uint8Array): Stream<Uint8Array> {
+  callStream (method: string, request: Any): Stream<Any> {
     if (!this._open) {
       throw new RpcNotOpenError();
     }

package/src/trace.ts

@@ -0,0 +1,42 @@
+//
+// Copyright 2021 DXOS.org
+//
+
+import { Event } from '@dxos/async';
+
+import { MessageTrace } from './proto/gen/dxos/rpc';
+import { RpcPort } from './rpc';
+
+export class PortTracer {
+  readonly message = new Event<MessageTrace>();
+
+  private readonly _port: RpcPort;
+
+  constructor (
+    private readonly _wrappedPort: RpcPort
+  ) {
+    this._port = {
+      send: (msg: Uint8Array) => {
+        this.message.emit({
+          direction: MessageTrace.Direction.OUTGOING,
+          data: msg
+        });
+
+        return this._wrappedPort.send(msg);
+      },
+      subscribe: (cb: (msg: Uint8Array) => void) => {
+        return this._wrappedPort.subscribe(msg => {
+          this.message.emit({
+            direction: MessageTrace.Direction.INCOMING,
+            data: msg
+          });
+          cb(msg);
+        });
+      }
+    };
+  }
+
+  public get port () {
+    return this._port;
+  }
+}

package/src/proto/schema.proto

@@ -1,48 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-syntax = "proto3";
-
-package dxos.rpc;
-
-message RpcMessage {
-  oneof content {
-    Request request = 1;
-    Response response = 2;
-
-    /// Means that the node is open to receiving requests. Second stage of the hasnshake protocol.
-    bool open = 3;
-
-    StreamClose streamClose = 4;
-  }
-}
-
-message Request {
-  int32 id = 1;
-  string method = 2;
-  bytes payload = 3;
-  bool stream = 4;
-}
-
-message Response {
-  int32 id = 1;
-  oneof content {
-    bytes payload = 2;
-    Error error = 3;
-    // Sent when stream is closed without an error.
-    bool close = 4;
-  }
-}
-
-// Sent by client to end the streaming response.
-message StreamClose {
-  int32 id = 1;
-}
-
-
-message Error {
-  string name = 1;
-  string message = 2;
-  string stack = 3;
-}