Merge pull request #1146 from JulianAdams4/nucleus

Fix analytics

Author: Erika Perugachi

electron_app/electron-starter.js

@@ -17,7 +17,6 @@ const {
   isFromStore,
   getSystemLanguage
 } = require('./src/windows/windowUtils');
-require('dotenv').config();
 require('./src/ipc/composer.js');
 require('./src/ipc/loading.js');
 require('./src/ipc/login.js');
@@ -27,9 +26,6 @@ require('./src/ipc/manager.js');
 require('./src/ipc/dataTransfer.js');
 require('./src/ipc/backup.js');
 const ipcUtils = require('./src/ipc/utils.js');
-const { version } = require('./package.json');
-const nucleusId = process.env.NUCLEUS_ID;
-const versionApp = process.env.NODE_ENV === 'development' ? '0.0.0' : version;
 
 globalManager.forcequit.set(false);
 
@@ -50,7 +46,7 @@ async function initApp() {
       mySettings.initialize(settings);
       wsClient.start(myAccount);
       createAppMenu();
-      mailboxWindow.show();
+      mailboxWindow.show({ firstOpenApp: true });
     } else {
       await getUserLanguage();
       createAppMenu();
@@ -83,8 +79,6 @@ async function initApp() {
       loadingWindow.send('socket-message', data);
     }
   });
-
-  upNucleus();
 }
 
 //   App
@@ -105,17 +99,6 @@ const getUserLanguage = async () => {
   await dbManager.updateSettings({ language: osLanguage });
 };
 
-const upNucleus = () => {
-  const data = {
-    onlyMainProcess: true,
-    userId: myAccount.recipientId,
-    version: versionApp,
-    language: mySettings.language
-  }
-  const Nucleus = require('electron-nucleus')(nucleusId, data);
-  Nucleus.track("PLAYED_TRACK");
-}
-
 app.on('ready', () => {
   initApp();
 });

electron_app/installerResources/make_installer.sh

@@ -2,7 +2,8 @@
 
 has_error=0
 isSupported=0
-installerTypeDefaultValue="DEVELOPMENT";
+installerTypeDefaultValue="DEVELOPMENT"
+nucleusIdDefaultValue="0.0.0"
 entitlementsOriginalFileName="entitlements.mac.plist"
 entitlementsBackupFileName="backup-entitlements.mac.plist"
 # Folders
@@ -30,11 +31,15 @@ CURRENT_OS=$( uname )
 if [ "$CURRENT_OS" = "Linux" ]; then    
     echo "    OS:    Linux";
     isSupported=1;
+    # Load environment variables
+    source ./.env
     # Update package.json
     linuxInstallerType=$( cat ./installerResources/installerTypes.json | json "linux.installer" )
     json -I -f ./package.json -e "this.criptextInstallerType=\"${linuxInstallerType}\"" -q
+    json -I -f ./package.json -e "this.nucleusId=\"${PROD_NUCLEUS_ID}\"" -q
     printf "    Updated package.json \n";
-    printf "        -> Installer-type:  ${linuxInstallerType} \n";
+    printf "        -> Installer-type:  ${linuxInstallerType}\n";
+    printf "        ->   Nucleus Id  :  ${PROD_NUCLEUS_ID}\n";
     echo "    Executing:    yarn build";
     yarn build > /dev/null;
     # Move to subfolder
@@ -55,9 +60,11 @@ elif [ "$CURRENT_OS" = "Darwin" ]; then
     # Update package.json
     macStoreType=$( cat ./installerResources/installerTypes.json | json "mac.store" )
     json -I -f ./package.json -e "this.criptextInstallerType=\"${macStoreType}\"" -q
+    json -I -f ./package.json -e "this.nucleusId=\"${PROD_NUCLEUS_ID}\"" -q
     json -I -f ./package.json -e 'this.build.mac.target=["mas"]' -q
     printf "    Updated package.json \n";
     printf "        -> Installer-type:  ${macStoreType} \n";
+    printf "        ->   Nucleus Id  :  ${PROD_NUCLEUS_ID}\n";
     printf "        -> Current target:  MAS \n";
     # Building
     printf "    Executing:    yarn build \n";
@@ -77,6 +84,7 @@ elif [ "$CURRENT_OS" = "Darwin" ]; then
     json -I -f ./package.json -e 'this.build.mac.target=["dmg", "zip"]' -q
     printf "\n    Updated package.json \n";
     printf "        -> Installer-type:  ${macInstallerType} \n";
+    printf "        ->   Nucleus Id  :  ${PROD_NUCLEUS_ID}\n";
     printf "        -> Current target:  DMG & ZIP \n";
     mv "build/${entitlementsOriginalFileName}" "build/${entitlementsBackupFileName}";
     printf "    Renamed [${entitlementsOriginalFileName}] to [${entitlementsBackupFileName}] \n";
@@ -107,9 +115,11 @@ else
     # Update package.json
     windowsInstallerType=$( cat ./installerResources/installerTypes.json | json "windows.installer" )
     json -I -f ./package.json -e "this.criptextInstallerType=\"${windowsInstallerType}\"" -q
+    json -I -f ./package.json -e "this.nucleusId=\"${PROD_NUCLEUS_ID}\"" -q
     json -I -f ./package.json -e 'this.build.win.target=["nsis"]' -q
     printf "    Updated package.json \n";
     printf "        -> Installer-type:  ${windowsInstallerType} \n";
+    printf "        ->   Nucleus Id  :  ${PROD_NUCLEUS_ID}\n";
     printf "        -> Current target:  Nsis \n";
     # Building
     printf "    Executing:    yarn build";
@@ -133,8 +143,9 @@ else
     json -I -f ./package.json -e "this.build.appx.publisher=\"${WIN_STORE_DEVELOPER_ID}\"" -q
     printf "\n    Updated package.json \n";
     printf "        -> Installer-type:  ${windowsStoreType} \n";
+    printf "        ->   Nucleus Id  :  ${PROD_NUCLEUS_ID}\n";
     printf "        -> Current target:  AppX \n";
-    printf "        -> Publisher:       ${WIN_STORE_DEVELOPER_ID} \n";
+    printf "        ->    Publisher  :       ${WIN_STORE_DEVELOPER_ID} \n";
     # Building
     printf "    Executing:    yarn build";
     yarn build > /dev/null;
@@ -152,8 +163,9 @@ else
 fi
 
 
-# Set default criptextInstallerType
+# Set default criptextInstallerType & Nucleus Id
 json -I -f ./package.json -e "this.criptextInstallerType=\"${installerTypeDefaultValue}\"" -q
+json -I -f ./package.json -e "this.nucleusId=\"${nucleusIdDefaultValue}\"" -q
 # Remove modified package.json 
 rm -f ./package.json
 # Restore original package.json

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",
@@ -24,9 +24,10 @@
     "lint": "criptext-js-tools lint",
     "clear-build": "sh ./installerResources/clearBuild.sh",
     "package": "sh ./installerResources/converge_builds.sh",
-    "release": "sh ./installerResources/make_installer.sh"
+    "release": "bash ./installerResources/make_installer.sh"
   },
   "criptextInstallerType": "DEVELOPMENT",
+  "nucleusId": "0.0.0",
   "build": {
     "appId": "com.criptext.criptextmail",
     "buildVersion": "1",

electron_app/src/ipc/mailbox.js

@@ -44,9 +44,9 @@ ipc.answerRenderer('open-file-explorer', filename => {
   mailboxWindow.showFileExplorer(filename);
 });
 
-ipc.answerRenderer('open-mailbox', () => {
+ipc.answerRenderer('open-mailbox', ({ firstOpenApp }) => {
   wsClient.start(myAccount);
-  mailboxWindow.show();
+  mailboxWindow.show({ firstOpenApp });
 });
 
 ipc.answerRenderer('print-to-pdf', async ({ emailId, threadId }) => {

electron_app/src/utils/const.js

@@ -1,5 +1,6 @@
 /* process */
 require('dotenv').config();
+const { version, nucleusId } = require('./../../package.json');
 
 const API_CLIENT_VERSION = '9.0.0';
 const LINK_DEVICES_FILE_VERSION = '5';
@@ -27,5 +28,9 @@ module.exports = {
     : PROD_DATA_TRANSFER_URL,
   NEWS_SERVER_URL,
   API_CLIENT_VERSION,
-  LINK_DEVICES_FILE_VERSION
+  LINK_DEVICES_FILE_VERSION,
+  APP_VERSION: isDevelopment ? '0.0.0' : version,
+  NUCLEUS_ID: isDevelopment
+    ? process.env.DEV_NUCLEUS_ID
+    : process.env.PROD_NUCLEUS_ID || nucleusId
 };

electron_app/src/windows/mailbox.js

@@ -8,7 +8,12 @@ const { appUpdater } = require('./../updater');
 const globalManager = require('./../globalManager');
 const { mailtoProtocolRegex } = require('./../utils/RegexUtils');
 const { removeProtocolFromUrl } = require('./../utils/stringUtils');
-const { isFromStore, isDev } = require('./windowUtils');
+const {
+  isFromStore,
+  isDev,
+  nucleusTrack,
+  NUCLEUS_EVENTS
+} = require('./windowUtils');
 const { createTrayIcon, destroyTrayIcon } = require('./tray');
 const { isWindows } = require('./../utils/osUtils');
 
@@ -89,18 +94,20 @@ const showFileExplorer = filename => {
   mailboxWindow.send('display-message-success-download');
 };
 
-const show = async () => {
+const show = async ({ firstOpenApp = false }) => {
   const existVisibleWindow = BrowserWindow.getAllWindows().filter(w =>
     w.isVisible()
   );
   if (mailboxWindow) {
     mailboxWindow.show();
     createTrayIcon();
+    if (firstOpenApp) nucleusTrack(NUCLEUS_EVENTS.MAILBOX_TRACK);
   } else if (!existVisibleWindow.length || !mailboxWindow) {
     await create();
     mailboxWindow.on('ready-to-show', () => {
       mailboxWindow.show();
       createTrayIcon();
+      if (firstOpenApp) nucleusTrack(NUCLEUS_EVENTS.MAILBOX_TRACK);
     });
     mailboxWindow.on('focus', () => {
       if (!globalManager.windowsEvents.checkDisabled()) {

electron_app/src/windows/tray.js

@@ -53,7 +53,7 @@ const createTrayIcon = () => {
     tray.setContextMenu(contextMenu);
     tray.on('click', () => {
       const mailboxWindow = require('./mailbox');
-      mailboxWindow.show();
+      mailboxWindow.show({});
     });
   }
 };

electron_app/src/windows/windowUtils.js

@@ -1,6 +1,9 @@
 const { app, BrowserWindow } = require('electron');
 const osLocale = require('os-locale');
 const globalManager = require('./../globalManager');
+const myAccount = require('./../Account');
+const mySettings = require('./../Settings');
+const { APP_VERSION, NUCLEUS_ID } = require('./../utils/const');
 
 const showWindows = () => {
   const visibleWindows = BrowserWindow.getAllWindows();
@@ -39,6 +42,23 @@ const sendEventToAllWindows = (eventName, params) => {
   });
 };
 
+const getNucleusPayload = () => ({
+  onlyMainProcess: true,
+  userId: myAccount.recipientId,
+  version: APP_VERSION,
+  language: mySettings.language
+});
+
+const nucleusTrack = eventName => {
+  const data = getNucleusPayload();
+  const Nucleus = require('electron-nucleus')(NUCLEUS_ID, data);
+  Nucleus.track(eventName);
+};
+
+const NUCLEUS_EVENTS = {
+  MAILBOX_TRACK: 'MAILBOX_TRACK'
+};
+
 module.exports = {
   quit,
   isDev,
@@ -48,5 +68,7 @@ module.exports = {
   isFromStore,
   showWindows,
   getSystemLanguage,
-  sendEventToAllWindows
+  sendEventToAllWindows,
+  NUCLEUS_EVENTS,
+  nucleusTrack
 };

email_composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.1.0",
+  "version": "0.23.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",

email_loading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.1.0",
+  "version": "0.23.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",