@contentstack/datasync-manager 2.4.0-beta.0 → 2.4.0-beta.1

package/dist/api.js

@@ -56,7 +56,7 @@ const messages_1 = require("./util/messages");
 const debug = (0, debug_1.default)('api');
 let MAX_RETRY_LIMIT;
 let RETRY_DELAY_BASE = 200; // Default base delay in milliseconds
-let TIMEOUT = 30000; // Default timeout in milliseconds
+let TIMEOUT = 60000; // Increased from 30000 to 60000 (60 seconds) for large stack syncs
 let Contentstack;
 /**
  * @description Initialize sync utilities API requests
@@ -169,20 +169,24 @@ const get = (req, RETRY = 1) => {
                                     req.qs = {};
                                 }
                                 // Clear the invalid token parameters and reinitialize
-                                if (req.qs.sync_token) {
-                                    delete req.qs.sync_token;
-                                }
-                                if (req.qs.pagination_token) {
-                                    delete req.qs.pagination_token;
-                                }
+                                delete req.qs.sync_token;
+                                delete req.qs.pagination_token;
                                 req.qs.init = true;
+                                // Reset req.path so it gets rebuilt from Contentstack.apis.sync
+                                // (req.path has the old query string baked in from line 109)
+                                delete req.path;
                                 // Mark this as a recovery attempt to prevent infinite loops
                                 if (!req._error141Recovery) {
                                     req._error141Recovery = true;
                                     debug('Retrying with init=true after Error 141');
-                                    return (0, exports.get)(req, 1) // Reset retry counter for fresh start
-                                        .then(resolve)
-                                        .catch(reject);
+                                    // Use delayed retry
+                                    timeDelay = Math.pow(Math.SQRT2, RETRY) * RETRY_DELAY_BASE;
+                                    debug(`Error 141 recovery: waiting ${timeDelay}ms before retry`);
+                                    return setTimeout(() => {
+                                        return (0, exports.get)(req, RETRY)
+                                            .then(resolve)
+                                            .catch(reject);
+                                    }, timeDelay);
                                 }
                                 else {
                                     debug('Error 141 recovery already attempted, failing to prevent infinite loop');
@@ -204,14 +208,28 @@ const get = (req, RETRY = 1) => {
                 httpRequest.destroy();
                 reject(new Error('Request timeout'));
             });
-            // Enhanced error handling for socket hang ups and connection resets
+            // Enhanced error handling for network and connection errors
             httpRequest.on('error', (error) => {
-                var _a;
+                var _a, _b;
                 debug(messages_1.MESSAGES.API.REQUEST_ERROR(options.path, error === null || error === void 0 ? void 0 : error.message, error === null || error === void 0 ? void 0 : error.code));
-                // Handle socket hang up and connection reset errors with retry
-                if (((error === null || error === void 0 ? void 0 : error.code) === 'ECONNRESET' || ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('socket hang up'))) && RETRY <= MAX_RETRY_LIMIT) {
+                // List of retryable network error codes
+                const retryableErrors = [
+                    'ECONNRESET',
+                    'ETIMEDOUT',
+                    'ECONNREFUSED',
+                    'ENOTFOUND',
+                    'ENETUNREACH',
+                    'EAI_AGAIN',
+                    'EPIPE',
+                    'EHOSTUNREACH', // Host unreachable
+                ];
+                // Check if error is retryable
+                const isRetryable = retryableErrors.includes(error === null || error === void 0 ? void 0 : error.code) ||
+                    ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('socket hang up')) ||
+                    ((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes('ETIMEDOUT'));
+                if (isRetryable && RETRY <= MAX_RETRY_LIMIT) {
                     timeDelay = Math.pow(Math.SQRT2, RETRY) * RETRY_DELAY_BASE;
-                    debug(messages_1.MESSAGES.API.SOCKET_HANGUP_RETRY(options.path, timeDelay, RETRY, MAX_RETRY_LIMIT));
+                    debug(`Network error ${(error === null || error === void 0 ? void 0 : error.code) || (error === null || error === void 0 ? void 0 : error.message)}: waiting ${timeDelay}ms before retry ${RETRY}/${MAX_RETRY_LIMIT}`);
                     RETRY++;
                     return setTimeout(() => {
                         return (0, exports.get)(req, RETRY)

package/dist/core/index.js

@@ -42,7 +42,6 @@ exports.unlock = exports.lock = exports.poke = exports.pop = exports.unshift = e
  * MIT Licensed
  */
 const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
 const debug_1 = __importDefault(require("debug"));
 const events_1 = require("events");
 const lodash_1 = require("lodash");
@@ -56,7 +55,6 @@ const promise_map_1 = require("../util/promise.map");
 const inet_1 = require("./inet");
 const q_1 = require("./q");
 const token_management_1 = require("./token-management");
-const helper_1 = require("../plugins/helper");
 const debug = (0, debug_1.default)('sync-core');
 const emitter = new events_1.EventEmitter();
 const formattedAssetType = '_assets';
@@ -126,13 +124,8 @@ exports.init = init;
 const loadCheckpoint = (checkPointConfig, paths) => {
     if (!(checkPointConfig === null || checkPointConfig === void 0 ? void 0 : checkPointConfig.enabled))
         return;
-    // Try reading checkpoint from primary path
+    // Read checkpoint from configured path only
     let checkpoint = readHiddenFile(paths.checkpoint);
-    // Fallback to filePath in config if not found
-    if (!checkpoint) {
-        const fallbackPath = path.join((0, helper_1.sanitizePath)(__dirname), (0, helper_1.sanitizePath)(checkPointConfig.filePath || ".checkpoint"));
-        checkpoint = readHiddenFile(fallbackPath);
-    }
     // Set sync token if checkpoint is found
     if (checkpoint) {
         debug(messages_1.MESSAGES.SYNC_CORE.TOKEN_FOUND, checkpoint);
@@ -361,15 +354,17 @@ const fire = (req) => {
                 .catch(reject);
         }).catch((error) => {
             debug(messages_1.MESSAGES.SYNC_CORE.ERROR_FIRE, error);
-            // Check if this is an Error 141 (invalid token) - enhanced handling
+            // Check if this is an Error 141 (outdated token)
+            // Note: api.ts already handles recovery by retrying with init=true
             try {
                 const parsedError = typeof error === 'string' ? JSON.parse(error) : error;
                 if (parsedError.error_code === 141) {
-                    logger_1.logger.error('Error 141: Invalid sync_token detected. Token has been reset.');
-                    logger_1.logger.info('System will automatically re-initialize with fresh token on next sync.');
-                    // The error has already been handled in api.ts with init=true
-                    // Just ensure we don't keep retrying with the bad token
+                    logger_1.logger.error(messages_1.MESSAGES.SYNC_CORE.OUTDATED_SYNC_TOKEN);
+                    logger_1.logger.info(messages_1.MESSAGES.SYNC_CORE.SYNC_TOKEN_RENEWAL);
+                    // Reset flag so next webhook notification can trigger a fresh sync
                     flag.SQ = false;
+                    // Reset sync_token so next sync starts fresh with init=true
+                    Contentstack.sync_token = undefined;
                 }
             }
             catch (parseError) {
@@ -378,7 +373,6 @@ const fire = (req) => {
             if ((0, inet_1.netConnectivityIssues)(error)) {
                 flag.SQ = false;
             }
-            // do something
             return reject(error);
         });
     });

package/dist/plugins/helper.js

@@ -1,6 +1,5 @@
 "use strict";
 const { cloneDeep } = require('lodash');
-const { getConfig } = require('../index');
 const fieldType = {
     REFERENCE: 'reference',
     GLOBAL_FIELD: 'global_field',
@@ -186,6 +185,9 @@ const checkReferences = (schema, key) => {
     }
 };
 exports.buildAssetObject = (asset, locale, entry_uid, content_type_uid) => {
+    // Lazy-load getConfig at runtime to avoid circular dependency
+    // (helper.js is loaded during plugin init before index.ts finishes exporting)
+    const { getConfig } = require('../index');
     const { contentstack } = getConfig();
     // add locale key to inside of asset
     asset.locale = locale;

package/dist/util/messages.js

@@ -81,6 +81,8 @@ exports.MESSAGES = {
         ERROR_FIRE: 'Error during fire operation.',
         REFIRE_CALLED: (req) => `Re-fire operation triggered with: ${JSON.stringify(req)}`,
         CHECKPOINT_LOCKDOWN: 'Checkpoint: lockdown has been invoked',
+        OUTDATED_SYNC_TOKEN: 'Sync token is outdated and no longer accepted by the API. Recovering...',
+        SYNC_TOKEN_RENEWAL: 'Renewing sync token. This typically happens after network interruptions or long inactivity.',
     },
     // Main index messages (index.ts)
     INDEX: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/datasync-manager",
   "author": "Contentstack LLC <support@contentstack.com>",
-  "version": "2.4.0-beta.0",
+  "version": "2.4.0-beta.1",
   "description": "The primary module of Contentstack DataSync. Syncs Contentstack data with your server using Contentstack Sync API",
   "main": "dist/index.js",
   "dependencies": {