1 files changed, 23 insertions, 15 deletions

diff --git a/src/Utils.ts b/src/Utils.ts
index 4e4414a93..26514622c 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -1,12 +1,12 @@
-import v4 = require('uuid/v4');
-import v5 = require('uuid/v5');
-import { ColorState } from 'react-color';
+import * as uuid from 'uuid';
+import { ColorResult } from 'react-color';
+//import { Socket } from '../node_modules/socket.io-client';
+import { Socket } from '../node_modules/socket.io/dist/index';
 import * as rp from 'request-promise';
-import { Socket } from 'socket.io';
 import { DocumentType } from './client/documents/DocumentTypes';
 import { Colors } from './client/views/global/globalEnums';
 import { Message } from './server/Message';
-import Color = require('color');
+import * as Color from 'color';
 
 export namespace Utils {
     export let CLICK_TIME = 300;
@@ -48,11 +48,19 @@ export namespace Utils {
     }
 
     export function GenerateGuid(): string {
-        return v4();
+        return uuid.v4();
     }
 
     export function GenerateDeterministicGuid(seed: string): string {
-        return v5(seed, v5.URL);
+        return uuid.v5(seed, uuid.v5.URL);
+    }
+
+    export function GenerateMongoId(id: string): string {
+        return id.length !== 36 ? Utils.GenerateDeterministicGuid(id) : id;
+    }
+
+    export function GuestID() {
+        return '__guest__';
     }
 
     /**
@@ -139,7 +147,7 @@ export namespace Utils {
         return (number < 16 ? '0' : '') + number.toString(16).toUpperCase();
     }
 
-    export function colorString(color: ColorState) {
+    export function colorString(color: ColorResult) {
         return color.hex.startsWith('#') && color.hex.length < 8 ? color.hex + (color.rgb.a ? decimalToHexString(Math.round(color.rgb.a * 255)) : 'ff') : color.hex;
     }
 
@@ -398,14 +406,14 @@ export namespace Utils {
         };
     }
 
-    export function Emit<T>(socket: Socket | SocketIOClient.Socket, message: Message<T>, args: T) {
+    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 | SocketIOClient.Socket, message: Message<T>, args: T): Promise<any>;
-    export function EmitCallback<T>(socket: Socket | SocketIOClient.Socket, message: Message<T>, args: T, fn: (args: any) => any): void;
-    export function EmitCallback<T>(socket: Socket | SocketIOClient.Socket, message: Message<T>, args: T, fn?: (args: any) => any): void | Promise<any> {
+    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, loggingCallback('Receiving', fn, message.Name));
@@ -414,7 +422,7 @@ export namespace Utils {
         }
     }
 
-    export function AddServerHandler<T>(socket: Socket | SocketIOClient.Socket, message: Message<T>, handler: (args: T) => any) {
+    export function AddServerHandler<T>(socket: Socket, message: Message<T>, handler: (args: T) => any) {
         socket.on(message.Message, loggingCallback('Incoming', handler, message.Name));
     }
 
@@ -425,10 +433,10 @@ export namespace Utils {
         });
     }
     export type RoomHandler = (socket: Socket, room: string) => any;
-    export type UsedSockets = Socket | SocketIOClient.Socket;
+    export type UsedSockets = Socket;
     export type RoomMessage = 'create or join' | 'created' | 'joined';
     export function AddRoomHandler(socket: Socket, message: RoomMessage, handler: RoomHandler) {
-        socket.on(message, room => handler(socket, room));
+        socket.on(message, (room: any) => handler(socket, room));
     }
 }