bdy 1.14.3-stage → 1.14.4-dev

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.
Files changed (6) hide show
  1. package/distTs/package.json +1 -1
  2. package/distTs/src/agent/socket/client.js +18 -16
  3. package/distTs/src/api/client.js +7 -7
  4. package/distTs/src/tunnel/api/agent.js +5 -0
  5. package/distTs/src/tunnel/api/buddy.js +4 -0
  6. package/package.json +1 -1
package/distTs/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "bdy",
3
3
  "preferGlobal": false,
4
- "version": "1.14.3-stage",
4
+ "version": "1.14.4-dev",
5
5
  "type": "commonjs",
6
6
  "license": "MIT",
7
7
  "scripts": {
package/distTs/src/agent/socket/client.js CHANGED
@@ -22,10 +22,15 @@ class AgentSocketClient extends events_1.default {
22
22
  connected;
23
23
  lastUpdate;
24
24
  tunnelRequests;
25
- fetch(activate = true, action = null, disabled = null, resetFirstHeard = false, tunnels) {
25
+ socketEmit(msg, data) {
26
26
  if (!this.socket || !this.connected)
27
27
  return;
28
- this.socket.emit('fetchTunnelAgent', {
28
+ logger_1.default.debug(`AGENT SOCKET CLIENT EMIT: ${msg}`);
29
+ logger_1.default.debug(data);
30
+ this.socket.emit(msg, data);
31
+ }
32
+ fetch(activate = true, action = null, disabled = null, resetFirstHeard = false, tunnels) {
33
+ this.socketEmit('fetchTunnelAgent', {
29
34
  id: this.id,
30
35
  token: this.token,
31
36
  hostname: this.hostname,
@@ -39,14 +44,12 @@ class AgentSocketClient extends events_1.default {
39
44
  });
40
45
  }
41
46
  update(activate, tunnels, force = false) {
42
- if (!this.socket || !this.connected)
43
- return;
44
47
  const now = Date.now();
45
- // nie robimy update jak byl mniej niz 5s temu
48
+ // nie robimy update jak byl mniej niż 5s temu
46
49
  if (!force && this.lastUpdate && now - this.lastUpdate < 5000)
47
50
  return;
48
51
  this.lastUpdate = now;
49
- this.socket.emit('updateTunnelAgent', {
52
+ this.socketEmit('updateTunnelAgent', {
50
53
  id: this.id,
51
54
  token: this.token,
52
55
  hostname: this.hostname,
@@ -57,9 +60,7 @@ class AgentSocketClient extends events_1.default {
57
60
  });
58
61
  }
59
62
  emitRequest(tunnelId, logRequest) {
60
- if (!this.socket || !this.connected)
61
- return;
62
- this.socket.emit('tunnelRequest', {
63
+ this.socketEmit('tunnelRequest', {
63
64
  id: this.id,
64
65
  token: this.token,
65
66
  tunnelId,
@@ -94,7 +95,7 @@ class AgentSocketClient extends events_1.default {
94
95
  }
95
96
  }
96
97
  connect(atOnce) {
97
- logger_1.default.debug('socket connect');
98
+ logger_1.default.debug('AGENT SOCKET CLIENT: connect');
98
99
  if (atOnce && this.socket && !this.socket.connected) {
99
100
  this.socket.connect();
100
101
  }
@@ -146,29 +147,30 @@ class AgentSocketClient extends events_1.default {
146
147
  if (!this.socket)
147
148
  return;
148
149
  this.connected = true;
149
- logger_1.default.info(texts_1.LOG_SOCKET_CONNECTED);
150
+ logger_1.default.info(`AGENT SOCKET CLIENT: ${texts_1.LOG_SOCKET_CONNECTED}`);
150
151
  this.emit(tunnel_1.TUNNEL_SOCKET_EVENT.CONNECTED);
151
- this.socket.emit('joinTunnelAgent', {
152
+ this.socketEmit('joinTunnelAgent', {
152
153
  id: this.id,
153
154
  token: this.token,
154
155
  });
155
156
  });
156
157
  this.socket.on('disconnect', () => {
157
158
  this.connected = false;
158
- logger_1.default.info(texts_1.LOG_SOCKET_DISCONNECTED);
159
+ logger_1.default.info(`AGENT SOCKET CLIENT: ${texts_1.LOG_SOCKET_DISCONNECTED}`);
159
160
  this.emit(tunnel_1.TUNNEL_SOCKET_EVENT.DISCONNECTED);
160
161
  this.connect();
161
162
  });
162
163
  this.socket.on('connect_error', () => {
163
- logger_1.default.debug('socket error');
164
+ logger_1.default.debug('AGENT SOCKET CLIENT: connect error');
164
165
  this.connect();
165
166
  });
166
167
  this.socket.on('fetchTunnelAgentSuccess', (data) => {
167
- logger_1.default.debug('Socket fetch success');
168
+ logger_1.default.debug('AGENT SOCKET CLIENT: fetch success');
169
+ logger_1.default.debug(data);
168
170
  this.emit(tunnel_1.TUNNEL_SOCKET_EVENT.FETCH_SUCCESS, data);
169
171
  });
170
172
  this.socket.on('fetchTunnelAgentFailed', (code) => {
171
- logger_1.default.debug('Socket fetch failed');
173
+ logger_1.default.debug(`AGENT SOCKET CLIENT: fetch failed ${code}`);
172
174
  this.emit(tunnel_1.TUNNEL_SOCKET_EVENT.FETCH_FAILED, (0, utils_1.apiErrorCodeToClass)(code, host));
173
175
  });
174
176
  this.socket.on('sync', (data) => this.onSync(data));
package/distTs/src/api/client.js CHANGED
@@ -36,17 +36,17 @@ class ApiClient {
36
36
  };
37
37
  let status;
38
38
  let responseBody;
39
- logger_1.default.debug(`REST API ${method} ${this.baseUrl.protocol}//${this.baseUrl.host}${path}`);
39
+ logger_1.default.debug(`API CLIENT: ${method} ${this.baseUrl.protocol}//${this.baseUrl.host}${path}`);
40
40
  logger_1.default.debug(headers);
41
41
  logger_1.default.debug(body);
42
42
  try {
43
43
  const r = await this.client.request(opts);
44
44
  status = r.statusCode;
45
45
  responseBody = r.body;
46
- logger_1.default.debug(`REST API RESPONSE STATUS: ${status}`);
46
+ logger_1.default.debug(`API CLIENT RESPONSE STATUS: ${status}`);
47
47
  }
48
48
  catch (err) {
49
- logger_1.default.debug('REST API RESPONSE ERROR');
49
+ logger_1.default.debug('API CLIENT RESPONSE ERROR');
50
50
  logger_1.default.debug(err);
51
51
  throw new Error(texts_1.ERR_REST_API_GENERAL_ERROR);
52
52
  }
@@ -64,12 +64,12 @@ class ApiClient {
64
64
  json = await responseBody.json();
65
65
  }
66
66
  catch (err) {
67
- logger_1.default.debug('REST API PARSED RESPONSE ERROR:');
67
+ logger_1.default.debug('API CLIENT PARSED RESPONSE ERROR:');
68
68
  logger_1.default.debug(err);
69
69
  throw new Error(texts_1.ERR_REST_API_GENERAL_ERROR);
70
70
  // do nothing
71
71
  }
72
- logger_1.default.debug('REST API PARSED RESPONSE:');
72
+ logger_1.default.debug('API CLIENT PARSED RESPONSE:');
73
73
  logger_1.default.debug(json);
74
74
  if (json.errors && json.errors[0] && json.errors[0].message) {
75
75
  throw new Error(json.errors[0].message);
@@ -83,12 +83,12 @@ class ApiClient {
83
83
  if (parseResponseBody) {
84
84
  try {
85
85
  const b = await responseBody.json();
86
- logger_1.default.debug('REST API PARSED RESPONSE:');
86
+ logger_1.default.debug('API CLIENT PARSED RESPONSE:');
87
87
  logger_1.default.debug(b);
88
88
  return b;
89
89
  }
90
90
  catch (err) {
91
- logger_1.default.debug('REST API PARSED RESPONSE ERROR:');
91
+ logger_1.default.debug('API CLIENT PARSED RESPONSE ERROR:');
92
92
  logger_1.default.debug(err);
93
93
  throw new Error(texts_1.ERR_REST_API_GENERAL_ERROR);
94
94
  }
package/distTs/src/tunnel/api/agent.js CHANGED
@@ -23,17 +23,21 @@ const makeRequest = async (port, path, body) => {
23
23
  setTimeout(() => {
24
24
  c.abort();
25
25
  }, TIMEOUT);
26
+ logger_1.default.debug(`TUNNEL API AGENT REQUEST: :${port}${path}`);
27
+ logger_1.default.debug(body);
26
28
  const response = await fetch(`http://localhost:${port}${path}`, {
27
29
  body: body ? JSON.stringify(body) : null,
28
30
  headers: { 'Content-Type': 'application/json' },
29
31
  method: 'POST',
30
32
  signal: c.signal,
31
33
  });
34
+ logger_1.default.debug(`TUNNEL API AGENT RESPONSE: ${response.status}`);
32
35
  if (response.status === 404) {
33
36
  throw new Error(texts_1.ERR_NOT_FOUND);
34
37
  }
35
38
  if (response.status === 400) {
36
39
  const data = await response.json();
40
+ logger_1.default.debug(data);
37
41
  throw new Error(data.message);
38
42
  }
39
43
  if (response.status !== 200) {
@@ -42,6 +46,7 @@ const makeRequest = async (port, path, body) => {
42
46
  let data;
43
47
  try {
44
48
  data = await response.json();
49
+ logger_1.default.debug(data);
45
50
  }
46
51
  catch (err) {
47
52
  logger_1.default.error(texts_1.LOG_ERROR);
package/distTs/src/tunnel/api/buddy.js CHANGED
@@ -27,6 +27,8 @@ const makeRequest = async (host, path, body, method = 'POST', respAsJson = true,
27
27
  setTimeout(() => {
28
28
  c.abort();
29
29
  }, timeout);
30
+ logger_1.default.debug(`TUNNEL API BUDDY REQUEST: ${method} ${host}${path}`);
31
+ logger_1.default.debug(body);
30
32
  const response = await nodeFetch(`${host}${path}`, {
31
33
  body: body ? JSON.stringify(body) : null,
32
34
  headers: body ? { 'Content-Type': 'application/json' } : null,
@@ -40,6 +42,8 @@ const makeRequest = async (host, path, body, method = 'POST', respAsJson = true,
40
42
  data = await response.json();
41
43
  else
42
44
  data = await response.text();
45
+ logger_1.default.debug(`TUNNEL API BUDDY RESPONSE: ${response.status}`);
46
+ logger_1.default.debug(data);
43
47
  }
44
48
  catch {
45
49
  throw new utils_1.ApiErrorFailedToConnect(host);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "bdy",
3
3
  "preferGlobal": false,
4
- "version": "1.14.3-stage",
4
+ "version": "1.14.4-dev",
5
5
  "type": "commonjs",
6
6
  "license": "MIT",
7
7
  "scripts": {