squashed commits

Author: blva

src/helpers/connectionOptions.ts

@@ -30,17 +30,8 @@ export async function setAppNameParamIfMissing({
         return connectionStringUrl.toString();
     }
 
-    // Get deviceId if not provided
-    let deviceId = components.deviceId;
-    if (!deviceId) {
-        deviceId = await getDeviceIdForConnection();
-    }
-
-    // Get clientName if not provided
-    let clientName = components.clientName;
-    if (!clientName) {
-        clientName = "unknown";
-    }
+    const deviceId = components.deviceId || (await getDeviceIdForConnection());
+    const clientName = components.clientName || "unknown";
 
     // Build the extended appName format: appName--deviceId--clientName
     const extendedAppName = `${components.appName}--${deviceId}--${clientName}`;

src/helpers/deviceId.ts

@@ -18,6 +18,8 @@ export const DEVICE_ID_TIMEOUT = 3000;
  * ```
  */
 export async function getDeviceIdForConnection(): Promise<string> {
+    const controller = new AbortController();
+
     try {
         const deviceId = await getDeviceId({
             getMachineId: () => nodeMachineId.machineId(true),
@@ -34,7 +36,7 @@ export async function getDeviceIdForConnection(): Promise<string> {
                         break;
                 }
             },
-            abortSignal: new AbortController().signal,
+            abortSignal: controller.signal,
         });
         return deviceId;
     } catch (error) {