Merge pull request #215 from siddhishinde0723/atree

Telemetry changes

Author: siddhishinde0723

Dockerfile.atree

@@ -6,6 +6,7 @@ WORKDIR /workspace
 # Copy package.json and package-lock.json to the working directory
 COPY package*.json ./
 
+ENV NX_IGNORE_CYCLES=true
 # Install dependencies
 RUN npm install --legacy-peer-deps
 
@@ -17,9 +18,11 @@ COPY . .
 
 # Build Specific Application
 # Build only specific applications
-RUN npx nx run-many --target=build --projects=atree-app,content,players
-    npm install -g pm2
+#RUN npx nx run-many --target=build --projects=atree-app,content,players,atree-auth,registration
+#RUN npx nx run-many --target=build --projects=atree-app,content,players,atree-auth,registration --skip-nx-cache || true
 # Install PM2 to manage multiple apps
+RUN npx nx run-many --target=build --projects=atree-app,content,players --skip-nx-cache --parallel=1
+RUN npm install -g pm2
 
 # Expose the ports for all apps
 EXPOSE 3003

apps/atree-app/src/pages/_app.tsx

@@ -77,9 +77,13 @@ export default function RootLayout({ Component, pageProps }: AppProps) {
   const router = useRouter();
 
   useEffect(() => {
-    telemetryFactory.init();
+    // Initialize telemetry without async/await to avoid tslib dependency
+    if (typeof window !== 'undefined') {
+      telemetryFactory.init();
+    }
   }, []);
 
+
   useEffect(() => {
     runWhenIdle(clearLoginErrorHash);
   }, []);

apps/atree-app/src/pages/register/index.tsx

@@ -142,6 +142,7 @@ export default function Registration() {
         lastName,
         username,
         password: formData.password,
+        email: formData.username,
         gender: gender,
         ...(formData.mobile && { mobile: formData.mobile }),
         tenantCohortRoleMapping: tenantCohortRoleMapping,

apps/atree-app/src/utils/telemetry.js

@@ -28,7 +28,7 @@ const telemetryConfig = {
   },
   env: 'atree',
   channel: '',
-  did: 'did',
+  did: (typeof window !== 'undefined' && localStorage.getItem('deviceId')) || 'pending-device-id',
   authtoken: '',
   userId:
     (typeof window !== 'undefined' && localStorage.getItem('userId')) ||
@@ -44,36 +44,47 @@ const telemetryConfig = {
   tags: [],
 };
 
-// Wait for device ID before initializing telemetry
-if (typeof window !== 'undefined') {
-  getDeviceId().then((deviceId) => {
-    telemetryConfig.did = deviceId;
-    localStorage.setItem('deviceId', deviceId);
-    console.log('Telemetry Device ID (did):', deviceId);
-
-    // Ensure telemetry is initialized only once
-    if (!CsTelemetryModule.instance.isInitialised) {
-      CsTelemetryModule.instance.init({});
-      CsTelemetryModule.instance.telemetryService.initTelemetry({
-        config: telemetryConfig,
-        userOrgDetails: {},
-      });
-    }
-  });
-}
-
 // Exportable telemetry factory
 export const telemetryFactory = {
   init: () => {
-    if (
-      typeof window !== 'undefined' &&
-      !CsTelemetryModule.instance.isInitialised
-    ) {
-      CsTelemetryModule.instance.init({});
-      CsTelemetryModule.instance.telemetryService.initTelemetry({
-        config: telemetryConfig,
-        userOrgDetails: {},
-      });
+    if (typeof window !== 'undefined' && !CsTelemetryModule.instance.isInitialised) {
+      // Check if device ID already exists in localStorage
+      const deviceId = localStorage.getItem('deviceId');
+      
+      if (deviceId && deviceId !== 'pending-device-id') {
+        // Use existing device ID
+        telemetryConfig.did = deviceId;
+        console.log('Telemetry Device ID (did):', deviceId);
+        
+        // Initialize telemetry with existing device ID
+        CsTelemetryModule.instance.init({});
+        CsTelemetryModule.instance.telemetryService.initTelemetry({
+          config: telemetryConfig,
+          userOrgDetails: {},
+        });
+      } else {
+        // Get device ID asynchronously and initialize
+        getDeviceId().then((deviceId) => {
+          telemetryConfig.did = deviceId;
+          localStorage.setItem('deviceId', deviceId);
+          console.log('Telemetry Device ID (did):', deviceId);
+
+          // Initialize telemetry with proper device ID
+          CsTelemetryModule.instance.init({});
+          CsTelemetryModule.instance.telemetryService.initTelemetry({
+            config: telemetryConfig,
+            userOrgDetails: {},
+          });
+        }).catch((error) => {
+          console.error('Failed to get device ID:', error);
+          // Fallback initialization without device ID
+          CsTelemetryModule.instance.init({});
+          CsTelemetryModule.instance.telemetryService.initTelemetry({
+            config: telemetryConfig,
+            userOrgDetails: {},
+          });
+        });
+      }
     }
   },
 
@@ -86,12 +97,32 @@ export const telemetryFactory = {
     }
   },
 
+  updateDeviceId: async () => {
+    if (typeof window !== 'undefined') {
+      try {
+        const deviceId = await getDeviceId();
+        telemetryConfig.did = deviceId;
+        localStorage.setItem('deviceId', deviceId);
+        console.log('Telemetry Device ID updated:', deviceId);
+        return deviceId;
+      } catch (error) {
+        console.error('Failed to update device ID:', error);
+        return null;
+      }
+    }
+  },
+
+  getCurrentDeviceId: () => {
+    return telemetryConfig.did;
+  },
+
   interact: (interactEventInput) => {
     if (
       typeof window !== 'undefined' &&
       CsTelemetryModule.instance.isInitialised
     ) {
       const eventData = getEventData(interactEventInput);
+      console.log('Sending interact telemetry with device ID:', telemetryConfig.did);
       CsTelemetryModule.instance.telemetryService.raiseInteractTelemetry({
         options: eventData.options,
         edata: eventData.edata,
@@ -105,6 +136,7 @@ export const telemetryFactory = {
       CsTelemetryModule.instance.isInitialised
     ) {
       const eventData = getEventData(impressionEventInput);
+      console.log('Sending impression telemetry with device ID:', telemetryConfig.did);
       CsTelemetryModule.instance.telemetryService.raiseImpressionTelemetry({
         options: eventData.options,
         edata: eventData.edata,