abmp-npm 10.0.71 → 10.0.73

package/backend/jobs.js

@@ -2,6 +2,7 @@ const { taskManager } = require('psdev-task-manager');
 
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { TASKS_NAMES } = require('./tasks/consts');
+const { dailyPullExecutionCheck } = require('./tasks/daily-pull-check-methods');
 const { TASKS } = require('./tasks/tasks-configs');
 
 async function runScheduledTasks() {
@@ -96,6 +97,16 @@ async function scheduleFixUrlsWithSpacesTask() {
   }
 }
 
+async function runDailyPullExecutionCheck() {
+  try {
+    console.log('runDailyPullExecutionCheck started!');
+    return await dailyPullExecutionCheck({});
+  } catch (error) {
+    console.error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
+    throw new Error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
+  }
+}
+
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -115,4 +126,5 @@ module.exports = {
   scheduleCreateContactsFromMembersTask,
   scheduleFixPrimaryAddressForMembersTask,
   scheduleFixUrlsWithSpacesTask,
+  runDailyPullExecutionCheck,
 };

package/backend/tasks/consts.js

@@ -22,6 +22,7 @@ const TASKS_NAMES = {
   fixPrimaryAddressChunk: 'fixPrimaryAddressChunk',
   scheduleFixUrlsWithSpaces: 'scheduleFixUrlsWithSpaces',
   fixUrlsWithSpacesChunk: 'fixUrlsWithSpacesChunk',
+  dailyPullExecutionCheck: 'dailyPullExecutionCheck',
 };
 
 module.exports = {

package/backend/tasks/daily-pull-check-methods.js

@@ -0,0 +1,58 @@
+const { taskManager } = require('psdev-task-manager');
+const { COLLECTIONS } = require('psdev-task-manager/public/consts');
+
+const { wixData } = require('../elevated-modules');
+const { queryAllItems } = require('../utils');
+
+const { TASKS_NAMES } = require('./consts');
+
+const DEFAULT_HOURS_BACK = 4;
+
+/**
+ * Detects whether the daily pull was scheduled (cron / root task).
+ * If no `ScheduleDailyMembersDataSync` task exists in the lookback window, schedules it.
+ */
+async function dailyPullExecutionCheck(taskData) {
+  const hoursBack =
+    taskData?.hoursBack && Number.isFinite(taskData.hoursBack)
+      ? taskData.hoursBack
+      : DEFAULT_HOURS_BACK;
+  const sinceDate = new Date(Date.now() - hoursBack * 60 * 60 * 1000);
+
+  console.log('dailyPullExecutionCheck started', { hoursBack, sinceDate });
+
+  const rootTasksQuery = wixData
+    .query(COLLECTIONS.TASKS)
+    .eq('name', TASKS_NAMES.ScheduleDailyMembersDataSync)
+    .ge('_createdDate', sinceDate);
+
+  const rootTasks = await queryAllItems(rootTasksQuery);
+  const rootTaskScheduled = rootTasks.length > 0;
+
+  const result = {
+    success: rootTaskScheduled,
+    sinceDate: sinceDate.toISOString(),
+    rootTaskName: TASKS_NAMES.ScheduleDailyMembersDataSync,
+    rootTasksFound: rootTasks.length,
+  };
+
+  if (!rootTaskScheduled) {
+    console.log('ScheduleDailyMembersDataSync missing in window; scheduling root daily pull', {
+      hoursBack,
+    });
+    await taskManager().schedule({
+      name: TASKS_NAMES.ScheduleDailyMembersDataSync,
+      data: {},
+      type: 'scheduled',
+    });
+    result.fallbackScheduled = true;
+  }
+
+  console.log('dailyPullExecutionCheck result', JSON.stringify(result, null, 2));
+
+  return result;
+}
+
+module.exports = {
+  dailyPullExecutionCheck,
+};

package/backend/tasks/index.js

@@ -6,4 +6,5 @@ module.exports = {
   ...require('./url-migration-methods'),
   ...require('./address-primary-methods'),
   ...require('./url-space-fix-methods'),
+  ...require('./daily-pull-check-methods'),
 };

package/backend/tasks/tasks-configs.js

@@ -9,6 +9,7 @@ const {
   fixPrimaryAddressChunk,
 } = require('./address-primary-methods');
 const { TASKS_NAMES } = require('./consts');
+const { dailyPullExecutionCheck } = require('./daily-pull-check-methods');
 const {
   scheduleTaskForEmptyAboutYouMembers,
   convertAboutYouHtmlToRichContent,
@@ -202,6 +203,13 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
+  [TASKS_NAMES.dailyPullExecutionCheck]: {
+    name: TASKS_NAMES.dailyPullExecutionCheck,
+    getIdentifier: task => task.data,
+    process: dailyPullExecutionCheck,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 30,
+  },
 };
 
 module.exports = { TASKS };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "10.0.71",
+  "version": "10.0.73",
   "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 {
@@ -279,6 +285,7 @@ const homePageOnReady = async ({
   }
 
   async function handleUrlParams() {
+    logHomePageLoadPhase('handleUrlParams_start');
     const { isDefaultStateParams, filter: newFilter } = await parseAndValidateQueryParams(
       filter,
       pagination
@@ -288,7 +295,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 +331,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 +352,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 +439,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 +453,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 +468,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 +480,7 @@ const homePageOnReady = async ({
 
     // 4. Re-enable nearby input when done
     _$w('#nearBy').enable();
+    logHomePageLoadPhase('nearByHandler_complete', { success: true });
     return true;
   }
 
@@ -470,6 +488,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 +529,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,6 +3,7 @@ const { window: wixWindow, rendering } = require('@wix/site-window');
 
 const { DEFAULT_FILTER } = require('../consts.js');
 
+const { logHomePageLoadPhase } = require('./homePageLoadTrace.js');
 const { debouncedFunction } = require('./sharedUtils.js');
 
 const createHomepageUtils = (_$w, filterProfiles) => {
@@ -362,6 +363,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       });
   }
   async function getAndSetUserLocation(isSearchingNearby, filter) {
+    logHomePageLoadPhase('getAndSetUserLocation_start', { isSearchingNearby });
     try {
       let location = {
         coords: {
@@ -369,6 +371,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
           longitude: 0,
         },
       };
+      logHomePageLoadPhase('getAndSetUserLocation_before_getCurrentGeolocation');
       location = await wixWindow.getCurrentGeolocation();
 
       console.log('location inside getAndSetUserLocation', location);
@@ -384,8 +387,15 @@ const createHomepageUtils = (_$w, filterProfiles) => {
         latitude: userLat,
         longitude: userLong,
       };
+      logHomePageLoadPhase('getAndSetUserLocation_success', {
+        lat: userLat,
+        lng: userLong,
+      });
       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 +514,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 +526,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 +541,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 +555,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 +595,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 +682,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 +704,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
             longitude: 0,
           }) === JSON.stringify(DEFAULT_FILTER)
         ) {
+          logHomePageLoadPhase('search_short_circuit_no_criteria');
           multiStateBoxSelector.changeState('noSearchCriteria');
           return [];
         }
@@ -704,14 +728,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 are one JSON line per line for easy grep: type "HomePageLoad" and field loadId.
+ */
+
+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(JSON.stringify(payload));
+}
+
+function getHomePageLoadId() {
+  return ensureSession().loadId;
+}
+
+module.exports = {
+  logHomePageLoadPhase,
+  getHomePageLoadId,
+};