dukascopy-node-plus 1.1.4 → 1.2.5

package/dist/esm/{chunk-KAQS2RYD.js → chunk-PVYCTSWT.js}

@@ -1,9 +1,6 @@
-import {
-  version
-} from "./chunk-VHVSB2KI.js";
 import {
   formatOutput
-} from "./chunk-476J4KQE.js";
+} from "./chunk-ASWACD3L.js";
 import {
   BufferFetcher,
   CacheManager,
@@ -11,8 +8,9 @@ import {
   generateUrls,
   normaliseDates,
   processData,
-  validateConfigNode
-} from "./chunk-Z4O2KLFU.js";
+  validateConfigNode,
+  version
+} from "./chunk-GDKYDWLQ.js";
 
 // src/getHistoricalRates.ts
 import debug from "debug";
@@ -64,7 +62,7 @@ async function getHistoricalRates(config) {
     endDate
   });
   debug(`${DEBUG_NAMESPACE}:urls`)(`Generated ${urls.length} urls`);
-  debug(`${DEBUG_NAMESPACE}:urls`)(`%O`, urls);
+  debug(`${DEBUG_NAMESPACE}:urls`)("%O", urls);
   const onItemFetch = process.env.DEBUG ? (url, buffer, isCacheHit) => {
     debug(`${DEBUG_NAMESPACE}:fetcher`)(
       url,

package/dist/esm/cli/index.js

@@ -1,12 +1,8 @@
 #!/usr/bin/env node
-import {
-  version
-} from "../chunk-VHVSB2KI.js";
 import {
   BufferFetcher,
   CacheManager,
   VolumeUnit,
-  __require,
   formatBytes,
   generateUrls,
   getDateTimeFormatOptions,
@@ -15,8 +11,9 @@ import {
   normaliseDates,
   processData,
   schema,
-  validateConfig
-} from "../chunk-Z4O2KLFU.js";
+  validateConfig,
+  version
+} from "../chunk-GDKYDWLQ.js";
 
 // src/cli/cli.ts
 import { resolve, join } from "path";
@@ -24,7 +21,7 @@ import os from "os";
 
 // src/cli/progress.ts
 import { Bar } from "cli-progress";
-var chalk = __require("chalk");
+import chalk from "chalk";
 var progressBar = new Bar({
   format: "|" + chalk.green("{bar}") + "| {percentage}%",
   barCompleteChar: "\u2588",
@@ -64,7 +61,7 @@ var commanderSchema = program.option("-d, --debug", "Output extra debugging", fa
 function getConfigFromCliArgs(argv) {
   const options = commanderSchema.parse(argv).opts();
   if (options.dateTo === now) {
-    options.dateTo = /* @__PURE__ */ new Date();
+    options.dateTo = new Date();
   }
   const cliConfig = {
     instrument: options.instrument,
@@ -111,7 +108,7 @@ function getConfigFromCliArgs(argv) {
 }
 
 // src/cli/printer.ts
-var chalk2 = __require("chalk");
+import chalk2 from "chalk";
 var log = console.log;
 function printSpacer() {
   log();
@@ -360,7 +357,7 @@ async function run(argv) {
         if (hasMinutes) {
           cutoff = 16;
         }
-        return date.toISOString().slice(0, cutoff);
+        return date.toISOString().slice(0, cutoff).replace(/:/g, "-");
       }).join("-");
       const fileName = customFileName ? `${customFileName}.${fileExtension}` : `${instrument}-${timeframe}${timeframe === "tick" ? "" : "-" + priceType}-${dateRangeStr}.${fileExtension}`;
       const folderPath = resolve(process.cwd(), dir);
@@ -370,23 +367,31 @@ async function run(argv) {
       }
       const urls = generateUrls({ instrument, timeframe, priceType, startDate, endDate });
       debug(`${DEBUG_NAMESPACE}:urls`)(`Generated ${urls.length} urls`);
-      debug(`${DEBUG_NAMESPACE}:urls`)(`%O`, urls);
+      debug(`${DEBUG_NAMESPACE}:urls`)("%O", urls);
       let step = 0;
       if (!isDebugActive) {
         progressBar.start(urls.length, step);
       }
       await ensureDir(folderPath);
       const fileWriteStream = createWriteStream(filePath, { flags: "w+" });
-      fileWriteStream.on("finish", async () => {
-        const downloadEndTs = Date.now();
-        if (!isDebugActive) {
-          progressBar.stop();
-        }
-        const relativeFilePath = join(dir, fileName);
-        await ensureFile(filePath);
-        const { size } = await stat(filePath);
-        printSuccess(`\u221A File saved: ${chalk3.bold(relativeFilePath)} (${formatBytes(size)})`);
-        printGeneral(`Download time: ${formatTimeDuration(downloadEndTs - downloadStartTs)}`);
+      const streamFinishPromise = new Promise((resolve2, reject) => {
+        fileWriteStream.on("finish", async () => {
+          try {
+            const downloadEndTs = Date.now();
+            if (!isDebugActive) {
+              progressBar.stop();
+            }
+            const relativeFilePath = join(dir, fileName);
+            await ensureFile(filePath);
+            const { size } = await stat(filePath);
+            printSuccess(`\u221A File saved: ${chalk3.bold(relativeFilePath)} (${formatBytes(size)})`);
+            printGeneral(`Download time: ${formatTimeDuration(downloadEndTs - downloadStartTs)}`);
+            resolve2();
+          } catch (error) {
+            reject(error);
+          }
+        });
+        fileWriteStream.on("error", reject);
       });
       const batchStreamWriter = new BatchStreamWriter({
         fileWriteStream,
@@ -451,18 +456,24 @@ async function run(argv) {
           }
         }
       });
-      await bufferFetcher.fetch_optimized(urls);
+      try {
+        await bufferFetcher.fetch_optimized(urls);
+        await streamFinishPromise;
+      } catch (fetchError) {
+        fileWriteStream.destroy();
+        throw fetchError;
+      }
     } else {
       printErrors(
         "Search config invalid:",
-        validationErrors.map((err) => err?.message || "")
+        validationErrors.map((err) => (err == null ? void 0 : err.message) || "")
       );
-      process.exit(0);
+      process.exit(1);
     }
   } catch (err) {
     const errorMsg = err instanceof Error ? err.message : JSON.stringify(err);
     printErrors("\nSomething went wrong:", errorMsg);
-    process.exit(0);
+    process.exit(1);
   }
 }
 

package/dist/esm/index.example.nostream.js

@@ -1,9 +1,8 @@
 import {
   getHistoricalRates
-} from "./chunk-KAQS2RYD.js";
-import "./chunk-VHVSB2KI.js";
-import "./chunk-476J4KQE.js";
-import "./chunk-Z4O2KLFU.js";
+} from "./chunk-PVYCTSWT.js";
+import "./chunk-ASWACD3L.js";
+import "./chunk-GDKYDWLQ.js";
 
 // src/index.example.nostream.ts
 var printMemory = () => {
@@ -23,8 +22,8 @@ var printMemory = () => {
     const data = await getHistoricalRates({
       instrument: "eurusd",
       dates: {
-        from: /* @__PURE__ */ new Date("2021-02-01"),
-        to: /* @__PURE__ */ new Date("2021-06-03")
+        from: new Date("2021-02-01"),
+        to: new Date("2021-06-03")
       },
       timeframe: "m1",
       format: "csv"

package/dist/esm/index.example.stream.js

@@ -1,8 +1,8 @@
 import {
   getHistoricalRatesToStream
-} from "./chunk-EN4CESUH.js";
-import "./chunk-476J4KQE.js";
-import "./chunk-Z4O2KLFU.js";
+} from "./chunk-5ZJB4AEL.js";
+import "./chunk-ASWACD3L.js";
+import "./chunk-GDKYDWLQ.js";
 
 // src/index.example.stream.ts
 var printMemory = () => {
@@ -22,8 +22,8 @@ var printMemory = () => {
     const data = await getHistoricalRatesToStream({
       instrument: "eurusd",
       dates: {
-        from: /* @__PURE__ */ new Date("2021-02-01"),
-        to: /* @__PURE__ */ new Date("2021-06-03")
+        from: new Date("2021-02-01"),
+        to: new Date("2021-06-03")
       },
       timeframe: "m1",
       format: "csv"

package/dist/esm/index.js

@@ -1,19 +1,19 @@
 import {
   getHistoricalRatesToStream
-} from "./chunk-EN4CESUH.js";
+} from "./chunk-5ZJB4AEL.js";
 import {
   getHistoricRates,
   getHistoricalRates
-} from "./chunk-KAQS2RYD.js";
-import "./chunk-VHVSB2KI.js";
+} from "./chunk-PVYCTSWT.js";
 import {
   formatOutput
-} from "./chunk-476J4KQE.js";
+} from "./chunk-ASWACD3L.js";
 import {
   BufferFetcher,
   CacheManager,
   Format,
   Instrument,
+  InstrumentGroup,
   Price,
   Timeframe,
   URL_ROOT,
@@ -25,13 +25,12 @@ import {
   schema,
   validateConfig,
   validateConfigNode
-} from "./chunk-Z4O2KLFU.js";
+} from "./chunk-GDKYDWLQ.js";
 
 // src/index.ts
 import { RuleDate, RuleBoolean, RuleNumber, RuleString, RuleObject } from "fastest-validator";
 
-// src/getCurrentRates.ts
-import fetch from "node-fetch";
+// src/getRealTimeRates.ts
 var timeframeMap = {
   tick: "TICK",
   s1: "1SEC",
@@ -44,20 +43,20 @@ var timeframeMap = {
   d1: "1DAY",
   mn1: "1MONTH"
 };
-async function getCurrentRates({
+async function getRealTimeRates({
   instrument,
   priceType = "bid",
   timeframe = "d1",
   volumes = true,
   format = "array",
   dates,
-  limit
+  last = 10
 }) {
   const mappedTimeframe = timeframeMap[timeframe];
   const instrumentName = instrumentMetaData[instrument].name;
   const offerSide = priceType === "bid" ? "B" : "A";
   const timeDirection = "N";
-  const now = /* @__PURE__ */ new Date();
+  const now = new Date();
   let fromDate = now;
   let toDate = now;
   if (dates) {
@@ -65,7 +64,7 @@ async function getCurrentRates({
     fromDate = typeof from === "string" || typeof from === "number" ? new Date(from) : from;
     toDate = typeof to === "string" || typeof to === "number" ? new Date(to) : to;
   } else {
-    fromDate = getTimeframeLimit(timeframe, now, limit || 10);
+    fromDate = getTimeframeLimit(timeframe, now, last || 10);
     toDate = now;
   }
   let targetTimestamp = +toDate;
@@ -107,8 +106,8 @@ async function getCurrentRates({
       shouldFetch = false;
     }
   }
-  const shouldSlice = !dates && (typeof limit === "undefined" || typeof limit === "number");
-  let filteredRates = shouldSlice ? rates.slice((limit || 10) * -1) : rates.filter(function(item) {
+  const shouldSlice = !dates && (typeof last === "undefined" || typeof last === "number");
+  let filteredRates = shouldSlice ? rates.slice((last || 10) * -1) : rates.filter(function(item) {
     let key = item[0];
     const isWithinBounds = item[0] >= +fromDate && item[0] < +toDate;
     const isUnique = !this.has(key);
@@ -152,11 +151,13 @@ function getTimeframeLimit(timeframe, now, limit) {
   };
   return new Date(nowTimestamp - limit * bufferMultiplier * timeframeLimits[timeframe]);
 }
+var getCurrentRates = getRealTimeRates;
 export {
   BufferFetcher,
   CacheManager,
   Format,
   Instrument,
+  InstrumentGroup,
   instrumentMetaData as InstrumentMetaData,
   Price,
   RuleBoolean,
@@ -173,6 +174,8 @@ export {
   getHistoricRates,
   getHistoricalRates,
   getHistoricalRatesToStream,
+  getRealTimeRates,
+  instrumentMetaData,
   normaliseDates,
   processData,
   schema,