@webiny/api-page-builder-import-export 0.0.0-unstable.40876133bb → 0.0.0-unstable.4485d22882

package/export/process/formsHandler.js

@@ -0,0 +1,189 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formsHandler = void 0;
+var _types = require("../../types");
+var _client = require("../../client");
+var _handlerGraphql = require("@webiny/handler-graphql");
+var _mockSecurity = require("../../mockSecurity");
+var _utils = require("@webiny/utils");
+var _FormExporter = require("./exporters/FormExporter");
+/**
+ * Handles the export forms process workflow.
+ */
+const formsHandler = async (configuration, payload, context) => {
+  const log = console.log;
+  let subTask;
+  let noPendingTask = true;
+  let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
+  log("RUNNING Export Forms Process Handler");
+  const {
+    formBuilder,
+    pageBuilder
+  } = context;
+  const {
+    taskId,
+    subTaskIndex,
+    type,
+    identity
+  } = payload;
+  // Disable authorization; this is necessary because we call Form Builder CRUD methods which include authorization checks
+  // and this Lambda is invoked internally, without credentials.
+  (0, _mockSecurity.mockSecurity)(identity, context);
+  try {
+    /*
+     * Note: We're not going to DB for finding the next sub-task to process,
+     * because the data might be out of sync due to GSI eventual consistency.
+     */
+    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex, 5));
+    /**
+     * Base condition!!
+     * Bail out early, if task not found or task's status is not "pending".
+     */
+    if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
+      noPendingTask = true;
+      return {
+        data: "",
+        error: null
+      };
+    } else {
+      noPendingTask = false;
+    }
+    log(`Fetched sub task => ${subTask.id}`);
+    const {
+      input
+    } = subTask;
+    const {
+      formId,
+      exportFormsDataKey,
+      revisionType
+    } = input;
+
+    /**
+     * At the moment, we only export a single revision of the form.
+     * It could be "published" or "latest" depending upon user input.
+     *
+     * Note: In case of no "published" revision available, we use the latest revision.
+     */
+    let form;
+    try {
+      if (revisionType === _types.ExportRevisionType.PUBLISHED) {
+        // Get "published" form.
+        form = await formBuilder.getLatestPublishedFormRevision(formId);
+      } else {
+        // Get "latest" form.
+        form = await formBuilder.getForm(formId);
+      }
+    } catch (e) {
+      // If we're looking for "published" form and doesn't found it, get latest form.
+      if (revisionType === _types.ExportRevisionType.PUBLISHED && e instanceof _handlerGraphql.NotFoundError) {
+        form = await formBuilder.getForm(formId);
+      } else {
+        throw e;
+      }
+    }
+    if (!form) {
+      log(`Unable to load form "${formId}"`);
+      throw new _handlerGraphql.NotFoundError(`Unable to load form "${formId}"`);
+    }
+    log(`Processing form key "${formId}" | version ${form.version} | ${form.status}`);
+
+    // Mark task status as PROCESSING
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.PROCESSING
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.PROCESSING
+    });
+    prevStatusOfSubTask = subTask.status;
+    log(`Extracting form data and uploading to storage...`);
+    const formExporter = new _FormExporter.FormExporter();
+    const formDataZip = await formExporter.execute(form, exportFormsDataKey);
+    log(`Finish uploading zip...`);
+    // Update task record in DB
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.COMPLETED,
+      data: {
+        message: `Finish uploading data for form "${form.id}" v${form.version} (${form.status}).`,
+        key: formDataZip.Key
+      }
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.COMPLETED
+    });
+    prevStatusOfSubTask = subTask.status;
+  } catch (e) {
+    log("[EXPORT_PAGES_PROCESS] Error => ", e);
+    if (subTask && subTask.id) {
+      /**
+       * In case of error, we'll update the task status to "failed",
+       * so that, client can show notify the user appropriately.
+       */
+      subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+        status: _types.ImportExportTaskStatus.FAILED,
+        error: {
+          name: e.name,
+          message: e.message,
+          stack: e.stack,
+          code: "EXPORT_FAILED"
+        }
+      });
+
+      // Update stats in main task
+      await pageBuilder.importExportTask.updateStats(taskId, {
+        prevStatus: prevStatusOfSubTask,
+        nextStatus: _types.ImportExportTaskStatus.FAILED
+      });
+      prevStatusOfSubTask = subTask.status;
+    }
+    return {
+      data: null,
+      error: {
+        message: e.message
+      }
+    };
+  } finally {
+    // Base condition!
+    if (noPendingTask) {
+      log(`No pending sub-task for task ${taskId}`);
+      // Combine individual form zip files.
+      await (0, _client.invokeHandlerClient)({
+        context,
+        name: configuration.handlers.combine,
+        payload: {
+          taskId,
+          type,
+          identity: context.security.getIdentity()
+        },
+        description: "Export forms - combine"
+      });
+    } else {
+      console.log(`Invoking PROCESS for task "${subTaskIndex + 1}"`);
+      // We want to continue with Self invocation no matter if current form error out.
+      await (0, _client.invokeHandlerClient)({
+        context,
+        name: configuration.handlers.process,
+        payload: {
+          taskId,
+          type,
+          subTaskIndex: subTaskIndex + 1,
+          identity: context.security.getIdentity()
+        },
+        description: "Export forms - process - subtask"
+      });
+    }
+  }
+  return {
+    data: "",
+    error: null
+  };
+};
+exports.formsHandler = formsHandler;
+
+//# sourceMappingURL=formsHandler.js.map

package/export/process/formsHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_types","require","_client","_handlerGraphql","_mockSecurity","_utils","_FormExporter","formsHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","formBuilder","pageBuilder","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","input","formId","exportFormsDataKey","revisionType","form","ExportRevisionType","PUBLISHED","getLatestPublishedFormRevision","getForm","e","NotFoundError","version","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","formExporter","FormExporter","formDataZip","execute","COMPLETED","message","key","Key","FAILED","name","stack","code","invokeHandlerClient","handlers","combine","security","getIdentity","description","process","exports"],"sources":["formsHandler.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport { ExportRevisionType, ImportExportTaskStatus } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport type { Payload as ExtractPayload } from \"../combine\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport type { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { zeroPad } from \"@webiny/utils\";\nimport type { Configuration, Payload, Response } from \"~/export/process\";\nimport { FormExporter } from \"./exporters/FormExporter\";\n\n/**\n * Handles the export forms process workflow.\n */\nexport const formsHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Export Forms Process Handler\");\n    const { formBuilder, pageBuilder } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Form Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity as SecurityIdentity, context);\n\n    try {\n        /*\n         * Note: We're not going to DB for finding the next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { input } = subTask;\n        const { formId, exportFormsDataKey, revisionType } = input;\n\n        /**\n         * At the moment, we only export a single revision of the form.\n         * It could be \"published\" or \"latest\" depending upon user input.\n         *\n         * Note: In case of no \"published\" revision available, we use the latest revision.\n         */\n        let form;\n        try {\n            if (revisionType === ExportRevisionType.PUBLISHED) {\n                // Get \"published\" form.\n                form = await formBuilder.getLatestPublishedFormRevision(formId);\n            } else {\n                // Get \"latest\" form.\n                form = await formBuilder.getForm(formId);\n            }\n        } catch (e) {\n            // If we're looking for \"published\" form and doesn't found it, get latest form.\n            if (revisionType === ExportRevisionType.PUBLISHED && e instanceof NotFoundError) {\n                form = await formBuilder.getForm(formId);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!form) {\n            log(`Unable to load form \"${formId}\"`);\n            throw new NotFoundError(`Unable to load form \"${formId}\"`);\n        }\n\n        log(`Processing form key \"${formId}\" | version ${form.version} | ${form.status}`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Extracting form data and uploading to storage...`);\n        const formExporter = new FormExporter();\n        const formDataZip = await formExporter.execute(form, exportFormsDataKey);\n        log(`Finish uploading zip...`);\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading data for form \"${form.id}\" v${form.version} (${form.status}).`,\n                key: formDataZip.Key\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[EXPORT_PAGES_PROCESS] Error => \", e);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    stack: e.stack,\n                    code: \"EXPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n            // Combine individual form zip files.\n            await invokeHandlerClient<ExtractPayload>({\n                context,\n                name: configuration.handlers.combine,\n                payload: {\n                    taskId,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export forms - combine\"\n            });\n        } else {\n            console.log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current form error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    type,\n                    subTaskIndex: subTaskIndex + 1,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export forms - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/{exportPages → export}/process/index.d.ts

@@ -1,6 +1,6 @@
-import { PbPageImportExportContext } from "../../types";
-import { SecurityIdentity } from "@webiny/api-security/types";
-interface Configuration {
+import type { PbImportExportContext } from "../../types";
+import type { SecurityIdentity } from "@webiny/api-security/types";
+export interface Configuration {
     handlers: {
         process: string;
         combine: string;
@@ -9,14 +9,12 @@ interface Configuration {
 export interface Payload {
     taskId: string;
     subTaskIndex: number;
+    type: string;
     identity?: SecurityIdentity;
 }
 export interface Response {
     data: string | null;
     error: Partial<Error> | null;
 }
-/**
- * Handles the export pages process workflow.
- */
-declare const _default: (configuration: Configuration) => import("@webiny/handler-aws").RawEventHandler<Payload, PbPageImportExportContext, Response>;
+declare const _default: (configuration: Configuration) => import("@webiny/handler-aws").RawEventHandler<Payload, PbImportExportContext, Response>;
 export default _default;

package/export/process/index.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _handlerAws = require("@webiny/handler-aws");
+var _blocksHandler = require("./blocksHandler");
+var _formsHandler = require("./formsHandler");
+var _templatesHandler = require("./templatesHandler");
+var _default = configuration => {
+  return (0, _handlerAws.createRawEventHandler)(async ({
+    payload,
+    context
+  }) => {
+    return context.security.withoutAuthorization(() => {
+      switch (payload.type) {
+        case "block":
+          {
+            return (0, _blocksHandler.blocksHandler)(configuration, payload, context);
+          }
+        case "form":
+          {
+            return (0, _formsHandler.formsHandler)(configuration, payload, context);
+          }
+        case "template":
+          {
+            return (0, _templatesHandler.templatesHandler)(configuration, payload, context);
+          }
+        default:
+          {
+            console.log("Export PB process", JSON.stringify(payload));
+            throw new Error("Invalid type provided: pb process.");
+          }
+      }
+    });
+  });
+};
+exports.default = _default;
+
+//# sourceMappingURL=index.js.map

package/export/process/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_handlerAws","require","_blocksHandler","_formsHandler","_templatesHandler","_default","configuration","createRawEventHandler","payload","context","security","withoutAuthorization","type","blocksHandler","formsHandler","templatesHandler","console","log","JSON","stringify","Error","exports","default"],"sources":["index.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport type { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\nimport { blocksHandler } from \"~/export/process/blocksHandler\";\nimport { formsHandler } from \"~/export/process/formsHandler\";\nimport { templatesHandler } from \"~/export/process/templatesHandler\";\n\nexport interface Configuration {\n    handlers: {\n        process: string;\n        combine: string;\n    };\n}\n\nexport interface Payload {\n    taskId: string;\n    subTaskIndex: number;\n    type: string;\n    identity?: SecurityIdentity;\n}\n\nexport interface Response {\n    data: string | null;\n    error: Partial<Error> | null;\n}\n\nexport default (configuration: Configuration) => {\n    return createRawEventHandler<Payload, PbImportExportContext, Response>(\n        async ({ payload, context }) => {\n            return context.security.withoutAuthorization(() => {\n                switch (payload.type) {\n                    case \"block\": {\n                        return blocksHandler(configuration, payload, context);\n                    }\n                    case \"form\": {\n                        return formsHandler(configuration, payload, context);\n                    }\n                    case \"template\": {\n                        return templatesHandler(configuration, payload, context);\n                    }\n                    default: {\n                        console.log(\"Export PB process\", JSON.stringify(payload));\n                        throw new Error(\"Invalid type provided: pb process.\");\n                    }\n                }\n            });\n        }\n    );\n};\n"],"mappings":";;;;;;AAEA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAAqE,IAAAI,QAAA,GAqBrDC,aAA4B,IAAK;EAC7C,OAAO,IAAAC,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC5B,OAAOA,OAAO,CAACC,QAAQ,CAACC,oBAAoB,CAAC,MAAM;MAC/C,QAAQH,OAAO,CAACI,IAAI;QAChB,KAAK,OAAO;UAAE;YACV,OAAO,IAAAC,4BAAa,EAACP,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UACzD;QACA,KAAK,MAAM;UAAE;YACT,OAAO,IAAAK,0BAAY,EAACR,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UACxD;QACA,KAAK,UAAU;UAAE;YACb,OAAO,IAAAM,kCAAgB,EAACT,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UAC5D;QACA;UAAS;YACLO,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAEC,IAAI,CAACC,SAAS,CAACX,OAAO,CAAC,CAAC;YACzD,MAAM,IAAIY,KAAK,CAAC,oCAAoC,CAAC;UACzD;MACJ;IACJ,CAAC,CAAC;EACN,CACJ,CAAC;AACL,CAAC;AAAAC,OAAA,CAAAC,OAAA,GAAAjB,QAAA","ignoreList":[]}

package/export/process/templatesHandler.d.ts

@@ -0,0 +1,6 @@
+import type { PbImportExportContext } from "../../types";
+import type { Configuration, Payload, Response } from "./";
+/**
+ * Handles the export templates process workflow.
+ */
+export declare const templatesHandler: (configuration: Configuration, payload: Payload, context: PbImportExportContext) => Promise<Response>;

package/export/process/templatesHandler.js

@@ -0,0 +1,168 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.templatesHandler = void 0;
+var _types = require("../../types");
+var _client = require("../../client");
+var _handlerGraphql = require("@webiny/handler-graphql");
+var _mockSecurity = require("../../mockSecurity");
+var _utils = require("@webiny/utils");
+var _PageTemplateExporter = require("./exporters/PageTemplateExporter");
+/**
+ * Handles the export templates process workflow.
+ */
+const templatesHandler = async (configuration, payload, context) => {
+  const log = console.log;
+  let subTask;
+  let noPendingTask = true;
+  let prevStatusOfSubTask = _types.ImportExportTaskStatus.PENDING;
+  log("RUNNING Export Templates Process Handler");
+  const {
+    pageBuilder,
+    fileManager
+  } = context;
+  const {
+    taskId,
+    subTaskIndex,
+    type,
+    identity
+  } = payload;
+  // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
+  // and this Lambda is invoked internally, without credentials.
+  (0, _mockSecurity.mockSecurity)(identity, context);
+  try {
+    /*
+     * Note: We're not going to DB for finding the next sub-task to process,
+     * because the data might be out of sync due to GSI eventual consistency.
+     */
+    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex, 5));
+    /**
+     * Base condition!!
+     * Bail out early, if task not found or task's status is not "pending".
+     */
+    if (!subTask || subTask.status !== _types.ImportExportTaskStatus.PENDING) {
+      noPendingTask = true;
+      return {
+        data: "",
+        error: null
+      };
+    } else {
+      noPendingTask = false;
+    }
+    log(`Fetched sub task => ${subTask.id}`);
+    const {
+      input
+    } = subTask;
+    const {
+      templateId,
+      exportTemplatesDataKey
+    } = input;
+    const template = await pageBuilder.getPageTemplate({
+      where: {
+        id: templateId
+      }
+    });
+    if (!template) {
+      log(`Unable to load template "${templateId}"`);
+      throw new _handlerGraphql.NotFoundError(`Unable to load template "${templateId}"`);
+    }
+    log(`Processing template key "${templateId}"`);
+
+    // Mark task status as PROCESSING
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.PROCESSING
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.PROCESSING
+    });
+    prevStatusOfSubTask = subTask.status;
+    log(`Extracting template data and uploading to storage...`);
+    const templateExporter = new _PageTemplateExporter.PageTemplateExporter(fileManager);
+    const templateDataZip = await templateExporter.execute(template, exportTemplatesDataKey);
+    log(`Finish uploading zip...`);
+    // Update task record in DB
+    subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+      status: _types.ImportExportTaskStatus.COMPLETED,
+      data: {
+        message: `Finish uploading data for template "${template.id}"`,
+        key: templateDataZip.Key
+      }
+    });
+    // Update stats in main task
+    await pageBuilder.importExportTask.updateStats(taskId, {
+      prevStatus: prevStatusOfSubTask,
+      nextStatus: _types.ImportExportTaskStatus.COMPLETED
+    });
+    prevStatusOfSubTask = subTask.status;
+  } catch (e) {
+    log("[EXPORT_TEMPLATES_PROCESS] Error => ", e.message);
+    if (subTask && subTask.id) {
+      /**
+       * In case of error, we'll update the task status to "failed",
+       * so that, client can show notify the user appropriately.
+       */
+      subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
+        status: _types.ImportExportTaskStatus.FAILED,
+        error: {
+          name: e.name,
+          message: e.message,
+          code: "EXPORT_FAILED"
+        }
+      });
+
+      // Update stats in main task
+      await pageBuilder.importExportTask.updateStats(taskId, {
+        prevStatus: prevStatusOfSubTask,
+        nextStatus: _types.ImportExportTaskStatus.FAILED
+      });
+      prevStatusOfSubTask = subTask.status;
+    }
+    return {
+      data: null,
+      error: {
+        message: e.message
+      }
+    };
+  } finally {
+    // Base condition!
+    if (noPendingTask) {
+      log(`No pending sub-task for task ${taskId}`);
+      // Combine individual template zip files.
+      await (0, _client.invokeHandlerClient)({
+        context,
+        name: configuration.handlers.combine,
+        payload: {
+          taskId,
+          type,
+          identity: context.security.getIdentity()
+        },
+        description: "Export templates - combine"
+      });
+    } else {
+      console.log(`Invoking PROCESS for task "${subTaskIndex + 1}"`);
+      // We want to continue with Self invocation no matter if current template error out.
+      await (0, _client.invokeHandlerClient)({
+        context,
+        name: configuration.handlers.process,
+        payload: {
+          taskId,
+          subTaskIndex: subTaskIndex + 1,
+          type,
+          identity: context.security.getIdentity()
+        },
+        description: "Export templates - process - subtask"
+      });
+    }
+  }
+  return {
+    data: "",
+    error: null
+  };
+};
+exports.templatesHandler = templatesHandler;
+
+//# sourceMappingURL=templatesHandler.js.map

package/export/process/templatesHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_types","require","_client","_handlerGraphql","_mockSecurity","_utils","_PageTemplateExporter","templatesHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","pageBuilder","fileManager","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","input","templateId","exportTemplatesDataKey","template","getPageTemplate","where","NotFoundError","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","templateExporter","PageTemplateExporter","templateDataZip","execute","COMPLETED","message","key","Key","e","FAILED","name","code","invokeHandlerClient","handlers","combine","security","getIdentity","description","process","exports"],"sources":["templatesHandler.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport { ImportExportTaskStatus } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport type { Payload as ExtractPayload } from \"../combine\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport type { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { zeroPad } from \"@webiny/utils\";\nimport type { Configuration, Payload, Response } from \"~/export/process\";\nimport { PageTemplateExporter } from \"~/export/process/exporters/PageTemplateExporter\";\n\n/**\n * Handles the export templates process workflow.\n */\nexport const templatesHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Export Templates Process Handler\");\n    const { pageBuilder, fileManager } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity as SecurityIdentity, context);\n    try {\n        /*\n         * Note: We're not going to DB for finding the next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { input } = subTask;\n        const { templateId, exportTemplatesDataKey } = input;\n\n        const template = await pageBuilder.getPageTemplate({ where: { id: templateId } });\n\n        if (!template) {\n            log(`Unable to load template \"${templateId}\"`);\n            throw new NotFoundError(`Unable to load template \"${templateId}\"`);\n        }\n\n        log(`Processing template key \"${templateId}\"`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Extracting template data and uploading to storage...`);\n        const templateExporter = new PageTemplateExporter(fileManager);\n        const templateDataZip = await templateExporter.execute(template, exportTemplatesDataKey);\n\n        log(`Finish uploading zip...`);\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading data for template \"${template.id}\"`,\n                key: templateDataZip.Key\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[EXPORT_TEMPLATES_PROCESS] Error => \", e.message);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    code: \"EXPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n            // Combine individual template zip files.\n            await invokeHandlerClient<ExtractPayload>({\n                context,\n                name: configuration.handlers.combine,\n                payload: {\n                    taskId,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - combine\"\n            });\n        } else {\n            console.log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current template error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    subTaskIndex: subTaskIndex + 1,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/export/s3Stream.d.ts

@@ -0,0 +1,36 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import type { Readable } from "stream";
+import type { ListObjectsOutput, DeleteObjectOutput, HeadObjectOutput } from "@webiny/aws-sdk/client-s3";
+import { S3 } from "@webiny/aws-sdk/client-s3";
+export type { ListObjectsOutput };
+declare class S3Stream {
+    s3: S3;
+    bucket: string;
+    constructor();
+    getPresignedUrl(key?: string): Promise<string>;
+    /**
+     * We're checking if the file is accessible on S3 by getting object meta data.
+     * It help us to filter files that we need to download as part of export data.
+     * @param Key {string}
+     */
+    isFileAccessible(Key: string): Promise<boolean>;
+    getObjectHead(Key: string): Promise<HeadObjectOutput>;
+    readStream(Key: string): Promise<Readable>;
+    writeStream(Key: string, contentType?: string): {
+        streamPassThrough: import("stream").PassThrough;
+        /**
+         * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.
+         */
+        streamPassThroughUploadPromise: Promise<import("@webiny/aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
+    };
+    upload(params: {
+        Key: string;
+        ContentType: string;
+        Body: Buffer;
+    }): Promise<void>;
+    listObject(prefix: string): Promise<ListObjectsOutput>;
+    deleteObject(key: string): Promise<DeleteObjectOutput>;
+}
+export declare const s3Stream: S3Stream;

package/{exportPages → export}/s3Stream.js

@@ -1,47 +1,34 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.s3Stream = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _stream = require("stream");
-
-var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
+var _clientS = require("@webiny/aws-sdk/client-s3");
+var _libStorage = require("@webiny/aws-sdk/lib-storage");
 const ARCHIVE_CONTENT_TYPE = "application/zip";
-
 class S3Stream {
   constructor() {
-    (0, _defineProperty2.default)(this, "s3", void 0);
-    (0, _defineProperty2.default)(this, "bucket", void 0);
-    this.s3 = new _s.default({
+    this.s3 = new _clientS.S3({
       region: process.env.AWS_REGION
     });
     this.bucket = process.env.S3_BUCKET;
   }
-
   getPresignedUrl(key) {
-    return this.s3.getSignedUrl("getObject", {
+    return (0, _clientS.getSignedUrl)(this.s3, new _clientS.GetObjectCommand({
       Bucket: this.bucket,
-      Key: key,
-      Expires: 604800 // 1 week
-
+      Key: key
+    }), {
+      expiresIn: 604800 // 1 week
     });
   }
+
   /**
    * We're checking if the file is accessible on S3 by getting object meta data.
    * It help us to filter files that we need to download as part of export data.
    * @param Key {string}
    */
-
-
   async isFileAccessible(Key) {
     try {
       await this.getObjectHead(Key);
@@ -52,21 +39,19 @@ class S3Stream {
       return false;
     }
   }
-
   getObjectHead(Key) {
     return this.s3.headObject({
       Bucket: this.bucket,
       Key
-    }).promise();
+    });
   }
-
-  readStream(Key) {
-    return this.s3.getObject({
+  async readStream(Key) {
+    const response = await this.s3.send(new _clientS.GetObjectCommand({
       Bucket: this.bucket,
       Key
-    }).createReadStream();
+    }));
+    return response.Body;
   }
-
   writeStream(Key, contentType = ARCHIVE_CONTENT_TYPE) {
     const streamPassThrough = new _stream.Stream.PassThrough();
     const params = {
@@ -76,38 +61,38 @@ class S3Stream {
       ContentType: contentType,
       Key
     };
+    const upload = new _libStorage.Upload({
+      client: this.s3,
+      params
+    });
     return {
       streamPassThrough: streamPassThrough,
-
       /**
        * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.
        */
-      streamPassThroughUploadPromise: this.s3.upload(params).promise()
+      streamPassThroughUploadPromise: upload.done()
     };
   }
-
-  upload(params) {
-    return this.s3.upload((0, _objectSpread2.default)({
+  async upload(params) {
+    await this.s3.send(new _clientS.PutObjectCommand({
       ACL: "private",
-      Bucket: this.bucket
-    }, params)).promise();
+      Bucket: this.bucket,
+      ...params
+    }));
   }
-
   listObject(prefix) {
     return this.s3.listObjects({
       Bucket: this.bucket,
       Prefix: prefix
-    }).promise();
+    });
   }
-
   deleteObject(key) {
     return this.s3.deleteObject({
       Key: key,
       Bucket: this.bucket
-    }).promise();
+    });
   }
-
 }
+const s3Stream = exports.s3Stream = new S3Stream();
 
-const s3Stream = new S3Stream();
-exports.s3Stream = s3Stream;
+//# sourceMappingURL=s3Stream.js.map