@contentstack/datasync-manager 1.2.3 → 1.2.4

package/.github/workflows/jira.yml

@@ -25,3 +25,4 @@ jobs:
           description: |
             PR: ${{ github.event.pull_request.html_url }}
 
+          fields: "${{ secrets.JIRA_FIELDS }}"

package/dist/api.js

@@ -8,6 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.get = exports.init = void 0;
 const debug_1 = __importDefault(require("debug"));
 const https_1 = require("https");
 const path_1 = require("path");

package/dist/config.js

@@ -5,6 +5,7 @@
 * MIT Licensed
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
 /**
  * @description Default application's internal config
  */

package/dist/core/index.js

@@ -4,10 +4,20 @@
  * Copyright (c) 2019 Contentstack LLC
  * MIT Licensed
  */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.unlock = exports.lock = exports.poke = exports.pop = exports.unshift = exports.push = exports.init = void 0;
 const debug_1 = __importDefault(require("debug"));
 const events_1 = require("events");
 const lodash_1 = require("lodash");
@@ -95,55 +105,73 @@ exports.pop = () => {
 /**
  * @description Notifies the sync manager utility to wake up and start syncing..
  */
-exports.poke = () => {
-    logger_1.logger.info('Received \'contentstack sync\' notification');
-    if (!flag.lockdown) {
-        flag.WQ = true;
-        check();
+exports.poke = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        debug('Invoked poke');
+        logger_1.logger.info('Received \'contentstack sync\' notification');
+        if (!flag.lockdown) {
+            flag.WQ = true;
+            return yield check();
+        }
+        return null;
     }
-};
+    catch (error) {
+        debug('Error [poke]', error);
+        throw error;
+    }
+});
 /**
  * @description Check's if the status of the app when a new incoming notification is fired
  * @description Starts processing if the 'SQ: false'
  */
-const check = () => {
-    debug(`Check called. SQ status is ${flag.SQ} and WQ status is ${flag.WQ}`);
-    if (!flag.SQ && flag.WQ) {
-        flag.WQ = false;
-        flag.SQ = true;
-        sync().then(() => {
+const check = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        debug(`Check called. SQ status is ${flag.SQ} and WQ status is ${flag.WQ}`);
+        if (!flag.SQ && flag.WQ) {
+            flag.WQ = false;
+            flag.SQ = true;
+            yield sync();
             debug(`Sync completed and SQ flag updated. Cooloff duration is ${config.syncManager.cooloff}`);
             setTimeout(() => {
                 flag.SQ = false;
                 emitter.emit('check');
             }, config.syncManager.cooloff);
+        }
+    }
+    catch (error) {
+        logger_1.logger.error(error);
+        debug('Error [check]', error);
+        check().then(() => {
+            debug('passed [check] error');
         }).catch((error) => {
-            logger_1.logger.error(error);
-            check();
+            debug('failed [check] error', error);
         });
+        throw error;
     }
-};
+});
 /**
  * @description Gets saved token, builds request object and fires the sync process
  */
-const sync = () => {
-    return new Promise((resolve, reject) => {
-        return token_management_1.getToken().then((tokenObject) => {
-            const token = tokenObject;
-            const request = {
-                qs: {
-                    environment: process.env.SYNC_ENV || Contentstack.environment || 'development',
-                    limit: config.syncManager.limit,
-                    [token.name]: token.token,
-                },
-            };
-            return fire(request)
-                .then(resolve);
-        }).catch((error) => {
-            return reject(error);
-        });
-    });
-};
+const sync = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        debug('started [sync]');
+        const tokenObject = yield token_management_1.getToken();
+        debug('tokenObject [sync]', tokenObject);
+        const token = tokenObject;
+        const request = {
+            qs: {
+                environment: process.env.SYNC_ENV || Contentstack.environment || 'development',
+                limit: config.syncManager.limit,
+                [token.name]: token.token,
+            },
+        };
+        return yield fire(request);
+    }
+    catch (error) {
+        debug('Error [sync]', error);
+        throw error;
+    }
+});
 /**
  * @description Used to lockdown the 'sync' process in case of exceptions
  */
@@ -181,6 +209,7 @@ const fire = (req) => {
             delete req.qs.sync_token;
             delete req.path;
             const syncResponse = response;
+            debug('Response [fire]', syncResponse.items.length);
             if (syncResponse.items.length) {
                 return index_1.filterItems(syncResponse, config).then(() => {
                     if (syncResponse.items.length === 0) {
@@ -228,7 +257,7 @@ const fire = (req) => {
                                         entry._content_type = lodash_1.cloneDeep(schemaResponse.content_type);
                                         Q.push(entry);
                                     });
-                                    return mapResolve();
+                                    return mapResolve('');
                                 }
                                 const err = new Error('Content type ${uid} schema not found!');
                                 // Illegal content type call
@@ -259,6 +288,7 @@ const fire = (req) => {
             return postProcess(req, syncResponse)
                 .then(resolve);
         }).catch((error) => {
+            debug('Error [fire]', error);
             if (inet_1.netConnectivityIssues(error)) {
                 flag.SQ = false;
             }
@@ -296,7 +326,7 @@ const postProcess = (req, resp) => {
             else {
                 if (name === 'sync_token') {
                     flag.SQ = false;
-                    return resolve();
+                    return resolve('');
                 }
                 return fire(req)
                     .then(resolve)

package/dist/core/inet.js

@@ -8,6 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.netConnectivityIssues = exports.checkNetConnectivity = exports.init = void 0;
 const debug_1 = __importDefault(require("debug"));
 const dns_socket_1 = __importDefault(require("dns-socket"));
 const events_1 = require("events");

package/dist/core/plugins.js

@@ -8,6 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.load = void 0;
 const debug_1 = __importDefault(require("debug"));
 const lodash_1 = require("lodash");
 const index_1 = require("../util/index");

package/dist/core/process.js

@@ -5,6 +5,7 @@
 * MIT Licensed
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.configure = void 0;
 /**
  * @note 'SIGKILL' cannot have a listener installed, it will unconditionally terminate Node.js on all platforms.
  * @note 'SIGSTOP' cannot have a listener installed.

package/dist/core/q.js

@@ -5,10 +5,11 @@
 * MIT Licensed
 */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -16,6 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.notifications = exports.Q = void 0;
 const debug_1 = __importDefault(require("debug"));
 const events_1 = require("events");
 const lodash_1 = require("lodash");

package/dist/core/token-management.js

@@ -5,10 +5,11 @@
 * MIT Licensed
 */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -16,6 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveCheckpoint = exports.saveToken = exports.getToken = void 0;
 const debug_1 = __importDefault(require("debug"));
 const index_1 = require("../index");
 const fs_1 = require("../util/fs");
@@ -27,7 +29,7 @@ let counter = 0;
  * @param {String} type - Token type (checkpoint | current)
  */
 exports.getToken = () => {
-    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const config = index_1.getConfig();
             const checkpoint = config.paths.checkpoint;
@@ -58,7 +60,7 @@ exports.getToken = () => {
  */
 exports.saveToken = (name, token) => {
     debug(`Save token invoked with name: ${name}, token: ${token}`);
-    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const config = index_1.getConfig();
             const path = config.paths.token;
@@ -108,7 +110,7 @@ exports.saveToken = (name, token) => {
  * @param {String} token - Token value
  * @param {String} type - Token type
  */
-exports.saveCheckpoint = (name, token) => __awaiter(this, void 0, void 0, function* () {
+exports.saveCheckpoint = (name, token) => __awaiter(void 0, void 0, void 0, function* () {
     debug(`Save token invoked with name: ${name}, token: ${token}`);
     const config = index_1.getConfig();
     const path = config.paths.checkpoint;

package/dist/index.js

@@ -5,10 +5,11 @@
 * MIT Licensed
 */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -16,6 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.debugNotifications = exports.start = exports.notifications = exports.getConfig = exports.setConfig = exports.setListener = exports.setAssetStore = exports.setContentStore = exports.getAssetLocation = exports.pop = exports.unshift = exports.push = void 0;
 const debug_1 = __importDefault(require("debug"));
 const lodash_1 = require("lodash");
 const config_1 = require("./config");
@@ -23,7 +25,7 @@ const index_1 = require("./core/index");
 const inet_1 = require("./core/inet");
 const process_1 = require("./core/process");
 const q_1 = require("./core/q");
-exports.notifications = q_1.notifications;
+Object.defineProperty(exports, "notifications", { enumerable: true, get: function () { return q_1.notifications; } });
 const build_paths_1 = require("./util/build-paths");
 const index_2 = require("./util/index");
 const logger_1 = require("./util/logger");
@@ -46,7 +48,7 @@ exports.pop = () => {
     index_1.pop();
 };
 exports.getAssetLocation = (asset) => {
-    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const assetStoreConfig = assetStore.getConfig();
             const assetConfig = (assetStoreConfig.assetStore) ? assetStoreConfig.assetStore : assetStoreConfig;
@@ -111,7 +113,7 @@ exports.getConfig = () => {
  * @param {object} instance Custom logger instance
  */
 var logger_2 = require("./util/logger");
-exports.setLogger = logger_2.setLogger;
+Object.defineProperty(exports, "setLogger", { enumerable: true, get: function () { return logger_2.setLogger; } });
 /**
  * @public
  * @method start

package/dist/plugins/helper.js

@@ -191,5 +191,5 @@ exports.buildAssetObject = (asset, locale, entry_uid, content_type_uid) => {
         throw new Error('Unable to determine fine name.\n' + JSON.stringify(matches));
     }
     asset.filename = matches[5];
-    return Object.assign({ _content_type_uid: '_assets' }, asset, { _type: 'publish', entry_content_type: content_type_uid, entry_reffered_in: entry_uid, locale, uid: asset.uid });
+    return Object.assign(Object.assign({ _content_type_uid: '_assets' }, asset), { _type: 'publish', entry_content_type: content_type_uid, entry_reffered_in: entry_uid, locale, uid: asset.uid });
 };

package/dist/util/build-paths.js

@@ -5,6 +5,7 @@
 * MIT Licensed
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildConfigPaths = void 0;
 const path_1 = require("path");
 /**
  * @description Builds application's config paths where data is stored

package/dist/util/fs.js

@@ -9,9 +9,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mkdir = exports.readFileSync = exports.readFile = exports.writeFile = exports.existsSync = void 0;
 const Debug = require("debug");
 const fs_1 = require("fs");
-exports.existsSync = fs_1.existsSync;
+Object.defineProperty(exports, "existsSync", { enumerable: true, get: function () { return fs_1.existsSync; } });
 const mkdirp_1 = __importDefault(require("mkdirp"));
 const path_1 = require("path");
 const write_file_atomic_1 = __importDefault(require("write-file-atomic"));
@@ -112,9 +113,9 @@ exports.mkdir = (path) => {
  * @description exports fs.stat
  */
 var fs_2 = require("fs");
-exports.stat = fs_2.stat;
+Object.defineProperty(exports, "stat", { enumerable: true, get: function () { return fs_2.stat; } });
 /**
  * @description synchnonous way of creating nested folder directory structure
  */
 var mkdirp_2 = require("mkdirp");
-exports.mkdirpSync = mkdirp_2.sync;
+Object.defineProperty(exports, "mkdirpSync", { enumerable: true, get: function () { return mkdirp_2.sync; } });

package/dist/util/index.js

@@ -5,10 +5,11 @@
  * MIT Licensed
  */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -16,6 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSchema = exports.filterUnwantedKeys = exports.normalizePluginPath = exports.getOrSetRTEMarkdownAssets = exports.getFile = exports.markCheckpoint = exports.formatItems = exports.groupItems = exports.formatSyncFilters = exports.filterItems = void 0;
 const debug_1 = __importDefault(require("debug"));
 const lodash_1 = require("lodash");
 const marked_1 = __importDefault(require("marked"));
@@ -35,13 +37,17 @@ const assetType = 'sys_assets';
  * @param {Object} config - Application config
  * @returns {Promise} Returns a promise
  */
-exports.filterItems = (response, config) => __awaiter(this, void 0, void 0, function* () {
+exports.filterItems = (response, config) => __awaiter(void 0, void 0, void 0, function* () {
     const locales = lodash_1.map(config.locales, 'code');
     const filteredObjects = lodash_1.remove(response.items, (item) => {
         // validate item structure. If the structure is not as expected, filter it out
         if (!(validations_1.validateItemStructure(item))) {
             return item;
         }
+        // To handle content-type.
+        if (!item.data) {
+            return false;
+        }
         // for published items
         if (item.data.publish_details) {
             return locales.indexOf(item.data.publish_details.locale) !== -1;
@@ -421,6 +427,10 @@ exports.filterUnwantedKeys = (action, data) => {
 // Add option to delete embedded documents
 const filterKeys = (data, unwantedKeys) => {
     for (const key in unwantedKeys) {
+        // We need _content_type for handling asset published/unpublished events in entry object (Wherever it is referenced).
+        if (key === '_content_type') {
+            continue;
+        }
         if (unwantedKeys[key] && data.hasOwnProperty(key)) {
             delete data[key];
         }

package/dist/util/logger.js

@@ -5,6 +5,7 @@
 * MIT Licensed
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.logger = exports.setLogger = void 0;
 const validations_1 = require("./validations");
 /**
  * @summary Creates a logger instance

package/dist/util/promise.map.js

@@ -5,6 +5,7 @@
 * MIT Licensed
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.map = void 0;
 /**
  * @description Custom promisified map - mimicing 'Bluebird.map'
  * @param {Object} arr - List of items to be passed to 'fn'

package/dist/util/series.js

@@ -1,14 +1,16 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.series = (promises, output = [], counter = 0) => __awaiter(this, void 0, void 0, function* () {
+exports.series = void 0;
+exports.series = (promises, output = [], counter = 0) => __awaiter(void 0, void 0, void 0, function* () {
     if (counter === promises.length) {
         return output;
     }

package/dist/util/unprocessible.js

@@ -6,14 +6,16 @@
 * MIT Licensed
 */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveFilteredItems = exports.saveFailedItems = void 0;
 const index_1 = require("../index");
 const fs_1 = require("./fs");
 const index_2 = require("./index");
@@ -43,7 +45,7 @@ exports.saveFailedItems = (obj) => {
  * @returns {Promise} Returns a promise
  */
 exports.saveFilteredItems = (items, name, token) => {
-    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const config = index_1.getConfig();
             let filename;

package/dist/util/validations.js

@@ -5,6 +5,7 @@
 * MIT Licensed
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validatePlugin = exports.validateItemStructure = exports.validateLogger = exports.validateExternalInput = exports.validateAssetStoreInstance = exports.validateContentStoreInstance = exports.validateListener = exports.validateContentStore = exports.validateAssetStore = exports.validateConfig = void 0;
 const lodash_1 = require("lodash");
 /**
  * @public

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/datasync-manager",
   "author": "Contentstack LLC <support@contentstack.com>",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "The primary module of Contentstack DataSync. Syncs Contentstack data with your server using Contentstack Sync API",
   "main": "dist/index.js",
   "dependencies": {
@@ -27,14 +27,14 @@
     "@types/write-file-atomic": "2.1.1",
     "eslint": "^8.14.0",
     "jest": "^29.0.3",
-    "jest-html-reporter": "^2.5.0",
+    "jest-html-reporter": "^3.7.0",
     "mkdirp": "^1.0.4",
     "nock": "^10.0.6",
     "rimraf": "^2.6.2",
     "semantic-release": "^19.0.5",
     "ts-jest": "^29.0.1",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.2"
+    "typescript": "^3.9.2"
   },
   "scripts": {
     "clean": "rimraf dist typings coverage .tokens .ledger .checkpoint",