abmp-npm 10.3.6 → 10.3.7

package/backend/http-functions/interests.js

@@ -1,5 +1,3 @@
-const axios = require('axios');
-
 const { COLLECTIONS } = require('../../public/consts');
 const { clearCollection } = require('../cms-data-methods');
 const { CONFIG_KEYS } = require('../consts');
@@ -12,9 +10,13 @@ const getInterests = async () => {
     getSiteConfigs(CONFIG_KEYS.INTERESTS_API_URL),
     getHeaders(),
   ]);
+  const fetchOptions = {
+    method: 'get',
+    headers: headers,
+  };
   try {
-    const response = await axios.get(url, { headers });
-    return response.data;
+    const response = await fetch(url, fetchOptions);
+    return await response.json();
   } catch (e) {
     console.error('Error getting interests:', e);
     throw e;

package/backend/login/sso-methods.js

@@ -1,6 +1,5 @@
 const { createHmac } = require('crypto');
 
-const axios = require('axios');
 const { decode } = require('jwt-js-decode');
 
 const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL } = require('../consts');
@@ -92,16 +91,17 @@ async function checkAndFetchSSO(token) {
   const SSO_TOKEN_AUTH_API_KEY = await getSecret('SSO_TOKEN_AUTH_API_KEY');
   const signature = createHmac('sha256', SSO_TOKEN_AUTH_API_KEY).update(token).digest('hex');
   const professionalassistcorpUrl = `${SSO_TOKEN_AUTH_API_URL}/eweb/SSOToken.ashx?token=${token}&Partner=Wix&Signature=${signature}`;
+  const options = {
+    method: 'get',
+  };
   try {
-    const httpResponse = await axios.get(professionalassistcorpUrl, {
-      transformResponse: [d => d],
-      validateStatus: () => true,
-    });
+    const httpResponse = await fetch(professionalassistcorpUrl, options);
     console.log('httpResponse status', httpResponse.status);
-    if (httpResponse.status < 200 || httpResponse.status >= 300) {
+    if (!httpResponse.ok) {
       throw new Error('Fetch did not succeed with status: ' + httpResponse.status);
     }
-    return httpResponse.data;
+    const responseToken = await httpResponse.text();
+    return responseToken;
   } catch (error) {
     console.error('Error in checkAndFetchSSO', error);
     return null;

package/backend/pac-api-methods.js

@@ -1,5 +1,3 @@
-const axios = require('axios');
-
 const { PAC_API_URL, TEST_PAC_API_URL, BACKUP_API_URL } = require('./consts');
 const { getSecret } = require('./utils');
 
@@ -33,22 +31,24 @@ const fetchPACMembers = async ({ page, action, backupDate, isTestEnvironment })
   const url = `${baseUrl}/Members?${new URLSearchParams(queryParams).toString()}`;
   console.log(`Fetching PAC members from:  ${url}`);
   const headers = await getHeaders();
-  const response = await axios.get(url, {
-    headers,
-    validateStatus: () => true,
-  });
-  const responseType = response.headers['content-type'] || '';
+  const fetchOptions = {
+    method: 'get',
+    headers: headers,
+  };
+  const response = await fetch(url, fetchOptions);
+  const responseType = response.headers.get('content-type');
   if (!responseType.includes('application/json')) {
     const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${page} and actionFilter ${action}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }
-  if (response.status >= 200 && response.status < 300) {
-    return response.data;
+  if (response.ok) {
+    return response.json();
+  } else {
+    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${page} and actionFilter ${action}`;
+    console.error(errorMessage);
+    throw new Error(errorMessage);
   }
-  const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${page} and actionFilter ${action}`;
-  console.error(errorMessage);
-  throw new Error(errorMessage);
 };
 
 module.exports = { fetchPACMembers, getHeaders }; //TODO: remove getHeaders from exported methods once npm movement finishes

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

@@ -103,23 +103,23 @@ async function updateMemberRichContent(memberId) {
     content: htmlString,
   });
 
-  const requestHeaders = {
-    'Content-Type': 'application/json',
-    Cookie: 'XSRF-TOKEN=1753949844|p--a7HsuVjR4',
-    Authorization: 'Bearer ' + (await getServerlessAuth()),
+  const requestOptions = {
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/json',
+      Cookie: 'XSRF-TOKEN=1753949844|p--a7HsuVjR4',
+      Authorization: 'Bearer ' + (await getServerlessAuth()),
+    },
+    body: raw,
   };
 
   try {
-    const response = await axios.post(
+    const response = await fetch(
       'https://www.wixapis.com/data-sync/v1/abmp-content-converter',
-      raw,
-      {
-        headers: requestHeaders,
-        validateStatus: () => true,
-      }
+      requestOptions
     );
-    if (response.status >= 200 && response.status < 300) {
-      const data = response.data;
+    if (response.ok) {
+      const data = await response.json();
       const updatedMember = {
         ...member,
         aboutYourSelf: data.richContent.richContent,
@@ -358,13 +358,9 @@ async function uploadMembersSitemap({ members, tokens, destinationFileName, site
 
   const url = `https://${host}${pathName}`;
   console.log('url', url);
-  const res = await axios.put(url, body, {
-    headers: reqOpts.headers,
-    transformResponse: [d => d],
-    validateStatus: () => true,
-  });
-  if (res.status < 200 || res.status >= 300) {
-    const respText = res.data;
+  const res = await fetch(url, { method, headers: reqOpts.headers, body });
+  if (!res.ok) {
+    const respText = await res.text();
     console.log('Response body', respText);
     throw new Error(`S3 PUT failed ${res.status} ${res.statusText}: ${respText}`);
   }
@@ -395,13 +391,13 @@ async function stsPost(body, baseAccessKeyId, baseSecretAccessKey) {
     accessKeyId: baseAccessKeyId,
     secretAccessKey: baseSecretAccessKey,
   });
-  const res = await axios.post(`https://${host}${path}`, body, {
+  const res = await fetch(`https://${host}${path}`, {
+    method,
     headers: reqOpts.headers,
-    transformResponse: [d => d],
-    validateStatus: () => true,
+    body,
   });
-  const text = res.data;
-  if (res.status < 200 || res.status >= 300) throw new Error(`STS ${res.status}: ${text}`);
+  const text = await res.text();
+  if (!res.ok) throw new Error(`STS ${res.status}: ${text}`);
 
   const accessKeyId = parseXmlVal(text, 'AccessKeyId');
   const secretAccessKey = parseXmlVal(text, 'SecretAccessKey');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "10.3.6",
+  "version": "10.3.7",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/pages/Home.js

@@ -5,6 +5,7 @@ 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,
@@ -13,6 +14,8 @@ 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;
@@ -36,6 +39,7 @@ const homePageOnReady = async ({
   getNonCompiledFiltersOptions,
   filterProfiles,
 }) => {
+  logHomePageLoadPhase('wix_onready_handler_entered');
   const {
     getParamsMapping,
     handlePagination,
@@ -58,7 +62,9 @@ const homePageOnReady = async ({
   detectMobile();
   initPageUI();
   attachEventListeners();
+  logHomePageLoadPhase('before_handleUrlParams');
   await handleUrlParams();
+  logHomePageLoadPhase('after_handleUrlParams');
 
   async function detectMobile() {
     try {
@@ -288,7 +294,9 @@ 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);
@@ -322,7 +330,9 @@ 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');
@@ -341,12 +351,15 @@ 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');
     }
@@ -425,6 +438,7 @@ 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
@@ -438,6 +452,7 @@ 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');
@@ -452,6 +467,7 @@ 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();
@@ -463,6 +479,7 @@ const homePageOnReady = async ({
 
     // 4. Re-enable nearby input when done
     _$w('#nearBy').enable();
+    logHomePageLoadPhase('nearByHandler_complete', { success: true });
     return true;
   }
 
@@ -470,6 +487,7 @@ 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 } =
@@ -510,6 +528,7 @@ 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,8 +3,46 @@ 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) {
+  return Number.isFinite(lat) && Number.isFinite(lng) && (lat !== 0 || lng !== 0);
+}
+
+function applyGeolocationToFilter(filter, lat, lng, isSearchingNearby) {
+  return {
+    ...filter,
+    postalcode: isSearchingNearby ? null : filter.postalcode,
+    state: isSearchingNearby ? [] : filter.state,
+    city: isSearchingNearby ? [] : filter.city,
+    stateSearch: isSearchingNearby ? '' : filter.stateSearch,
+    citySearch: isSearchingNearby ? '' : filter.citySearch,
+    latitude: lat,
+    longitude: lng,
+  };
+}
+
+const GEOLOCATION_TIMEOUT_MS = 10000;
+
+function getCurrentGeolocationWithTimeout(timeoutMs = GEOLOCATION_TIMEOUT_MS) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(`Geolocation timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
+    wixWindow
+      .getCurrentGeolocation()
+      .then(location => {
+        clearTimeout(timer);
+        resolve(location);
+      })
+      .catch(error => {
+        clearTimeout(timer);
+        reject(error);
+      });
+  });
+}
+
 const createHomepageUtils = (_$w, filterProfiles) => {
   const getFiltersSelectors = filterName => ({
     checkBoxContainerSelector: _$w(`#${filterName}CheckBoxContainer`),
@@ -362,30 +400,34 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       });
   }
   async function getAndSetUserLocation(isSearchingNearby, filter) {
-    try {
-      let location = {
-        coords: {
-          latitude: 0,
-          longitude: 0,
-        },
+    logHomePageLoadPhase('getAndSetUserLocation_start', { isSearchingNearby });
+
+    const { latitude: existingLat, longitude: existingLng } = filter;
+    if (isValidGeolocation(existingLat, existingLng)) {
+      return {
+        success: true,
+        filter: applyGeolocationToFilter(filter, existingLat, existingLng, isSearchingNearby),
       };
-      location = await wixWindow.getCurrentGeolocation();
+    }
 
+    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;
-      filter = {
-        ...filter,
-        postalcode: isSearchingNearby ? null : filter.postalcode,
-        state: isSearchingNearby ? [] : filter.state,
-        city: isSearchingNearby ? [] : filter.city,
-        stateSearch: isSearchingNearby ? '' : filter.stateSearch,
-        citySearch: isSearchingNearby ? '' : filter.citySearch,
-        latitude: userLat,
-        longitude: userLong,
+      logHomePageLoadPhase('getAndSetUserLocation_success', {
+        lat: userLat,
+        lng: userLong,
+      });
+      return {
+        success: true,
+        filter: applyGeolocationToFilter(filter, userLat, userLong, isSearchingNearby),
       };
-      return { success: true, filter };
     } catch (error) {
+      logHomePageLoadPhase('getAndSetUserLocation_error', {
+        message: String(error && error.message),
+      });
       console.warn('Failed to get user location in getAndSetUserLocation', error);
       return { success: false, filter };
     }
@@ -504,6 +546,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     );
   }
   async function parseAndValidateQueryParams(filter, pagination) {
+    logHomePageLoadPhase('parseAndValidateQueryParams_start');
     const params = await wixLocation.query();
     const paramsMapping = getParamsMapping(filter, pagination);
     const {
@@ -515,6 +558,11 @@ 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 (
@@ -525,6 +573,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       !isSearchingNearby
     ) {
       await wixQueryParams.add({ nearby: 'true', page: '1' });
+      logHomePageLoadPhase('parseAndValidateQueryParams_return', { branch: 'auto_nearby_url' });
       return { isDefaultStateParams: true, filter: newFilter };
     }
 
@@ -538,6 +587,7 @@ 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;
@@ -577,6 +627,10 @@ 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 };
   }
 
@@ -660,6 +714,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     isSearchingNearby,
     preservePagination = false,
   }) {
+    logHomePageLoadPhase('search_start', { timeoutType, isSearchingNearby });
     const multiStateBoxSelector = _$w('#resultsStateBox');
     const renderingEnv = await rendering.env();
     const initSearchResultsUI = () => {
@@ -681,6 +736,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
             longitude: 0,
           }) === JSON.stringify(DEFAULT_FILTER)
         ) {
+          logHomePageLoadPhase('search_short_circuit_no_criteria');
           multiStateBoxSelector.changeState('noSearchCriteria');
           return [];
         }
@@ -704,14 +760,19 @@ 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/homePageLoadTrace.js

@@ -0,0 +1,58 @@
+/**
+ * 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,
+};