Merge pull request #26 from datastax/fix-ragstack

fix ragstack user agent detection

Author: toptobes

src/api/constants.ts

@@ -14,15 +14,15 @@
 
 import { LIB_NAME, LIB_VERSION } from '@/src/version';
 
-export const RAG_STACK_REQUESTED_WITH = (() => {
+export const RAGSTACK_REQUESTED_WITH = (() => {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const lib = require('ragstack-ai');
-
-    if (!lib['LIB_NAME'] || !lib['LIB_VERSION']) {
-      return '';
-    }
-    return lib['LIB_NAME'] + '/' + lib['LIB_VERSION'];
+    /**
+     * Do not use require() here, it will break the build in some environments such as NextJS application^M
+     * if @datastax/ragstack-ai is not installed (which is perfectly fine).
+     */
+    const ragstack = eval(`require('@datastax/ragstack-ai')`);
+    const version =  ragstack['RAGSTACK_VERSION'] || "?";
+    return `ragstack-ai-ts/${version}`
   } catch (e) {
     return '';
   }

src/api/http-client.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { CLIENT_USER_AGENT, RAG_STACK_REQUESTED_WITH } from '@/src/api/constants';
+import { CLIENT_USER_AGENT, RAGSTACK_REQUESTED_WITH } from '@/src/api/constants';
 import { HTTPRequestInfo, InternalFetchCtx, InternalHTTPClientOptions, ResponseWithBody } from '@/src/api/types';
 import { Caller, DataAPIClientEvents } from '@/src/client';
 import TypedEmitter from 'typed-emitter';
@@ -104,5 +104,5 @@ export function buildUserAgent(caller: Caller | Caller[] | undefined): string {
     return c[1] ? `${c[0]}/${c[1]}` : c[0];
   }).join(' ');
 
-  return `${RAG_STACK_REQUESTED_WITH} ${callerString} ${CLIENT_USER_AGENT}`.trim();
+  return `${RAGSTACK_REQUESTED_WITH} ${callerString} ${CLIENT_USER_AGENT}`.trim();
 }