isolated FlightTrackerConfig in a module

JeanExtreme002 · Dec 22, 2023 · 48a778c · 48a778c
1 parent 7eca057
commit 48a778c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 77 deletions.
diff --git a/nodejs/FlightRadar24/api.js b/nodejs/FlightRadar24/api.js
@@ -2,72 +2,10 @@ const Core = require("./core");
 const APIRequest = require("./request");
 const Airport = require("./entities/airport");
 const Flight = require("./entities/flight");
+const FlightTrackerConfig = require("./flightTrackerConfig");
 const {LoginError} = require("./errors");
 
 
-class FlightTrackerConfig {
-    /**
-     * Data class with settings of the Real Time Flight Tracker.
-     */
-
-    faa = "1";
-    satellite = "1";
-    mlat = "1";
-    flarm = "1";
-    adsb = "1";
-    gnd = "1";
-    air = "1";
-    vehicles = "1";
-    estimated = "1";
-    maxage = "14400";
-    gliders = "1";
-    stats = "1";
-    limit = "5000";
-
-    __proxyHandler = {
-        set: function(target, key, value) {
-            if (!target.hasOwnProperty(key)) {
-                throw new Error("Unknown option: '" + key + "'");
-            }
-            if ((typeof value !== "number") && (!target.__isNumeric(value))) {
-                throw new Error("Value must be a decimal. Got '" + key + "'");
-            }
-            target[key] = value.toString();
-        },
-    };
-
-    constructor(data) {
-        for (const key in data) {
-            const value = data[key];
-
-            if (this.hasOwnProperty(key) && (typeof value === "number" || this.__isNumeric(value))) {
-                this[key] = value;
-            }
-        }
-        return new Proxy(this, this.__proxyHandler);
-    }
-
-    __isNumeric(string) {
-        for (let index = 0; index < string.length; index++) {
-            if (!"0123456789".includes(string[index])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    asdict() {
-        const dict = {};
-
-        for (const key in this) {
-            if (!key.startsWith("_")) {
-                dict[key] = this[key];
-            }
-        }
-        return dict;
-    }
-}
-
 class FlightRadar24API {
     /**
      * Main class of the FlightRadarAPI
@@ -300,7 +238,7 @@ class FlightRadar24API {
      * @param {boolean} details -  If true, it returns flights with detailed information
      */
     async getFlights(airline = null, bounds = null, registration = null, aircraftType = null, details = false) {
-        const requestParams = this.__flightTrackerConfig.asdict();
+        const requestParams = {...this.__flightTrackerConfig};
 
         if (this.__loginData != null) {
             requestParams["enc"] = this.__loginData["cookies"]["_frPl"];
@@ -363,7 +301,7 @@ class FlightRadar24API {
      * @return {FlightTrackerConfig}
      */
     getFlightTrackerConfig() {
-        return new FlightTrackerConfig(this.__flightTrackerConfig.asdict());
+        return new FlightTrackerConfig({...this.__flightTrackerConfig});
     }
 
     /**
@@ -506,22 +444,18 @@ class FlightRadar24API {
     /**
      * Set config for the Real Time Flight Tracker, used by getFlights() method.
      *
-     * @param {FlightTrackerConfig} flightTrackerConfig - If null, set to default config.
+     * @param {FlightTrackerConfig} flightTrackerConfig - If null, set to the default config.
      */
     async setFlightTrackerConfig(flightTrackerConfig = null, config = {}) {
         if (flightTrackerConfig != null) {
             this.__flightTrackerConfig = flightTrackerConfig;
         }
 
-        const currentConfigDict = this.__flightTrackerConfig.asdict();
-
         for (const key in config) {
             const value = config[key].toString();
-            currentConfigDict[key] = value;
+            this.__flightTrackerConfig[key] = value;
         }
-
-        this.__flightTrackerConfig = new FlightTrackerConfig(currentConfigDict);
     }
 }
 
-module.exports = {FlightRadar24API, FlightTrackerConfig};
+module.exports = FlightRadar24API;
diff --git a/nodejs/FlightRadar24/index.js b/nodejs/FlightRadar24/index.js
@@ -11,13 +11,14 @@
  */
 
 const {CloudflareError, LoginError} = require("./errors");
-const {FlightRadar24API, FlightTrackerConfig} = require("./api");
+const FlightRadar24API = require("./api");
+const FlightTrackerConfig = require("./flightTrackerConfig");
 const Airport = require("./entities/airport");
 const Entity = require("./entities/entity");
 const Flight = require("./entities/flight");
 
 const author = "Jean Loui Bernard Silva de Jesus";
-const version = "1.3.17";
+const version = "1.3.18";
 
 module.exports = {
     FlightRadar24API,

diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json
diff --git a/nodejs/package.json b/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flightradarapi",
-  "version": "1.3.17",
+  "version": "1.3.18",
   "description": "SDK for FlightRadar24",
   "main": "./FlightRadar24/index.js",
   "scripts": {