abmp-npm 10.3.7 → 10.3.9

package/backend/tasks/tasks-process-methods.js

@@ -1,9 +1,9 @@
 const { taskManager } = require('psdev-task-manager');
 
 const { COLLECTIONS } = require('../../public/consts');
-const { COMPILED_FILTERS_FIELDS, CONFIG_KEYS } = require('../consts');
+const { COMPILED_FILTERS_FIELDS, CONFIG_KEYS, LOGIN_EMAIL_SYNC_STATUS } = require('../consts');
+const { changeWixMembersEmails, summarizeLoginEmailOutcomes } = require('../daily-pull/utils');
 const { wixData } = require('../elevated-modules');
-const { updateWixMemberLoginEmail } = require('../members-area-methods');
 const {
   getAllEmptyAboutYouMembers,
   getAllMembersWithExternalImages,
@@ -481,6 +481,7 @@ const syncMemberLoginEmails = async data => {
       membersToUpdate.push({
         ...member,
         email: newEmail,
+        previousLoginEmail: member.email,
       });
     }
 
@@ -497,14 +498,35 @@ const syncMemberLoginEmails = async data => {
 
     for (const chunk of updateChunks) {
       try {
-        await bulkSaveMembers(chunk);
-
-        for (const member of chunk) {
-          await updateWixMemberLoginEmail(member, result);
-        }
-
-        result.successful += chunk.length;
-        console.log(`✅ Successfully updated ${chunkIndex} ${chunk.length} members`);
+        // Change Wix login emails first; only advance the CMS login email for the ones that
+        // succeeded. Failures keep their previous email (CMS stays consistent with Wix) and are
+        // reported in result.errors for manual handling.
+        const outcomes = await changeWixMembersEmails(chunk);
+        const { failedMemberIds } = summarizeLoginEmailOutcomes(outcomes);
+        const toSave = chunk.map(member => {
+          const { previousLoginEmail, ...restMember } = member;
+          if (failedMemberIds.has(member.memberId) && previousLoginEmail !== undefined) {
+            return { ...restMember, email: previousLoginEmail };
+          }
+          return restMember;
+        });
+        await bulkSaveMembers(toSave);
+
+        outcomes.forEach(outcome => {
+          if (outcome.status === LOGIN_EMAIL_SYNC_STATUS.UPDATED) {
+            result.successful++;
+          } else if (outcome.status === LOGIN_EMAIL_SYNC_STATUS.FAILED) {
+            result.failed++;
+            result.errors.push({
+              memberId: outcome.memberId,
+              wixMemberId: outcome.wixMemberId,
+              desiredEmail: outcome.desiredEmail,
+              error: outcome.error,
+            });
+          } else {
+            result.skipped++;
+          }
+        });
       } catch (error) {
         console.error(`❌ Error updating chunk ${chunkIndex}:`, error);
         result.failed += chunk.length;
@@ -515,14 +537,8 @@ const syncMemberLoginEmails = async data => {
         });
       }
     }
-    // Log comprehensive results including Wix member updates
-    const wixStats = result.wixMemberUpdates || { successful: 0, failed: 0 };
-    console.log(`Login Emails sync task completed:`);
-    console.log(
-      `  - Member data updates: ${result.successful} successful, ${result.failed} failed, ${result.skipped} skipped`
-    );
     console.log(
-      `  - Wix member login emails: ${wixStats.successful} successful, ${wixStats.failed} failed`
+      `Login Emails sync task completed: ${result.successful} synced, ${result.failed} failed, ${result.skipped} skipped`
     );
 
     return result;

package/backend/utils.js

@@ -210,6 +210,46 @@ function formatDateOnly(dateStr) {
 
 const runIf = (condition, asyncFn) => (condition ? asyncFn() : Promise.resolve(null));
 
+/**
+ * Whether an error looks like a transient network failure that is safe to retry,
+ * e.g. undici's generic "fetch failed" thrown by the Wix SDKs, connection resets
+ * or DNS hiccups under heavy load.
+ * @param {Error} error
+ * @returns {boolean}
+ */
+const isTransientNetworkError = error => {
+  const message = `${error?.message || ''} ${error?.cause?.message || ''} ${error?.code || ''} ${error?.cause?.code || ''}`;
+  return /fetch failed|ECONNRESET|ETIMEDOUT|ECONNREFUSED|EAI_AGAIN|EPIPE|UND_ERR|socket hang up|network error/i.test(
+    message
+  );
+};
+
+/**
+ * Runs an async operation, retrying with exponential backoff when it fails with a
+ * transient network error. Non-transient errors are rethrown immediately.
+ * @param {Function} operation - Async function to run
+ * @param {Object} [options]
+ * @param {number} [options.retries=2] - Maximum number of retries after the first attempt
+ * @param {number} [options.baseDelayMs=500] - Delay before the first retry, doubled each retry
+ * @returns {Promise<any>} - The operation's resolved value
+ */
+const withTransientErrorRetry = async (operation, { retries = 2, baseDelayMs = 500 } = {}) => {
+  for (let attempt = 0; ; attempt++) {
+    try {
+      return await operation();
+    } catch (error) {
+      if (attempt >= retries || !isTransientNetworkError(error)) {
+        throw error;
+      }
+      const delayMs = baseDelayMs * 2 ** attempt;
+      console.warn(
+        `Transient network error (attempt ${attempt + 1}/${retries + 1}): ${error.message}. Retrying in ${delayMs}ms`
+      );
+      await new Promise(resolve => setTimeout(resolve, delayMs));
+    }
+  }
+};
+
 module.exports = {
   getSiteConfigs,
   retrieveAllItems,
@@ -232,4 +272,6 @@ module.exports = {
   isPAC_STAFF,
   searchAllItems,
   runIf,
+  isTransientNetworkError,
+  withTransientErrorRetry,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "10.3.7",
+  "version": "10.3.9",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",
@@ -35,8 +35,8 @@
     "@wix/automations": "^1.0.261",
     "@wix/crm": "^1.0.1061",
     "@wix/data": "^1.0.349",
-    "@wix/essentials": "^0.1.28",
-    "@wix/identity": "^1.0.178",
+    "@wix/essentials": "^1.0.7",
+    "@wix/identity": "^1.0.195",
     "@wix/media": "^1.0.213",
     "@wix/members": "^1.0.365",
     "@wix/secrets": "^1.0.62",
@@ -49,6 +49,7 @@
     "axios": "^1.13.1",
     "crypto": "^1.0.1",
     "csv-parser": "^3.0.0",
+    "debug": "^4.4.3",
     "jwt-js-decode": "^1.9.0",
     "lodash": "^4.17.21",
     "ngeohash": "^0.6.3",

package/pages/Home.js

@@ -5,7 +5,6 @@ const { withWarmUpData } = require('psdev-utils/frontend');
 
 const { ADDRESS_STATUS_TYPES, DEFAULT_FILTER, DROPDOWN_OPTIONS } = require('../public/consts.js');
 const { createHomepageUtils } = require('../public/Utils/homePage.js');
-const { logHomePageLoadPhase } = require('../public/Utils/homePageLoadTrace.js');
 const {
   getMainAddress,
   formatPracticeAreasForDisplay,
@@ -14,8 +13,6 @@ const {
   normalizeExternalUrl,
 } = require('../public/Utils/sharedUtils.js');
 
-logHomePageLoadPhase('home_js_module_evaluated');
-
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
 let dropDownOptions = JSON.parse(JSON.stringify(DROPDOWN_OPTIONS));
 let stateCityMap;
@@ -39,7 +36,6 @@ const homePageOnReady = async ({
   getNonCompiledFiltersOptions,
   filterProfiles,
 }) => {
-  logHomePageLoadPhase('wix_onready_handler_entered');
   const {
     getParamsMapping,
     handlePagination,
@@ -62,9 +58,7 @@ const homePageOnReady = async ({
   detectMobile();
   initPageUI();
   attachEventListeners();
-  logHomePageLoadPhase('before_handleUrlParams');
   await handleUrlParams();
-  logHomePageLoadPhase('after_handleUrlParams');
 
   async function detectMobile() {
     try {
@@ -294,9 +288,7 @@ const homePageOnReady = async ({
   }
 
   async function applyFilterToUI(isDefaultStateParams) {
-    logHomePageLoadPhase('applyFilterToUI_start', { isDefaultStateParams });
     const renderingEnv = await rendering.env();
-    logHomePageLoadPhase('applyFilterToUI_rendering_env', { env: renderingEnv });
     const setFilterFromParams = async (isInitializeValue = true) => {
       const params = await wixLocation.query();
       console.log('params inside setFilterFromParams ', params);
@@ -330,9 +322,7 @@ const homePageOnReady = async ({
     await setFilterFromParams(true);
     if (isDefaultStateParams) {
       console.log('default state set for nearby');
-      logHomePageLoadPhase('applyFilterToUI_default_path_fetch_and_nearby_start');
       await Promise.all([fetchFilterData(), nearByHandler(true)]);
-      logHomePageLoadPhase('applyFilterToUI_default_path_complete');
       return;
     }
     console.log('not default state');
@@ -351,15 +341,12 @@ const homePageOnReady = async ({
         : () => updateResults('filterTimeout', true);
     console.log('filter ..', filter);
     try {
-      logHomePageLoadPhase('applyFilterToUI_non_default_path_start');
       await Promise.all([
         fetchFilterData().then(() => setFilterFromParams(false)),
         //TODO: remove this workaround to fix issue with SSR showing invalid results
         renderingEnv === 'backend' ? Promise.resolve() : searchPromise(),
       ]);
-      logHomePageLoadPhase('applyFilterToUI_non_default_path_complete');
     } catch (error) {
-      logHomePageLoadPhase('applyFilterToUI_error', { message: String(error && error.message) });
       console.error('[applyFilterToUI] failed with error:', error);
       multiStateBoxSelector.changeState('errorState');
     }
@@ -438,7 +425,6 @@ const homePageOnReady = async ({
   }
   // NEAR BY FILTER
   async function nearByHandler(preservePagination = false) {
-    logHomePageLoadPhase('nearByHandler_start', { preservePagination });
     const isSearchingNearby = _$w('#nearBy').checked;
     const renderingEnv = await rendering.env();
     // 1. Disable nearby input while processing
@@ -452,7 +438,6 @@ const homePageOnReady = async ({
     filter = newFilter;
     console.log('filter inside nearByHandler', filter);
     if (!success) {
-      logHomePageLoadPhase('nearByHandler_geolocation_failed');
       if (renderingEnv !== 'backend') {
         //on Backend environment, geolocation API don't work, so makes no sense to change state for near by
         multiStateBoxSelector.changeState('nearByState');
@@ -467,7 +452,6 @@ const homePageOnReady = async ({
     // If location is not selected, change state to "resultsState"
     if (!isSearchingNearby) {
       if (await noSearchCriteria()) {
-        logHomePageLoadPhase('nearByHandler_no_search_criteria');
         multiStateBoxSelector.changeState('noSearchCriteria');
         // 4. Re-enable nearby input
         _$w('#nearBy').enable();
@@ -479,7 +463,6 @@ const homePageOnReady = async ({
 
     // 4. Re-enable nearby input when done
     _$w('#nearBy').enable();
-    logHomePageLoadPhase('nearByHandler_complete', { success: true });
     return true;
   }
 
@@ -487,7 +470,6 @@ const homePageOnReady = async ({
   // FETCH STATE/CITY/AREAS OF PRACTICE FROM BACKEND ONCE AND STORE IT
 
   async function fetchFilterData() {
-    logHomePageLoadPhase('fetchFilterData_start');
     let completeStateList, areasOfPracticesList, stateCityMapList;
     try {
       const { COMPILED_STATE_LIST, COMPILED_AREAS_OF_PRACTICES, COMPILED_STATE_CITY_MAP } =
@@ -528,7 +510,6 @@ const homePageOnReady = async ({
 
     // Update filter states after data is loaded
     updateFiltersState();
-    logHomePageLoadPhase('fetchFilterData_complete');
   }
 
   // CONSTRUCT DROPDOWN OPTIONS FOR STATE, CITY, AREA OF PRACTICES

package/public/Utils/homePage.js

@@ -3,7 +3,6 @@ const { window: wixWindow, rendering } = require('@wix/site-window');
 
 const { DEFAULT_FILTER } = require('../consts.js');
 
-const { logHomePageLoadPhase } = require('./homePageLoadTrace.js');
 const { debouncedFunction } = require('./sharedUtils.js');
 
 function isValidGeolocation(lat, lng) {
@@ -400,8 +399,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       });
   }
   async function getAndSetUserLocation(isSearchingNearby, filter) {
-    logHomePageLoadPhase('getAndSetUserLocation_start', { isSearchingNearby });
-
     const { latitude: existingLat, longitude: existingLng } = filter;
     if (isValidGeolocation(existingLat, existingLng)) {
       return {
@@ -411,23 +408,16 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     }
 
     try {
-      logHomePageLoadPhase('getAndSetUserLocation_before_getCurrentGeolocation');
       const location = await getCurrentGeolocationWithTimeout();
+
       console.log('location inside getAndSetUserLocation', location);
       const userLat = location.coords?.latitude ?? 0;
       const userLong = location.coords?.longitude ?? 0;
-      logHomePageLoadPhase('getAndSetUserLocation_success', {
-        lat: userLat,
-        lng: userLong,
-      });
       return {
         success: true,
         filter: applyGeolocationToFilter(filter, userLat, userLong, isSearchingNearby),
       };
     } catch (error) {
-      logHomePageLoadPhase('getAndSetUserLocation_error', {
-        message: String(error && error.message),
-      });
       console.warn('Failed to get user location in getAndSetUserLocation', error);
       return { success: false, filter };
     }
@@ -546,7 +536,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     );
   }
   async function parseAndValidateQueryParams(filter, pagination) {
-    logHomePageLoadPhase('parseAndValidateQueryParams_start');
     const params = await wixLocation.query();
     const paramsMapping = getParamsMapping(filter, pagination);
     const {
@@ -558,11 +547,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     const isSearchingNearby = params.nearby === 'true';
     const isNoParams = !withoutPreviewParams || Object.keys(withoutPreviewParams).length === 0;
     const { success, filter: newFilter } = await getAndSetUserLocation(isSearchingNearby, filter);
-    logHomePageLoadPhase('parseAndValidateQueryParams_after_geolocation', {
-      isNoParams,
-      isSearchingNearby,
-      success,
-    });
 
     // Auto-enable nearby if GPS permission granted on fresh page load
     if (
@@ -573,7 +557,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       !isSearchingNearby
     ) {
       await wixQueryParams.add({ nearby: 'true', page: '1' });
-      logHomePageLoadPhase('parseAndValidateQueryParams_return', { branch: 'auto_nearby_url' });
       return { isDefaultStateParams: true, filter: newFilter };
     }
 
@@ -587,7 +570,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       // });
       // Don't search yet - let the caller decide what to do
       // The search will be handled in applyFilterToUI
-      logHomePageLoadPhase('parseAndValidateQueryParams_return', { branch: 'default_no_params' });
       return { isDefaultStateParams: true, filter: newFilter };
     }
     let autoAdjustFilters = false;
@@ -627,10 +609,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
         withoutPreviewParams.page) ||
       (Object.keys(withoutPreviewParams).length === 1 && withoutPreviewParams.nearby);
     const isDefaultStateParams = isNoParams || isNearbyFilter;
-    logHomePageLoadPhase('parseAndValidateQueryParams_return', {
-      branch: 'with_query_params',
-      isDefaultStateParams,
-    });
     return { isDefaultStateParams, filter: newFilter };
   }
 
@@ -714,7 +692,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     isSearchingNearby,
     preservePagination = false,
   }) {
-    logHomePageLoadPhase('search_start', { timeoutType, isSearchingNearby });
     const multiStateBoxSelector = _$w('#resultsStateBox');
     const renderingEnv = await rendering.env();
     const initSearchResultsUI = () => {
@@ -736,7 +713,6 @@ const createHomepageUtils = (_$w, filterProfiles) => {
             longitude: 0,
           }) === JSON.stringify(DEFAULT_FILTER)
         ) {
-          logHomePageLoadPhase('search_short_circuit_no_criteria');
           multiStateBoxSelector.changeState('noSearchCriteria');
           return [];
         }
@@ -760,19 +736,14 @@ const createHomepageUtils = (_$w, filterProfiles) => {
                 timeoutType,
                 args: { filter, isSearchingNearby },
               });
-      logHomePageLoadPhase('search_before_filterProfiles', { renderingEnv });
       const { success, response, error } = await funcPromise();
       if (!success) {
         _$w('#numberOfResults').text = '';
         console.error('[search] failed with error:', error);
-        logHomePageLoadPhase('search_filterProfiles_failed', {
-          message: String(error && error.message),
-        });
         multiStateBoxSelector.changeState('errorState');
         return [];
       }
       const totalCount = response.items.length;
-      logHomePageLoadPhase('search_filterProfiles_success', { totalCount });
       if (!totalCount) {
         _$w('#numberOfResults').text = 'Showing 0 results';
         _$w('#noResultsMessage').text = `${

package/public/Utils/sharedUtils.js

@@ -195,6 +195,28 @@ function normalizeExternalUrl(url) {
   return `https://${trimmed}`;
 }
 
+/**
+ * Normalizes an email for comparison (lowercased + trimmed).
+ * Wix CRM treats emails as case-insensitive, so comparisons must too.
+ * @param {string} email
+ * @returns {string}
+ */
+function normalizeEmail(email) {
+  return typeof email === 'string' ? email.trim().toLowerCase() : '';
+}
+
+/**
+ * Case-insensitive email equality. Two empty/missing emails are not considered a match.
+ * @param {string} a
+ * @param {string} b
+ * @returns {boolean}
+ */
+function emailsMatch(a, b) {
+  const normalizedA = normalizeEmail(a);
+  const normalizedB = normalizeEmail(b);
+  return Boolean(normalizedA) && normalizedA === normalizedB;
+}
+
 module.exports = {
   checkAddressIsVisible,
   formatPracticeAreasForDisplay,
@@ -208,4 +230,6 @@ module.exports = {
   formatAddress,
   isWixHostedImage,
   normalizeExternalUrl,
+  normalizeEmail,
+  emailsMatch,
 };

package/backend/login/login-methods-factory.js

@@ -1,24 +0,0 @@
-const { loginQAMember } = require('./qa-login-methods');
-const { authenticateSSOToken } = require('./sso-methods');
-
-/**
- * Creates login methods with injected generateSessionToken dependency
- * @param {Function} generateSessionToken - The Velo generateSessionToken function to inject
- * @returns {Object} Object containing loginQAMember and authenticateSSOToken methods
- */
-const createLoginMethods = generateSessionToken => {
-  //There is no generateSessionToken SDK version,  and the signOn of @wix/identity returns 403 error regardless that the permissions are valid
-  //Therefore, as a workaround we need to inject the Velo version of generateSessionToken to the login methods.
-  const injectGenerateSessionTokenToMethod =
-    method =>
-    async (...args) =>
-      await method(...args, generateSessionToken);
-  return {
-    loginQAMember: injectGenerateSessionTokenToMethod(loginQAMember),
-    authenticateSSOToken: injectGenerateSessionTokenToMethod(authenticateSSOToken),
-  };
-};
-
-module.exports = {
-  createLoginMethods,
-};

package/public/Utils/homePageLoadTrace.js

@@ -1,58 +0,0 @@
-/**
- * One session per full page load. First log call creates `loadId` (send this to support for GCL search).
- * Logs a plain object so DevTools shows an expandable tree; `loadId` is still easy to copy for GCL.
- */
-
-function randomSegment() {
-  return Math.random().toString(36).slice(2, 10);
-}
-
-function nowMs() {
-  if (typeof performance !== 'undefined' && typeof performance.now === 'function') {
-    return performance.now();
-  }
-  return Date.now();
-}
-
-let session = null;
-
-function ensureSession() {
-  if (session) {
-    return session;
-  }
-  const t0 = nowMs();
-  session = {
-    loadId: `hpl_${Date.now()}_${randomSegment()}_${randomSegment()}`,
-    t0,
-  };
-  return session;
-}
-
-/**
- * @param {string} phase
- * @param {Record<string, unknown>} [detail]
- */
-function logHomePageLoadPhase(phase, detail) {
-  const s = ensureSession();
-  const elapsed = Math.round(nowMs() - s.t0);
-  const payload = {
-    type: 'HomePageLoad',
-    loadId: s.loadId,
-    phase,
-    elapsedSinceStartMs: elapsed,
-    wallTimeIso: new Date().toISOString(),
-  };
-  if (detail && typeof detail === 'object') {
-    payload.detail = detail;
-  }
-  console.log('[HomePageLoad]', payload);
-}
-
-function getHomePageLoadId() {
-  return ensureSession().loadId;
-}
-
-module.exports = {
-  logHomePageLoadPhase,
-  getHomePageLoadId,
-};