@ganaka/sdk 1.0.1 → 1.0.2

package/dist/index.mjs

@@ -4400,8 +4400,8 @@ const p = object({
           close: number$1()
         })
       ),
-      start_time: string(),
-      end_time: string(),
+      start_time: string().nullable(),
+      end_time: string().nullable(),
       interval_in_minutes: number$1()
     })
   })
@@ -7922,8 +7922,7 @@ const fetchCandles = ({
       headers["X-Run-Id"] = runId;
     }
     if (currentTimestamp) {
-      const timestampStr = dayjs.tz(currentTimestamp, currentTimezone).format("YYYY-MM-DDTHH:mm:ss");
-      headers["X-Current-Timestamp"] = timestampStr;
+      headers["X-Current-Timestamp"] = currentTimestamp;
     }
     if (currentTimezone) {
       headers["X-Current-Timezone"] = currentTimezone;
@@ -7967,8 +7966,7 @@ const fetchQuote = ({
       headers["X-Run-Id"] = runId;
     }
     if (currentTimestamp) {
-      const timestampStr = dayjs.tz(currentTimestamp, currentTimezone).format("YYYY-MM-DDTHH:mm:ss");
-      headers["X-Current-Timestamp"] = timestampStr;
+      headers["X-Current-Timestamp"] = currentTimestamp;
     }
     if (currentTimezone) {
       headers["X-Current-Timezone"] = currentTimezone;
@@ -8012,8 +8010,7 @@ const fetchQuoteTimeline = ({
       headers["X-Run-Id"] = runId;
     }
     if (currentTimestamp) {
-      const timestampStr = dayjs.tz(currentTimestamp, currentTimezone).format("YYYY-MM-DDTHH:mm:ss");
-      headers["X-Current-Timestamp"] = timestampStr;
+      headers["X-Current-Timestamp"] = currentTimestamp;
     }
     if (currentTimezone) {
       headers["X-Current-Timezone"] = currentTimezone;
@@ -8057,8 +8054,7 @@ const fetchShortlist = ({
       headers["X-Run-Id"] = runId;
     }
     if (currentTimestamp) {
-      const timestampStr = dayjs.tz(currentTimestamp, currentTimezone).format("YYYY-MM-DDTHH:mm:ss");
-      headers["X-Current-Timestamp"] = timestampStr;
+      headers["X-Current-Timestamp"] = currentTimestamp;
     }
     if (currentTimezone) {
       headers["X-Current-Timezone"] = currentTimezone;
@@ -8152,7 +8148,7 @@ async function retryWithBackoff(fn, maxRetries = 3, baseDelayMs = 1e3) {
   throw lastError;
 }
 const placeOrder = ({ runId, apiClient }) => async (data) => {
-  console.log(data);
+  logger.debug(`data: ${JSON.stringify(data)}`);
   if (runId) {
     try {
       await retryWithBackoff(
@@ -8268,73 +8264,144 @@ class ApiClient {
     }
   }
 }
-function getNextIntervalBoundary(timestamp, intervalMinutes) {
-  const date2 = dayjs(timestamp);
-  const currentMinute = date2.minute();
-  const currentSecond = date2.second();
-  const currentMillisecond = date2.millisecond();
-  const minutesIntoHour = currentMinute % intervalMinutes;
-  if (minutesIntoHour === 0 && currentSecond === 0 && currentMillisecond === 0) {
-    return date2.add(intervalMinutes, "minute").toDate();
-  }
-  const minutesToAdd = intervalMinutes - minutesIntoHour;
-  return date2.add(minutesToAdd, "minute").second(0).millisecond(0).toDate();
-}
+var calendar$1 = { exports: {} };
+(function(module, exports$1) {
+  !function(e, t2) {
+    module.exports = t2();
+  }(commonjsGlobal, function() {
+    return function(e, t2, a) {
+      var n2 = "h:mm A", d2 = { lastDay: "[Yesterday at] " + n2, sameDay: "[Today at] " + n2, nextDay: "[Tomorrow at] " + n2, nextWeek: "dddd [at] " + n2, lastWeek: "[Last] dddd [at] " + n2, sameElse: "MM/DD/YYYY" };
+      t2.prototype.calendar = function(e2, t3) {
+        var n3 = t3 || this.$locale().calendar || d2, o2 = a(e2 || void 0).startOf("d"), s = this.diff(o2, "d", true), i2 = "sameElse", f2 = s < -6 ? i2 : s < -1 ? "lastWeek" : s < 0 ? "lastDay" : s < 1 ? "sameDay" : s < 2 ? "nextDay" : s < 7 ? "nextWeek" : i2, l2 = n3[f2] || d2[f2];
+        return "function" == typeof l2 ? l2.call(this, a()) : this.format(l2);
+      };
+    };
+  });
+})(calendar$1);
+var calendarExports = calendar$1.exports;
+const calendar = /* @__PURE__ */ getDefaultExportFromCjs(calendarExports);
+var relativeTime$1 = { exports: {} };
+(function(module, exports$1) {
+  !function(r2, e) {
+    module.exports = e();
+  }(commonjsGlobal, function() {
+    return function(r2, e, t2) {
+      r2 = r2 || {};
+      var n2 = e.prototype, o2 = { future: "in %s", past: "%s ago", s: "a few seconds", m: "a minute", mm: "%d minutes", h: "an hour", hh: "%d hours", d: "a day", dd: "%d days", M: "a month", MM: "%d months", y: "a year", yy: "%d years" };
+      function i2(r3, e2, t3, o3) {
+        return n2.fromToBase(r3, e2, t3, o3);
+      }
+      t2.en.relativeTime = o2, n2.fromToBase = function(e2, n3, i3, d3, u) {
+        for (var f2, a, s, l2 = i3.$locale().relativeTime || o2, h = r2.thresholds || [{ l: "s", r: 44, d: "second" }, { l: "m", r: 89 }, { l: "mm", r: 44, d: "minute" }, { l: "h", r: 89 }, { l: "hh", r: 21, d: "hour" }, { l: "d", r: 35 }, { l: "dd", r: 25, d: "day" }, { l: "M", r: 45 }, { l: "MM", r: 10, d: "month" }, { l: "y", r: 17 }, { l: "yy", d: "year" }], m2 = h.length, c2 = 0; c2 < m2; c2 += 1) {
+          var y2 = h[c2];
+          y2.d && (f2 = d3 ? t2(e2).diff(i3, y2.d, true) : i3.diff(e2, y2.d, true));
+          var p2 = (r2.rounding || Math.round)(Math.abs(f2));
+          if (s = f2 > 0, p2 <= y2.r || !y2.r) {
+            p2 <= 1 && c2 > 0 && (y2 = h[c2 - 1]);
+            var v2 = l2[y2.l];
+            u && (p2 = u("" + p2)), a = "string" == typeof v2 ? v2.replace("%d", p2) : v2(p2, n3, y2.l, s);
+            break;
+          }
+        }
+        if (n3) return a;
+        var M2 = s ? l2.future : l2.past;
+        return "function" == typeof M2 ? M2(a) : M2.replace("%s", a);
+      }, n2.to = function(r3, e2) {
+        return i2(r3, e2, this, true);
+      }, n2.from = function(r3, e2) {
+        return i2(r3, e2, this);
+      };
+      var d2 = function(r3) {
+        return r3.$u ? t2.utc() : t2();
+      };
+      n2.toNow = function(r3) {
+        return this.to(d2(this), r3);
+      }, n2.fromNow = function(r3) {
+        return this.from(d2(this), r3);
+      };
+    };
+  });
+})(relativeTime$1);
+var relativeTimeExports = relativeTime$1.exports;
+const relativeTime = /* @__PURE__ */ getDefaultExportFromCjs(relativeTimeExports);
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(calendar);
+dayjs.extend(relativeTime);
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function runMinuteLoop({
-  startTime,
-  endTime,
-  callback,
-  intervalMinutes
+  startTimeDayJS,
+  endTimeDayJS,
+  intervalMinutes,
+  callback
 }) {
-  const now = /* @__PURE__ */ new Date();
-  const isSimulationMode = now < startTime || now > endTime;
+  let currentISTDayJS = dayjs.utc().tz("Asia/Kolkata");
+  logger.debug(`currentIST: ${currentISTDayJS.format("YYYY-MM-DDTHH:mm:ss")}`);
+  logger.debug(`startTime: ${startTimeDayJS.format("YYYY-MM-DDTHH:mm:ss")}`);
+  logger.debug(`endTime: ${endTimeDayJS.format("YYYY-MM-DDTHH:mm:ss")}`);
+  const isSimulationMode = currentISTDayJS.isAfter(endTimeDayJS);
   if (isSimulationMode) {
-    console.log("Current time is outside the specified range, simulating loop");
+    logger.info("Current time is after endTime, simulating loop");
+  }
+  if (currentISTDayJS.isBefore(startTimeDayJS)) {
+    const delayUntilStart = startTimeDayJS.diff(currentISTDayJS, "millisecond");
+    logger.info(
+      `Starting loop ${startTimeDayJS.from(currentISTDayJS)} at ${startTimeDayJS.format(
+        "YYYY-MM-DD HH:mm"
+      )}`
+    );
+    await sleep(delayUntilStart);
+    currentISTDayJS = currentISTDayJS.add(delayUntilStart, "millisecond");
+  }
+  if (currentISTDayJS.isAfter(startTimeDayJS) && currentISTDayJS.isBefore(endTimeDayJS)) {
+    startTimeDayJS = currentISTDayJS;
   }
-  const startDate = dayjs(startTime);
-  const startMinute = startDate.minute();
+  const startMinute = startTimeDayJS.minute();
   const minutesToFirstBoundary = intervalMinutes - startMinute % intervalMinutes;
-  const isOnBoundary = startMinute % intervalMinutes === 0 && startDate.second() === 0 && startDate.millisecond() === 0;
-  let nextBoundary;
+  const isOnBoundary = startMinute % intervalMinutes === 0 && startTimeDayJS.second() === 0 && startTimeDayJS.millisecond() === 0;
+  let nextBoundaryDayJS;
   if (isOnBoundary) {
-    nextBoundary = startTime;
+    nextBoundaryDayJS = startTimeDayJS;
   } else {
-    nextBoundary = startDate.add(minutesToFirstBoundary, "minute").second(0).millisecond(0).toDate();
+    nextBoundaryDayJS = startTimeDayJS.add(minutesToFirstBoundary, "minute").second(0).millisecond(0);
   }
+  logger.debug(`nextBoundary: ${nextBoundaryDayJS.format("YYYY-MM-DDTHH:mm:ss")}`);
   if (isSimulationMode) {
-    while (nextBoundary <= endTime) {
+    while (nextBoundaryDayJS.isBefore(endTimeDayJS) || nextBoundaryDayJS.isSame(endTimeDayJS)) {
       try {
-        await callback(nextBoundary);
+        await callback(nextBoundaryDayJS.format("YYYY-MM-DDTHH:mm:ss"));
       } catch (error) {
         console.error(
-          `Error executing callback at ${nextBoundary.toISOString()}:`,
+          `Error executing callback at ${nextBoundaryDayJS.format("YYYY-MM-DDTHH:mm:ss")}:`,
           error
         );
       }
-      nextBoundary = dayjs(nextBoundary).add(intervalMinutes, "minute").toDate();
+      nextBoundaryDayJS = nextBoundaryDayJS.add(intervalMinutes, "minute");
     }
     return;
   }
-  if (startTime < now && nextBoundary < now) {
-    nextBoundary = getNextIntervalBoundary(now, intervalMinutes);
-  }
-  while (nextBoundary <= endTime) {
-    const delay = nextBoundary.getTime() - Date.now();
+  while (nextBoundaryDayJS.isBefore(endTimeDayJS) || nextBoundaryDayJS.isSame(endTimeDayJS)) {
+    const delay = nextBoundaryDayJS.diff(currentISTDayJS, "millisecond");
     if (delay > 0) {
+      logger.info(
+        `Waiting for ${nextBoundaryDayJS.from(
+          currentISTDayJS,
+          true
+        )} to reach next execution time: ${nextBoundaryDayJS.format("YYYY-MM-DD HH:mm:ss")}`
+      );
       await sleep(delay);
     }
     try {
-      await callback(nextBoundary);
+      await callback(nextBoundaryDayJS.format("YYYY-MM-DDTHH:mm:ss"));
     } catch (error) {
       console.error(
-        `Error executing callback at ${nextBoundary.toISOString()}:`,
+        `Error executing callback at ${nextBoundaryDayJS.format("YYYY-MM-DDTHH:mm:ss")}:`,
         error
       );
     }
-    nextBoundary = dayjs(nextBoundary).add(intervalMinutes, "minute").toDate();
+    nextBoundaryDayJS = nextBoundaryDayJS.add(intervalMinutes, "minute");
   }
 }
 dotenv.config();
@@ -8355,10 +8422,15 @@ async function ganaka({
     );
   }
   const apiClient = new ApiClient({ developerToken, apiDomain });
+  const startTimeDayJS = dayjs.tz(startTime, "Asia/Kolkata");
+  const endTimeDayJS = dayjs.tz(endTime, "Asia/Kolkata");
+  if (startTimeDayJS.isAfter(endTimeDayJS)) {
+    throw new Error("Start time cannot be after end time");
+  }
   let runId = null;
   const createRunBody = {
-    start_datetime: dayjs.tz(startTime, "Asia/Kolkata").format("YYYY-MM-DDTHH:mm:ss"),
-    end_datetime: dayjs.tz(endTime, "Asia/Kolkata").format("YYYY-MM-DDTHH:mm:ss"),
+    start_datetime: startTime,
+    end_datetime: endTime,
     timezone: "Asia/Kolkata"
   };
   try {
@@ -8382,8 +8454,8 @@ async function ganaka({
   }
   try {
     await runMinuteLoop({
-      startTime,
-      endTime,
+      startTimeDayJS,
+      endTimeDayJS,
       intervalMinutes,
       callback: async (currentTimestamp) => {
         await fn({