Rename clientName to apikeyName

Adhidarma Hadiwinoto
1 parent 192a9e60ec
Showing 1 changed file with 8 additions and 7 deletions Side-by-side Diff
server.js
@@ -46,12 +46,12 @@ if (!wsListenPort) {
         // eslint-disable-next-line no-param-reassign
         ws.isAlive = true;
  
-        const { remoteAddress, apikey, name: clientName } = client;
+        const { remoteAddress, apikey, apikeyName } = client;
  
         logger.info(`${MODULE_NAME} F7755A03: Client connected`, {
             xid: connectionXid,
             remoteAddress,
-            clientName,
+            apikeyName,
             apikey,
         });
  
@@ -175,17 +175,18 @@ if (!wsListenPort) {
             return;
         }
  
-        logger.verbose(`${MODULE_NAME} AB8BC2F4: Incoming HTTP connection`, {
-            headers: req.headers,
-        });
-
         wss.handleUpgrade(req, socket, head, (ws) => {
             const client = {
                 remoteAddress: req.socket.remoteAddress,
+                apikeyName: matchedApikey.name,
                 apikey,
-                name: matchedApikey.name,
             };
  
+            logger.verbose(`${MODULE_NAME} AB8BC2F4: Incoming HTTP connection`, {
+                headers: req.headers,
+                client,
+            });
+
             wss.emit('connection', ws, req, client);
         });
     });
...	...	@@ -46,12 +46,12 @@ if (!wsListenPort) {
46	46	// eslint-disable-next-line no-param-reassign
47	47	ws.isAlive = true;
48	48
49		- const { remoteAddress, apikey, name: clientName } = client;
	49	+ const { remoteAddress, apikey, apikeyName } = client;
50	50
51	51	logger.info(`${MODULE_NAME} F7755A03: Client connected`, {
52	52	xid: connectionXid,
53	53	remoteAddress,
54		- clientName,
	54	+ apikeyName,
55	55	apikey,
56	56	});
57	57
...	...	@@ -175,17 +175,18 @@ if (!wsListenPort) {
175	175	return;
176	176	}
177	177
178		- logger.verbose(`${MODULE_NAME} AB8BC2F4: Incoming HTTP connection`, {
179		- headers: req.headers,
180		- });
181		-
182	178	wss.handleUpgrade(req, socket, head, (ws) => {
183	179	const client = {
184	180	remoteAddress: req.socket.remoteAddress,
	181	+ apikeyName: matchedApikey.name,
185	182	apikey,
186		- name: matchedApikey.name,
187	183	};
188	184
	185	+ logger.verbose(`${MODULE_NAME} AB8BC2F4: Incoming HTTP connection`, {
	186	+ headers: req.headers,
	187	+ client,
	188	+ });
	189	+
189	190	wss.emit('connection', ws, req, client);
190	191	});
191	192	});