Merge pull request #100 from contentstack/development

DX | 16-02-2026 | Beta Release

Author: harshithad0703

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": {

src/api.ts

@@ -60,7 +60,7 @@ import { MESSAGES } from './util/messages'
 const debug = Debug('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
 
 /**
@@ -186,21 +186,26 @@ export const get = (req, RETRY = 1) => {
                     }
 
                     // 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 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 get(req, RETRY)
+                          .then(resolve)
+                          .catch(reject)
+                      }, timeDelay)
                     } else {
                       debug('Error 141 recovery already attempted, failing to prevent infinite loop')
                     }
@@ -223,14 +228,30 @@ export const get = (req, RETRY = 1) => {
         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: any) => {
         debug(MESSAGES.API.REQUEST_ERROR(options.path, error?.message, error?.code))
 
-        // Handle socket hang up and connection reset errors with retry
-        if ((error?.code === 'ECONNRESET' || error?.message?.includes('socket hang up')) && RETRY <= MAX_RETRY_LIMIT) {
+        // List of retryable network error codes
+        const retryableErrors = [
+          'ECONNRESET',    // Connection reset by peer
+          'ETIMEDOUT',     // Connection timeout
+          'ECONNREFUSED',  // Connection refused
+          'ENOTFOUND',     // DNS lookup failed
+          'ENETUNREACH',   // Network unreachable
+          'EAI_AGAIN',     // DNS lookup timeout
+          'EPIPE',         // Broken pipe
+          'EHOSTUNREACH',  // Host unreachable
+        ]
+        
+        // Check if error is retryable
+        const isRetryable = retryableErrors.includes(error?.code) || 
+                          error?.message?.includes('socket hang up') ||
+                          error?.message?.includes('ETIMEDOUT')
+        
+        if (isRetryable && RETRY <= MAX_RETRY_LIMIT) {
           timeDelay = Math.pow(Math.SQRT2, RETRY) * RETRY_DELAY_BASE
-          debug(MESSAGES.API.SOCKET_HANGUP_RETRY(options.path, timeDelay, RETRY, MAX_RETRY_LIMIT))
+          debug(`Network error ${error?.code || error?.message}: waiting ${timeDelay}ms before retry ${RETRY}/${MAX_RETRY_LIMIT}`)
           RETRY++
 
           return setTimeout(() => {

src/core/index.ts

@@ -4,7 +4,6 @@
  * MIT Licensed
  */
 import * as fs from 'fs'
-import * as path from 'path'
 import Debug from 'debug'
 import { EventEmitter } from 'events'
 import { cloneDeep, remove } from 'lodash'
@@ -18,7 +17,6 @@ import { map } from '../util/promise.map'
 import { netConnectivityIssues } from './inet'
 import { Q as Queue } from './q'
 import { getToken, saveCheckpoint } from './token-management'
-import { sanitizePath } from '../plugins/helper'
 
 interface IQueryString {
   init?: true,
@@ -123,18 +121,9 @@ export const init = (contentStore, assetStore) => {
 const loadCheckpoint = (checkPointConfig: ICheckpoint, paths: any): void => {
   if (!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(
-      sanitizePath(__dirname),
-      sanitizePath(checkPointConfig.filePath || ".checkpoint")
-    );
-    checkpoint = readHiddenFile(fallbackPath);
-  }
-
   // Set sync token if checkpoint is found
   if (checkpoint) {
     debug(MESSAGES.SYNC_CORE.TOKEN_FOUND, checkpoint);
@@ -376,25 +365,26 @@ const fire = (req: IApiRequest) => {
         .catch(reject)
     }).catch((error) => {
       debug(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.error('Error 141: Invalid sync_token detected. Token has been reset.')
-          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.error(MESSAGES.SYNC_CORE.OUTDATED_SYNC_TOKEN)
+          logger.info(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) {
         // Not a JSON error or not Error 141, continue with normal handling
       }
-      
+
       if (netConnectivityIssues(error)) {
         flag.SQ = false
       }
-      // do something
 
       return reject(error)
     })

src/plugins/helper.js

@@ -1,5 +1,4 @@
 const { cloneDeep } = require('lodash')
-const { getConfig } = require('../index')
 
 
 const fieldType = {
@@ -184,6 +183,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

src/util/messages.ts

@@ -88,6 +88,8 @@ export const MESSAGES = {
     ERROR_FIRE: 'Error during fire operation.',
     REFIRE_CALLED: (req: any) => `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)