@webiny/api-page-builder-import-export 0.0.0-mt-3 → 0.0.0-unstable.5e7233243f

package/importPages/create/index.js

@@ -9,46 +9,57 @@ var _types = require("../../types");
 
 var _utils = require("../utils");
 
-var _client = require("../client");
+var _client = require("../../client");
 
 var _mockSecurity = require("../../mockSecurity");
 
+var _utils2 = require("@webiny/utils");
+
+var _handlerAws = require("@webiny/handler-aws");
+
 /**
  * Handles the import page workflow.
  */
-var _default = configuration => ({
-  type: "handler",
-
-  async handle(context) {
+var _default = configuration => {
+  return (0, _handlerAws.createRawEventHandler)(async ({
+    payload,
+    context
+  }) => {
     const log = console.log;
+    const {
+      pageBuilder
+    } = context;
+    const {
+      task,
+      category,
+      zipFileUrl,
+      identity
+    } = payload;
 
     try {
       log("RUNNING Import Pages Create");
-      const {
-        invocationArgs: args,
-        pageBuilder
-      } = context;
-      const {
-        task,
-        category,
-        zipFileKey,
-        zipFileUrl,
-        identity
-      } = args;
+
+      if (!zipFileUrl) {
+        return {
+          data: null,
+          error: {
+            message: `Missing "zipFileUrl"!`
+          }
+        };
+      }
+
       (0, _mockSecurity.mockSecurity)(identity, context); // Step 1: Read the zip file
 
-      const pageImportDataList = await (0, _utils.readExtractAndUploadZipFileContents)(zipFileKey || zipFileUrl); // Once we have map we can start processing each page
-      // For each page create a sub task and invoke the process handler
+      const pageImportDataList = await (0, _utils.readExtractAndUploadZipFileContents)(zipFileUrl); // For each page create a subtask and invoke the process handler
 
       for (let i = 0; i < pageImportDataList.length; i++) {
         const pagesDirMap = pageImportDataList[i]; // Create sub task
 
-        const subtask = await pageBuilder.pageImportExportTask.createSubTask(task.id, (0, _utils.zeroPad)(i + 1), {
+        const subtask = await pageBuilder.pageImportExportTask.createSubTask(task.id, (0, _utils2.zeroPad)(i + 1, 5), {
           status: _types.PageImportExportTaskStatus.PENDING,
           data: {
             pageKey: pagesDirMap.key,
             category,
-            zipFileKey,
             zipFileUrl,
             input: {
               fileUploadsData: pagesDirMap
@@ -71,7 +82,8 @@ var _default = configuration => ({
           // Execute "Process" for the first sub task.
           subTaskIndex: 1,
           identity: context.security.getIdentity()
-        }
+        },
+        description: "Import pages - process - first"
       });
     } catch (e) {
       log("[IMPORT_PAGES_CREATE] Error => ", e);
@@ -80,13 +92,6 @@ var _default = configuration => ({
        * so that, client can show notify the user appropriately.
        */
 
-      const {
-        invocationArgs: args,
-        pageBuilder
-      } = context;
-      const {
-        task
-      } = args;
       await pageBuilder.pageImportExportTask.updateTask(task.id, {
         status: _types.PageImportExportTaskStatus.FAILED,
         error: {
@@ -102,8 +107,12 @@ var _default = configuration => ({
         }
       };
     }
-  }
 
-});
+    return {
+      data: "",
+      error: null
+    };
+  });
+};
 
 exports.default = _default;

package/importPages/create/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["configuration","createRawEventHandler","payload","context","log","console","pageBuilder","task","category","zipFileUrl","identity","data","error","message","mockSecurity","pageImportDataList","readExtractAndUploadZipFileContents","i","length","pagesDirMap","subtask","pageImportExportTask","createSubTask","id","zeroPad","status","PageImportExportTaskStatus","PENDING","pageKey","key","input","fileUploadsData","updateTask","PROCESSING","stats","initialStats","invokeHandlerClient","name","handlers","process","taskId","subTaskIndex","security","getIdentity","description","e","FAILED","code"],"sources":["index.ts"],"sourcesContent":["import {\n    PageImportExportTask,\n    PageImportExportTaskStatus,\n    PbPageImportExportContext\n} from \"~/types\";\nimport { initialStats, readExtractAndUploadZipFileContents } from \"~/importPages/utils\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { Payload as ProcessPayload } from \"../process\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\n\ninterface Configuration {\n    handlers: {\n        process: string;\n    };\n}\n\nexport interface Payload {\n    category: string;\n    zipFileUrl: string;\n    task: PageImportExportTask;\n    identity: SecurityIdentity;\n}\nexport interface Response {\n    data: string | null;\n    error: Partial<Error> | null;\n}\n\n/**\n * Handles the import page workflow.\n */\nexport default (configuration: Configuration) => {\n    return createRawEventHandler<Payload, PbPageImportExportContext, Response>(\n        async ({ payload, context }) => {\n            const log = console.log;\n\n            const { pageBuilder } = context;\n            const { task, category, zipFileUrl, identity } = payload;\n            try {\n                log(\"RUNNING Import Pages Create\");\n                if (!zipFileUrl) {\n                    return {\n                        data: null,\n                        error: {\n                            message: `Missing \"zipFileUrl\"!`\n                        }\n                    };\n                }\n                mockSecurity(identity, context);\n                // Step 1: Read the zip file\n                const pageImportDataList = await readExtractAndUploadZipFileContents(zipFileUrl);\n\n                // For each page create a subtask and invoke the process handler\n                for (let i = 0; i < pageImportDataList.length; i++) {\n                    const pagesDirMap = pageImportDataList[i];\n                    // Create sub task\n                    const subtask = await pageBuilder.pageImportExportTask.createSubTask(\n                        task.id,\n                        zeroPad(i + 1, 5),\n                        {\n                            status: PageImportExportTaskStatus.PENDING,\n                            data: {\n                                pageKey: pagesDirMap.key,\n                                category,\n                                zipFileUrl,\n                                input: {\n                                    fileUploadsData: pagesDirMap\n                                }\n                            }\n                        }\n                    );\n                    log(`Added SUB_TASK \"${subtask.id}\" to queue.`);\n                }\n                // Update main task status\n                await pageBuilder.pageImportExportTask.updateTask(task.id, {\n                    status: PageImportExportTaskStatus.PROCESSING,\n                    stats: initialStats(pageImportDataList.length)\n                });\n\n                await invokeHandlerClient<ProcessPayload>({\n                    context,\n                    name: configuration.handlers.process,\n                    payload: {\n                        taskId: task.id,\n                        // Execute \"Process\" for the first sub task.\n                        subTaskIndex: 1,\n                        identity: context.security.getIdentity()\n                    },\n                    description: \"Import pages - process - first\"\n                });\n            } catch (e) {\n                log(\"[IMPORT_PAGES_CREATE] Error => \", e);\n\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\n                await pageBuilder.pageImportExportTask.updateTask(task.id, {\n                    status: PageImportExportTaskStatus.FAILED,\n                    error: {\n                        name: e.name,\n                        message: e.message,\n                        code: e.code || \"EXPORT_FAILED\"\n                    }\n                });\n\n                return {\n                    data: null,\n                    error: {\n                        message: e.message\n                    }\n                };\n            }\n\n            return {\n                data: \"\",\n                error: null\n            };\n        }\n    );\n};\n"],"mappings":"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"}

package/importPages/process/index.d.ts

@@ -1,25 +1,18 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-import { ArgsContext } from "@webiny/handler-args/types";
 import { PbPageImportExportContext } from "../../types";
 import { SecurityIdentity } from "@webiny/api-security/types";
-export declare type HandlerArgs = {
-    taskId: string;
-    subTaskIndex: number;
-    identity: SecurityIdentity;
-};
-export declare type HandlerResponse = {
-    data: string;
-    error: {
-        message: string;
-    };
-};
 interface Configuration {
     handlers: {
         process: string;
     };
 }
-declare const _default: (configuration: Configuration) => HandlerPlugin<PbPageImportExportContext, ArgsContext<HandlerArgs>>;
-/**
- * Handles the import page workflow.
- */
+export interface Payload {
+    taskId: string;
+    subTaskIndex: number;
+    identity: SecurityIdentity;
+}
+export interface Response {
+    data: string | null;
+    error: Partial<Error> | null;
+}
+declare const _default: (configuration: Configuration) => import("@webiny/handler-aws").RawEventHandler<Payload, PbPageImportExportContext, Response>;
 export default _default;

package/importPages/process/index.js

@@ -9,31 +9,32 @@ var _types = require("../../types");
 
 var _utils = require("../utils");
 
-var _client = require("../client");
+var _client = require("../../client");
 
 var _mockSecurity = require("../../mockSecurity");
 
-/**
- * Handles the import page workflow.
- */
-var _default = configuration => ({
-  type: "handler",
+var _utils2 = require("@webiny/utils");
 
-  async handle(context) {
+var _handlerAws = require("@webiny/handler-aws");
+
+var _default = configuration => {
+  return (0, _handlerAws.createRawEventHandler)(async ({
+    payload,
+    context
+  }) => {
     const log = console.log;
     let subTask;
     let noPendingTask = true;
     let prevStatusOfSubTask = _types.PageImportExportTaskStatus.PENDING;
     log("RUNNING Import Page Queue Process");
     const {
-      invocationArgs: args,
       pageBuilder
     } = context;
     const {
       taskId,
       subTaskIndex,
       identity
-    } = args; // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks
+    } = 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);
@@ -43,7 +44,7 @@ var _default = configuration => ({
        * Note: We're not going to DB for getting next sub-task to process,
        * because the data might be out of sync due to GSI eventual consistency.
        */
-      subTask = await pageBuilder.pageImportExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex));
+      subTask = await pageBuilder.pageImportExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
       /**
        * Base condition!!
        * Bail out early, if task not found or task's status is not "pending".
@@ -51,7 +52,10 @@ var _default = configuration => ({
 
       if (!subTask || subTask.status !== _types.PageImportExportTaskStatus.PENDING) {
         noPendingTask = true;
-        return;
+        return {
+          data: "",
+          error: null
+        };
       } else {
         noPendingTask = false;
       }
@@ -86,9 +90,9 @@ var _default = configuration => ({
         fileUploadsData
       }); // Create a page
 
-      let pbPage = await context.pageBuilder.pages.create(category); // Update page with data
+      let pbPage = await context.pageBuilder.createPage(category); // Update page with data
 
-      pbPage = await context.pageBuilder.pages.update(pbPage.id, {
+      pbPage = await context.pageBuilder.updatePage(pbPage.id, {
         content: page.content,
         title: page.title,
         path: page.path,
@@ -122,13 +126,6 @@ var _default = configuration => ({
          * In case of error, we'll update the task status to "failed",
          * so that, client can show notify the user appropriately.
          */
-        const {
-          invocationArgs: args,
-          pageBuilder
-        } = context;
-        const {
-          taskId
-        } = args;
         subTask = await pageBuilder.pageImportExportTask.updateSubTask(taskId, subTask.id, {
           status: _types.PageImportExportTaskStatus.FAILED,
           error: {
@@ -172,12 +169,17 @@ var _default = configuration => ({
             taskId,
             subTaskIndex: subTaskIndex + 1,
             identity: context.security.getIdentity()
-          }
+          },
+          description: "Import pages - process - subtask"
         });
       }
     }
-  }
 
-});
+    return {
+      data: "",
+      error: null
+    };
+  });
+};
 
 exports.default = _default;

package/importPages/process/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["configuration","createRawEventHandler","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","PageImportExportTaskStatus","PENDING","pageBuilder","taskId","subTaskIndex","identity","mockSecurity","pageImportExportTask","getSubTask","zeroPad","status","data","error","id","pageKey","category","zipFileKey","input","fileUploadsData","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","page","importPage","key","pbPage","createPage","updatePage","content","title","path","settings","COMPLETED","message","version","e","FAILED","name","stack","code","updateTask","invokeHandlerClient","handlers","process","security","getIdentity","description"],"sources":["index.ts"],"sourcesContent":["import { PageImportExportTaskStatus, PbPageImportExportContext } from \"~/types\";\nimport { importPage } from \"~/importPages/utils\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\n\ninterface Configuration {\n    handlers: {\n        process: string;\n    };\n}\n\nexport interface Payload {\n    taskId: string;\n    subTaskIndex: number;\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, PbPageImportExportContext, Response>(\n        async ({ payload, context }) => {\n            const log = console.log;\n            let subTask;\n            let noPendingTask = true;\n            let prevStatusOfSubTask = PageImportExportTaskStatus.PENDING;\n\n            log(\"RUNNING Import Page Queue Process\");\n            const { pageBuilder } = context;\n            const { taskId, subTaskIndex, 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, context);\n\n            try {\n                /*\n                 * Note: We're not going to DB for getting next sub-task to process,\n                 * because the data might be out of sync due to GSI eventual consistency.\n                 */\n\n                subTask = await pageBuilder.pageImportExportTask.getSubTask(\n                    taskId,\n                    zeroPad(subTaskIndex, 5)\n                );\n\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 !== PageImportExportTaskStatus.PENDING) {\n                    noPendingTask = true;\n                    return {\n                        data: \"\",\n                        error: null\n                    };\n                } else {\n                    noPendingTask = false;\n                }\n                prevStatusOfSubTask = subTask.status;\n\n                log(`Fetched sub task => ${subTask.id}`);\n\n                const { pageKey, category, zipFileKey, input } = subTask.data;\n                const { fileUploadsData } = input;\n\n                log(`Processing page key \"${pageKey}\"`);\n\n                // Mark task status as PROCESSING\n                subTask = await pageBuilder.pageImportExportTask.updateSubTask(taskId, subTask.id, {\n                    status: PageImportExportTaskStatus.PROCESSING\n                });\n                // Update stats in main task\n                await pageBuilder.pageImportExportTask.updateStats(taskId, {\n                    prevStatus: prevStatusOfSubTask,\n                    nextStatus: PageImportExportTaskStatus.PROCESSING\n                });\n                prevStatusOfSubTask = subTask.status;\n\n                // Real job\n                const page = await importPage({\n                    context,\n                    pageKey,\n                    key: zipFileKey,\n                    fileUploadsData\n                });\n\n                // Create a page\n                let pbPage = await context.pageBuilder.createPage(category);\n\n                // Update page with data\n                pbPage = await context.pageBuilder.updatePage(pbPage.id, {\n                    content: page.content,\n                    title: page.title,\n                    path: page.path,\n                    settings: page.settings\n                });\n\n                // TODO: Publish page\n\n                // Update task record in DB\n                subTask = await pageBuilder.pageImportExportTask.updateSubTask(taskId, subTask.id, {\n                    status: PageImportExportTaskStatus.COMPLETED,\n                    data: {\n                        message: \"Done\",\n                        page: {\n                            id: pbPage.id,\n                            title: pbPage.title,\n                            version: pbPage.version,\n                            status: pbPage.status\n                        }\n                    }\n                });\n                // Update stats in main task\n                await pageBuilder.pageImportExportTask.updateStats(taskId, {\n                    prevStatus: prevStatusOfSubTask,\n                    nextStatus: PageImportExportTaskStatus.COMPLETED\n                });\n                prevStatusOfSubTask = subTask.status;\n            } catch (e) {\n                log(\"[IMPORT_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.pageImportExportTask.updateSubTask(\n                        taskId,\n                        subTask.id,\n                        {\n                            status: PageImportExportTaskStatus.FAILED,\n                            error: {\n                                name: e.name,\n                                message: e.message,\n                                stack: e.stack,\n                                code: \"IMPORT_FAILED\"\n                            }\n                        }\n                    );\n\n                    // Update stats in main task\n                    await pageBuilder.pageImportExportTask.updateStats(taskId, {\n                        prevStatus: prevStatusOfSubTask,\n                        nextStatus: PageImportExportTaskStatus.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\n                    await pageBuilder.pageImportExportTask.updateTask(taskId, {\n                        status: PageImportExportTaskStatus.COMPLETED,\n                        data: {\n                            message: `Finish importing pages.`\n                        }\n                    });\n                } else {\n                    log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n                    // We want to continue with Self invocation no matter if current page error out.\n                    await invokeHandlerClient<Payload>({\n                        context,\n                        name: configuration.handlers.process,\n                        payload: {\n                            taskId,\n                            subTaskIndex: subTaskIndex + 1,\n                            identity: context.security.getIdentity()\n                        },\n                        description: \"Import pages - process - subtask\"\n                    });\n                }\n            }\n            return {\n                data: \"\",\n                error: null\n            };\n        }\n    );\n};\n"],"mappings":"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"}

package/importPages/utils.d.ts

@@ -1,15 +1,23 @@
-import { PageImportExportTaskStatus } from "../types";
+import { File } from "../types";
 import { PbPageImportExportContext } from "../graphql/types";
 import { ExportedPageData } from "../exportPages/utils";
+interface FileItem extends File {
+    key: string;
+    type: string;
+    name: string;
+    size: number;
+    meta: Record<string, any>;
+    tags: string[];
+}
 interface UploadPageAssetsParams {
     context: PbPageImportExportContext;
-    filesData: Record<string, any>[];
+    filesData: FileItem[];
     fileUploadsData: FileUploadsData;
 }
 interface UploadPageAssetsReturnType {
-    fileIdToKeyMap?: Map<string, string>;
+    fileIdToKeyMap: Map<string, string>;
 }
-export declare const uploadPageAssets: ({ context, filesData, fileUploadsData }: UploadPageAssetsParams) => Promise<UploadPageAssetsReturnType>;
+export declare const uploadPageAssets: (params: UploadPageAssetsParams) => Promise<UploadPageAssetsReturnType>;
 interface FileUploadsData {
     data: string;
     assets: Record<string, string>;
@@ -28,16 +36,15 @@ interface PageImportData {
 }
 /**
  * Function will read the given zip file from S3 via stream, extract its content and upload it to S3 bucket.
- * @param zipFileKey
+ * @param zipFileUrl
  * @return PageImportData S3 file keys for all uploaded assets group by page.
  */
-export declare function readExtractAndUploadZipFileContents(zipFileKey: string): Promise<PageImportData[]>;
-export declare const zeroPad: (version: any) => string;
-export declare function initialStats(total: any): {
-    pending: any;
+export declare function readExtractAndUploadZipFileContents(zipFileUrl: string): Promise<PageImportData[]>;
+export declare function initialStats(total: number): {
+    pending: number;
     processing: number;
     completed: number;
     failed: number;
-    total: any;
+    total: number;
 };
 export {};

package/importPages/utils.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.importPage = importPage;
 exports.initialStats = initialStats;
 exports.readExtractAndUploadZipFileContents = readExtractAndUploadZipFileContents;
-exports.zeroPad = exports.uploadPageAssets = void 0;
+exports.uploadPageAssets = void 0;
 
 var _uniqid = _interopRequireDefault(require("uniqid"));
 
@@ -46,25 +46,29 @@ const INSTALL_DIR = "/tmp";
 const INSTALL_EXTRACT_DIR = _path.default.join(INSTALL_DIR, "apiPageBuilderImportPage");
 
 const FILES_COUNT_IN_EACH_BATCH = 15;
-const ZIP_CONTENT_TYPE = "application/zip";
 
-function updateImageInPageSettings({
-  settings,
-  fileIdToKeyMap,
-  srcPrefix
-}) {
+function updateImageInPageSettings(params) {
+  const {
+    settings,
+    fileIdToKeyMap,
+    srcPrefix
+  } = params;
   let newSettings = settings;
   const srcPrefixWithoutTrailingSlash = srcPrefix.endsWith("/") ? srcPrefix.slice(0, -1) : srcPrefix;
 
   if (_dotPropImmutable.default.get(newSettings, "general.image.src")) {
-    newSettings = _dotPropImmutable.default.set(newSettings, "general.image.src", `${srcPrefixWithoutTrailingSlash}/${fileIdToKeyMap.get(settings.general.image.id)}`);
+    var _settings$general, _settings$general$ima;
+
+    newSettings = _dotPropImmutable.default.set(newSettings, "general.image.src", `${srcPrefixWithoutTrailingSlash}/${fileIdToKeyMap.get(((_settings$general = settings.general) === null || _settings$general === void 0 ? void 0 : (_settings$general$ima = _settings$general.image) === null || _settings$general$ima === void 0 ? void 0 : _settings$general$ima.id) || "")}`);
   }
 
   if (_dotPropImmutable.default.get(newSettings, "social.image.src")) {
-    newSettings = _dotPropImmutable.default.set(newSettings, "social.image.src", `${srcPrefixWithoutTrailingSlash}/${fileIdToKeyMap.get(settings.social.image.id)}`);
+    var _settings$social, _settings$social$imag;
+
+    newSettings = _dotPropImmutable.default.set(newSettings, "social.image.src", `${srcPrefixWithoutTrailingSlash}/${fileIdToKeyMap.get(((_settings$social = settings.social) === null || _settings$social === void 0 ? void 0 : (_settings$social$imag = _settings$social.image) === null || _settings$social$imag === void 0 ? void 0 : _settings$social$imag.id) || "")}`);
   }
 
-  return settings;
+  return newSettings;
 }
 
 function updateFilesInPageData({
@@ -111,23 +115,27 @@ function updateFilesInPageData({
   }
 }
 
-const uploadPageAssets = async ({
-  context,
-  filesData,
-  fileUploadsData
-}) => {
+const uploadPageAssets = async params => {
+  const {
+    context,
+    filesData,
+    fileUploadsData
+  } = params; // Save uploaded file key against static id for later use.
+
+  const fileIdToKeyMap = new Map();
   /**
    * This function contains logic of file download from S3.
    * Current we're not mocking zip file download from S3 in tests at the moment.
    * So, we're manually mocking it in case of test just by returning an empty object.
    */
+
   if (process.env.NODE_ENV === "test") {
-    return {};
+    return {
+      fileIdToKeyMap
+    };
   }
 
-  console.log("INSIDE uploadPageAssets"); // Save uploaded file key against static id for later use.
-
-  const fileIdToKeyMap = new Map(); // Save files meta data against old key for later use.
+  console.log("INSIDE uploadPageAssets"); // Save files meta data against old key for later use.
 
   const fileKeyToFileMap = new Map(); // Initialize maps.
 
@@ -145,7 +153,12 @@ const uploadPageAssets = async ({
 
   const createFilesInput = fileUploadResults.map(uploadResult => {
     const newKey = uploadResult.Key;
-    const file = fileKeyToFileMap.get(getOldFileKey(newKey)); // Update the file map with newly uploaded file.
+    const file = fileKeyToFileMap.get(getOldFileKey(newKey));
+
+    if (!file) {
+      return null;
+    } // Update the file map with newly uploaded file.
+
 
     fileIdToKeyMap.set(file.id, newKey);
     return {
@@ -156,7 +169,7 @@ const uploadPageAssets = async ({
       meta: file.meta,
       tags: file.tags
     };
-  });
+  }).filter(Boolean);
   const createFilesPromises = []; // Gives an array of chunks (each consists of FILES_COUNT_IN_EACH_BATCH items).
 
   const createFilesInputChunks = (0, _chunk.default)(createFilesInput, FILES_COUNT_IN_EACH_BATCH);
@@ -206,25 +219,31 @@ async function importPage({
     files
   } = await (0, _loadJsonFile.default)(PAGE_DATA_FILE_PATH); // Only update page data if there are files.
 
-  if (Array.isArray(files) && files.length) {
+  if (files && Array.isArray(files) && files.length > 0) {
     // Upload page assets.
     const {
       fileIdToKeyMap
     } = await uploadPageAssets({
       context,
+
+      /**
+       * TODO @ts-refactor @ashutosh figure out correct types.
+       */
+      // @ts-ignore
       filesData: files,
       fileUploadsData
     });
+    const settings = await context.fileManager.settings.getSettings();
     const {
-      srcPrefix
-    } = await context.fileManager.settings.getSettings();
+      srcPrefix = ""
+    } = settings || {};
     updateFilesInPageData({
-      data: page.content,
+      data: page.content || {},
       fileIdToKeyMap,
       srcPrefix
     });
     page.settings = updateImageInPageSettings({
-      settings: page.settings,
+      settings: page.settings || {},
       fileIdToKeyMap,
       srcPrefix
     });
@@ -270,14 +289,6 @@ async function uploadFilesFromS3({
   return Promise.all(promises);
 }
 
-async function getObjectMetaFromS3(Key) {
-  const meta = await _s3Stream.s3Stream.getObjectHead(Key);
-
-  if (meta.ContentType !== ZIP_CONTENT_TYPE) {
-    throw new _error.default(`Unsupported file type: "${meta.ContentType}"`, "UNSUPPORTED_FILE");
-  }
-}
-
 function getOldFileKey(key) {
   /*
    * Because we know the naming convention, we can extract the old key from new key.
@@ -298,32 +309,23 @@ function getFileNameWithoutExt(fileName) {
 
 /**
  * Function will read the given zip file from S3 via stream, extract its content and upload it to S3 bucket.
- * @param zipFileKey
+ * @param zipFileUrl
  * @return PageImportData S3 file keys for all uploaded assets group by page.
  */
-async function readExtractAndUploadZipFileContents(zipFileKey) {
+async function readExtractAndUploadZipFileContents(zipFileUrl) {
   const log = console.log;
   const pageImportDataList = [];
-  let readStream; // Check whether it is a URL
 
-  if (zipFileKey.startsWith("http")) {
-    const response = await (0, _nodeFetch.default)(zipFileKey);
+  const zipFileName = _path.default.basename(zipFileUrl).split("?")[0];
 
-    if (!response.ok) {
-      throw new _error.default(`Unable to downloading file: "${zipFileKey}"`, response.statusText);
-    }
+  const response = await (0, _nodeFetch.default)(zipFileUrl);
 
-    readStream = response.body;
-  } else {
-    // We're first retrieving object's meta data, just to check whether the file is available at the given Key
-    await getObjectMetaFromS3(zipFileKey);
-    readStream = _s3Stream.s3Stream.readStream(zipFileKey);
+  if (!response.ok) {
+    throw new _error.default(`Unable to downloading file: "${zipFileUrl}"`, response.statusText);
   }
 
-  const uniquePath = (0, _uniqid.default)("IMPORT_PAGES/");
-
-  const zipFileName = _path.default.basename(zipFileKey); // Read export file and download it in the disk
-
+  const readStream = response.body;
+  const uniquePath = (0, _uniqid.default)("IMPORT_PAGES/"); // Read export file and download it in the disk
 
   const ZIP_FILE_PATH = _path.default.join(INSTALL_DIR, zipFileName);
 
@@ -332,7 +334,7 @@ async function readExtractAndUploadZipFileContents(zipFileKey) {
   log(`Downloaded file "${zipFileName}" at ${ZIP_FILE_PATH}`); // Extract the downloaded zip file
 
   const zipFilePaths = await extractZipToDisk(ZIP_FILE_PATH);
-  log(`Removing ZIP file "${zipFileKey}" from ${ZIP_FILE_PATH}`);
+  log(`Removing ZIP file "${zipFileUrl}" from ${ZIP_FILE_PATH}`);
   await (0, _downloadInstallFiles.deleteFile)(ZIP_FILE_PATH); // Extract each page zip and upload their content's to S3
 
   for (let i = 0; i < zipFilePaths.length; i++) {
@@ -382,16 +384,13 @@ async function deleteS3Folder(key) {
   }
 
   const response = await _s3Stream.s3Stream.listObject(key);
-  const keys = response.Contents.map(c => c.Key);
+  const keys = (response.Contents || []).map(c => c.Key).filter(Boolean);
   console.log(`Found ${keys.length} files.`);
   const deleteFilePromises = keys.map(key => _s3Stream.s3Stream.deleteObject(key));
   await Promise.all(deleteFilePromises);
   console.log(`Successfully deleted ${deleteFilePromises.length} files.`);
-}
-
-const zeroPad = version => `${version}`.padStart(5, "0");
+} // export const zeroPad = version => `${version}`.padStart(5, "0");
 
-exports.zeroPad = zeroPad;
 
 function initialStats(total) {
   return {
@@ -419,6 +418,13 @@ function extractZipToDisk(exportFileZipPath) {
       if (err) {
         console.warn("ERROR: Failed to extract zip: ", exportFileZipPath, err);
         reject(err);
+        return;
+      }
+
+      if (!zipFile) {
+        console.log("ERROR: Missing zip file resource for path: " + exportFileZipPath);
+        reject("Missing Zip File Resource.");
+        return;
       }
 
       console.info(`The ZIP file contains ${zipFile.entryCount} entries.`);
@@ -445,6 +451,13 @@ function extractZipToDisk(exportFileZipPath) {
             if (err) {
               console.warn("ERROR: Failed to openReadStream for file: ", entry.fileName, err);
               reject(err);
+              return;
+            }
+
+            if (!readStream) {
+              console.log("ERROR: Missing Read Stream Resource when extracting to disk.");
+              reject("Missing Read Stream Resource.");
+              return;
             }
 
             const filePath = _path.default.join(EXPORT_FILE_EXTRACTION_PATH, entry.fileName);
@@ -453,7 +466,9 @@ function extractZipToDisk(exportFileZipPath) {
               pageZipFilePaths.push(filePath);
               zipFile.readEntry();
             });
-            streamPipeline(readStream, (0, _fs.createWriteStream)(filePath));
+            streamPipeline(readStream, (0, _fs.createWriteStream)(filePath)).catch(error => {
+              reject(error);
+            });
           });
         }
       });
@@ -478,6 +493,13 @@ function extractZipAndUploadToS3(pageDataZipFilePath, uniquePath) {
       if (err) {
         console.warn("ERROR: Failed to extract zip: ", pageDataZipFilePath, err);
         reject(err);
+        return;
+      }
+
+      if (!zipFile) {
+        console.log("ERROR: Probably failed to extract zip: " + pageDataZipFilePath);
+        reject("Missing Zip File Resource.");
+        return;
       }
 
       console.info(`The ZIP file contains ${zipFile.entryCount} entries.`);
@@ -509,6 +531,13 @@ function extractZipAndUploadToS3(pageDataZipFilePath, uniquePath) {
             if (err) {
               console.warn("ERROR: Failed while performing [openReadStream] for file: ", entry.fileName, err);
               reject(err);
+              return;
+            }
+
+            if (!readStream) {
+              console.log("ERROR: Missing Read Stream while importing pages.");
+              reject("Missing Read Strea Resource.");
+              return;
             }
 
             readStream.on("end", function () {
@@ -530,6 +559,8 @@ function extractZipAndUploadToS3(pageDataZipFilePath, uniquePath) {
 
             streamPipeline(readStream, streamPassThrough).then(() => {
               fileUploadPromises.push(promise);
+            }).catch(error => {
+              reject(error);
             });
           });
         }