@webiny/api-elasticsearch-tasks 0.0.0-unstable.eb196ccd2f → 0.0.0-unstable.f6dc066313

package/tasks/enableIndexing/index.js

@@ -1,51 +1,45 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createEnableIndexingTask = void 0;
-var _tasks = require("@webiny/tasks");
-const createEnableIndexingTask = params => {
-  return (0, _tasks.createTaskDefinition)({
-    id: "elasticsearchEnableIndexing",
-    title: "Enable Indexing on Elasticsearch Indexes",
-    run: async ({
-      response,
-      context,
-      isAborted,
-      isCloseToTimeout,
-      input,
-      store,
-      timer
-    }) => {
-      const {
-        Manager
-      } = await import(/* webpackChunkName: "Manager" */"../Manager");
-      const {
-        IndexManager
-      } = await import(/* webpackChunkName: "IndexManager" */"../../settings");
-      const {
-        EnableIndexingTaskRunner
-      } = await import(/* webpackChunkName: "EnableIndexingTaskRunner" */"./EnableIndexingTaskRunner");
-      const manager = new Manager({
-        elasticsearchClient: params?.elasticsearchClient,
-        documentClient: params?.documentClient,
-        response,
-        context,
-        isAborted,
-        isCloseToTimeout,
-        store,
-        timer
-      });
-      const indexManager = new IndexManager(manager.elasticsearch, {}, {
-        refreshInterval: input.refreshInterval,
-        numberOfReplicas: input.numberOfReplicas
-      });
-      const enableIndexing = new EnableIndexingTaskRunner(manager, indexManager);
-      return enableIndexing.exec(input.matching);
+import { createContextPlugin } from "@webiny/api";
+import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import { Manager } from "../Manager.js";
+import { IndexManager } from "../../settings/index.js";
+import { EnableIndexingTaskRunner } from "./EnableIndexingTaskRunner.js";
+import { getClients } from "../../helpers/getClients.js";
+class ElasticsearchEnableIndexingTask {
+  id = "elasticsearchEnableIndexing";
+  title = "Enable Indexing on Elasticsearch Indexes";
+  constructor(elasticsearchClient, documentClient) {
+    this.elasticsearchClient = elasticsearchClient;
+    this.documentClient = documentClient;
+  }
+  async run({
+    input,
+    controller
+  }) {
+    if (controller.runtime.isAborted()) {
+      return controller.response.aborted();
     }
+    const manager = new Manager({
+      elasticsearchClient: this.elasticsearchClient,
+      documentClient: this.documentClient,
+      controller
+    });
+    const indexManager = new IndexManager(manager.elasticsearch, {}, {
+      refreshInterval: input.refreshInterval,
+      numberOfReplicas: input.numberOfReplicas
+    });
+    const enableIndexing = new EnableIndexingTaskRunner(manager, indexManager);
+    return enableIndexing.exec(input.matching);
+  }
+}
+export const createEnableIndexingTask = params => {
+  return createContextPlugin(context => {
+    const clients = getClients(context, params);
+
+    // Register the task definition
+    context.container.registerFactory(TaskDefinition, () => {
+      return new ElasticsearchEnableIndexingTask(clients.elasticsearchClient, clients.documentClient);
+    });
   });
 };
-exports.createEnableIndexingTask = createEnableIndexingTask;
 
 //# sourceMappingURL=index.js.map

package/tasks/enableIndexing/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_tasks","require","createEnableIndexingTask","params","createTaskDefinition","id","title","run","response","context","isAborted","isCloseToTimeout","input","store","timer","Manager","IndexManager","EnableIndexingTaskRunner","manager","elasticsearchClient","documentClient","indexManager","elasticsearch","refreshInterval","numberOfReplicas","enableIndexing","exec","matching","exports"],"sources":["index.ts"],"sourcesContent":["import { createTaskDefinition } from \"@webiny/tasks\";\nimport type { Context, IElasticsearchTaskConfig } from \"~/types\";\nimport type { IElasticsearchEnableIndexingTaskInput } from \"./types\";\n\nexport const createEnableIndexingTask = (params?: IElasticsearchTaskConfig) => {\n    return createTaskDefinition<Context, IElasticsearchEnableIndexingTaskInput>({\n        id: \"elasticsearchEnableIndexing\",\n        title: \"Enable Indexing on Elasticsearch Indexes\",\n        run: async ({ response, context, isAborted, isCloseToTimeout, input, store, timer }) => {\n            const { Manager } = await import(\n                /* webpackChunkName: \"Manager\" */\n                \"../Manager\"\n            );\n            const { IndexManager } = await import(\n                /* webpackChunkName: \"IndexManager\" */ \"~/settings\"\n            );\n\n            const { EnableIndexingTaskRunner } = await import(\n                /* webpackChunkName: \"EnableIndexingTaskRunner\" */ \"./EnableIndexingTaskRunner\"\n            );\n\n            const manager = new Manager<IElasticsearchEnableIndexingTaskInput>({\n                elasticsearchClient: params?.elasticsearchClient,\n                documentClient: params?.documentClient,\n                response,\n                context,\n                isAborted,\n                isCloseToTimeout,\n                store,\n                timer\n            });\n\n            const indexManager = new IndexManager(\n                manager.elasticsearch,\n                {},\n                {\n                    refreshInterval: input.refreshInterval,\n                    numberOfReplicas: input.numberOfReplicas\n                }\n            );\n\n            const enableIndexing = new EnableIndexingTaskRunner(manager, indexManager);\n\n            return enableIndexing.exec(input.matching);\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAIO,MAAMC,wBAAwB,GAAIC,MAAiC,IAAK;EAC3E,OAAO,IAAAC,2BAAoB,EAAiD;IACxEC,EAAE,EAAE,6BAA6B;IACjCC,KAAK,EAAE,0CAA0C;IACjDC,GAAG,EAAE,MAAAA,CAAO;MAAEC,QAAQ;MAAEC,OAAO;MAAEC,SAAS;MAAEC,gBAAgB;MAAEC,KAAK;MAAEC,KAAK;MAAEC;IAAM,CAAC,KAAK;MACpF,MAAM;QAAEC;MAAQ,CAAC,GAAG,MAAM,MAAM,CAC5B,6CAEJ,CAAC;MACD,MAAM;QAAEC;MAAa,CAAC,GAAG,MAAM,MAAM,CACjC,sDACJ,CAAC;MAED,MAAM;QAAEC;MAAyB,CAAC,GAAG,MAAM,MAAM,CAC7C,8EACJ,CAAC;MAED,MAAMC,OAAO,GAAG,IAAIH,OAAO,CAAwC;QAC/DI,mBAAmB,EAAEhB,MAAM,EAAEgB,mBAAmB;QAChDC,cAAc,EAAEjB,MAAM,EAAEiB,cAAc;QACtCZ,QAAQ;QACRC,OAAO;QACPC,SAAS;QACTC,gBAAgB;QAChBE,KAAK;QACLC;MACJ,CAAC,CAAC;MAEF,MAAMO,YAAY,GAAG,IAAIL,YAAY,CACjCE,OAAO,CAACI,aAAa,EACrB,CAAC,CAAC,EACF;QACIC,eAAe,EAAEX,KAAK,CAACW,eAAe;QACtCC,gBAAgB,EAAEZ,KAAK,CAACY;MAC5B,CACJ,CAAC;MAED,MAAMC,cAAc,GAAG,IAAIR,wBAAwB,CAACC,OAAO,EAAEG,YAAY,CAAC;MAE1E,OAAOI,cAAc,CAACC,IAAI,CAACd,KAAK,CAACe,QAAQ,CAAC;IAC9C;EACJ,CAAC,CAAC;AACN,CAAC;AAACC,OAAA,CAAA1B,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["createContextPlugin","TaskDefinition","Manager","IndexManager","EnableIndexingTaskRunner","getClients","ElasticsearchEnableIndexingTask","id","title","constructor","elasticsearchClient","documentClient","run","input","controller","runtime","isAborted","response","aborted","manager","indexManager","elasticsearch","refreshInterval","numberOfReplicas","enableIndexing","exec","matching","createEnableIndexingTask","params","context","clients","container","registerFactory"],"sources":["index.ts"],"sourcesContent":["import { createContextPlugin } from \"@webiny/api\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport type { Context, IElasticsearchTaskConfig } from \"~/types.js\";\nimport type { IElasticsearchEnableIndexingTaskInput } from \"./types.js\";\nimport { Manager } from \"../Manager.js\";\nimport { IndexManager } from \"~/settings/index.js\";\nimport { EnableIndexingTaskRunner } from \"./EnableIndexingTaskRunner.js\";\nimport { getClients } from \"~/helpers/getClients.js\";\n\nclass ElasticsearchEnableIndexingTask\n    implements TaskDefinition.Interface<IElasticsearchEnableIndexingTaskInput>\n{\n    id = \"elasticsearchEnableIndexing\";\n    title = \"Enable Indexing on Elasticsearch Indexes\";\n\n    constructor(\n        private elasticsearchClient: IElasticsearchTaskConfig[\"elasticsearchClient\"],\n        private documentClient: IElasticsearchTaskConfig[\"documentClient\"]\n    ) {}\n\n    async run({\n        input,\n        controller\n    }: TaskDefinition.RunParams<IElasticsearchEnableIndexingTaskInput>) {\n        if (controller.runtime.isAborted()) {\n            return controller.response.aborted();\n        }\n\n        const manager = new Manager<IElasticsearchEnableIndexingTaskInput>({\n            elasticsearchClient: this.elasticsearchClient,\n            documentClient: this.documentClient,\n            controller\n        });\n\n        const indexManager = new IndexManager(\n            manager.elasticsearch,\n            {},\n            {\n                refreshInterval: input.refreshInterval,\n                numberOfReplicas: input.numberOfReplicas\n            }\n        );\n\n        const enableIndexing = new EnableIndexingTaskRunner(manager, indexManager);\n\n        return enableIndexing.exec(input.matching);\n    }\n}\n\nexport const createEnableIndexingTask = (params?: Partial<IElasticsearchTaskConfig>) => {\n    return createContextPlugin<Context>(context => {\n        const clients = getClients(context, params);\n\n        // Register the task definition\n        context.container.registerFactory(TaskDefinition, () => {\n            return new ElasticsearchEnableIndexingTask(\n                clients.elasticsearchClient,\n                clients.documentClient\n            );\n        });\n    });\n};\n"],"mappings":"AAAA,SAASA,mBAAmB,QAAQ,aAAa;AACjD,SAASC,cAAc,QAAQ,wDAAwD;AAGvF,SAASC,OAAO;AAChB,SAASC,YAAY;AACrB,SAASC,wBAAwB;AACjC,SAASC,UAAU;AAEnB,MAAMC,+BAA+B,CAErC;EACIC,EAAE,GAAG,6BAA6B;EAClCC,KAAK,GAAG,0CAA0C;EAElDC,WAAWA,CACCC,mBAAoE,EACpEC,cAA0D,EACpE;IAAA,KAFUD,mBAAoE,GAApEA,mBAAoE;IAAA,KACpEC,cAA0D,GAA1DA,cAA0D;EACnE;EAEH,MAAMC,GAAGA,CAAC;IACNC,KAAK;IACLC;EAC6D,CAAC,EAAE;IAChE,IAAIA,UAAU,CAACC,OAAO,CAACC,SAAS,CAAC,CAAC,EAAE;MAChC,OAAOF,UAAU,CAACG,QAAQ,CAACC,OAAO,CAAC,CAAC;IACxC;IAEA,MAAMC,OAAO,GAAG,IAAIjB,OAAO,CAAwC;MAC/DQ,mBAAmB,EAAE,IAAI,CAACA,mBAAmB;MAC7CC,cAAc,EAAE,IAAI,CAACA,cAAc;MACnCG;IACJ,CAAC,CAAC;IAEF,MAAMM,YAAY,GAAG,IAAIjB,YAAY,CACjCgB,OAAO,CAACE,aAAa,EACrB,CAAC,CAAC,EACF;MACIC,eAAe,EAAET,KAAK,CAACS,eAAe;MACtCC,gBAAgB,EAAEV,KAAK,CAACU;IAC5B,CACJ,CAAC;IAED,MAAMC,cAAc,GAAG,IAAIpB,wBAAwB,CAACe,OAAO,EAAEC,YAAY,CAAC;IAE1E,OAAOI,cAAc,CAACC,IAAI,CAACZ,KAAK,CAACa,QAAQ,CAAC;EAC9C;AACJ;AAEA,OAAO,MAAMC,wBAAwB,GAAIC,MAA0C,IAAK;EACpF,OAAO5B,mBAAmB,CAAU6B,OAAO,IAAI;IAC3C,MAAMC,OAAO,GAAGzB,UAAU,CAACwB,OAAO,EAAED,MAAM,CAAC;;IAE3C;IACAC,OAAO,CAACE,SAAS,CAACC,eAAe,CAAC/B,cAAc,EAAE,MAAM;MACpD,OAAO,IAAIK,+BAA+B,CACtCwB,OAAO,CAACpB,mBAAmB,EAC3BoB,OAAO,CAACnB,cACZ,CAAC;IACL,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/tasks/enableIndexing/types.js

@@ -1,7 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+export {};
 
 //# sourceMappingURL=types.js.map

package/tasks/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./enableIndexing";
-export * from "./dataSynchronization";
-export * from "./reindexing";
-export * from "./createIndexes";
+export * from "./enableIndexing/index.js";
+export * from "./dataSynchronization/index.js";
+export * from "./reindexing/index.js";
+export * from "./createIndexes/index.js";

package/tasks/index.js

@@ -1,51 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _enableIndexing = require("./enableIndexing");
-Object.keys(_enableIndexing).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _enableIndexing[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _enableIndexing[key];
-    }
-  });
-});
-var _dataSynchronization = require("./dataSynchronization");
-Object.keys(_dataSynchronization).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _dataSynchronization[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _dataSynchronization[key];
-    }
-  });
-});
-var _reindexing = require("./reindexing");
-Object.keys(_reindexing).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _reindexing[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _reindexing[key];
-    }
-  });
-});
-var _createIndexes = require("./createIndexes");
-Object.keys(_createIndexes).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _createIndexes[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _createIndexes[key];
-    }
-  });
-});
+export * from "./enableIndexing/index.js";
+export * from "./dataSynchronization/index.js";
+export * from "./reindexing/index.js";
+export * from "./createIndexes/index.js";
 
 //# sourceMappingURL=index.js.map

package/tasks/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_enableIndexing","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_dataSynchronization","_reindexing","_createIndexes"],"sources":["index.ts"],"sourcesContent":["export * from \"./enableIndexing\";\nexport * from \"./dataSynchronization\";\nexport * from \"./reindexing\";\nexport * from \"./createIndexes\";\n"],"mappings":";;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,eAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,eAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,eAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,oBAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,oBAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,oBAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,oBAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,WAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,WAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,WAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,WAAA,CAAAN,GAAA;IAAA;EAAA;AAAA;AACA,IAAAO,cAAA,GAAAX,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAS,cAAA,EAAAR,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAO,cAAA,CAAAP,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAG,cAAA,CAAAP,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./enableIndexing/index.js\";\nexport * from \"./dataSynchronization/index.js\";\nexport * from \"./reindexing/index.js\";\nexport * from \"./createIndexes/index.js\";\n"],"mappings":"AAAA;AACA;AACA;AACA","ignoreList":[]}

package/tasks/reindexing/ReindexingTaskRunner.d.ts

@@ -1,16 +1,15 @@
-import type { IElasticsearchIndexingTaskValues, IElasticsearchIndexingTaskValuesKeys, IManager } from "../../types";
-import type { ITaskResponseResult } from "@webiny/tasks/response/abstractions";
-import type { IndexManager } from "../../settings";
+import type { IElasticsearchIndexingTaskValues, IElasticsearchIndexingTaskValuesKeys, IManager } from "../../types.js";
+import type { ITaskResult } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import type { IndexManager } from "../../settings/index.js";
 export declare class ReindexingTaskRunner {
     private readonly manager;
     private keys?;
     private readonly indexManager;
-    private readonly response;
     constructor(manager: IManager<IElasticsearchIndexingTaskValues>, indexManager: IndexManager);
     /**
      * When running the task, we always must check:
      * * if task is close to timeout
      * * if task was aborted
      */
-    exec(keys: IElasticsearchIndexingTaskValuesKeys | undefined, limit: number): Promise<ITaskResponseResult>;
+    exec(keys: IElasticsearchIndexingTaskValuesKeys | undefined, limit: number): Promise<ITaskResult<IElasticsearchIndexingTaskValues>>;
 }

package/tasks/reindexing/ReindexingTaskRunner.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ReindexingTaskRunner = void 0;
-var _scan = require("../../helpers/scan");
-var _dbDynamodb = require("@webiny/db-dynamodb");
+import { scan } from "../../helpers/scan.js";
+import { createTableWriteBatch } from "@webiny/db-dynamodb";
 const getKeys = results => {
   if (results.lastEvaluatedKey?.PK && results.lastEvaluatedKey?.SK) {
     return {
@@ -15,10 +9,9 @@ const getKeys = results => {
   }
   return undefined;
 };
-class ReindexingTaskRunner {
+export class ReindexingTaskRunner {
   constructor(manager, indexManager) {
     this.manager = manager;
-    this.response = manager.response;
     this.indexManager = indexManager;
   }
 
@@ -30,19 +23,19 @@ class ReindexingTaskRunner {
   async exec(keys = undefined, limit) {
     this.keys = keys;
     const isIndexAllowed = index => {
-      const input = this.manager.store.getInput();
+      const input = this.manager.controller.state.getInput();
       if (typeof input.matching !== "string" || !input.matching) {
         return true;
       }
       return index.includes(input.matching);
     };
     try {
-      while (this.manager.isCloseToTimeout() === false) {
-        if (this.manager.isAborted()) {
-          return this.response.aborted();
+      while (this.manager.controller.runtime.isCloseToTimeout() === false) {
+        if (this.manager.controller.runtime.isAborted()) {
+          return this.manager.controller.response.aborted();
         }
-        const results = await (0, _scan.scan)({
-          table: this.manager.table,
+        const results = await scan({
+          table: this.manager.table.table,
           keys: this.keys,
           options: {
             limit
@@ -50,10 +43,10 @@ class ReindexingTaskRunner {
         });
         if (results.items.length === 0) {
           await this.indexManager.enableIndexing();
-          return this.response.done("No more items to process.");
+          return this.manager.controller.response.done("No more items to process.");
         }
-        const tableWriteBatch = (0, _dbDynamodb.createTableWriteBatch)({
-          table: this.manager.table
+        const tableWriteBatch = createTableWriteBatch({
+          table: this.manager.table.table
         });
         for (const item of results.items) {
           /**
@@ -67,7 +60,7 @@ class ReindexingTaskRunner {
           }
           const exists = await this.indexManager.indexExists(item.index);
           if (!exists) {
-            await this.manager.store.addInfoLog({
+            await this.manager.controller.logger.info({
               message: `Index "${item.index}" does not exist. Skipping the item.`
             });
             continue;
@@ -103,7 +96,7 @@ class ReindexingTaskRunner {
          * Also, we always want to store what was the last key we processed, just in case something breaks, so we can continue from this point.
          */
         this.keys = getKeys(results);
-        await this.manager.store.updateInput({
+        await this.manager.controller.state.updateInput({
           settings: this.indexManager.settings,
           keys: this.keys
         });
@@ -112,10 +105,10 @@ class ReindexingTaskRunner {
          */
         if (!this.keys) {
           await this.indexManager.enableIndexing();
-          return this.response.done("No more items to process - no last evaluated keys.");
+          return this.manager.controller.response.done("No more items to process - no last evaluated keys.");
         }
       }
-      return this.response.continue({
+      return this.manager.controller.response.continue({
         keys: this.keys
       });
     } catch (ex) {
@@ -126,12 +119,11 @@ class ReindexingTaskRunner {
         await this.indexManager.enableIndexing();
       } catch (er) {
         er.data = ex;
-        return this.response.error(er);
+        return this.manager.controller.response.error(er);
       }
-      return this.response.error(ex);
+      return this.manager.controller.response.error(ex);
     }
   }
 }
-exports.ReindexingTaskRunner = ReindexingTaskRunner;
 
 //# sourceMappingURL=ReindexingTaskRunner.js.map

package/tasks/reindexing/ReindexingTaskRunner.js.map

@@ -1 +1 @@
-{"version":3,"names":["_scan","require","_dbDynamodb","getKeys","results","lastEvaluatedKey","PK","SK","undefined","ReindexingTaskRunner","constructor","manager","indexManager","response","exec","keys","limit","isIndexAllowed","index","input","store","getInput","matching","includes","isCloseToTimeout","isAborted","aborted","scan","table","options","items","length","enableIndexing","done","tableWriteBatch","createTableWriteBatch","item","exists","indexExists","addInfoLog","message","entityName","_et","entity","getEntity","disableIndexing","put","TYPE","modified","Date","toISOString","execute","updateInput","settings","continue","ex","er","data","error","exports"],"sources":["ReindexingTaskRunner.ts"],"sourcesContent":["import type {\n    IDynamoDbElasticsearchRecord,\n    IElasticsearchIndexingTaskValues,\n    IElasticsearchIndexingTaskValuesKeys,\n    IManager\n} from \"~/types\";\nimport type { ITaskResponse, ITaskResponseResult } from \"@webiny/tasks/response/abstractions\";\nimport { scan } from \"~/helpers/scan\";\nimport type { ScanResponse } from \"@webiny/db-dynamodb\";\nimport { createTableWriteBatch } from \"@webiny/db-dynamodb\";\nimport type { IndexManager } from \"~/settings\";\nimport type { IIndexManager } from \"~/settings/types\";\n\nconst getKeys = (results: ScanResponse): IElasticsearchIndexingTaskValuesKeys | undefined => {\n    if (results.lastEvaluatedKey?.PK && results.lastEvaluatedKey?.SK) {\n        return {\n            PK: results.lastEvaluatedKey.PK as unknown as string,\n            SK: results.lastEvaluatedKey.SK as unknown as string\n        };\n    }\n    return undefined;\n};\n\nexport class ReindexingTaskRunner {\n    private readonly manager: IManager<IElasticsearchIndexingTaskValues>;\n    private keys?: IElasticsearchIndexingTaskValuesKeys;\n\n    private readonly indexManager: IIndexManager;\n    private readonly response: ITaskResponse;\n\n    public constructor(\n        manager: IManager<IElasticsearchIndexingTaskValues>,\n        indexManager: IndexManager\n    ) {\n        this.manager = manager;\n        this.response = manager.response;\n        this.indexManager = indexManager;\n    }\n\n    /**\n     * When running the task, we always must check:\n     * * if task is close to timeout\n     * * if task was aborted\n     */\n    public async exec(\n        keys: IElasticsearchIndexingTaskValuesKeys | undefined = undefined,\n        limit: number\n    ): Promise<ITaskResponseResult> {\n        this.keys = keys;\n\n        const isIndexAllowed = (index: string): boolean => {\n            const input = this.manager.store.getInput();\n            if (typeof input.matching !== \"string\" || !input.matching) {\n                return true;\n            }\n            return index.includes(input.matching);\n        };\n\n        try {\n            while (this.manager.isCloseToTimeout() === false) {\n                if (this.manager.isAborted()) {\n                    return this.response.aborted();\n                }\n\n                const results = await scan<IDynamoDbElasticsearchRecord>({\n                    table: this.manager.table,\n                    keys: this.keys,\n                    options: {\n                        limit\n                    }\n                });\n                if (results.items.length === 0) {\n                    await this.indexManager.enableIndexing();\n                    return this.response.done(\"No more items to process.\");\n                }\n\n                const tableWriteBatch = createTableWriteBatch({\n                    table: this.manager.table\n                });\n\n                for (const item of results.items) {\n                    /**\n                     * No index defined? Impossible but let's skip if really happens.\n                     */\n                    if (!item.index) {\n                        continue;\n                    }\n                    if (isIndexAllowed(item.index) === false) {\n                        continue;\n                    }\n                    const exists = await this.indexManager.indexExists(item.index);\n                    if (!exists) {\n                        await this.manager.store.addInfoLog({\n                            message: `Index \"${item.index}\" does not exist. Skipping the item.`\n                        });\n                        continue;\n                    }\n                    /**\n                     * Is there a possibility that entityName does not exist? What do we do at that point?\n                     */\n                    const entityName = item._et || item.entity;\n                    /**\n                     * Let's skip for now.\n                     */\n                    if (!entityName) {\n                        continue;\n                    }\n                    const entity = this.manager.getEntity(entityName);\n                    /**\n                     * Disable the indexing for the current index.\n                     * Method does nothing if indexing is already disabled.\n                     */\n                    await this.indexManager.disableIndexing(item.index);\n                    /**\n                     * Reindexing will be triggered by the `putBatch` method.\n                     */\n                    tableWriteBatch.put(entity.entity, {\n                        ...item,\n                        TYPE: item.TYPE || \"unknown\",\n                        modified: new Date().toISOString()\n                    });\n                }\n                await tableWriteBatch.execute();\n                /**\n                 * We always store the index settings, so we can restore them later.\n                 * Also, we always want to store what was the last key we processed, just in case something breaks, so we can continue from this point.\n                 */\n                this.keys = getKeys(results);\n                await this.manager.store.updateInput({\n                    settings: this.indexManager.settings,\n                    keys: this.keys\n                });\n                /**\n                 * We want to make sure that, if there are no last evaluated keys, we enable indexing.\n                 */\n                if (!this.keys) {\n                    await this.indexManager.enableIndexing();\n                    return this.response.done(\"No more items to process - no last evaluated keys.\");\n                }\n            }\n            return this.response.continue({\n                keys: this.keys\n            });\n        } catch (ex) {\n            /**\n             * We want to enable indexing if there was an error.\n             */\n            try {\n                await this.indexManager.enableIndexing();\n            } catch (er) {\n                er.data = ex;\n                return this.response.error(er);\n            }\n            return this.response.error(ex);\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["scan","createTableWriteBatch","getKeys","results","lastEvaluatedKey","PK","SK","undefined","ReindexingTaskRunner","constructor","manager","indexManager","exec","keys","limit","isIndexAllowed","index","input","controller","state","getInput","matching","includes","runtime","isCloseToTimeout","isAborted","response","aborted","table","options","items","length","enableIndexing","done","tableWriteBatch","item","exists","indexExists","logger","info","message","entityName","_et","entity","getEntity","disableIndexing","put","TYPE","modified","Date","toISOString","execute","updateInput","settings","continue","ex","er","data","error"],"sources":["ReindexingTaskRunner.ts"],"sourcesContent":["import type {\n    IDynamoDbElasticsearchRecord,\n    IElasticsearchIndexingTaskValues,\n    IElasticsearchIndexingTaskValuesKeys,\n    IManager\n} from \"~/types.js\";\nimport type { ITaskResult } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { scan } from \"~/helpers/scan.js\";\nimport type { ScanResponse } from \"@webiny/db-dynamodb\";\nimport { createTableWriteBatch } from \"@webiny/db-dynamodb\";\nimport type { IndexManager } from \"~/settings/index.js\";\nimport type { IIndexManager } from \"~/settings/types.js\";\n\nconst getKeys = (results: ScanResponse): IElasticsearchIndexingTaskValuesKeys | undefined => {\n    if (results.lastEvaluatedKey?.PK && results.lastEvaluatedKey?.SK) {\n        return {\n            PK: results.lastEvaluatedKey.PK as unknown as string,\n            SK: results.lastEvaluatedKey.SK as unknown as string\n        };\n    }\n    return undefined;\n};\n\nexport class ReindexingTaskRunner {\n    private readonly manager: IManager<IElasticsearchIndexingTaskValues>;\n    private keys?: IElasticsearchIndexingTaskValuesKeys;\n    private readonly indexManager: IIndexManager;\n\n    public constructor(\n        manager: IManager<IElasticsearchIndexingTaskValues>,\n        indexManager: IndexManager\n    ) {\n        this.manager = manager;\n        this.indexManager = indexManager;\n    }\n\n    /**\n     * When running the task, we always must check:\n     * * if task is close to timeout\n     * * if task was aborted\n     */\n    public async exec(\n        keys: IElasticsearchIndexingTaskValuesKeys | undefined = undefined,\n        limit: number\n    ): Promise<ITaskResult<IElasticsearchIndexingTaskValues>> {\n        this.keys = keys;\n\n        const isIndexAllowed = (index: string): boolean => {\n            const input = this.manager.controller.state.getInput();\n            if (typeof input.matching !== \"string\" || !input.matching) {\n                return true;\n            }\n            return index.includes(input.matching);\n        };\n\n        try {\n            while (this.manager.controller.runtime.isCloseToTimeout() === false) {\n                if (this.manager.controller.runtime.isAborted()) {\n                    return this.manager.controller.response.aborted();\n                }\n\n                const results = await scan<IDynamoDbElasticsearchRecord>({\n                    table: this.manager.table.table,\n                    keys: this.keys,\n                    options: {\n                        limit\n                    }\n                });\n                if (results.items.length === 0) {\n                    await this.indexManager.enableIndexing();\n                    return this.manager.controller.response.done(\"No more items to process.\");\n                }\n\n                const tableWriteBatch = createTableWriteBatch({\n                    table: this.manager.table.table\n                });\n\n                for (const item of results.items) {\n                    /**\n                     * No index defined? Impossible but let's skip if really happens.\n                     */\n                    if (!item.index) {\n                        continue;\n                    }\n                    if (isIndexAllowed(item.index) === false) {\n                        continue;\n                    }\n                    const exists = await this.indexManager.indexExists(item.index);\n                    if (!exists) {\n                        await this.manager.controller.logger.info({\n                            message: `Index \"${item.index}\" does not exist. Skipping the item.`\n                        });\n                        continue;\n                    }\n                    /**\n                     * Is there a possibility that entityName does not exist? What do we do at that point?\n                     */\n                    const entityName = item._et || item.entity;\n                    /**\n                     * Let's skip for now.\n                     */\n                    if (!entityName) {\n                        continue;\n                    }\n                    const entity = this.manager.getEntity(entityName);\n                    /**\n                     * Disable the indexing for the current index.\n                     * Method does nothing if indexing is already disabled.\n                     */\n                    await this.indexManager.disableIndexing(item.index);\n                    /**\n                     * Reindexing will be triggered by the `putBatch` method.\n                     */\n                    tableWriteBatch.put(entity.entity, {\n                        ...item,\n                        TYPE: item.TYPE || \"unknown\",\n                        modified: new Date().toISOString()\n                    });\n                }\n                await tableWriteBatch.execute();\n                /**\n                 * We always store the index settings, so we can restore them later.\n                 * Also, we always want to store what was the last key we processed, just in case something breaks, so we can continue from this point.\n                 */\n                this.keys = getKeys(results);\n                await this.manager.controller.state.updateInput({\n                    settings: this.indexManager.settings,\n                    keys: this.keys\n                });\n                /**\n                 * We want to make sure that, if there are no last evaluated keys, we enable indexing.\n                 */\n                if (!this.keys) {\n                    await this.indexManager.enableIndexing();\n                    return this.manager.controller.response.done(\n                        \"No more items to process - no last evaluated keys.\"\n                    );\n                }\n            }\n            return this.manager.controller.response.continue({\n                keys: this.keys\n            });\n        } catch (ex) {\n            /**\n             * We want to enable indexing if there was an error.\n             */\n            try {\n                await this.indexManager.enableIndexing();\n            } catch (er) {\n                er.data = ex;\n                return this.manager.controller.response.error(er);\n            }\n            return this.manager.controller.response.error(ex);\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/tasks/reindexing/index.d.ts

@@ -1 +1 @@
-export * from "./reindexingTaskDefinition";
+export * from "./reindexingTaskDefinition.js";

package/tasks/reindexing/index.js

@@ -1,18 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _reindexingTaskDefinition = require("./reindexingTaskDefinition");
-Object.keys(_reindexingTaskDefinition).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _reindexingTaskDefinition[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _reindexingTaskDefinition[key];
-    }
-  });
-});
+export * from "./reindexingTaskDefinition.js";
 
 //# sourceMappingURL=index.js.map

package/tasks/reindexing/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reindexingTaskDefinition","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get"],"sources":["index.ts"],"sourcesContent":["export * from \"./reindexingTaskDefinition\";\n"],"mappings":";;;;;AAAA,IAAAA,yBAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,yBAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,yBAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,yBAAA,CAAAK,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./reindexingTaskDefinition.js\";\n"],"mappings":"AAAA","ignoreList":[]}

package/tasks/reindexing/reindexingTaskDefinition.d.ts

@@ -1,2 +1,2 @@
-import type { Context, IElasticsearchIndexingTaskValues, IElasticsearchTaskConfig } from "../../types";
-export declare const createElasticsearchReindexingTask: (params?: IElasticsearchTaskConfig) => import("@webiny/tasks").TaskDefinitionPlugin<Context, IElasticsearchIndexingTaskValues, import("@webiny/tasks").ITaskResponseDoneResultOutput>;
+import type { Context, IElasticsearchTaskConfig } from "../../types.js";
+export declare const createElasticsearchReindexingTask: (params?: Partial<IElasticsearchTaskConfig>) => import("@webiny/api").ContextPlugin<Context>;

package/tasks/reindexing/reindexingTaskDefinition.js

@@ -1,49 +1,48 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createElasticsearchReindexingTask = void 0;
-var _tasks = require("@webiny/tasks");
-const createElasticsearchReindexingTask = params => {
-  return (0, _tasks.createTaskDefinition)({
-    id: "elasticsearchReindexing",
-    title: "Elasticsearch reindexing",
-    run: async ({
-      context,
-      isCloseToTimeout,
-      response,
-      input,
-      isAborted,
-      store,
-      timer
-    }) => {
-      const {
-        Manager
-      } = await import(/* webpackChunkName: "Manager" */"../Manager");
-      const {
-        IndexManager
-      } = await import(/* webpackChunkName: "IndexManager" */"../../settings");
-      const {
-        ReindexingTaskRunner
-      } = await import(/* webpackChunkName: "ReindexingTaskRunner" */"./ReindexingTaskRunner");
-      const manager = new Manager({
-        elasticsearchClient: params?.elasticsearchClient,
-        documentClient: params?.documentClient,
-        response,
-        context,
-        isAborted,
-        isCloseToTimeout,
-        store,
-        timer
-      });
-      const indexManager = new IndexManager(manager.elasticsearch, input.settings || {});
-      const reindexing = new ReindexingTaskRunner(manager, indexManager);
-      const keys = input.keys || undefined;
-      return reindexing.exec(keys, input.limit || 100);
+import { createContextPlugin } from "@webiny/api";
+import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import { getClients } from "../../helpers/getClients.js";
+class ElasticsearchReindexingTask {
+  id = "elasticsearchReindexing";
+  title = "Elasticsearch reindexing";
+  constructor(elasticsearchClient, documentClient) {
+    this.elasticsearchClient = elasticsearchClient;
+    this.documentClient = documentClient;
+  }
+  async run({
+    input,
+    controller
+  }) {
+    if (controller.runtime.isAborted()) {
+      return controller.response.aborted();
     }
+    const {
+      Manager
+    } = await import(/* webpackChunkName: "Manager" */"../Manager.js");
+    const {
+      IndexManager
+    } = await import(/* webpackChunkName: "IndexManager" */"../../settings/index.js");
+    const {
+      ReindexingTaskRunner
+    } = await import(/* webpackChunkName: "ReindexingTaskRunner" */"./ReindexingTaskRunner.js");
+    const manager = new Manager({
+      elasticsearchClient: this.elasticsearchClient,
+      documentClient: this.documentClient,
+      controller
+    });
+    const indexManager = new IndexManager(manager.elasticsearch, input.settings || {});
+    const reindexing = new ReindexingTaskRunner(manager, indexManager);
+    const keys = input.keys || undefined;
+    return await reindexing.exec(keys, input.limit || 100);
+  }
+}
+export const createElasticsearchReindexingTask = params => {
+  return createContextPlugin(context => {
+    const {
+      documentClient,
+      elasticsearchClient
+    } = getClients(context, params);
+    context.container.registerFactory(TaskDefinition, () => new ElasticsearchReindexingTask(elasticsearchClient, documentClient));
   });
 };
-exports.createElasticsearchReindexingTask = createElasticsearchReindexingTask;
 
 //# sourceMappingURL=reindexingTaskDefinition.js.map

package/tasks/reindexing/reindexingTaskDefinition.js.map

@@ -1 +1 @@
-{"version":3,"names":["_tasks","require","createElasticsearchReindexingTask","params","createTaskDefinition","id","title","run","context","isCloseToTimeout","response","input","isAborted","store","timer","Manager","IndexManager","ReindexingTaskRunner","manager","elasticsearchClient","documentClient","indexManager","elasticsearch","settings","reindexing","keys","undefined","exec","limit","exports"],"sources":["reindexingTaskDefinition.ts"],"sourcesContent":["import { createTaskDefinition } from \"@webiny/tasks\";\nimport type { Context, IElasticsearchIndexingTaskValues, IElasticsearchTaskConfig } from \"~/types\";\n\nexport const createElasticsearchReindexingTask = (params?: IElasticsearchTaskConfig) => {\n    return createTaskDefinition<Context, IElasticsearchIndexingTaskValues>({\n        id: \"elasticsearchReindexing\",\n        title: \"Elasticsearch reindexing\",\n        run: async ({ context, isCloseToTimeout, response, input, isAborted, store, timer }) => {\n            const { Manager } = await import(\n                /* webpackChunkName: \"Manager\" */\n                \"../Manager\"\n            );\n            const { IndexManager } = await import(\n                /* webpackChunkName: \"IndexManager\" */ \"~/settings\"\n            );\n            const { ReindexingTaskRunner } = await import(\n                /* webpackChunkName: \"ReindexingTaskRunner\" */ \"./ReindexingTaskRunner\"\n            );\n\n            const manager = new Manager<IElasticsearchIndexingTaskValues>({\n                elasticsearchClient: params?.elasticsearchClient,\n                documentClient: params?.documentClient,\n                response,\n                context,\n                isAborted,\n                isCloseToTimeout,\n                store,\n                timer\n            });\n\n            const indexManager = new IndexManager(manager.elasticsearch, input.settings || {});\n            const reindexing = new ReindexingTaskRunner(manager, indexManager);\n\n            const keys = input.keys || undefined;\n            return reindexing.exec(keys, input.limit || 100);\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGO,MAAMC,iCAAiC,GAAIC,MAAiC,IAAK;EACpF,OAAO,IAAAC,2BAAoB,EAA4C;IACnEC,EAAE,EAAE,yBAAyB;IAC7BC,KAAK,EAAE,0BAA0B;IACjCC,GAAG,EAAE,MAAAA,CAAO;MAAEC,OAAO;MAAEC,gBAAgB;MAAEC,QAAQ;MAAEC,KAAK;MAAEC,SAAS;MAAEC,KAAK;MAAEC;IAAM,CAAC,KAAK;MACpF,MAAM;QAAEC;MAAQ,CAAC,GAAG,MAAM,MAAM,CAC5B,6CAEJ,CAAC;MACD,MAAM;QAAEC;MAAa,CAAC,GAAG,MAAM,MAAM,CACjC,sDACJ,CAAC;MACD,MAAM;QAAEC;MAAqB,CAAC,GAAG,MAAM,MAAM,CACzC,sEACJ,CAAC;MAED,MAAMC,OAAO,GAAG,IAAIH,OAAO,CAAmC;QAC1DI,mBAAmB,EAAEhB,MAAM,EAAEgB,mBAAmB;QAChDC,cAAc,EAAEjB,MAAM,EAAEiB,cAAc;QACtCV,QAAQ;QACRF,OAAO;QACPI,SAAS;QACTH,gBAAgB;QAChBI,KAAK;QACLC;MACJ,CAAC,CAAC;MAEF,MAAMO,YAAY,GAAG,IAAIL,YAAY,CAACE,OAAO,CAACI,aAAa,EAAEX,KAAK,CAACY,QAAQ,IAAI,CAAC,CAAC,CAAC;MAClF,MAAMC,UAAU,GAAG,IAAIP,oBAAoB,CAACC,OAAO,EAAEG,YAAY,CAAC;MAElE,MAAMI,IAAI,GAAGd,KAAK,CAACc,IAAI,IAAIC,SAAS;MACpC,OAAOF,UAAU,CAACG,IAAI,CAACF,IAAI,EAAEd,KAAK,CAACiB,KAAK,IAAI,GAAG,CAAC;IACpD;EACJ,CAAC,CAAC;AACN,CAAC;AAACC,OAAA,CAAA3B,iCAAA,GAAAA,iCAAA","ignoreList":[]}
+{"version":3,"names":["createContextPlugin","TaskDefinition","getClients","ElasticsearchReindexingTask","id","title","constructor","elasticsearchClient","documentClient","run","input","controller","runtime","isAborted","response","aborted","Manager","IndexManager","ReindexingTaskRunner","manager","indexManager","elasticsearch","settings","reindexing","keys","undefined","exec","limit","createElasticsearchReindexingTask","params","context","container","registerFactory"],"sources":["reindexingTaskDefinition.ts"],"sourcesContent":["import { createContextPlugin } from \"@webiny/api\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport type {\n    Context,\n    IElasticsearchIndexingTaskValues,\n    IElasticsearchTaskConfig\n} from \"~/types.js\";\nimport { getClients } from \"~/helpers/getClients.js\";\n\nclass ElasticsearchReindexingTask\n    implements TaskDefinition.Interface<IElasticsearchIndexingTaskValues>\n{\n    id = \"elasticsearchReindexing\";\n    title = \"Elasticsearch reindexing\";\n\n    constructor(\n        private elasticsearchClient: IElasticsearchTaskConfig[\"elasticsearchClient\"],\n        private documentClient: IElasticsearchTaskConfig[\"documentClient\"]\n    ) {}\n\n    async run({ input, controller }: TaskDefinition.RunParams<IElasticsearchIndexingTaskValues>) {\n        if (controller.runtime.isAborted()) {\n            return controller.response.aborted();\n        }\n\n        const { Manager } = await import(\n            /* webpackChunkName: \"Manager\" */\n            \"../Manager.js\"\n        );\n\n        const { IndexManager } = await import(\n            /* webpackChunkName: \"IndexManager\" */ \"~/settings/index.js\"\n        );\n        const { ReindexingTaskRunner } = await import(\n            /* webpackChunkName: \"ReindexingTaskRunner\" */ \"./ReindexingTaskRunner.js\"\n        );\n\n        const manager = new Manager<IElasticsearchIndexingTaskValues>({\n            elasticsearchClient: this.elasticsearchClient,\n            documentClient: this.documentClient,\n            controller\n        });\n\n        const indexManager = new IndexManager(manager.elasticsearch, input.settings || {});\n        const reindexing = new ReindexingTaskRunner(manager, indexManager);\n\n        const keys = input.keys || undefined;\n        return await reindexing.exec(keys, input.limit || 100);\n    }\n}\n\nexport const createElasticsearchReindexingTask = (params?: Partial<IElasticsearchTaskConfig>) => {\n    return createContextPlugin<Context>(context => {\n        const { documentClient, elasticsearchClient } = getClients(context, params);\n\n        context.container.registerFactory(\n            TaskDefinition,\n            () => new ElasticsearchReindexingTask(elasticsearchClient, documentClient)\n        );\n    });\n};\n"],"mappings":"AAAA,SAASA,mBAAmB,QAAQ,aAAa;AACjD,SAASC,cAAc,QAAQ,wDAAwD;AAMvF,SAASC,UAAU;AAEnB,MAAMC,2BAA2B,CAEjC;EACIC,EAAE,GAAG,yBAAyB;EAC9BC,KAAK,GAAG,0BAA0B;EAElCC,WAAWA,CACCC,mBAAoE,EACpEC,cAA0D,EACpE;IAAA,KAFUD,mBAAoE,GAApEA,mBAAoE;IAAA,KACpEC,cAA0D,GAA1DA,cAA0D;EACnE;EAEH,MAAMC,GAAGA,CAAC;IAAEC,KAAK;IAAEC;EAAuE,CAAC,EAAE;IACzF,IAAIA,UAAU,CAACC,OAAO,CAACC,SAAS,CAAC,CAAC,EAAE;MAChC,OAAOF,UAAU,CAACG,QAAQ,CAACC,OAAO,CAAC,CAAC;IACxC;IAEA,MAAM;MAAEC;IAAQ,CAAC,GAAG,MAAM,MAAM,CAC5B,gDAEJ,CAAC;IAED,MAAM;MAAEC;IAAa,CAAC,GAAG,MAAM,MAAM,CACjC,+DACJ,CAAC;IACD,MAAM;MAAEC;IAAqB,CAAC,GAAG,MAAM,MAAM,CACzC,yEACJ,CAAC;IAED,MAAMC,OAAO,GAAG,IAAIH,OAAO,CAAmC;MAC1DT,mBAAmB,EAAE,IAAI,CAACA,mBAAmB;MAC7CC,cAAc,EAAE,IAAI,CAACA,cAAc;MACnCG;IACJ,CAAC,CAAC;IAEF,MAAMS,YAAY,GAAG,IAAIH,YAAY,CAACE,OAAO,CAACE,aAAa,EAAEX,KAAK,CAACY,QAAQ,IAAI,CAAC,CAAC,CAAC;IAClF,MAAMC,UAAU,GAAG,IAAIL,oBAAoB,CAACC,OAAO,EAAEC,YAAY,CAAC;IAElE,MAAMI,IAAI,GAAGd,KAAK,CAACc,IAAI,IAAIC,SAAS;IACpC,OAAO,MAAMF,UAAU,CAACG,IAAI,CAACF,IAAI,EAAEd,KAAK,CAACiB,KAAK,IAAI,GAAG,CAAC;EAC1D;AACJ;AAEA,OAAO,MAAMC,iCAAiC,GAAIC,MAA0C,IAAK;EAC7F,OAAO7B,mBAAmB,CAAU8B,OAAO,IAAI;IAC3C,MAAM;MAAEtB,cAAc;MAAED;IAAoB,CAAC,GAAGL,UAAU,CAAC4B,OAAO,EAAED,MAAM,CAAC;IAE3EC,OAAO,CAACC,SAAS,CAACC,eAAe,CAC7B/B,cAAc,EACd,MAAM,IAAIE,2BAA2B,CAACI,mBAAmB,EAAEC,cAAc,CAC7E,CAAC;EACL,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/types.d.ts

@@ -1,17 +1,18 @@
-import type { ElasticsearchContext } from "@webiny/api-elasticsearch/types";
-import type { Context as TasksContext, IIsCloseToTimeoutCallable, ITaskManagerStore, ITaskResponse, ITaskResponseDoneResultOutput } from "@webiny/tasks/types";
-import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb";
-import type { Client } from "@webiny/api-elasticsearch";
-import type { createTable } from "./definitions";
-import type { BatchReadItem, IEntity } from "@webiny/db-dynamodb";
-import type { ITimer } from "@webiny/handler-aws";
-import type { GenericRecord } from "@webiny/api/types";
-import type { Context as LoggerContext } from "@webiny/api-log/types";
-export interface Context extends ElasticsearchContext, TasksContext, LoggerContext {
+import type { ElasticsearchContext } from "@webiny/api-elasticsearch/types.js";
+import type { Context as TasksContext } from "@webiny/tasks/types.js";
+import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb/index.js";
+import type { Client, createElasticsearchTable } from "@webiny/api-elasticsearch";
+import type { BatchReadItem } from "@webiny/db-dynamodb/utils/batch/batchRead.js";
+import type { IEntity } from "@webiny/db-dynamodb";
+import type { GenericRecord } from "@webiny/api/types.js";
+import { TaskController } from "@webiny/api-core/features/task/TaskController/index.js";
+import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import { DbRegistry } from "./abstractions/DbRegistry.js";
+export interface Context extends ElasticsearchContext, TasksContext {
 }
 export interface IElasticsearchTaskConfig {
-    documentClient?: DynamoDBDocument;
-    elasticsearchClient?: Client;
+    documentClient: DynamoDBDocument;
+    elasticsearchClient: Client;
 }
 export interface IElasticsearchIndexingTaskValuesKeys {
     PK: string;
@@ -37,6 +38,7 @@ export interface AugmentedError extends Error {
 export interface IDynamoDbElasticsearchRecord {
     PK: string;
     SK: string;
+    GSI_TENANT: string;
     TYPE?: string;
     index: string;
     _et?: string;
@@ -44,16 +46,12 @@ export interface IDynamoDbElasticsearchRecord {
     data: GenericRecord;
     modified: string;
 }
-export interface IManager<T, O extends ITaskResponseDoneResultOutput = ITaskResponseDoneResultOutput> {
+export interface IManager<I extends TaskDefinition.TaskInput = TaskDefinition.TaskInput, O extends TaskDefinition.TaskOutput = TaskDefinition.TaskOutput> {
     readonly documentClient: DynamoDBDocument;
     readonly elasticsearch: Client;
-    readonly context: Context;
-    readonly table: ReturnType<typeof createTable>;
-    readonly isCloseToTimeout: IIsCloseToTimeoutCallable;
-    readonly isAborted: () => boolean;
-    readonly response: ITaskResponse<T, O>;
-    readonly store: ITaskManagerStore<T>;
-    readonly timer: ITimer;
+    readonly table: ReturnType<typeof createElasticsearchTable>;
+    readonly controller: TaskController.Interface<I, O>;
+    readonly dbRegistry?: DbRegistry.Interface;
     getEntity: (name: string) => IEntity;
     read<T>(items: BatchReadItem[]): Promise<T[]>;
 }

package/types.js

@@ -1,7 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+export {};
 
 //# sourceMappingURL=types.js.map