airdcpp-apisocket 2.4.4 → 2.4.5-beta.1
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/GUIDE.md +6 -6
- package/babel.config.cjs +6 -0
- package/dist/NodeSocket.d.ts +3 -3
- package/dist/NodeSocket.js +9 -5
- package/dist/NodeSocket.js.map +1 -1
- package/dist/Promise.js +6 -6
- package/dist/Promise.js.map +1 -1
- package/dist/PublicHelpers.d.ts +1 -1
- package/dist/PublicHelpers.js +75 -168
- package/dist/PublicHelpers.js.map +1 -1
- package/dist/SocketBase.d.ts +2 -2
- package/dist/SocketBase.js +81 -97
- package/dist/SocketBase.js.map +1 -1
- package/dist/SocketLogger.d.ts +2 -2
- package/dist/SocketLogger.js +28 -38
- package/dist/SocketLogger.js.map +1 -1
- package/dist/SocketRequestHandler.d.ts +6 -6
- package/dist/SocketRequestHandler.js +55 -69
- package/dist/SocketRequestHandler.js.map +1 -1
- package/dist/SocketSubscriptionHandler.d.ts +5 -5
- package/dist/SocketSubscriptionHandler.js +55 -70
- package/dist/SocketSubscriptionHandler.js.map +1 -1
- package/dist/types/api.d.ts +3 -3
- package/dist/types/api_internal.d.ts +2 -2
- package/dist/types/index.d.ts +7 -7
- package/dist/types/index.js +12 -8
- package/dist/types/index.js.map +1 -1
- package/dist/types/options.d.ts +3 -3
- package/dist/types/public_helpers.d.ts +1 -1
- package/dist/types/public_helpers_internal.d.ts +2 -2
- package/dist/types/requests.d.ts +1 -1
- package/dist/types/socket.d.ts +7 -7
- package/dist/types/socket.js +0 -1
- package/dist/types/socket.js.map +1 -1
- package/dist/types/subscriptions.d.ts +9 -9
- package/dist/utils.d.ts +2 -2
- package/dist/utils.js +1 -1
- package/dist/utils.js.map +1 -1
- package/dist-es/NodeSocket.d.ts +3 -3
- package/dist-es/NodeSocket.js +3 -3
- package/dist-es/NodeSocket.js.map +1 -1
- package/dist-es/Promise.js +6 -6
- package/dist-es/Promise.js.map +1 -1
- package/dist-es/PublicHelpers.d.ts +1 -1
- package/dist-es/PublicHelpers.js +75 -168
- package/dist-es/PublicHelpers.js.map +1 -1
- package/dist-es/SocketBase.d.ts +2 -2
- package/dist-es/SocketBase.js +76 -92
- package/dist-es/SocketBase.js.map +1 -1
- package/dist-es/SocketLogger.d.ts +2 -2
- package/dist-es/SocketLogger.js +31 -41
- package/dist-es/SocketLogger.js.map +1 -1
- package/dist-es/SocketRequestHandler.d.ts +6 -6
- package/dist-es/SocketRequestHandler.js +51 -65
- package/dist-es/SocketRequestHandler.js.map +1 -1
- package/dist-es/SocketSubscriptionHandler.d.ts +5 -5
- package/dist-es/SocketSubscriptionHandler.js +52 -67
- package/dist-es/SocketSubscriptionHandler.js.map +1 -1
- package/dist-es/types/api.d.ts +3 -3
- package/dist-es/types/api_internal.d.ts +2 -2
- package/dist-es/types/index.d.ts +7 -7
- package/dist-es/types/index.js +7 -7
- package/dist-es/types/index.js.map +1 -1
- package/dist-es/types/options.d.ts +3 -3
- package/dist-es/types/public_helpers.d.ts +1 -1
- package/dist-es/types/public_helpers_internal.d.ts +2 -2
- package/dist-es/types/requests.d.ts +1 -1
- package/dist-es/types/socket.d.ts +7 -7
- package/dist-es/types/socket.js +0 -1
- package/dist-es/types/socket.js.map +1 -1
- package/dist-es/types/subscriptions.d.ts +9 -9
- package/dist-es/utils.d.ts +2 -2
- package/dist-es/utils.js +1 -1
- package/dist-es/utils.js.map +1 -1
- package/jest.config.js +18 -3
- package/package.json +15 -13
- package/src/NodeSocket.ts +3 -3
- package/src/PublicHelpers.ts +2 -2
- package/src/SocketBase.ts +9 -9
- package/src/SocketLogger.ts +5 -5
- package/src/SocketRequestHandler.ts +8 -8
- package/src/SocketSubscriptionHandler.ts +10 -10
- package/src/tests/Socket.test.ts +30 -22
- package/src/tests/helpers.ts +7 -6
- package/src/tests/public_helpers.test.ts +9 -8
- package/src/types/api_internal.ts +1 -1
- package/src/types/index.ts +7 -7
- package/src/types/public_helpers_internal.ts +1 -1
- package/src/types/requests.ts +1 -1
- package/src/types/socket.ts +4 -20
- package/src/types/subscriptions.ts +1 -1
- package/src/utils.ts +1 -1
- package/tsconfig.json +4 -8
- package/dist/tests/Socket.test.d.ts +0 -1
- package/dist/tests/Socket.test.js +0 -758
- package/dist/tests/Socket.test.js.map +0 -1
- package/dist/tests/helpers.d.ts +0 -57
- package/dist/tests/helpers.js +0 -178
- package/dist/tests/helpers.js.map +0 -1
- package/dist/tests/public_helpers.test.d.ts +0 -1
- package/dist/tests/public_helpers.test.js +0 -241
- package/dist/tests/public_helpers.test.js.map +0 -1
- package/dist-es/tests/Socket.test.d.ts +0 -1
- package/dist-es/tests/Socket.test.js +0 -734
- package/dist-es/tests/Socket.test.js.map +0 -1
- package/dist-es/tests/helpers.d.ts +0 -57
- package/dist-es/tests/helpers.js +0 -168
- package/dist-es/tests/helpers.js.map +0 -1
- package/dist-es/tests/public_helpers.test.d.ts +0 -1
- package/dist-es/tests/public_helpers.test.js +0 -236
- package/dist-es/tests/public_helpers.test.js.map +0 -1
package/dist/SocketBase.js
CHANGED
@@ -1,46 +1,35 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
3
|
-
__assign = Object.assign || function(t) {
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
5
|
-
s = arguments[i];
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
7
|
-
t[p] = s[p];
|
8
|
-
}
|
9
|
-
return t;
|
10
|
-
};
|
11
|
-
return __assign.apply(this, arguments);
|
12
|
-
};
|
13
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
14
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
15
4
|
};
|
16
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
6
|
+
const ApiConstants_js_1 = __importDefault(require("./ApiConstants.js"));
|
7
|
+
const SocketLogger_js_1 = __importDefault(require("./SocketLogger.js"));
|
8
|
+
const SocketSubscriptionHandler_js_1 = __importDefault(require("./SocketSubscriptionHandler.js"));
|
9
|
+
const SocketRequestHandler_js_1 = __importDefault(require("./SocketRequestHandler.js"));
|
10
|
+
const invariant_1 = __importDefault(require("invariant"));
|
11
|
+
const Promise_js_1 = __importDefault(require("./Promise.js"));
|
23
12
|
// CONSTANTS
|
24
|
-
|
13
|
+
const defaultOptions = {
|
25
14
|
autoReconnect: true,
|
26
15
|
reconnectInterval: 10,
|
27
16
|
userSession: false,
|
28
17
|
};
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
18
|
+
const ApiSocket = (userOptions, WebSocketImpl) => {
|
19
|
+
const options = Object.assign(Object.assign({}, defaultOptions), userOptions);
|
20
|
+
let ws = null;
|
21
|
+
let authToken = null;
|
22
|
+
let socket = null;
|
23
|
+
let reconnectTimer;
|
24
|
+
let forceNoAutoConnect = true;
|
25
|
+
let connectedCallback = null;
|
26
|
+
let sessionResetCallback = null;
|
27
|
+
let disconnectedCallback = null;
|
28
|
+
const logger = (0, SocketLogger_js_1.default)(options);
|
29
|
+
const subscriptions = (0, SocketSubscriptionHandler_js_1.default)(() => socket, logger, options);
|
30
|
+
const requests = (0, SocketRequestHandler_js_1.default)(() => socket, logger, options);
|
42
31
|
(0, invariant_1.default)(userOptions.url, '"url" must be defined in settings object');
|
43
|
-
|
32
|
+
const resetSession = () => {
|
44
33
|
if (authToken) {
|
45
34
|
if (sessionResetCallback) {
|
46
35
|
sessionResetCallback();
|
@@ -48,12 +37,12 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
48
37
|
authToken = null;
|
49
38
|
}
|
50
39
|
};
|
51
|
-
|
40
|
+
const onClosed = (event) => {
|
52
41
|
if (event.wasClean) {
|
53
42
|
logger.info('Websocket was closed normally');
|
54
43
|
}
|
55
44
|
else {
|
56
|
-
logger.error(
|
45
|
+
logger.error(`Websocket failed: ${event.reason} (code: ${event.code})`);
|
57
46
|
}
|
58
47
|
requests.onSocketDisconnected();
|
59
48
|
subscriptions.onSocketDisconnected();
|
@@ -62,19 +51,19 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
62
51
|
disconnectedCallback(event.reason, event.code, event.wasClean);
|
63
52
|
}
|
64
53
|
if (authToken && options.autoReconnect && !forceNoAutoConnect) {
|
65
|
-
setTimeout(
|
54
|
+
setTimeout(() => {
|
66
55
|
if (forceNoAutoConnect) {
|
67
56
|
return;
|
68
57
|
}
|
69
58
|
socket.reconnect()
|
70
|
-
.catch(
|
59
|
+
.catch((error) => {
|
71
60
|
logger.error('Reconnect failed for a closed socket', error.message);
|
72
61
|
});
|
73
62
|
});
|
74
63
|
}
|
75
64
|
};
|
76
|
-
|
77
|
-
|
65
|
+
const onMessage = (event) => {
|
66
|
+
const messageObj = JSON.parse(event.data);
|
78
67
|
if (messageObj.callback_id) {
|
79
68
|
// Callback
|
80
69
|
requests.handleMessage(messageObj);
|
@@ -84,49 +73,47 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
84
73
|
subscriptions.handleMessage(messageObj);
|
85
74
|
}
|
86
75
|
};
|
87
|
-
|
88
|
-
ws.onerror =
|
89
|
-
logger.error(
|
76
|
+
const setSocketHandlers = () => {
|
77
|
+
ws.onerror = (event) => {
|
78
|
+
logger.error(`Websocket failed: ${event.reason}`);
|
90
79
|
};
|
91
80
|
ws.onclose = onClosed;
|
92
81
|
ws.onmessage = onMessage;
|
93
82
|
};
|
94
83
|
// Connect handler for creation of new session
|
95
|
-
|
96
|
-
if (username === void 0) { username = options.username; }
|
97
|
-
if (password === void 0) { password = options.password; }
|
84
|
+
const handlePasswordLogin = (username = options.username, password = options.password) => {
|
98
85
|
if (!username) {
|
99
86
|
throw '"username" option was not supplied for authentication';
|
100
87
|
}
|
101
88
|
if (!password) {
|
102
89
|
throw '"password" option was not supplied for authentication';
|
103
90
|
}
|
104
|
-
|
105
|
-
username
|
106
|
-
password
|
91
|
+
const data = {
|
92
|
+
username,
|
93
|
+
password,
|
107
94
|
grant_type: 'password',
|
108
95
|
};
|
109
|
-
return requests.postAuthenticate(
|
96
|
+
return requests.postAuthenticate(ApiConstants_js_1.default.LOGIN_URL, data);
|
110
97
|
};
|
111
|
-
|
98
|
+
const handleRefreshTokenLogin = (refreshToken) => {
|
112
99
|
if (!refreshToken) {
|
113
100
|
throw '"refreshToken" option was not supplied for authentication';
|
114
101
|
}
|
115
|
-
|
102
|
+
const data = {
|
116
103
|
refresh_token: refreshToken,
|
117
104
|
grant_type: 'refresh_token',
|
118
105
|
};
|
119
|
-
return requests.postAuthenticate(
|
106
|
+
return requests.postAuthenticate(ApiConstants_js_1.default.LOGIN_URL, data);
|
120
107
|
};
|
121
108
|
// Connect handler for associating socket with an existing session token
|
122
|
-
|
123
|
-
|
109
|
+
const handleAuthorizeToken = () => {
|
110
|
+
const data = {
|
124
111
|
auth_token: authToken,
|
125
112
|
};
|
126
|
-
return requests.postAuthenticate(
|
113
|
+
return requests.postAuthenticate(ApiConstants_js_1.default.CONNECT_URL, data);
|
127
114
|
};
|
128
115
|
// Called after a successful authentication request
|
129
|
-
|
116
|
+
const onSocketAuthenticated = (data) => {
|
130
117
|
if (!authToken) {
|
131
118
|
// New session
|
132
119
|
logger.info('Login succeed');
|
@@ -149,13 +136,13 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
149
136
|
};
|
150
137
|
// Send API authentication and handle the result
|
151
138
|
// Authentication handler should send the actual authentication request
|
152
|
-
|
139
|
+
const authenticate = (resolve, reject, authenticationHandler, reconnectHandler) => {
|
153
140
|
authenticationHandler()
|
154
|
-
.then(
|
141
|
+
.then((data) => {
|
155
142
|
onSocketAuthenticated(data);
|
156
143
|
resolve(data);
|
157
144
|
})
|
158
|
-
.catch(
|
145
|
+
.catch((error) => {
|
159
146
|
if (error.code) {
|
160
147
|
if (authToken && error.code === 400 && options.autoReconnect) {
|
161
148
|
// The session was lost (most likely the client was restarted)
|
@@ -181,64 +168,62 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
181
168
|
});
|
182
169
|
};
|
183
170
|
// Authentication handler should send the actual authentication request
|
184
|
-
|
185
|
-
if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
|
171
|
+
const connectInternal = (resolve, reject, authenticationHandler, reconnectOnFailure = true) => {
|
186
172
|
ws = new WebSocketImpl(options.url);
|
187
|
-
|
173
|
+
const scheduleReconnect = () => {
|
188
174
|
ws = null;
|
189
175
|
if (!reconnectOnFailure) {
|
190
176
|
reject('Cannot connect to the server');
|
191
177
|
return;
|
192
178
|
}
|
193
|
-
reconnectTimer = setTimeout(
|
179
|
+
reconnectTimer = setTimeout(() => {
|
194
180
|
logger.info('Socket reconnecting');
|
195
181
|
connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
|
196
182
|
}, options.reconnectInterval * 1000);
|
197
183
|
};
|
198
|
-
ws.onopen =
|
184
|
+
ws.onopen = () => {
|
199
185
|
logger.info('Socket connected');
|
200
186
|
setSocketHandlers();
|
201
187
|
authenticate(resolve, reject, authenticationHandler, scheduleReconnect);
|
202
188
|
};
|
203
|
-
ws.onerror =
|
189
|
+
ws.onerror = (event) => {
|
204
190
|
logger.error('Connecting socket failed');
|
205
191
|
scheduleReconnect();
|
206
192
|
};
|
207
193
|
};
|
208
194
|
// Authentication handler should send the actual authentication request
|
209
|
-
|
195
|
+
const startConnect = (authenticationHandler, reconnectOnFailure) => {
|
210
196
|
forceNoAutoConnect = false;
|
211
|
-
return new
|
197
|
+
return new Promise_js_1.default((resolve, reject) => {
|
212
198
|
logger.info('Starting socket connect');
|
213
199
|
connectInternal(resolve, reject, authenticationHandler, reconnectOnFailure);
|
214
200
|
});
|
215
201
|
};
|
216
202
|
// Is the socket connected and authorized?
|
217
|
-
|
203
|
+
const isConnected = () => {
|
218
204
|
return !!(ws && ws.readyState === (ws.OPEN || 1) && authToken);
|
219
205
|
};
|
220
206
|
// Is the socket connected but not possibly authorized?
|
221
|
-
|
207
|
+
const isConnecting = () => {
|
222
208
|
return !!(ws && !isConnected());
|
223
209
|
};
|
224
210
|
// Socket exists
|
225
|
-
|
211
|
+
const isActive = () => {
|
226
212
|
return !!ws;
|
227
213
|
};
|
228
|
-
|
214
|
+
const disableReconnect = () => {
|
229
215
|
clearTimeout(reconnectTimer);
|
230
216
|
forceNoAutoConnect = true;
|
231
217
|
};
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
var wait = function () {
|
218
|
+
const waitDisconnected = (timeoutMs = 2000) => {
|
219
|
+
const checkInterval = 50;
|
220
|
+
const maxAttempts = timeoutMs > 0 ? timeoutMs / checkInterval : 0;
|
221
|
+
return new Promise_js_1.default((resolve, reject) => {
|
222
|
+
let attempts = 0;
|
223
|
+
const wait = () => {
|
239
224
|
if (isActive()) {
|
240
225
|
if (attempts >= maxAttempts) {
|
241
|
-
logger.error(
|
226
|
+
logger.error(`Socket disconnect timed out after ${timeoutMs} ms`);
|
242
227
|
reject('Socket disconnect timed out');
|
243
228
|
}
|
244
229
|
else {
|
@@ -254,9 +239,7 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
254
239
|
});
|
255
240
|
};
|
256
241
|
// Disconnects the socket but keeps the session token
|
257
|
-
|
258
|
-
if (autoConnect === void 0) { autoConnect = false; }
|
259
|
-
if (reason === void 0) { reason = 'Manually disconnected by the client'; }
|
242
|
+
const disconnect = (autoConnect = false, reason = 'Manually disconnected by the client') => {
|
260
243
|
if (!ws) {
|
261
244
|
if (!forceNoAutoConnect) {
|
262
245
|
if (!autoConnect) {
|
@@ -279,28 +262,24 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
279
262
|
}
|
280
263
|
ws.close(1000, reason);
|
281
264
|
};
|
282
|
-
socket =
|
265
|
+
socket = Object.assign(Object.assign({
|
283
266
|
// Start connect
|
284
267
|
// Username and password are not required if those are available in socket options
|
285
|
-
connect:
|
286
|
-
if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
|
268
|
+
connect: (username, password, reconnectOnFailure = true) => {
|
287
269
|
if (isActive()) {
|
288
270
|
throw 'Connect may only be used for a closed socket';
|
289
271
|
}
|
290
272
|
resetSession();
|
291
|
-
return startConnect(
|
292
|
-
}, connectRefreshToken:
|
293
|
-
if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
|
273
|
+
return startConnect(() => handlePasswordLogin(username, password), reconnectOnFailure);
|
274
|
+
}, connectRefreshToken: (refreshToken, reconnectOnFailure = true) => {
|
294
275
|
if (isActive()) {
|
295
276
|
throw 'Connect may only be used for a closed socket';
|
296
277
|
}
|
297
278
|
resetSession();
|
298
|
-
return startConnect(
|
279
|
+
return startConnect(() => handleRefreshTokenLogin(refreshToken), reconnectOnFailure);
|
299
280
|
},
|
300
281
|
// Connect and attempt to associate the socket with an existing session
|
301
|
-
reconnect:
|
302
|
-
if (token === void 0) { token = undefined; }
|
303
|
-
if (reconnectOnFailure === void 0) { reconnectOnFailure = true; }
|
282
|
+
reconnect: (token = undefined, reconnectOnFailure = true) => {
|
304
283
|
if (isActive()) {
|
305
284
|
throw 'Reconnect may only be used for a closed socket';
|
306
285
|
}
|
@@ -314,22 +293,27 @@ var ApiSocket = function (userOptions, WebSocketImpl) {
|
|
314
293
|
return startConnect(handleAuthorizeToken, reconnectOnFailure);
|
315
294
|
},
|
316
295
|
// Remove the associated API session and close the socket
|
317
|
-
logout:
|
318
|
-
|
319
|
-
socket.delete(
|
320
|
-
.then(
|
296
|
+
logout: () => {
|
297
|
+
const resolver = Promise_js_1.default.pending();
|
298
|
+
socket.delete(ApiConstants_js_1.default.LOGOUT_URL)
|
299
|
+
.then((data) => {
|
321
300
|
logger.info('Logout succeed');
|
322
301
|
resetSession();
|
323
302
|
resolver.resolve(data);
|
324
303
|
// Don't fire the disconnected event before resolver actions are handled
|
325
304
|
disconnect(undefined, 'Logged out');
|
326
305
|
})
|
327
|
-
.catch(
|
306
|
+
.catch((error) => {
|
328
307
|
logger.error('Logout failed', error);
|
329
308
|
resolver.reject(error);
|
330
309
|
});
|
331
310
|
return resolver.promise;
|
332
|
-
}, disconnect
|
311
|
+
}, disconnect,
|
312
|
+
isConnecting,
|
313
|
+
isConnected,
|
314
|
+
isActive,
|
315
|
+
logger,
|
316
|
+
waitDisconnected,
|
333
317
|
// Function to call each time the socket has been connected (and authorized)
|
334
318
|
set onConnected(handler) {
|
335
319
|
connectedCallback = handler;
|
package/dist/SocketBase.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SocketBase.js","sourceRoot":"","sources":["../src/SocketBase.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"SocketBase.js","sourceRoot":"","sources":["../src/SocketBase.ts"],"names":[],"mappings":"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"}
|
package/dist/SocketLogger.d.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import * as Options from './types/options';
|
2
|
-
import { Logger } from './types/logger';
|
1
|
+
import * as Options from './types/options.js';
|
2
|
+
import { Logger } from './types/logger.js';
|
3
3
|
export declare const LOG_NONE = "none";
|
4
4
|
export declare const LOG_ERROR = "error";
|
5
5
|
export declare const LOG_WARN = "warn";
|
package/dist/SocketLogger.js
CHANGED
@@ -1,78 +1,68 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
3
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
4
|
-
if (ar || !(i in from)) {
|
5
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
6
|
-
ar[i] = from[i];
|
7
|
-
}
|
8
|
-
}
|
9
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
10
|
-
};
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
13
4
|
};
|
14
|
-
var _a;
|
15
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
16
6
|
exports.LOG_VERBOSE = exports.LOG_INFO = exports.LOG_WARN = exports.LOG_ERROR = exports.LOG_NONE = void 0;
|
17
|
-
|
18
|
-
|
19
|
-
|
7
|
+
const chalk_1 = __importDefault(require("chalk"));
|
8
|
+
// @ts-ignore
|
9
|
+
const is_in_browser_1 = require("is-in-browser");
|
10
|
+
const invariant_1 = __importDefault(require("invariant"));
|
20
11
|
exports.LOG_NONE = 'none';
|
21
12
|
exports.LOG_ERROR = 'error';
|
22
13
|
exports.LOG_WARN = 'warn';
|
23
14
|
exports.LOG_INFO = 'info';
|
24
15
|
exports.LOG_VERBOSE = 'verbose';
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
16
|
+
const Severities = {
|
17
|
+
[exports.LOG_NONE]: -1,
|
18
|
+
[exports.LOG_ERROR]: 0,
|
19
|
+
[exports.LOG_WARN]: 1,
|
20
|
+
[exports.LOG_INFO]: 2,
|
21
|
+
[exports.LOG_VERBOSE]: 3,
|
22
|
+
};
|
32
23
|
// Should we format the line with timestamp and coloring or let the logger implementation to handle it?
|
33
24
|
// Do this when running in terminal (node.js/tests in browser env)
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
var _b = _a.logLevel, logSetting = _b === void 0 ? exports.LOG_VERBOSE : _b, _c = _a.logOutput, logOutput = _c === void 0 ? console : _c;
|
38
|
-
var logLevel = Severities[logSetting];
|
25
|
+
const shouldFormatLine = is_in_browser_1.isJsDom || !is_in_browser_1.isBrowser;
|
26
|
+
const Logger = ({ logLevel: logSetting = exports.LOG_VERBOSE, logOutput = console }) => {
|
27
|
+
const logLevel = Severities[logSetting];
|
39
28
|
(0, invariant_1.default)(
|
40
29
|
// @ts-ignore: This condition will always return true since the function is always defined
|
41
30
|
logOutput.log && logOutput.info && logOutput.warn && logOutput.error, 'Invalid logOutput provided');
|
42
|
-
|
43
|
-
|
44
|
-
return
|
31
|
+
const formatCurrentTime = () => {
|
32
|
+
const d = new Date();
|
33
|
+
return `[${d.toLocaleDateString()} ${d.toLocaleTimeString()}:${d.getMilliseconds()}]`;
|
45
34
|
};
|
46
|
-
|
47
|
-
|
35
|
+
const print = (args, printHandler, argFormat) => {
|
36
|
+
let printableArgs = [...Array.prototype.slice.call(args)];
|
48
37
|
if (shouldFormatLine && argFormat) {
|
49
38
|
// Add the current time as well
|
50
|
-
printableArgs =
|
51
|
-
chalk_1.default.magenta(formatCurrentTime())
|
52
|
-
|
39
|
+
printableArgs = [
|
40
|
+
chalk_1.default.magenta(formatCurrentTime()),
|
41
|
+
...printableArgs.map(arg => argFormat(typeof arg === 'object' ? JSON.stringify(arg, null, ' ') : arg)),
|
42
|
+
];
|
53
43
|
}
|
54
44
|
printHandler.apply(logOutput, printableArgs);
|
55
45
|
};
|
56
|
-
|
57
|
-
verbose
|
46
|
+
const Impl = {
|
47
|
+
verbose() {
|
58
48
|
if (logLevel < Severities[exports.LOG_VERBOSE]) {
|
59
49
|
return;
|
60
50
|
}
|
61
51
|
print(arguments, logOutput.log, chalk_1.default.gray);
|
62
52
|
},
|
63
|
-
info
|
53
|
+
info() {
|
64
54
|
if (logLevel < Severities[exports.LOG_INFO]) {
|
65
55
|
return;
|
66
56
|
}
|
67
57
|
print(arguments, logOutput.info, chalk_1.default.white.bold);
|
68
58
|
},
|
69
|
-
warn
|
59
|
+
warn() {
|
70
60
|
if (logLevel < Severities[exports.LOG_WARN]) {
|
71
61
|
return;
|
72
62
|
}
|
73
63
|
print(arguments, logOutput.warn, chalk_1.default.yellow.bold);
|
74
64
|
},
|
75
|
-
error
|
65
|
+
error() {
|
76
66
|
if (logLevel < Severities[exports.LOG_ERROR]) {
|
77
67
|
return;
|
78
68
|
}
|
package/dist/SocketLogger.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SocketLogger.js","sourceRoot":"","sources":["../src/SocketLogger.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"SocketLogger.js","sourceRoot":"","sources":["../src/SocketLogger.ts"],"names":[],"mappings":"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"}
|
@@ -1,9 +1,9 @@
|
|
1
|
-
import * as API from './types/api';
|
2
|
-
import * as APIInternal from './types/api_internal';
|
3
|
-
import * as Options from './types/options';
|
4
|
-
import * as Socket from './types/socket';
|
5
|
-
import { Logger } from './types/logger';
|
6
|
-
import { SocketRequestMethods } from './types/requests';
|
1
|
+
import * as API from './types/api.js';
|
2
|
+
import * as APIInternal from './types/api_internal.js';
|
3
|
+
import * as Options from './types/options.js';
|
4
|
+
import * as Socket from './types/socket.js';
|
5
|
+
import { Logger } from './types/logger.js';
|
6
|
+
import { SocketRequestMethods } from './types/requests.js';
|
7
7
|
declare const SocketRequestHandler: (socket: () => Socket.APISocket, logger: Logger, { requestTimeout, ignoredRequestPaths }: Options.SocketRequestOptions) => {
|
8
8
|
socket: SocketRequestMethods;
|
9
9
|
onSocketConnected(): void;
|