misc improvements + update docs extension

rmorshea · rmorshea · commit 57b913f67eb4 · 2023-03-22T21:56:15.000-07:00
diff --git a/docs/source/_custom_js/src/index.js b/docs/source/_custom_js/src/index.js
@@ -16,11 +16,11 @@ export function mountWidgetExample(
     reactpyPort = window.location.port;
   }
 
-  const client = SimpleReactPyServer({
+  const client = new SimpleReactPyClient({
     serverLocation: {
       url: `${window.location.protocol}//${reactpyHost}:${reactpyPort}`,
-      route: "",
-      query: `view_id=${viewID}`,
+      route: "/",
+      query: `?view_id=${viewID}`,
     },
   });
 
diff --git a/src/client/packages/app/index.html b/src/client/packages/app/index.html
@@ -2,23 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
+    <script type="module">
+      import { app } from "./src/index";
+      app(document.getElementById("app"));
+    </script>
     <!-- we replace this with user-provided head elements -->
     {__head__}
   </head>
   <body>
     <div id="app"></div>
-    <script type="module">
-      import { mount } from "@reactpy/client";
-      mount(
-        document.getElementById("app"),
-        new SimpleReactPyClient({
-          serverLocation: {
-            url: document.location.origin,
-            route: document.location.pathname,
-            query: document.location.search,
-          },
-        }),
-      );
-    </script>
   </body>
 </html>
diff --git a/src/client/packages/app/src/index.ts b/src/client/packages/app/src/index.ts
@@ -0,0 +1,14 @@
+import { mount, SimpleReactPyClient } from "@reactpy/client";
+
+export function app(element: HTMLElement) {
+  mount(
+    element,
+    new SimpleReactPyClient({
+      serverLocation: {
+        url: document.location.host,
+        route: document.location.pathname,
+        query: document.location.search,
+      },
+    }),
+  );
+}
diff --git a/src/client/packages/app/src/index.tsx b/src/client/packages/app/src/index.tsx
diff --git a/src/client/packages/client/src/reactpy-client.ts b/src/client/packages/client/src/reactpy-client.ts
@@ -70,12 +70,12 @@ export class SimpleReactPyClient implements ReactPyClient {
   }
 
   start(): void {
-    logger.log("Starting ReactPy client...");
+    logger.log("Starting client...");
     this.resolveShouldOpen(undefined);
   }
 
   stop(): void {
-    logger.log("Stopping ReactPy client...");
+    logger.log("stopping client...");
     this.resolveShouldClose(undefined);
   }
 
@@ -173,15 +173,17 @@ function startReconnectingWebSocket(
         return;
       }
 
-      logger.log("disconnected");
+      logger.log("client disconnected");
       props.onClose();
 
       if (retries >= maxRetries) {
         return;
       }
 
       const thisInterval = addJitter(interval, intervalJitter);
-      logger.log(`reconnecting in ${thisInterval / 1000} seconds...`);
+      logger.log(
+        `reconnecting in ${(thisInterval / 1000).toPrecision(4)} seconds...`,
+      );
       setTimeout(connect, thisInterval);
       interval = nextInterval(interval, backoffRate, maxInterval);
       retries++;
diff --git a/src/client/tsconfig.package.json b/src/client/tsconfig.package.json
@@ -3,6 +3,7 @@
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
     "declaration": true,
+    "declarationMap": true,
     "esModuleInterop": false,
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,

Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@ export class SimpleReactPyClient implements ReactPyClient {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`start(): void {`
`73`		`- logger.log("Starting ReactPy client...");`
	`73`	`+ logger.log("Starting client...");`
`74`	`74`	`this.resolveShouldOpen(undefined);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`stop(): void {`
`78`		`- logger.log("Stopping ReactPy client...");`
	`78`	`+ logger.log("stopping client...");`
`79`	`79`	`this.resolveShouldClose(undefined);`
`80`	`80`	`}`
`81`	`81`
`@@ -173,15 +173,17 @@ function startReconnectingWebSocket(`
`173`	`173`	`return;`
`174`	`174`	`}`
`175`	`175`
`176`		`- logger.log("disconnected");`
	`176`	`+ logger.log("client disconnected");`
`177`	`177`	`props.onClose();`
`178`	`178`
`179`	`179`	`if (retries >= maxRetries) {`
`180`	`180`	`return;`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`const thisInterval = addJitter(interval, intervalJitter);`
`184`		- logger.log(`reconnecting in ${thisInterval / 1000} seconds...`);
	`184`	`+ logger.log(`
	`185`	+ `reconnecting in ${(thisInterval / 1000).toPrecision(4)} seconds...`,
	`186`	`+ );`
`185`	`187`	`setTimeout(connect, thisInterval);`
`186`	`188`	`interval = nextInterval(interval, backoffRate, maxInterval);`
`187`	`189`	`retries++;`