@dxos/websocket-rpc 0.8.4-main.84f28bd → 0.8.4-main.937b3ca

package/package.json

@@ -1,15 +1,20 @@
 {
   "name": "@dxos/websocket-rpc",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.937b3ca",
   "description": "websocket-rpc",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -27,11 +32,11 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/protocols": "0.8.4-main.84f28bd",
-    "@dxos/node-std": "0.8.4-main.84f28bd",
-    "@dxos/rpc": "0.8.4-main.84f28bd"
+    "@dxos/async": "0.8.4-main.937b3ca",
+    "@dxos/rpc": "0.8.4-main.937b3ca",
+    "@dxos/node-std": "0.8.4-main.937b3ca",
+    "@dxos/protocols": "0.8.4-main.937b3ca",
+    "@dxos/log": "0.8.4-main.937b3ca"
   },
   "devDependencies": {},
   "publishConfig": {

package/src/client.ts

@@ -6,11 +6,11 @@ import WebSocket from 'isomorphic-ws';
 
 import { Event, Trigger } from '@dxos/async';
 import { log, logInfo } from '@dxos/log';
-import { createProtoRpcPeer, type ProtoRpcPeer, type ProtoRpcPeerOptions } from '@dxos/rpc';
+import { type ProtoRpcPeer, type ProtoRpcPeerOptions, createProtoRpcPeer } from '@dxos/rpc';
 
 import { WebSocketWithTokenAuth } from './token-auth';
 
-export type WebsocketRpcClientParams<C, S> = {
+export type WebsocketRpcClientProps<C, S> = {
   url: string;
   authenticationToken?: string;
 } & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers' | 'noHandshake'>;
@@ -24,7 +24,7 @@ export class WebsocketRpcClient<C, S> {
   readonly disconnected = new Event();
   readonly error = new Event<Error>();
 
-  constructor(private readonly _params: WebsocketRpcClientParams<C, S>) {
+  constructor(private readonly _params: WebsocketRpcClientProps<C, S>) {
     this._rpc = createProtoRpcPeer({
       requested: this._params.requested,
       exposed: this._params.exposed,

package/src/e2e.node.test.ts

@@ -2,10 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { schema } from '@dxos/protocols/proto';
-import { createServiceBundle, type ServiceTypesOf } from '@dxos/rpc';
+import { type ServiceTypesOf, createServiceBundle } from '@dxos/rpc';
 
 import { WebsocketRpcClient } from './client';
 import { WebsocketRpcServer } from './server';
@@ -24,7 +24,7 @@ describe('e2e', () => {
           requested: {},
           handlers: {
             TestService: {
-              testCall: async (request) => {
+              testCall: async (request: any) => {
                 return {
                   data: request.data,
                 };

package/src/server.ts

@@ -3,11 +3,12 @@
 //
 
 import { type IncomingMessage } from 'http';
-import WebSocket from 'isomorphic-ws';
 import { type Socket } from 'node:net';
 
+import WebSocket from 'isomorphic-ws';
+
 import { log } from '@dxos/log';
-import { createProtoRpcPeer, type ProtoRpcPeer, type ProtoRpcPeerOptions } from '@dxos/rpc';
+import { type ProtoRpcPeer, type ProtoRpcPeerOptions, createProtoRpcPeer } from '@dxos/rpc';
 
 export type ConnectionInfo = {
   request: IncomingMessage;
@@ -18,16 +19,16 @@ export type ConnectionHandler<C, S> = {
   onClose?: (rpc: ProtoRpcPeer<C>) => Promise<void>;
 } & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;
 
-export type WebsocketRpcServerParams<C, S> = {
+export type WebsocketRpcServerProps<C, S> = {
   onConnection: (info: ConnectionInfo) => Promise<ConnectionHandler<C, S>>;
 } & WebSocket.ServerOptions;
 
 export class WebsocketRpcServer<C, S> {
   private _server?: WebSocket.Server;
 
-  constructor(private readonly _params: WebsocketRpcServerParams<C, S>) {}
+  constructor(private readonly _params: WebsocketRpcServerProps<C, S>) {}
   handleUpgrade(request: IncomingMessage, socket: Socket, head: Buffer): void {
-    this._server?.handleUpgrade(request, socket, head, (ws) => {
+    this._server?.handleUpgrade(request, socket, head, (ws: WebSocket) => {
       this._server?.emit('connection', ws, request);
     });
   }
@@ -36,7 +37,7 @@ export class WebsocketRpcServer<C, S> {
     this._server = new WebSocket.Server({
       ...this._params,
     });
-    this._server.on('connection', async (socket, request) => {
+    this._server.on('connection', async (socket: WebSocket, request: IncomingMessage) => {
       log('connection', { url: request.url, headers: request.headers });
       const info: ConnectionInfo = {
         request,

package/src/token-auth.ts

@@ -6,9 +6,10 @@
 // https://stackoverflow.com/questions/4361173/http-headers-in-websockets-client-api/77060459#77060459
 
 import { type IncomingMessage } from 'http';
-import WebSocket from 'isomorphic-ws';
 import { type Socket } from 'node:net';
 
+import WebSocket from 'isomorphic-ws';
+
 import { log } from '@dxos/log';
 
 const PROTOCOL_TOKEN_PREFIX = 'base64url.bearer.authorization.dxos.org';