Merge branch 'master' into dataviz-ai-sarah

1 files changed, 41 insertions, 22 deletions

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index bd60a205c..321572071 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -7,10 +7,10 @@ import { HandleUpdate, Id, Parent } from '../fields/FieldSymbols';
 import { ObjectField } from '../fields/ObjectField';
 import { RefField } from '../fields/RefField';
 import { DocCast, StrCast } from '../fields/Types';
-import { Socket } from '../../node_modules/socket.io/dist/index';
 //import MobileInkOverlay from '../mobile/MobileInkOverlay';
+import { io, Socket } from 'socket.io-client';
 import { emptyFunction, Utils } from '../Utils';
-import { GestureContent, MessageStore, MobileDocumentUploadContent, MobileInkOverlayContent, UpdateMobileInkOverlayPositionContent, YoutubeQueryTypes } from './../server/Message';
+import { GestureContent, Message, MessageStore, MobileDocumentUploadContent, MobileInkOverlayContent, UpdateMobileInkOverlayPositionContent, YoutubeQueryTypes } from './../server/Message';
 import { DocumentType } from './documents/DocumentTypes';
 import { LinkManager } from './util/LinkManager';
 import { SerializationHelper } from './util/SerializationHelper';
@@ -32,6 +32,24 @@ import { SerializationHelper } from './util/SerializationHelper';
 export namespace DocServer {
     let _cache: { [id: string]: RefField | Promise<Opt<RefField>> } = {};
 
+    export function AddServerHandler<T>(socket: Socket, message: Message<T>, handler: (args: T) => any) {
+        socket.on(message.Message, Utils.loggingCallback('Incoming', handler, message.Name));
+    }
+    export function Emit<T>(socket: Socket, message: Message<T>, args: T) {
+        //log('Emit', message.Name, args, false);
+        socket.emit(message.Message, args);
+    }
+    export function EmitCallback<T>(socket: Socket, message: Message<T>, args: T): Promise<any>;
+    export function EmitCallback<T>(socket: Socket, message: Message<T>, args: T, fn: (args: any) => any): void;
+    export function EmitCallback<T>(socket: Socket, message: Message<T>, args: T, fn?: (args: any) => any): void | Promise<any> {
+        //log('Emit', message.Name, args, false);
+        if (fn) {
+            socket.emit(message.Message, args, Utils.loggingCallback('Receiving', fn, message.Name));
+        } else {
+            return new Promise<any>(res => socket.emit(message.Message, args, Utils.loggingCallback('Receiving', res, message.Name)));
+        }
+    }
+
     export function FindDocByTitle(title: string) {
         const foundDocId =
             title &&
@@ -132,20 +150,20 @@ export namespace DocServer {
 
     export namespace Mobile {
         export function dispatchGesturePoints(content: GestureContent) {
-            Utils.Emit(_socket, MessageStore.GesturePoints, content);
+            DocServer.Emit(_socket, MessageStore.GesturePoints, content);
         }
 
         export function dispatchOverlayTrigger(content: MobileInkOverlayContent) {
             // _socket.emit("dispatchBoxTrigger");
-            Utils.Emit(_socket, MessageStore.MobileInkOverlayTrigger, content);
+            DocServer.Emit(_socket, MessageStore.MobileInkOverlayTrigger, content);
         }
 
         export function dispatchOverlayPositionUpdate(content: UpdateMobileInkOverlayPositionContent) {
-            Utils.Emit(_socket, MessageStore.UpdateMobileInkOverlayPosition, content);
+            DocServer.Emit(_socket, MessageStore.UpdateMobileInkOverlayPosition, content);
         }
 
         export function dispatchMobileDocumentUpload(content: MobileDocumentUploadContent) {
-            Utils.Emit(_socket, MessageStore.MobileDocumentUpload, content);
+            DocServer.Emit(_socket, MessageStore.MobileDocumentUpload, content);
         }
     }
 
@@ -171,7 +189,8 @@ export namespace DocServer {
         _cache = {};
         USER_ID = identifier;
         protocol = protocol.startsWith('https') ? 'wss' : 'ws';
-        _socket = require('socket.io-client')(`${protocol}://${hostname}:${port}`, { transports: ['websocket'], rejectUnauthorized: false });
+        _socket = io(`${protocol}://${hostname}:${port}`, { transports: ['websocket'], rejectUnauthorized: false });
+        _socket.on("connect_error", (err:any) => console.log(err));
         // io.connect(`https://7f079dda.ngrok.io`);// if using ngrok, create a special address for the websocket
 
         _GetCachedRefField = _GetCachedRefFieldImpl;
@@ -184,11 +203,11 @@ export namespace DocServer {
          * Whenever the server sends us its handshake message on our
          * websocket, we use the above function to return the handshake.
          */
-        Utils.AddServerHandler(_socket, MessageStore.Foo, onConnection);
-        Utils.AddServerHandler(_socket, MessageStore.UpdateField, respondToUpdate);
-        Utils.AddServerHandler(_socket, MessageStore.DeleteField, respondToDelete);
-        Utils.AddServerHandler(_socket, MessageStore.DeleteFields, respondToDelete);
-        Utils.AddServerHandler(_socket, MessageStore.ConnectionTerminated, alertUser);
+        DocServer.AddServerHandler(_socket, MessageStore.Foo, onConnection);
+        DocServer.AddServerHandler(_socket, MessageStore.UpdateField, respondToUpdate);
+        DocServer.AddServerHandler(_socket, MessageStore.DeleteField, respondToDelete);
+        DocServer.AddServerHandler(_socket, MessageStore.DeleteFields, respondToDelete);
+        DocServer.AddServerHandler(_socket, MessageStore.ConnectionTerminated, alertUser);
 
         // // mobile ink overlay socket events to communicate between mobile view and desktop view
         // _socket.addEventListener('receiveGesturePoints', (content: GestureContent) => {
@@ -252,7 +271,7 @@ export namespace DocServer {
          * all documents in the database.
          */
         export function deleteDatabase() {
-            Utils.Emit(_socket, MessageStore.DeleteAll, {});
+            DocServer.Emit(_socket, MessageStore.DeleteAll, {});
         }
     }
 
@@ -275,7 +294,7 @@ export namespace DocServer {
             // synchronously, we emit a single callback to the server requesting the serialized (i.e. represented by a string)
             // field for the given ids. This returns a promise, which, when resolved, indicates the the JSON serialized version of
             // the field has been returned from the server
-            const getSerializedField = Utils.EmitCallback(_socket, MessageStore.GetRefField, id);
+            const getSerializedField = DocServer.EmitCallback(_socket, MessageStore.GetRefField, id);
 
             // when the serialized RefField has been received, go head and begin deserializing it into an object.
             // Here, once deserialized, we also invoke .proto to 'load' the document's prototype, which ensures that all
@@ -339,15 +358,15 @@ export namespace DocServer {
     }
 
     export async function getYoutubeChannels() {
-        return await Utils.EmitCallback(_socket, MessageStore.YoutubeApiQuery, { type: YoutubeQueryTypes.Channels });
+        return await DocServer.EmitCallback(_socket, MessageStore.YoutubeApiQuery, { type: YoutubeQueryTypes.Channels });
     }
 
     export function getYoutubeVideos(videoTitle: string, callBack: (videos: any[]) => void) {
-        Utils.EmitCallback(_socket, MessageStore.YoutubeApiQuery, { type: YoutubeQueryTypes.SearchVideo, userInput: videoTitle }, callBack);
+        DocServer.EmitCallback(_socket, MessageStore.YoutubeApiQuery, { type: YoutubeQueryTypes.SearchVideo, userInput: videoTitle }, callBack);
     }
 
     export function getYoutubeVideoDetails(videoIds: string, callBack: (videoDetails: any[]) => void) {
-        Utils.EmitCallback(_socket, MessageStore.YoutubeApiQuery, { type: YoutubeQueryTypes.VideoDetails, videoIds: videoIds }, callBack);
+        DocServer.EmitCallback(_socket, MessageStore.YoutubeApiQuery, { type: YoutubeQueryTypes.VideoDetails, videoIds: videoIds }, callBack);
     }
 
     /**
@@ -397,7 +416,7 @@ export namespace DocServer {
             // the fields have been returned from the server
             console.log('Requesting ' + requestedIds.length);
             setTimeout(() => runInAction(() => (FieldLoader.ServerLoadStatus.requested = requestedIds.length)));
-            const serializedFields = await Utils.EmitCallback(_socket, MessageStore.GetRefFields, requestedIds);
+            const serializedFields = await DocServer.EmitCallback(_socket, MessageStore.GetRefFields, requestedIds);
 
             // 3) when the serialized RefFields have been received, go head and begin deserializing them into objects.
             // Here, once deserialized, we also invoke .proto to 'load' the documents' prototypes, which ensures that all
@@ -502,7 +521,7 @@ export namespace DocServer {
     function _CreateFieldImpl(field: RefField) {
         _cache[field[Id]] = field;
         const initialState = SerializationHelper.Serialize(field);
-        Doc.CurrentUserEmail !== 'guest' && Utils.Emit(_socket, MessageStore.CreateField, initialState);
+        Doc.CurrentUserEmail !== 'guest' && DocServer.Emit(_socket, MessageStore.CreateField, initialState);
     }
 
     let _CreateField: (field: RefField) => void = errorFunc;
@@ -522,7 +541,7 @@ export namespace DocServer {
     }
 
     function _UpdateFieldImpl(id: string, diff: any) {
-        !DocServer.Control.isReadOnly() && Doc.CurrentUserEmail !== 'guest' && Utils.Emit(_socket, MessageStore.UpdateField, { id, diff });
+        !DocServer.Control.isReadOnly() && Doc.CurrentUserEmail !== 'guest' && DocServer.Emit(_socket, MessageStore.UpdateField, { id, diff });
     }
 
     let _UpdateField: (id: string, diff: any) => void = errorFunc;
@@ -559,11 +578,11 @@ export namespace DocServer {
     }
 
     export function DeleteDocument(id: string) {
-        Doc.CurrentUserEmail !== 'guest' && Utils.Emit(_socket, MessageStore.DeleteField, id);
+        Doc.CurrentUserEmail !== 'guest' && DocServer.Emit(_socket, MessageStore.DeleteField, id);
     }
 
     export function DeleteDocuments(ids: string[]) {
-        Doc.CurrentUserEmail !== 'guest' && Utils.Emit(_socket, MessageStore.DeleteFields, ids);
+        Doc.CurrentUserEmail !== 'guest' && DocServer.Emit(_socket, MessageStore.DeleteFields, ids);
     }
 
     function _respondToDeleteImpl(ids: string | string[]) {