@seafile/sdoc-editor 2.0.181 → 2.0.182
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/socket/socket-client.js +28 -23
- package/package.json +2 -2
|
@@ -13,7 +13,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/es
|
|
|
13
13
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
14
14
|
var _socket = _interopRequireDefault(require("socket.io-client"));
|
|
15
15
|
var _debug = require("../utils/debug");
|
|
16
|
-
var
|
|
16
|
+
var _socketManager2 = _interopRequireDefault(require("./socket-manager"));
|
|
17
17
|
var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketClient(_config) {
|
|
18
18
|
var _this = this;
|
|
19
19
|
(0, _classCallCheck2["default"])(this, SocketClient);
|
|
@@ -64,7 +64,7 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
64
64
|
(0, _debug.clientDebug)('socket is connected: %s', _this.socket.connected);
|
|
65
65
|
// join room
|
|
66
66
|
_this.socket.emit('join-room', function (result) {
|
|
67
|
-
var socketManager =
|
|
67
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
68
68
|
if (result.success) {
|
|
69
69
|
// sync operations or document
|
|
70
70
|
if (_this.isReconnect) {
|
|
@@ -84,17 +84,17 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
84
84
|
(0, _defineProperty2["default"])(this, "onReconnect", function (data) {
|
|
85
85
|
(0, _debug.clientDebug)('reconnect.');
|
|
86
86
|
_this.isReconnect = true;
|
|
87
|
-
var socketManager =
|
|
87
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
88
88
|
socketManager.dispatchConnectState('reconnect');
|
|
89
89
|
});
|
|
90
90
|
(0, _defineProperty2["default"])(this, "onReconnectAttempt", function (attemptNumber) {
|
|
91
91
|
(0, _debug.clientDebug)('reconnect_attempt. %s', attemptNumber);
|
|
92
|
-
var socketManager =
|
|
92
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
93
93
|
socketManager.dispatchConnectState('reconnect_attempt', attemptNumber);
|
|
94
94
|
});
|
|
95
95
|
(0, _defineProperty2["default"])(this, "onReconnectError", function () {
|
|
96
96
|
(0, _debug.clientDebug)('reconnect_error.');
|
|
97
|
-
var socketManager =
|
|
97
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
98
98
|
socketManager.dispatchConnectState('reconnect_error');
|
|
99
99
|
});
|
|
100
100
|
(0, _defineProperty2["default"])(this, "onDisconnected", function (data) {
|
|
@@ -102,13 +102,15 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
102
102
|
var time = new Date().toLocaleString();
|
|
103
103
|
(0, _debug.clientDebug)('Current time is: %s', time);
|
|
104
104
|
(0, _debug.clientDebug)('Disconnected due to ping timeout, trying to reconnect...');
|
|
105
|
+
var _socketManager = _socketManager2["default"].getInstance();
|
|
106
|
+
_socketManager.dispatchConnectState('disconnect');
|
|
105
107
|
setTimeout(function () {
|
|
106
108
|
_this.safeReconnect();
|
|
107
109
|
}, 1000);
|
|
108
110
|
return;
|
|
109
111
|
}
|
|
110
112
|
(0, _debug.clientDebug)('disconnect message: %s', data);
|
|
111
|
-
var socketManager =
|
|
113
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
112
114
|
socketManager.dispatchConnectState('disconnect');
|
|
113
115
|
});
|
|
114
116
|
(0, _defineProperty2["default"])(this, "onConnectError", function (error) {
|
|
@@ -120,7 +122,7 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
120
122
|
_this.safeReconnect();
|
|
121
123
|
}, 1000);
|
|
122
124
|
}
|
|
123
|
-
var socketManager =
|
|
125
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
124
126
|
socketManager.dispatchConnectState('connect_error');
|
|
125
127
|
});
|
|
126
128
|
(0, _defineProperty2["default"])(this, "safeReconnect", /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
|
|
@@ -131,6 +133,7 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
131
133
|
_context.p = 0;
|
|
132
134
|
_this.socket.disconnect();
|
|
133
135
|
_this.socket = null;
|
|
136
|
+
(0, _debug.clientDebug)('Entering the reconnection state...');
|
|
134
137
|
_context.n = 1;
|
|
135
138
|
return new Promise(function (resolve) {
|
|
136
139
|
return setTimeout(resolve, 1000);
|
|
@@ -188,22 +191,22 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
188
191
|
});
|
|
189
192
|
(0, _defineProperty2["default"])(this, "onJoinRoom", function (userInfo) {
|
|
190
193
|
(0, _debug.serverDebug)('%s joined room success.', userInfo.username);
|
|
191
|
-
var socketManager =
|
|
194
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
192
195
|
socketManager.dispatchConnectState('join-room', userInfo);
|
|
193
196
|
});
|
|
194
197
|
(0, _defineProperty2["default"])(this, "onLeaveRoom", function (username) {
|
|
195
198
|
(0, _debug.serverDebug)('%s leaved room success.', username);
|
|
196
|
-
var socketManager =
|
|
199
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
197
200
|
socketManager.dispatchConnectState('leave-room', username);
|
|
198
201
|
});
|
|
199
202
|
(0, _defineProperty2["default"])(this, "onUserUpdated", function (userInfo) {
|
|
200
203
|
(0, _debug.serverDebug)('%s name updated: %s', userInfo.username, userInfo.name);
|
|
201
|
-
var socketManager =
|
|
204
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
202
205
|
socketManager.dispatchConnectState('user-updated', userInfo);
|
|
203
206
|
});
|
|
204
207
|
(0, _defineProperty2["default"])(this, "onReloadImage", function () {
|
|
205
208
|
(0, _debug.serverDebug)('Reload image by other people copy images from different repos');
|
|
206
|
-
var socketManager =
|
|
209
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
207
210
|
socketManager.dispatchConnectState('reload_image');
|
|
208
211
|
});
|
|
209
212
|
/**
|
|
@@ -212,12 +215,12 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
212
215
|
*/
|
|
213
216
|
(0, _defineProperty2["default"])(this, "onReceiveRemoteOperations", function (params) {
|
|
214
217
|
(0, _debug.serverDebug)('receive operations: %O', params);
|
|
215
|
-
var socketManager =
|
|
218
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
216
219
|
socketManager.onReceiveRemoteOperations(params);
|
|
217
220
|
});
|
|
218
221
|
(0, _defineProperty2["default"])(this, "getRecentOperations", function () {
|
|
219
222
|
var docUuid = _this.config.docUuid;
|
|
220
|
-
var socketManager =
|
|
223
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
221
224
|
var clientVersion = socketManager.getDocumentVersion();
|
|
222
225
|
_this.socket.emit('sync-document', {
|
|
223
226
|
doc_uuid: docUuid,
|
|
@@ -236,46 +239,46 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
236
239
|
}));
|
|
237
240
|
});
|
|
238
241
|
(0, _defineProperty2["default"])(this, "receiveCursorLocation", function (params) {
|
|
239
|
-
var socketManager =
|
|
242
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
240
243
|
socketManager.receiveCursorLocation(params);
|
|
241
244
|
});
|
|
242
245
|
(0, _defineProperty2["default"])(this, "disconnectWithServer", function () {
|
|
243
246
|
_this.socket.disconnect();
|
|
244
247
|
});
|
|
245
248
|
(0, _defineProperty2["default"])(this, "receivePublishDocument", function () {
|
|
246
|
-
var socketManager =
|
|
249
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
247
250
|
socketManager.receivePublishDocument();
|
|
248
251
|
});
|
|
249
252
|
(0, _defineProperty2["default"])(this, "receivePublishDocumentError", function () {
|
|
250
|
-
var socketManager =
|
|
253
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
251
254
|
socketManager.receivePublishDocumentError();
|
|
252
255
|
});
|
|
253
256
|
(0, _defineProperty2["default"])(this, "receiveDocumentReplaced", function () {
|
|
254
|
-
var socketManager =
|
|
257
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
255
258
|
socketManager.receiveDocumentReplaced();
|
|
256
259
|
});
|
|
257
260
|
(0, _defineProperty2["default"])(this, "receiveDocumentReplacedError", function () {
|
|
258
|
-
var socketManager =
|
|
261
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
259
262
|
socketManager.receiveDocumentReplacedError();
|
|
260
263
|
});
|
|
261
264
|
(0, _defineProperty2["default"])(this, "receiveRemoveDocument", function () {
|
|
262
|
-
var socketManager =
|
|
265
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
263
266
|
socketManager.receiveRemoveDocument();
|
|
264
267
|
});
|
|
265
268
|
(0, _defineProperty2["default"])(this, "receiveRemoveDocumentError", function () {
|
|
266
|
-
var socketManager =
|
|
269
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
267
270
|
socketManager.receiveRemoveDocumentError();
|
|
268
271
|
});
|
|
269
272
|
(0, _defineProperty2["default"])(this, "receiveNewNotification", function (notification) {
|
|
270
|
-
var socketManager =
|
|
273
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
271
274
|
socketManager.receiveNewNotification(notification);
|
|
272
275
|
});
|
|
273
276
|
(0, _defineProperty2["default"])(this, "receiveParticipantAdded", function (uses) {
|
|
274
|
-
var socketManager =
|
|
277
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
275
278
|
socketManager.receiveParticipantAdded(uses);
|
|
276
279
|
});
|
|
277
280
|
(0, _defineProperty2["default"])(this, "receiveParticipantRemoved", function (email) {
|
|
278
|
-
var socketManager =
|
|
281
|
+
var socketManager = _socketManager2["default"].getInstance();
|
|
279
282
|
socketManager.receiveParticipantRemoved(email);
|
|
280
283
|
});
|
|
281
284
|
this.config = _config;
|
|
@@ -285,6 +288,8 @@ var SocketClient = /*#__PURE__*/(0, _createClass2["default"])(function SocketCli
|
|
|
285
288
|
auth: {
|
|
286
289
|
token: _config.accessToken
|
|
287
290
|
},
|
|
291
|
+
reconnectionDelay: 3000,
|
|
292
|
+
reconnectionDelayMax: 6000,
|
|
288
293
|
query: {
|
|
289
294
|
'sdoc_uuid': _config.docUuid
|
|
290
295
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@seafile/sdoc-editor",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.182",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "jest",
|
|
@@ -71,5 +71,5 @@
|
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "66343e00bc56ccd16080bb5c0a1d69d8de792c44"
|
|
75
75
|
}
|