psdev-task-manager 1.1.8 → 1.1.10

package/.github/workflows/update-sites.yml

@@ -0,0 +1,30 @@
+name: Update Sites After Release Main
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+      
+permissions:
+ contents: write
+ packages: write
+
+jobs:
+  update-sites:
+    uses: psdevteamenterprise/ci-workflows/.github/workflows/update-and-notify.yml@main
+    with:
+      npm_packages_to_update: "[{repo: 'Hisense-Wix/velo-npm'}]"
+      sites_to_update: "[{repo: 'psdevteamenterprise/external-template', secret: 'WIX_SR_API_KEY'},
+                          {repo: 'psdevteamenterprise/internal', secret: 'WIX_SR_API_KEY'},
+                          {repo: 'psdevteamenterprise/tests-site', secret: 'WIX_PS_API_KEY'},
+                          {repo: 'psdevteamenterprise/hisense_mexico', secret: 'WIX_HM_API_KEY'},
+                          ]"
+    secrets:
+      GH_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN_PUBLISH }}
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
+      WIX_SR_API_KEY: ${{secrets.WIX_SR_API_KEY}}
+      WIX_PS_API_KEY: ${{secrets.WIX_PS_API_KEY}}
+      WIX_HM_API_KEY: ${{secrets.WIX_HM_API_KEY}}

package/backend/tasks/taskManager.js

@@ -1,4 +1,4 @@
-const { withDuration, withSuccessRateLogs } = require('psdev-utils/shared'); // Import from shared module to avoid frontend dependencies in backend
+const { withDuration, withSuccessRateLogs } = require('psdev-utils');
 
 const { TASK_STATUS, CRON_JOB_MAX_DURATION_SEC, TASK_MAX_TRIES } = require('./consts');
 const { scheduleChildTasksAndUpdateParent } = require('./parentChildTasks/handler');
@@ -75,8 +75,9 @@ function taskManager() {
           }
           const isFailedAfterAllRetries = amountOfRetries >= TASK_MAX_TRIES;
           if (isFailedAfterAllRetries) {
+
             //Only throw error if task is permanently failed, otherwise we have retry mechanism
-            throw new Error(errMsg);
+            throw new Error("task failed after all retries: " + errMsg);
           }
         }
       },
@@ -122,7 +123,6 @@ function taskManager() {
     try {
       const scheduledTasks = await getScheduledTasks();
       console.log(`runScheduledTasks: scheduledTasks count: ${scheduledTasks.length}`);
-      console.log(`runScheduledTasks: tasksConfig: ${JSON.stringify(tasksConfig)}`);
       if (scheduledTasks.length) {
         await processTasksBasedOnVeloLimit(scheduledTasks, tasksConfig);
       } else {

package/backend/tasks/utils.js

@@ -2,7 +2,6 @@ const { COLLECTIONS, COLLECTIONS_FIELDS } = require('../../public/consts'); // n
 const { wixData, wixCollections } = require('../elevated-modules');
 
 const { TASK_STATUS, TASK_TYPE, TASK_MAX_TRIES } = require('./consts');
-
 /**
  * Generic function to create a collection if it doesn't exist
  * @param {string} collectionId - The ID of the collection to create
@@ -168,9 +167,6 @@ const isParentTask = (task, taskConfig) => {
   return true;
 };
 const filterScheduledTasksByStatus = (tasks, tasksConfig) => {
-  console.log(
-    `filterScheduledTasksByStatus: tasks count: ${tasks.length} tasksConfig: ${JSON.stringify(tasksConfig)}`
-  );
   const shouldIncludeTask = (task, taskConfig) => {
     console.log(`filterScheduledTasksByStatus: task: ${JSON.stringify(task)}`);
     console.log(`filterScheduledTasksByStatus: taskConfig: ${JSON.stringify(taskConfig)}`);
@@ -195,6 +191,18 @@ const filterScheduledTasksByStatus = (tasks, tasksConfig) => {
   console.log(`filterScheduledTasksByStatus: filtered count: ${filtered.length}`);
   return filtered;
 };
+const queryAllItems = async query => {
+  console.log('start query');
+  let oldResults = await query.find();
+  console.log(`found items: ${oldResults.items.length}`);
+  const allItems = oldResults.items;
+  while (oldResults.hasNext()) {
+    oldResults = await oldResults.next();
+    allItems.push(...oldResults.items);
+  }
+  console.log(`all items count : ${allItems.length}`);
+  return allItems;
+};
 const getScheduledTasks = async () => {
   try {
     const baseQuery = wixData.query(COLLECTIONS.TASKS);
@@ -204,13 +212,12 @@ const getScheduledTasks = async () => {
     const eventBasedTasksQuery = baseQuery
       .eq('type', TASK_TYPE.EVENT)
       .eq('status', TASK_STATUS.FAILED);
-    return await scheduledTasksQuery
+    const toRunQuery = scheduledTasksQuery
       .or(eventBasedTasksQuery)
       .lt('amountOfRetries', TASK_MAX_TRIES)
       .ascending('_updatedDate')
-      .limit(1000)
-      .find()
-      .then(result => result.items);
+      .limit(1000);
+    return await queryAllItems(toRunQuery);
   } catch (error) {
     throw new Error(`[getScheduledTasks] failed with error: ${error.message}`);
   }
@@ -240,13 +247,11 @@ const getTasksToProcess = ({ scheduledTasks, tasksConfig, maxDuration }) => {
   });
   const tasksToProcess = [];
   let totalDuration = 0;
-  console.log(`tasksConfig is : ${JSON.stringify(tasksConfig)}`);
   const filteredScheduledTasks = filterScheduledTasksByStatus(scheduledTasks, tasksConfig);
   console.log(`filteredScheduledTasks count  : ${filteredScheduledTasks.length}`);
   for (const task of filteredScheduledTasks) {
     console.log(`task is : ${JSON.stringify(task)}`);
     const taskConfig = getTaskConfig(task.name, tasksConfig);
-    console.log(`taskConfig is : ${JSON.stringify(taskConfig)}`);
     const estimated = taskConfig?.estimatedDurationSec;
     if (!estimated) {
       const errMsg = `[getTasksToProcess] estimatedDurationSec is not defined for task ${task.name}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "psdev-task-manager",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "Task manager library",
   "keywords": [
     "task-manager"
@@ -28,7 +28,7 @@
   "dependencies": {
     "@wix/data": "^1.0.273",
     "@wix/essentials": "^0.1.27",
-    "psdev-utils": "1.1.1"
+    "psdev-utils": "1.1.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.12.0",