refactor: update clients to have different user agents

meilisearch · Oct 27, 2023 · c767786 · c767786
1 parent 8fea5e4
commit c767786
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/clients/browser-client.ts b/src/clients/browser-client.ts
@@ -1,9 +1,16 @@
 import { Config } from '../types'
 import { Client } from './client'
+import { PACKAGE_VERSION } from '../package-version'
 
 class MeiliSearch extends Client {
   constructor(config: Config) {
-    super(config)
+    super({
+      ...config,
+      clientAgents: [
+        ...(config.clientAgents ?? []),
+        `Meilisearch JavaScript (v${PACKAGE_VERSION})`,
+      ],
+    })
   }
 }
 

diff --git a/src/clients/node-client.ts b/src/clients/node-client.ts
@@ -1,12 +1,19 @@
 import { Client } from './client'
 import { Config, TokenSearchRules, TokenOptions } from '../types'
 import { Token } from '../token'
+import { PACKAGE_VERSION } from '../package-version'
 
 class MeiliSearch extends Client {
   tokens: Token
 
   constructor(config: Config) {
-    super(config)
+    super({
+      ...config,
+      clientAgents: [
+        ...(config.clientAgents ?? []),
+        `Meilisearch Node (v${PACKAGE_VERSION})`,
+      ],
+    })
     this.tokens = new Token(config)
   }
 

diff --git a/src/http-requests.ts b/src/http-requests.ts
@@ -1,5 +1,4 @@
 import { Config, EnqueuedTaskObject } from './types'
-import { PACKAGE_VERSION } from './package-version'
 
 import {
   MeiliSearchError,
@@ -55,7 +54,6 @@ function cloneAndParseHeaders(headers: HeadersInit): Record<string, string> {
 
 function createHeaders(config: Config): Record<string, any> {
   const agentHeader = 'X-Meilisearch-Client'
-  const packageAgent = `Meilisearch JavaScript (v${PACKAGE_VERSION})`
   const contentType = 'Content-Type'
   const authorization = 'Authorization'
   const headers = cloneAndParseHeaders(config.requestConfig?.headers ?? {})
@@ -71,16 +69,12 @@ function createHeaders(config: Config): Record<string, any> {
 
   // Creates the custom user agent with information on the package used.
   if (config.clientAgents && Array.isArray(config.clientAgents)) {
-    const clients = config.clientAgents.concat(packageAgent)
-
-    headers[agentHeader] = clients.join(' ; ')
+    headers[agentHeader] = config.clientAgents.join(' ; ')
   } else if (config.clientAgents && !Array.isArray(config.clientAgents)) {
     // If the header is defined but not an array
     throw new MeiliSearchError(
       `Meilisearch: The header "${agentHeader}" should be an array of string(s).\n`
     )
-  } else {
-    headers[agentHeader] = packageAgent
   }
 
   return headers