airdcpp-apisocket 3.0.0-beta.2 → 3.0.0-beta.4
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/ApiConstants.d.ts +6 -0
- package/dist/ApiConstants.js +6 -0
- package/dist/ApiConstants.js.map +1 -0
- package/dist/NodeSocket.d.ts +4 -0
- package/dist/NodeSocket.js +5 -0
- package/dist/NodeSocket.js.map +1 -0
- package/dist/Promise.d.ts +8 -0
- package/dist/Promise.js +25 -0
- package/dist/Promise.js.map +1 -0
- package/dist/PublicHelpers.d.ts +2 -0
- package/dist/PublicHelpers.js +108 -0
- package/dist/PublicHelpers.js.map +1 -0
- package/dist/SocketBase.d.ts +4 -0
- package/dist/SocketBase.js +347 -0
- package/dist/SocketBase.js.map +1 -0
- package/dist/SocketLogger.d.ts +9 -0
- package/dist/SocketLogger.js +69 -0
- package/dist/SocketLogger.js.map +1 -0
- package/dist/SocketRequestHandler.d.ts +14 -0
- package/dist/SocketRequestHandler.js +164 -0
- package/dist/SocketRequestHandler.js.map +1 -0
- package/dist/SocketSubscriptionHandler.d.ts +11 -0
- package/dist/SocketSubscriptionHandler.js +157 -0
- package/dist/SocketSubscriptionHandler.js.map +1 -0
- package/dist/tests/helpers.d.ts +57 -0
- package/dist/tests/helpers.js +127 -0
- package/dist/tests/helpers.js.map +1 -0
- package/dist/types/api.d.ts +30 -0
- package/dist/types/api.js +3 -0
- package/dist/types/api.js.map +1 -0
- package/dist/types/api_internal.d.ts +24 -0
- package/dist/types/api_internal.js +2 -0
- package/dist/types/api_internal.js.map +1 -0
- package/dist/types/index.d.ts +7 -0
- package/dist/types/index.js +8 -0
- package/dist/types/index.js.map +1 -0
- package/dist/types/logger.d.ts +6 -0
- package/dist/types/logger.js +2 -0
- package/dist/types/logger.js.map +1 -0
- package/dist/types/options.d.ts +31 -0
- package/dist/types/options.js +3 -0
- package/dist/types/options.js.map +1 -0
- package/dist/types/public_helpers.d.ts +28 -0
- package/dist/types/public_helpers.js +2 -0
- package/dist/types/public_helpers.js.map +1 -0
- package/dist/types/public_helpers_internal.d.ts +27 -0
- package/dist/types/public_helpers_internal.js +2 -0
- package/dist/types/public_helpers_internal.js.map +1 -0
- package/dist/types/requests.d.ts +14 -0
- package/dist/types/requests.js +2 -0
- package/dist/types/requests.js.map +1 -0
- package/dist/types/socket.d.ts +23 -0
- package/dist/types/socket.js +2 -0
- package/dist/types/socket.js.map +1 -0
- package/dist/types/subscriptions.d.ts +20 -0
- package/dist/types/subscriptions.js +2 -0
- package/dist/types/subscriptions.js.map +1 -0
- package/dist/utils.d.ts +2 -0
- package/dist/utils.js +12 -0
- package/dist/utils.js.map +1 -0
- package/dist-es/tests/helpers.d.ts +74 -0
- package/dist-es/tests/helpers.js +134 -0
- package/dist-es/tests/helpers.js.map +1 -0
- package/dist-es/types/public_helpers.d.ts +1 -1
- package/dist-es/types/public_helpers_internal.d.ts +2 -2
- package/package.json +6 -3
- package/src/tests/Socket.test.ts +14 -12
- package/src/tests/helpers.ts +28 -13
- package/src/types/public_helpers.ts +1 -1
- package/src/types/public_helpers_internal.ts +2 -2
- package/tsconfig.json +1 -1
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"ApiConstants.js","sourceRoot":"","sources":["../src/ApiConstants.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,SAAS,EAAE,oBAAoB;IAC/B,WAAW,EAAE,iBAAiB;IAC9B,UAAU,EAAE,eAAe;CAC5B,CAAC"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"NodeSocket.js","sourceRoot":"","sources":["../src/NodeSocket.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAGzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,CAAC"}
|
@@ -0,0 +1,8 @@
|
|
1
|
+
export interface PendingResult extends Pick<PromiseConstructor, 'resolve' | 'reject'> {
|
2
|
+
promise: Promise<any>;
|
3
|
+
}
|
4
|
+
export interface AppPromise extends PromiseConstructor {
|
5
|
+
pending: () => PendingResult;
|
6
|
+
}
|
7
|
+
declare const PendingPromise: AppPromise;
|
8
|
+
export default PendingPromise;
|
package/dist/Promise.js
ADDED
@@ -0,0 +1,25 @@
|
|
1
|
+
// Use native promises when available
|
2
|
+
let AppPromise;
|
3
|
+
if (typeof Promise !== 'undefined') {
|
4
|
+
AppPromise = Promise;
|
5
|
+
}
|
6
|
+
else {
|
7
|
+
AppPromise = require('promise');
|
8
|
+
}
|
9
|
+
function pending() {
|
10
|
+
let resolve, reject;
|
11
|
+
let promise = new AppPromise(function () {
|
12
|
+
resolve = arguments[0];
|
13
|
+
reject = arguments[1];
|
14
|
+
});
|
15
|
+
return {
|
16
|
+
resolve: resolve,
|
17
|
+
reject: reject,
|
18
|
+
promise
|
19
|
+
};
|
20
|
+
}
|
21
|
+
const PendingPromise = Object.assign(AppPromise, {
|
22
|
+
pending
|
23
|
+
});
|
24
|
+
export default PendingPromise;
|
25
|
+
//# sourceMappingURL=Promise.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"Promise.js","sourceRoot":"","sources":["../src/Promise.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,IAAI,UAA8B,CAAC;AACnC,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;IACnC,UAAU,GAAG,OAAO,CAAC;AACvB,CAAC;KAAM,CAAC;IACN,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAClC,CAAC;AAOD,SAAS,OAAO;IACd,IAAI,OAAkC,EAAE,MAAgC,CAAC;IACzE,IAAI,OAAO,GAAG,IAAI,UAAU,CAAC;QAC3B,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,OAAQ;QACjB,MAAM,EAAE,MAAO;QACf,OAAO;KACR,CAAC;AACJ,CAAC;AAMD,MAAM,cAAc,GAAe,MAAM,CAAC,MAAM,CAC9C,UAAU,EACV;IACE,OAAO;CACR,CACF,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
@@ -0,0 +1,2 @@
|
|
1
|
+
import { APISocket, ContextMenuItem, EntityId, ContextMenu } from './types/index.js';
|
2
|
+
export declare const addContextMenuItems: <IdT, EntityIdT extends EntityId | undefined = undefined>(socket: APISocket, menuItems: ContextMenuItem<IdT, EntityIdT>[], menuTypeId: string, menu: ContextMenu) => Promise<() => void>;
|
@@ -0,0 +1,108 @@
|
|
1
|
+
const checkAccess = (menuItem, permissions) => {
|
2
|
+
if (!menuItem.access) {
|
3
|
+
return true;
|
4
|
+
}
|
5
|
+
return permissions.indexOf('admin') !== -1 || permissions.indexOf(menuItem.access) !== -1;
|
6
|
+
};
|
7
|
+
const URLS_SUPPORT = 'urls';
|
8
|
+
const FORM_SUPPORT = 'form';
|
9
|
+
const hasSupport = (support, supports) => {
|
10
|
+
return !!supports && supports.indexOf(support) !== -1;
|
11
|
+
};
|
12
|
+
// Check whether the item passes the access and filter checks
|
13
|
+
const validateItem = async (menuItem, data) => {
|
14
|
+
const { selected_ids, entity_id, permissions, supports } = data;
|
15
|
+
if (!!menuItem.urls && !hasSupport(URLS_SUPPORT, supports)) {
|
16
|
+
return false;
|
17
|
+
}
|
18
|
+
if (!!menuItem.filter && !(await menuItem.filter({
|
19
|
+
selectedIds: selected_ids,
|
20
|
+
entityId: entity_id,
|
21
|
+
permissions,
|
22
|
+
supports
|
23
|
+
}))) {
|
24
|
+
return false;
|
25
|
+
}
|
26
|
+
return checkAccess(menuItem, data.permissions);
|
27
|
+
};
|
28
|
+
const parseCallbackData = async (item, data) => {
|
29
|
+
const { selected_ids, entity_id, permissions, supports } = data;
|
30
|
+
const callbackProps = {
|
31
|
+
selectedIds: selected_ids,
|
32
|
+
entityId: entity_id,
|
33
|
+
permissions,
|
34
|
+
supports
|
35
|
+
};
|
36
|
+
if (!!item.urls && !!item.urls.length) {
|
37
|
+
let urls;
|
38
|
+
if (typeof item.urls === 'function') {
|
39
|
+
urls = await item.urls(callbackProps);
|
40
|
+
}
|
41
|
+
else {
|
42
|
+
urls = item.urls;
|
43
|
+
}
|
44
|
+
return {
|
45
|
+
urls,
|
46
|
+
};
|
47
|
+
}
|
48
|
+
else if (!!item.formDefinitions && hasSupport(FORM_SUPPORT, supports)) {
|
49
|
+
let formDefinitions;
|
50
|
+
if (typeof item.formDefinitions === 'function') {
|
51
|
+
formDefinitions = await item.formDefinitions(callbackProps);
|
52
|
+
}
|
53
|
+
else {
|
54
|
+
formDefinitions = item.formDefinitions;
|
55
|
+
}
|
56
|
+
return {
|
57
|
+
form_definitions: formDefinitions,
|
58
|
+
};
|
59
|
+
}
|
60
|
+
return {};
|
61
|
+
};
|
62
|
+
export const addContextMenuItems = async (socket, menuItems, menuTypeId, menu) => {
|
63
|
+
const removeListener = await socket.addListener('menus', `${menuTypeId}_menuitem_selected`, async (data) => {
|
64
|
+
if (data.hook_id === menu.id) {
|
65
|
+
const menuItem = menuItems.find(i => data.menuitem_id === i.id);
|
66
|
+
if (!!menuItem) {
|
67
|
+
const isValid = await validateItem(menuItem, data);
|
68
|
+
if (isValid && !!menuItem.onClick) {
|
69
|
+
const { selected_ids, entity_id, permissions, supports, form_values } = data;
|
70
|
+
menuItem.onClick({
|
71
|
+
selectedIds: selected_ids,
|
72
|
+
entityId: entity_id,
|
73
|
+
permissions,
|
74
|
+
supports,
|
75
|
+
formValues: form_values
|
76
|
+
});
|
77
|
+
}
|
78
|
+
}
|
79
|
+
}
|
80
|
+
});
|
81
|
+
const removeHook = await socket.addHook('menus', `${menuTypeId}_list_menuitems`, async (data, accept, reject) => {
|
82
|
+
const validItems = [];
|
83
|
+
for (const item of menuItems) {
|
84
|
+
const isValid = await validateItem(item, data);
|
85
|
+
if (isValid) {
|
86
|
+
const parsedCallbackData = await parseCallbackData(item, data);
|
87
|
+
const { onClick, id, title, icon } = item;
|
88
|
+
if (!!onClick || (!!parsedCallbackData.urls && parsedCallbackData.urls.length)) {
|
89
|
+
validItems.push({
|
90
|
+
id,
|
91
|
+
title,
|
92
|
+
icon,
|
93
|
+
...parsedCallbackData,
|
94
|
+
});
|
95
|
+
}
|
96
|
+
}
|
97
|
+
}
|
98
|
+
accept({
|
99
|
+
menuitems: validItems,
|
100
|
+
icon: menu.icon,
|
101
|
+
});
|
102
|
+
}, menu);
|
103
|
+
return () => {
|
104
|
+
removeHook();
|
105
|
+
removeListener();
|
106
|
+
};
|
107
|
+
};
|
108
|
+
//# sourceMappingURL=PublicHelpers.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"PublicHelpers.js","sourceRoot":"","sources":["../src/PublicHelpers.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,347 @@
|
|
1
|
+
import ApiConstants from './ApiConstants.js';
|
2
|
+
import SocketLogger from './SocketLogger.js';
|
3
|
+
import SocketSubscriptionHandler from './SocketSubscriptionHandler.js';
|
4
|
+
import SocketRequestHandler from './SocketRequestHandler.js';
|
5
|
+
import invariant from 'invariant';
|
6
|
+
import Promise from './Promise.js';
|
7
|
+
// CONSTANTS
|
8
|
+
const defaultOptions = {
|
9
|
+
autoReconnect: true,
|
10
|
+
reconnectInterval: 10,
|
11
|
+
userSession: false,
|
12
|
+
};
|
13
|
+
const ApiSocket = (userOptions, WebSocketImpl) => {
|
14
|
+
const options = {
|
15
|
+
...defaultOptions,
|
16
|
+
...userOptions
|
17
|
+
};
|
18
|
+
let ws = null;
|
19
|
+
let authToken = null;
|
20
|
+
let socket = null;
|
21
|
+
let reconnectTimer;
|
22
|
+
let forceNoAutoConnect = true;
|
23
|
+
let connectedCallback = null;
|
24
|
+
let sessionResetCallback = null;
|
25
|
+
let disconnectedCallback = null;
|
26
|
+
const logger = SocketLogger(options);
|
27
|
+
const subscriptions = SocketSubscriptionHandler(() => socket, logger, options);
|
28
|
+
const requests = SocketRequestHandler(() => socket, logger, options);
|
29
|
+
invariant(userOptions.url, '"url" must be defined in settings object');
|
30
|
+
const resetSession = () => {
|
31
|
+
if (authToken) {
|
32
|
+
if (sessionResetCallback) {
|
33
|
+
sessionResetCallback();
|
34
|
+
}
|
35
|
+
authToken = null;
|
36
|
+
}
|
37
|
+
};
|
38
|
+
const onClosed = (event) => {
|
39
|
+
if (event.wasClean) {
|
40
|
+
logger.info('Websocket was closed normally');
|
41
|
+
}
|
42
|
+
else {
|
43
|
+
logger.error(`Websocket failed: ${event.reason} (code: ${event.code})`);
|
44
|
+
}
|
45
|
+
requests.onSocketDisconnected();
|
46
|
+
subscriptions.onSocketDisconnected();
|
47
|
+
ws = null;
|
48
|
+
if (disconnectedCallback) {
|
49
|
+
disconnectedCallback(event.reason, event.code, event.wasClean);
|
50
|
+
}
|
51
|
+
if (authToken && options.autoReconnect && !forceNoAutoConnect) {
|
52
|
+
setTimeout(() => {
|
53
|
+
if (forceNoAutoConnect) {
|
54
|
+
return;
|
55
|
+
}
|
56
|
+
socket.reconnect()
|
57
|
+
.catch((error) => {
|
58
|
+
logger.error('Reconnect failed for a closed socket', error.message);
|
59
|
+
});
|
60
|
+
});
|
61
|
+
}
|
62
|
+
};
|
63
|
+
const onMessage = (event) => {
|
64
|
+
const messageObj = JSON.parse(event.data);
|
65
|
+
if (messageObj.callback_id) {
|
66
|
+
// Callback
|
67
|
+
requests.handleMessage(messageObj);
|
68
|
+
}
|
69
|
+
else {
|
70
|
+
// Listener message
|
71
|
+
subscriptions.handleMessage(messageObj);
|
72
|
+
}
|
73
|
+
};
|
74
|
+
const setSocketHandlers = () => {
|
75
|
+
ws.onerror = (event) => {
|
76
|
+
logger.error(`Websocket failed: ${event.reason}`);
|
77
|
+
};
|
78
|
+
ws.onclose = onClosed;
|
79
|
+
ws.onmessage = onMessage;
|
80
|
+
};
|
81
|
+
// Connect handler for creation of new session
|
82
|
+
const handlePasswordLogin = (username = options.username, password = options.password) => {
|
83
|
+
if (!username) {
|
84
|
+
throw '"username" option was not supplied for authentication';
|
85
|
+
}
|
86
|
+
if (!password) {
|
87
|
+
throw '"password" option was not supplied for authentication';
|
88
|
+
}
|
89
|
+
const data = {
|
90
|
+
username,
|
91
|
+
password,
|
92
|
+
grant_type: 'password',
|
93
|
+
};
|
94
|
+
return requests.postAuthenticate(ApiConstants.LOGIN_URL, data);
|
95
|
+
};
|
96
|
+
const handleRefreshTokenLogin = (refreshToken) => {
|
97
|
+
if (!refreshToken) {
|
98
|
+
throw '"refreshToken" option was not supplied for authentication';
|
99
|
+
}
|
100
|
+
const data = {
|
101
|
+
refresh_token: refreshToken,
|
102
|
+
grant_type: 'refresh_token',
|
103
|
+
};
|
104
|
+
return requests.postAuthenticate(ApiConstants.LOGIN_URL, data);
|
105
|
+
};
|
106
|
+
// Connect handler for associating socket with an existing session token
|
107
|
+
const handleAuthorizeToken = () => {
|
108
|
+
const data = {
|
109
|
+
auth_token: authToken,
|
110
|
+
};
|
111
|
+
return requests.postAuthenticate(ApiConstants.CONNECT_URL, data);
|
112
|
+
};
|
113
|
+
// Called after a successful authentication request
|
114
|
+
const onSocketAuthenticated = (data) => {
|
115
|
+
if (!authToken) {
|
116
|
+
// New session
|
117
|
+
logger.info('Login succeed');
|
118
|
+
authToken = data.auth_token;
|
119
|
+
}
|
120
|
+
else {
|
121
|
+
// Existing session
|
122
|
+
logger.info('Socket associated with an existing session');
|
123
|
+
}
|
124
|
+
if (connectedCallback) {
|
125
|
+
// Catch separately as we don't want an infinite reconnect loop
|
126
|
+
try {
|
127
|
+
connectedCallback(data);
|
128
|
+
}
|
129
|
+
catch (e) {
|
130
|
+
console.error('Error in socket connect handler', e.message);
|
131
|
+
}
|
132
|
+
requests.onSocketConnected();
|
133
|
+
}
|
134
|
+
};
|
135
|
+
// Send API authentication and handle the result
|
136
|
+
// Authentication handler should send the actual authentication request
|
137
|
+
const authenticate = (resolve, reject, authenticationHandler, reconnectHandler) => {
|
138
|
+
authenticationHandler()
|
139
|
+
.then((data) => {
|
140
|
+
onSocketAuthenticated(data);
|
141
|
+
resolve(data);
|
142
|
+
})
|
143
|
+
.catch((error) => {
|
144
|
+
if (error.code) {
|
145
|
+
if (authToken && error.code === 400 && options.autoReconnect) {
|
146
|
+
// The session was lost (most likely the client was restarted)
|
147
|
+
logger.info('Session lost, re-sending credentials');
|
148
|
+
resetSession();
|
149
|
+
authenticate(resolve, reject, handlePasswordLogin, reconnectHandler);
|
150
|
+
return;
|
151
|
+
}
|
152
|
+
else if (error.code === 401) {
|
153
|
+
// Invalid credentials, reset the token if we were reconnecting to avoid an infinite loop
|
154
|
+
resetSession();
|
155
|
+
}
|
156
|
+
// Authentication was rejected
|
157
|
+
socket.disconnect(undefined, 'Authentication failed');
|
158
|
+
}
|
159
|
+
else {
|
160
|
+
// Socket was disconnected during the authentication
|
161
|
+
logger.info('Socket disconnected during authentication, reconnecting');
|
162
|
+
reconnectHandler();
|
163
|
+
return;
|
164
|
+
}
|
165
|
+
reject(error);
|
166
|
+
});
|
167
|
+
};
|
168
|
+
// Authentication handler should send the actual authentication request
|
169
|
+
const connectInternal = (resolve, reject, authenticationHandler, reconnectOnFailure = true) => {
|
170
|
+
ws = new WebSocketImpl(options.url);
|
171
|
+
const scheduleReconnect = () => {
|
172
|
+
ws = null;
|
173
|
+
if (!reconnectOnFailure) {
|
174
|
+
reject('Cannot connect to the server');
|
175
|
+
return;
|
176
|
+
}
|
177
|
+
reconnectTimer = setTimeout(() => {
|
178
|
+
logger.info('Socket reconnecting');
|
179
|
+
connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
|
180
|
+
}, options.reconnectInterval * 1000);
|
181
|
+
};
|
182
|
+
ws.onopen = () => {
|
183
|
+
logger.info('Socket connected');
|
184
|
+
setSocketHandlers();
|
185
|
+
authenticate(resolve, reject, authenticationHandler, scheduleReconnect);
|
186
|
+
};
|
187
|
+
ws.onerror = (event) => {
|
188
|
+
logger.error('Connecting socket failed');
|
189
|
+
scheduleReconnect();
|
190
|
+
};
|
191
|
+
};
|
192
|
+
// Authentication handler should send the actual authentication request
|
193
|
+
const startConnect = (authenticationHandler, reconnectOnFailure) => {
|
194
|
+
forceNoAutoConnect = false;
|
195
|
+
return new Promise((resolve, reject) => {
|
196
|
+
logger.info('Starting socket connect');
|
197
|
+
connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
|
198
|
+
});
|
199
|
+
};
|
200
|
+
// Is the socket connected and authorized?
|
201
|
+
const isConnected = () => {
|
202
|
+
return !!(ws && ws.readyState === (ws.OPEN || 1) && authToken);
|
203
|
+
};
|
204
|
+
// Is the socket connected but not possibly authorized?
|
205
|
+
const isConnecting = () => {
|
206
|
+
return !!(ws && !isConnected());
|
207
|
+
};
|
208
|
+
// Socket exists
|
209
|
+
const isActive = () => {
|
210
|
+
return !!ws;
|
211
|
+
};
|
212
|
+
const disableReconnect = () => {
|
213
|
+
clearTimeout(reconnectTimer);
|
214
|
+
forceNoAutoConnect = true;
|
215
|
+
};
|
216
|
+
const waitDisconnected = (timeoutMs = 2000) => {
|
217
|
+
const checkInterval = 50;
|
218
|
+
const maxAttempts = timeoutMs > 0 ? timeoutMs / checkInterval : 0;
|
219
|
+
return new Promise((resolve, reject) => {
|
220
|
+
let attempts = 0;
|
221
|
+
const wait = () => {
|
222
|
+
if (isActive()) {
|
223
|
+
if (attempts >= maxAttempts) {
|
224
|
+
logger.error(`Socket disconnect timed out after ${timeoutMs} ms`);
|
225
|
+
reject('Socket disconnect timed out');
|
226
|
+
}
|
227
|
+
else {
|
228
|
+
setTimeout(wait, checkInterval);
|
229
|
+
attempts++;
|
230
|
+
}
|
231
|
+
}
|
232
|
+
else {
|
233
|
+
resolve();
|
234
|
+
}
|
235
|
+
};
|
236
|
+
wait();
|
237
|
+
});
|
238
|
+
};
|
239
|
+
// Disconnects the socket but keeps the session token
|
240
|
+
const disconnect = (autoConnect = false, reason = 'Manually disconnected by the client') => {
|
241
|
+
if (!ws) {
|
242
|
+
if (!forceNoAutoConnect) {
|
243
|
+
if (!autoConnect) {
|
244
|
+
logger.verbose('Disconnecting a closed socket with auto reconnect enabled (cancel reconnect)');
|
245
|
+
disableReconnect();
|
246
|
+
}
|
247
|
+
else {
|
248
|
+
logger.verbose('Attempting to disconnect a closed socket with auto reconnect enabled (continue connecting)');
|
249
|
+
}
|
250
|
+
}
|
251
|
+
else {
|
252
|
+
logger.warn('Attempting to disconnect a closed socket (ignore)');
|
253
|
+
//throw 'Attempting to disconnect a closed socket';
|
254
|
+
}
|
255
|
+
return;
|
256
|
+
}
|
257
|
+
logger.info('Disconnecting socket');
|
258
|
+
if (!autoConnect) {
|
259
|
+
disableReconnect();
|
260
|
+
}
|
261
|
+
ws.close(1000, reason);
|
262
|
+
};
|
263
|
+
socket = {
|
264
|
+
// Start connect
|
265
|
+
// Username and password are not required if those are available in socket options
|
266
|
+
connect: (username, password, reconnectOnFailure = true) => {
|
267
|
+
if (isActive()) {
|
268
|
+
throw 'Connect may only be used for a closed socket';
|
269
|
+
}
|
270
|
+
resetSession();
|
271
|
+
return startConnect(() => handlePasswordLogin(username, password), reconnectOnFailure);
|
272
|
+
},
|
273
|
+
connectRefreshToken: (refreshToken, reconnectOnFailure = true) => {
|
274
|
+
if (isActive()) {
|
275
|
+
throw 'Connect may only be used for a closed socket';
|
276
|
+
}
|
277
|
+
resetSession();
|
278
|
+
return startConnect(() => handleRefreshTokenLogin(refreshToken), reconnectOnFailure);
|
279
|
+
},
|
280
|
+
// Connect and attempt to associate the socket with an existing session
|
281
|
+
reconnect: (token = undefined, reconnectOnFailure = true) => {
|
282
|
+
if (isActive()) {
|
283
|
+
throw 'Reconnect may only be used for a closed socket';
|
284
|
+
}
|
285
|
+
if (token) {
|
286
|
+
authToken = token;
|
287
|
+
}
|
288
|
+
if (!authToken) {
|
289
|
+
throw 'No session token available for reconnecting';
|
290
|
+
}
|
291
|
+
logger.info('Reconnecting socket');
|
292
|
+
return startConnect(handleAuthorizeToken, reconnectOnFailure);
|
293
|
+
},
|
294
|
+
// Remove the associated API session and close the socket
|
295
|
+
logout: () => {
|
296
|
+
const resolver = Promise.pending();
|
297
|
+
socket.delete(ApiConstants.LOGOUT_URL)
|
298
|
+
.then((data) => {
|
299
|
+
logger.info('Logout succeed');
|
300
|
+
resetSession();
|
301
|
+
resolver.resolve(data);
|
302
|
+
// Don't fire the disconnected event before resolver actions are handled
|
303
|
+
disconnect(undefined, 'Logged out');
|
304
|
+
})
|
305
|
+
.catch((error) => {
|
306
|
+
logger.error('Logout failed', error);
|
307
|
+
resolver.reject(error);
|
308
|
+
});
|
309
|
+
return resolver.promise;
|
310
|
+
},
|
311
|
+
disconnect,
|
312
|
+
isConnecting,
|
313
|
+
isConnected,
|
314
|
+
isActive,
|
315
|
+
logger,
|
316
|
+
waitDisconnected,
|
317
|
+
// Function to call each time the socket has been connected (and authorized)
|
318
|
+
set onConnected(handler) {
|
319
|
+
connectedCallback = handler;
|
320
|
+
},
|
321
|
+
// Function to call each time the stored session token was reset (manual logout/rejected reconnect)
|
322
|
+
set onSessionReset(handler) {
|
323
|
+
sessionResetCallback = handler;
|
324
|
+
},
|
325
|
+
// Function to call each time the socket has been disconnected
|
326
|
+
set onDisconnected(handler) {
|
327
|
+
disconnectedCallback = handler;
|
328
|
+
},
|
329
|
+
get onConnected() {
|
330
|
+
return connectedCallback;
|
331
|
+
},
|
332
|
+
get onSessionReset() {
|
333
|
+
return sessionResetCallback;
|
334
|
+
},
|
335
|
+
get onDisconnected() {
|
336
|
+
return disconnectedCallback;
|
337
|
+
},
|
338
|
+
get nativeSocket() {
|
339
|
+
return ws;
|
340
|
+
},
|
341
|
+
...subscriptions.socket,
|
342
|
+
...requests.socket,
|
343
|
+
};
|
344
|
+
return socket;
|
345
|
+
};
|
346
|
+
export default ApiSocket;
|
347
|
+
//# sourceMappingURL=SocketBase.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"SocketBase.js","sourceRoot":"","sources":["../src/SocketBase.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,9 @@
|
|
1
|
+
import * as Options from './types/options.js';
|
2
|
+
import { Logger } from './types/logger.js';
|
3
|
+
export declare const LOG_NONE = "none";
|
4
|
+
export declare const LOG_ERROR = "error";
|
5
|
+
export declare const LOG_WARN = "warn";
|
6
|
+
export declare const LOG_INFO = "info";
|
7
|
+
export declare const LOG_VERBOSE = "verbose";
|
8
|
+
declare const Logger: ({ logLevel: logSetting, logOutput }: Options.LoggerOptions) => Logger;
|
9
|
+
export default Logger;
|
@@ -0,0 +1,69 @@
|
|
1
|
+
import chalk from 'chalk';
|
2
|
+
// @ts-ignore
|
3
|
+
import { isBrowser, isJsDom } from 'is-in-browser';
|
4
|
+
import invariant from 'invariant';
|
5
|
+
export const LOG_NONE = 'none';
|
6
|
+
export const LOG_ERROR = 'error';
|
7
|
+
export const LOG_WARN = 'warn';
|
8
|
+
export const LOG_INFO = 'info';
|
9
|
+
export const LOG_VERBOSE = 'verbose';
|
10
|
+
const Severities = {
|
11
|
+
[LOG_NONE]: -1,
|
12
|
+
[LOG_ERROR]: 0,
|
13
|
+
[LOG_WARN]: 1,
|
14
|
+
[LOG_INFO]: 2,
|
15
|
+
[LOG_VERBOSE]: 3,
|
16
|
+
};
|
17
|
+
// Should we format the line with timestamp and coloring or let the logger implementation to handle it?
|
18
|
+
// Do this when running in terminal (node.js/tests in browser env)
|
19
|
+
const shouldFormatLine = isJsDom || !isBrowser;
|
20
|
+
const Logger = ({ logLevel: logSetting = LOG_VERBOSE, logOutput = console }) => {
|
21
|
+
const logLevel = Severities[logSetting];
|
22
|
+
invariant(
|
23
|
+
// @ts-ignore: This condition will always return true since the function is always defined
|
24
|
+
logOutput.log && logOutput.info && logOutput.warn && logOutput.error, 'Invalid logOutput provided');
|
25
|
+
const formatCurrentTime = () => {
|
26
|
+
const d = new Date();
|
27
|
+
return `[${d.toLocaleDateString()} ${d.toLocaleTimeString()}:${d.getMilliseconds()}]`;
|
28
|
+
};
|
29
|
+
const print = (args, printHandler, argFormat) => {
|
30
|
+
let printableArgs = [...Array.prototype.slice.call(args)];
|
31
|
+
if (shouldFormatLine && argFormat) {
|
32
|
+
// Add the current time as well
|
33
|
+
printableArgs = [
|
34
|
+
chalk.magenta(formatCurrentTime()),
|
35
|
+
...printableArgs.map(arg => argFormat(typeof arg === 'object' ? JSON.stringify(arg, null, ' ') : arg)),
|
36
|
+
];
|
37
|
+
}
|
38
|
+
printHandler.apply(logOutput, printableArgs);
|
39
|
+
};
|
40
|
+
const Impl = {
|
41
|
+
verbose() {
|
42
|
+
if (logLevel < Severities[LOG_VERBOSE]) {
|
43
|
+
return;
|
44
|
+
}
|
45
|
+
print(arguments, logOutput.log, chalk.gray);
|
46
|
+
},
|
47
|
+
info() {
|
48
|
+
if (logLevel < Severities[LOG_INFO]) {
|
49
|
+
return;
|
50
|
+
}
|
51
|
+
print(arguments, logOutput.info, chalk.white.bold);
|
52
|
+
},
|
53
|
+
warn() {
|
54
|
+
if (logLevel < Severities[LOG_WARN]) {
|
55
|
+
return;
|
56
|
+
}
|
57
|
+
print(arguments, logOutput.warn, chalk.yellow.bold);
|
58
|
+
},
|
59
|
+
error() {
|
60
|
+
if (logLevel < Severities[LOG_ERROR]) {
|
61
|
+
return;
|
62
|
+
}
|
63
|
+
print(arguments, logOutput.error, chalk.red.bold);
|
64
|
+
},
|
65
|
+
};
|
66
|
+
return Impl;
|
67
|
+
};
|
68
|
+
export default Logger;
|
69
|
+
//# sourceMappingURL=SocketLogger.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"SocketLogger.js","sourceRoot":"","sources":["../src/SocketLogger.ts"],"names":[],"mappings":"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"}
|