Update entrypoint. Clean up messaging during connection.

Author: pedson

Dockerfile

@@ -8,6 +8,8 @@ ADD ./package.json .
 
 ADD ./yarn.lock .
 
+ADD ./docker-entry.sh .
+
 RUN yarn install
 
 ADD ./public/*.* ./public/
@@ -20,6 +22,6 @@ RUN usermod -a -G mousebrainmicro mluser
 
 USER mluser
 
-CMD ["node", "server/pipelineClientServer.js"]
+CMD ["./docker-entry.sh"]
 
 EXPOSE  3100

client/api/apiQueue.ts

@@ -41,6 +41,10 @@ export class ApiQueue {
         this._basePath = basePath || "";
     }
 
+    public get IsConnected(): boolean {
+        return !this._isKilled;
+    }
+
     public start(): boolean {
         if (this._isKilled) {
             this.createQueue();

client/api/realTimeApi.ts

@@ -1,4 +1,5 @@
 import * as socketIOClient from "socket.io-client";
+import {port} from "_debugger";
 
 export interface IRealTimeApiDelegate {
     onServiceConnectionStateChanged?(isConnected: boolean): void;
@@ -15,7 +16,11 @@ export class RealTimeApi {
     public async connect(portOffset: number = 0) {
         try {
             const loc = window.location;
-            const url = `${loc.protocol}//${loc.hostname}:${parseInt(loc.port) + portOffset}`;
+
+            const port = parseInt(loc.port);
+            const portString = isNaN(port) ? "" : `:${port + portOffset}`;
+
+            const url = `${loc.protocol}//${loc.hostname}${portString}`;
             this._socket = socketIOClient(url);
 
             this._socket.on("connect", () => this.onServiceConnectionStateChanged(true));

client/components/PageLayout.tsx

@@ -65,7 +65,8 @@ interface IPageLayoutState {
     buildVersion?: number;
     loadedBuildVersion?: number;
     processId?: number;
-    isServerConnected?: boolean;
+    isInternalApiConnected?: boolean;
+    isSocketIoServerConnected?: boolean;
     isSidebarExpanded?: boolean;
     thumbsHostname?: string;
     thumbsPort?: number;
@@ -85,7 +86,8 @@ export class PageLayout extends React.Component<IPageLayoutProps, IPageLayoutSta
             buildVersion: null,
             loadedBuildVersion: null,
             processId: null,
-            isServerConnected: false,
+            isInternalApiConnected: false,
+            isSocketIoServerConnected: false,
             isSidebarExpanded: !PreferencesManager.Instance.IsSidebarCollapsed,
             thumbsHostname: "",
             thumbsPort: 80,
@@ -114,12 +116,17 @@ export class PageLayout extends React.Component<IPageLayoutProps, IPageLayoutSta
     }
 
     public render() {
-        if (!this.state.isServerConnected) {
+        if (!this.state.isInternalApiConnected) {
             return (
-                <Message warning style={{margin: "20px"}}>The server is no longer responding. The service may be down.
+                <Message warning style={{margin: "20px"}}>The server is not responding. The service may be down.
                     Will continue to retry the connection.</Message>);
         }
 
+        if (!this.state.isSocketIoServerConnected) {
+            return (
+                <Message style={{margin: "20px"}}>Establishing connection...</Message>);
+        }
+
         const width = this.state.isSidebarExpanded ? 199 : 79;
         const icon = this.state.isSidebarExpanded ? "labeled" : true;
 
@@ -221,10 +228,10 @@ export class PageLayout extends React.Component<IPageLayoutProps, IPageLayoutSta
     public onServiceConnectionStateChanged(isConnected: boolean) {
         if (isConnected) {
             this._internalApi.start();
-            this.setState({isServerConnected: true});
+            this.setState({isSocketIoServerConnected: true});
         } else {
             this._internalApi.kill();
-            this.setState({isServerConnected: false});
+            this.setState({isSocketIoServerConnected: false, isInternalApiConnected: false});
         }
     }
 
@@ -245,6 +252,8 @@ export class PageLayout extends React.Component<IPageLayoutProps, IPageLayoutSta
             this.setState({loadedBuildVersion: message.buildVersion});
         }
 
+        this.setState({isInternalApiConnected: true});
+
         this._realTimeApi.connect(message.socketIoPortOffset).then();
     }
 

server/pipelineClientServer.ts

@@ -83,6 +83,7 @@ function startSocketIOServer(server = null) {
     const io = require("socket.io")(server);
 
     io.on("connection", (socket) => {
+        debug("socket.io connection");
         socket.on("stopMicroscopeAcquisition", () => {
         });
         socket.on("restartHubProxy", () => {