aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2024-04-05 00:46:11 -0400
committerbobzel <zzzman@gmail.com>2024-04-05 00:46:11 -0400
commit5a213d6e132a77a018e08c9feb292644bc0ac385 (patch)
tree57a283144001a3fbd089ef07497b23acd04781b2
parent583420f7b97b5d540fa269f9ce5625953bacdbe6 (diff)
updated socket references
-rw-r--r--src/Utils.ts9
-rw-r--r--src/client/DocServer.ts4
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Utils.ts b/src/Utils.ts
index a64c7c8a7..a48fb2bc2 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -1,13 +1,12 @@
-import { ColorResult } from 'react-color';
-import * as uuid from 'uuid';
-//import { Socket } from '../node_modules/socket.io-client';
import * as Color from 'color';
+import { ColorResult } from 'react-color';
import * as rp from 'request-promise';
-import { Socket } from '../node_modules/socket.io/dist/index';
+import { Socket } from 'socket.io-client';
+import * as uuid from 'uuid';
import { DocumentType } from './client/documents/DocumentTypes';
import { Colors } from './client/views/global/globalEnums';
-import { Message } from './server/Message';
import { DocumentView } from './client/views/nodes/DocumentView';
+import { Message } from './server/Message';
export namespace Utils {
export let CLICK_TIME = 300;
diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index bd60a205c..2658a1df5 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -7,8 +7,8 @@ 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 { DocumentType } from './documents/DocumentTypes';
@@ -171,7 +171,7 @@ 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 });
// io.connect(`https://7f079dda.ngrok.io`);// if using ngrok, create a special address for the websocket
_GetCachedRefField = _GetCachedRefFieldImpl;