minor fixes

Author: rmorshea

src/client/package.json

@@ -12,7 +12,7 @@
     "publish": "npm --workspaces publish",
     "format": "npm --workspaces run format",
     "check:format": "npm --workspaces run check-format",
-    "check:tests": "npm --workspaces check:tests",
+    "check:tests": "npm --workspaces run check:tests",
     "check:types": "npm --workspaces run check:types"
   },
   "version": "1.0.0",

src/client/packages/app/src/index.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import { render } from "react-dom";
-import { Layout, SimpleReactPyServer } from "@reactpy/client";
+import { Layout, SimpleReactPyClient } from "@reactpy/client";
 
 export function mount(root: HTMLElement) {
-  const server = new SimpleReactPyServer({
+  const server = new SimpleReactPyClient({
     serverApi: {
       baseUrl: document.location.origin,
       routePath: document.location.pathname,

src/client/packages/client/src/components.tsx

@@ -24,11 +24,11 @@ import {
   loadImportSource,
   ImportSourceBinding,
 } from "./reactpy-vdom";
-import { ReactPyServer } from "./reactpy-server";
+import { ReactPyClient } from "./reactpy-client";
 
-const LayoutServer = createContext<ReactPyServer>(null as any);
+const LayoutServer = createContext<ReactPyClient>(null as any);
 
-export function Layout(props: { server: ReactPyServer }): JSX.Element {
+export function Layout(props: { server: ReactPyClient }): JSX.Element {
   const currentModel: ReactPyVdom = useState({ tagName: "" })[0];
   const forceUpdate = useForceUpdate();
 

src/client/packages/client/src/index.ts

@@ -1,4 +1,4 @@
 export * from "./components";
 export * from "./messages";
-export * from "./reactpy-server";
+export * from "./reactpy-client";
 export * from "./reactpy-vdom";

src/client/packages/client/src/reactpy-server.ts renamed to src/client/packages/client/src/reactpy-client.ts

@@ -1,39 +1,39 @@
 import { OutgoingMessage, IncomingMessage } from "./messages";
 import { ReactPyModule } from "./reactpy-vdom";
 
-export interface ReactPyServer {
+export interface ReactPyClient {
   receiveMessage: <M extends IncomingMessage>(type: M["type"]) => Promise<M>;
   sendMessage: (message: OutgoingMessage) => Promise<void>;
   loadModule: (moduleName: string) => Promise<ReactPyModule>;
 }
 
-export type StandardServerUrlProps = {
+type UrlProps = {
   baseUrl: string;
   routePath: string;
   queryString: string;
 };
 
-export type StandardServerReconnectProps = {
+type ReconnectProps = {
   maxInterval?: number;
   maxRetries?: number;
   backoffRate?: number;
   intervalJitter?: number;
 };
 
-export class SimpleReactPyServer implements ReactPyServer {
-  private readonly urls: StandardServerUrls;
+export class SimpleReactPyClient implements ReactPyClient {
+  private readonly urls: ServerUrls;
   private readonly handlers: {
     [key in IncomingMessage["type"]]?: ((message: any) => void)[];
   };
   private readonly socket: { current?: WebSocket };
 
   constructor(props: {
-    serverApi: StandardServerUrlProps;
-    reconnectOptions?: StandardServerReconnectProps;
+    serverApi: UrlProps;
+    reconnectOptions?: ReconnectProps;
   }) {
     this.handlers = {};
 
-    this.urls = getStandardServerUrls(props.serverApi);
+    this.urls = getServerUrls(props.serverApi);
 
     this.socket = startReconnectingWebSocket({
       url: this.urls.stream,
@@ -82,25 +82,21 @@ export class SimpleReactPyServer implements ReactPyServer {
   }
 }
 
-type StandardServerUrls = {
+type ServerUrls = {
   base: URL;
   stream: string;
   modules: string;
   assets: string;
 };
 
-function getStandardServerUrls(
-  props: StandardServerUrlProps,
-): StandardServerUrls {
+function getServerUrls(props: UrlProps): ServerUrls {
   const base = new URL(`${props.baseUrl || document.location.origin}/_reactpy`);
   const modules = `${base}/modules`;
   const assets = `${base}/assets`;
 
-  const wsProtocol = `ws${base.protocol === "https:" ? "s" : ""}`;
-  const wsHost = `${base.host}:${base.port}`;
-  const wsPath = `${props.routePath || ""}${props.routePath || ""}`;
-
-  const stream = `${wsProtocol}://${wsHost}${wsPath}`;
+  const streamProtocol = `ws${base.protocol === "https:" ? "s" : ""}`;
+  const streamPath = `${base.pathname}/stream${props.routePath || ""}`;
+  const stream = `${streamProtocol}://${base.host}${streamPath}`;
 
   return { base, modules, assets, stream };
 }
@@ -111,7 +107,7 @@ function startReconnectingWebSocket(
     onOpen: () => void;
     onMessage: (message: MessageEvent<any>) => void;
     onClose: () => void;
-  } & StandardServerReconnectProps,
+  } & ReconnectProps,
 ) {
   const {
     maxInterval = 60000,

src/client/packages/client/src/reactpy-vdom.tsx

@@ -1,12 +1,12 @@
 import React, { ComponentType, ReactNode } from "react";
-import { ReactPyServer } from "./reactpy-server";
+import { ReactPyClient } from "./reactpy-client";
 // @ts-ignore
 import serializeEvent from "event-to-object";
 import { IncomingMessage, Message, OutgoingMessage } from "./messages";
 
 export async function loadImportSource(
   vdomImportSource: ReactPyVdomImportSource,
-  server: ReactPyServer,
+  server: ReactPyClient,
 ): Promise<BindImportSource> {
   let module: ReactPyModule;
   if (vdomImportSource.sourceType === "URL") {
@@ -51,7 +51,7 @@ export async function loadImportSource(
 }
 
 function createImportSourceElement(props: {
-  server: ReactPyServer;
+  server: ReactPyClient;
   module: ReactPyModule;
   binding: ReactPyModuleBinding;
   model: ReactPyVdom;
@@ -133,7 +133,7 @@ export function createChildren<Child>(
 
 export function createAttributes(
   model: ReactPyVdom,
-  server: ReactPyServer,
+  server: ReactPyClient,
 ): { [key: string]: any } {
   return Object.fromEntries(
     Object.entries({
@@ -151,7 +151,7 @@ export function createAttributes(
 }
 
 function createEventHandler(
-  { sendMessage }: ReactPyServer,
+  { sendMessage }: ReactPyClient,
   name: string,
   { target, preventDefault, stopPropagation }: ReactPyVdomEventHandler,
 ): [string, () => void] {