@vegan-friendly/strapi-plugin-elasticsearch 0.3.0 → 0.3.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vegan-friendly/strapi-plugin-elasticsearch",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "A Strapi plugin to enable using Elasticsearch with Strapi CMS.",
     "homepage": "https://github.com/vegan-friendly/strapi-plugin-elasticsearch",
     "strapi": {

package/dist/server/bootstrap.js

@@ -156,6 +156,9 @@ exports.default = async ({ strapi }) => {
                 },
             });
         });
+        // clean up old indexing tasks, as server is booting.
+        // allow 60 seconds, in case strapi is being run in cluster mode and this is the second instance
+        await scheduleIndexingService.getActiveFullIndexingTasks(60);
         configureIndexingService.markInitialized();
     }
     catch (err) {

package/dist/server/index.d.ts

@@ -144,7 +144,7 @@ declare const _default: {
             getItemsPendingToBeIndexed(): Promise<any>;
             markIndexingTaskComplete(recId: any, error?: string | null): Promise<void>;
             markIndexingTaskInProgress(recId: any): Promise<void>;
-            getFullIndexingInProgress(): Promise<any>;
+            getActiveFullIndexingTasks(staleTaskThresholdSeconds?: number): Promise<any[]>;
         };
         esInterface: ({ strapi }: {
             strapi: any;

package/dist/server/services/index.d.ts

@@ -40,7 +40,7 @@ declare const _default: {
         getItemsPendingToBeIndexed(): Promise<any>;
         markIndexingTaskComplete(recId: any, error?: string | null): Promise<void>;
         markIndexingTaskInProgress(recId: any): Promise<void>;
-        getFullIndexingInProgress(): Promise<any>;
+        getActiveFullIndexingTasks(staleTaskThresholdSeconds?: number): Promise<any[]>;
     };
     esInterface: ({ strapi }: {
         strapi: any;

package/dist/server/services/perform-indexing.js

@@ -2,17 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ({ strapi }) => ({
     async rebuildIndex(task = null) {
-        const helper = strapi.plugins['elasticsearch'].services.helper;
-        const esInterface = strapi.plugins['elasticsearch'].services.esInterface;
-        const scheduleIndexingService = strapi.plugins['elasticsearch'].services.scheduleIndexing;
-        const configureIndexingService = strapi.plugins['elasticsearch'].services.configureIndexing;
-        const logIndexingService = strapi.plugins['elasticsearch'].services.logIndexing;
-        const virtualCollectionsIndexer = strapi.plugins['elasticsearch'].services['virtualCollectionsIndexer'];
-        const virtualCollectionsRegistry = strapi.plugins['elasticsearch'].services['virtualCollectionsRegistry'];
+        const pluginServices = strapi.plugins['elasticsearch'].services;
+        const helper = pluginServices.helper;
+        const esInterface = pluginServices.esInterface;
+        const scheduleIndexingService = pluginServices.scheduleIndexing;
+        const configureIndexingService = pluginServices.configureIndexing;
+        const logIndexingService = pluginServices.logIndexing;
+        const virtualCollectionsIndexer = pluginServices.virtualCollectionsIndexer;
+        const virtualCollectionsRegistry = pluginServices.virtualCollectionsRegistry;
         let taskError = null;
         try {
             console.log('strapi-plugin-elasticsearch : Request to rebuild the index received.');
-            const fullIndexingInProgress = await scheduleIndexingService.getFullIndexingInProgress();
+            const fullIndexingInProgress = await scheduleIndexingService.getActiveFullIndexingTasks();
             if (fullIndexingInProgress.length > 0) {
                 const msg = `Indexing is already in progress - see tasks ${fullIndexingInProgress.map((t) => t.id)}. This request is ignored and marked as failed.`;
                 console.log('strapi-plugin-elasticsearch : ' + msg);

package/dist/server/services/schedule-indexing.d.ts

@@ -16,6 +16,6 @@ declare const _default: ({ strapi }: {
     getItemsPendingToBeIndexed(): Promise<any>;
     markIndexingTaskComplete(recId: any, error?: string | null): Promise<void>;
     markIndexingTaskInProgress(recId: any): Promise<void>;
-    getFullIndexingInProgress(): Promise<any>;
+    getActiveFullIndexingTasks(staleTaskThresholdSeconds?: number): Promise<any[]>;
 };
 export default _default;

package/dist/server/services/schedule-indexing.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const STUCK_THRESHOLD_SECONDS = 60 * 60; // 1 hour
 exports.default = ({ strapi }) => ({
     async addFullSiteIndexingTask() {
         const data = await strapi.entityService.create('plugin::elasticsearch.task', {
@@ -68,13 +69,29 @@ exports.default = ({ strapi }) => ({
             },
         });
     },
-    async getFullIndexingInProgress() {
+    async getActiveFullIndexingTasks(staleTaskThresholdSeconds) {
+        if (!staleTaskThresholdSeconds) {
+            staleTaskThresholdSeconds = Number(strapi.config.get('plugin.elasticsearch').staleTaskThresholdSeconds) || STUCK_THRESHOLD_SECONDS;
+        }
+        staleTaskThresholdSeconds *= 1000;
         const entries = await strapi.entityService.findMany('plugin::elasticsearch.task', {
             filters: {
                 indexing_status: 'in-progress',
                 full_site_indexing: true,
             },
         });
-        return entries;
+        const now = Date.now();
+        const activeTasks = [];
+        for (const t of entries) {
+            const updatedAt = new Date(t.updatedAt || t.createdAt).getTime();
+            if (now - updatedAt > staleTaskThresholdSeconds) {
+                await strapi.plugins['elasticsearch'].services.logIndexing.recordIndexingFail(`Task ${t.id} was stuck in-progress for too long. Marking as failed.`);
+                await this.markIndexingTaskComplete(t.id, 'Stuck in-progress');
+            }
+            else {
+                activeTasks.push(t);
+            }
+        }
+        return activeTasks;
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vegan-friendly/strapi-plugin-elasticsearch",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A Strapi plugin to enable using Elasticsearch with Strapi CMS.",
   "homepage": "https://github.com/vegan-friendly/strapi-plugin-elasticsearch",
   "strapi": {