@jd-data-limited/easy-fm 4.1.0 → 4.1.2

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "dependencies": {
     "@types/follow-redirects": "^1.14.4",
     "follow-redirects": "^1.15.5",
-    "moment": "^2.29.4"
+    "moment": "^2.29.4",
+    "node-fetch": "^3.3.2",
+    "node-fetch-cookies": "^2.1.1"
   },
   "type": "module",
   "main": "src/index.js",
@@ -49,6 +51,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "inquirer": "^9.2.13",
     "ts-morph": "^21.0.1",
+    "typedoc": "^0.25.12",
     "typescript": "^5.4.3",
     "webpack": "^5.81.0",
     "webpack-cli": "^5.0.2"

package/src/bin/generateTypes.js

@@ -1,53 +1,10 @@
-"use strict";
 /*
  * Copyright (c) 2024. See LICENSE file for more information
  */
-var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTypesCLI = void 0;
-var apiResults_js_1 = require("../models/apiResults.js");
-var inquirer_1 = require("inquirer");
-var FMHost_js_1 = require("../connection/FMHost.js");
-var fs = require("fs");
+import { ApiFieldResultTypes } from "../models/apiResults.js";
+import inquirer from 'inquirer';
+import FMHost from "../connection/FMHost.js";
+import * as fs from "fs";
 function sub(str) {
     return str
         .replace(/[^a-zA-Z0-9_]/g, "") // Remove non-alphanumeric characters
@@ -55,42 +12,38 @@ function sub(str) {
 }
 function generateFieldType(field) {
     switch (field.result) {
-        case apiResults_js_1.ApiFieldResultTypes.TEXT:
+        case ApiFieldResultTypes.TEXT:
             return "Field<string>";
-        case apiResults_js_1.ApiFieldResultTypes.CONTAINER:
+        case ApiFieldResultTypes.CONTAINER:
             return "Field<Container>";
-        case apiResults_js_1.ApiFieldResultTypes.DATE:
+        case ApiFieldResultTypes.DATE:
             return "Field<Date>";
-        case apiResults_js_1.ApiFieldResultTypes.NUMBER:
+        case ApiFieldResultTypes.NUMBER:
             return "Field<number>";
-        case apiResults_js_1.ApiFieldResultTypes.TIME:
+        case ApiFieldResultTypes.TIME:
             return "Field<Date>";
-        case apiResults_js_1.ApiFieldResultTypes.TIMESTAMP:
+        case ApiFieldResultTypes.TIMESTAMP:
             return "Field<Date>";
     }
 }
 function processFieldsChunk(fields) {
-    var existing_fields = [];
-    fields = fields.filter(function (field) {
+    let existing_fields = [];
+    fields = fields.filter(field => {
         if (existing_fields.includes(field.name))
             return false;
         existing_fields.push(field.name);
         return true;
     });
-    return fields.map(function (field) {
+    return fields.map(field => {
         return JSON.stringify(field.name) + ": " + generateFieldType(field);
     });
 }
 function camelToSnakeCase(str) {
     return str.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase();
 }
-function safeStringInjection(str) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
-    var result = "";
-    for (var i = 0; i < str.length; i++) {
+function safeStringInjection(str, ...args) {
+    let result = "";
+    for (let i = 0; i < str.length; i++) {
         result += str[i];
         if (i < args.length) {
             result += JSON.stringify(args[i].toString());
@@ -98,158 +51,111 @@ function safeStringInjection(str) {
     }
     return result;
 }
-function generateTypesCLI() {
-    return __awaiter(this, void 0, void 0, function () {
-        var data, HOST, DATABASE, stream, layouts, layoutInterfaces, _loop_1, _i, layouts_1, layout, layoutInterfaceLinks, _a, layoutInterfaces_1, layout, _b, layoutInterfaces_2, layout;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    process.stdout.write('\x1Bc');
-                    console.log("For this tool to work, you are required to have access to an account on the target database.\n" +
-                        "This account must have the fmrest extended privilege enabled.\n" +
-                        "This tool can only export type interfaces for layouts that the given account has access to.");
-                    console.log("\n");
-                    return [4 /*yield*/, inquirer_1.default.prompt([
-                            {
-                                type: "input",
-                                name: "hostname",
-                                message: "The IP address/domain of your FileMaker server (must start with either http:// or https://)",
-                                validate: function (input) {
-                                    return input.startsWith("http://") || input.startsWith("https://") || "Please enter a valid IP address/domain starting with http:// or https://";
-                                }
-                            },
-                            {
-                                type: "number",
-                                name: "timezoneOffset",
-                                message: "Server timezone offset (minutes)",
-                                default: 0 - (new Date()).getTimezoneOffset()
-                            },
-                            {
-                                type: "confirm",
-                                name: "verify",
-                                default: true,
-                                message: "Verify your server's identity",
-                                when: function (previousAnswers) {
-                                    return previousAnswers.hostname.startsWith("https://");
-                                }
-                            },
-                            {
-                                type: "input",
-                                name: "database",
-                                message: "Database filename"
-                            },
-                            {
-                                type: "input",
-                                name: "username",
-                                message: "Database username"
-                            },
-                            {
-                                type: "password",
-                                name: "password",
-                                message: "Database password",
-                                mask: "*"
-                            }
-                        ])];
-                case 1:
-                    data = _c.sent();
-                    HOST = new FMHost_js_1.default(data.hostname, data.timezoneOffset, data.verify);
-                    DATABASE = HOST.database({
-                        database: data.database,
-                        credentials: {
-                            method: "filemaker",
-                            username: data.username,
-                            password: data.password
-                        },
-                        externalSources: []
-                    });
-                    return [4 /*yield*/, DATABASE.login()
-                        // Create file write stream
-                    ];
-                case 2:
-                    _c.sent();
-                    stream = fs.createWriteStream("./types.ts");
-                    return [4 /*yield*/, DATABASE.listLayouts()];
-                case 3:
-                    layouts = _c.sent();
-                    stream.write("import FMHost, {Container, FieldBase, LayoutInterface, Portal} from \"@jd-data-limited/easy-fm\";\n");
-                    stream.write("// " + layouts.length + " layouts found\n\n");
-                    layoutInterfaces = new Map();
-                    _loop_1 = function (layout) {
-                        var substituteName, metadata, fields, portals, portalsProcessed, interfaceName;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0:
-                                    substituteName = sub(layout.name);
-                                    if (!substituteName)
-                                        return [2 /*return*/, "continue"];
-                                    console.log(substituteName);
-                                    return [4 /*yield*/, layout.getLayoutMeta()];
-                                case 1:
-                                    metadata = _d.sent();
-                                    fields = processFieldsChunk(metadata.fieldMetaData);
-                                    portals = metadata.portalMetaData;
-                                    portalsProcessed = Object.keys(portals).map(function (portalName) {
-                                        return "".concat(JSON.stringify(portalName), ": Portal<{").concat(processFieldsChunk(portals[portalName]), "}>");
-                                    });
-                                    interfaceName = substituteName + "LayoutInterface";
-                                    layoutInterfaces.set(layout.name, {
-                                        interfaceName: interfaceName,
-                                        interface: "export interface ".concat(interfaceName, " extends LayoutInterface {\n            fields: {").concat(fields.join(",\n    "), "},\n            portals: {").concat(portalsProcessed.join(",\n   "), "}\n        }")
-                                    });
-                                    return [2 /*return*/];
-                            }
-                        });
-                    };
-                    _i = 0, layouts_1 = layouts;
-                    _c.label = 4;
-                case 4:
-                    if (!(_i < layouts_1.length)) return [3 /*break*/, 7];
-                    layout = layouts_1[_i];
-                    return [5 /*yield**/, _loop_1(layout)];
-                case 5:
-                    _c.sent();
-                    _c.label = 6;
-                case 6:
-                    _i++;
-                    return [3 /*break*/, 4];
-                case 7:
-                    layoutInterfaceLinks = [];
-                    for (_a = 0, layoutInterfaces_1 = layoutInterfaces; _a < layoutInterfaces_1.length; _a++) {
-                        layout = layoutInterfaces_1[_a];
-                        layoutInterfaceLinks.push([
-                            "".concat(JSON.stringify(layout[0]), ": ").concat(layout[1].interfaceName),
-                            "".concat(sub(camelToSnakeCase(layout[0]).toUpperCase().replace(" ", "_")), ": HOST.getLayout<").concat(layout[1].interfaceName, ">(").concat(JSON.stringify(layout[0]), ")")
-                        ]);
-                    }
-                    stream.write(safeStringInjection(templateObject_1 || (templateObject_1 = __makeTemplateObject(["const HOST = new FMHost(", ", ", ", ", ");"], ["const HOST = new FMHost(", ", ", ", ", ");"])), data.hostname, data.timezoneOffset, data.verify));
-                    stream.write("HOST.database<{layouts:{".concat(layoutInterfaceLinks.map(function (i) { return i[0]; }).join(","), "}}>();"));
-                    stream.write("\n\n");
-                    stream.write("const LAYOUTS = {".concat(layoutInterfaceLinks.map(function (i) { return i[1]; }).join(","), "};"));
-                    for (_b = 0, layoutInterfaces_2 = layoutInterfaces; _b < layoutInterfaces_2.length; _b++) {
-                        layout = layoutInterfaces_2[_b];
-                        stream.write("\n\n");
-                        stream.write(layout[1].interface + ";");
-                    }
-                    // StructureKind
-                    //
-                    // const project = new Project({
-                    //     tsConfigFilePath: "../tsconfig.json"
-                    // })
-                    // project.resolveSourceFileDependencies()
-                    return [4 /*yield*/, DATABASE.logout()];
-                case 8:
-                    // StructureKind
-                    //
-                    // const project = new Project({
-                    //     tsConfigFilePath: "../tsconfig.json"
-                    // })
-                    // project.resolveSourceFileDependencies()
-                    _c.sent();
-                    console.log("DONE! Wrote database types to ./types.ts");
-                    return [2 /*return*/];
+export async function generateTypesCLI() {
+    process.stdout.write('\x1Bc');
+    console.log("For this tool to work, you are required to have access to an account on the target database.\n" +
+        "This account must have the fmrest extended privilege enabled.\n" +
+        "This tool can only export type interfaces for layouts that the given account has access to.");
+    console.log("\n");
+    const data = await inquirer.prompt([
+        {
+            type: "input",
+            name: "hostname",
+            message: "The IP address/domain of your FileMaker server (must start with either http:// or https://)",
+            validate(input) {
+                return input.startsWith("http://") || input.startsWith("https://") || "Please enter a valid IP address/domain starting with http:// or https://";
             }
-        });
+        },
+        {
+            type: "number",
+            name: "timezoneOffset",
+            message: "Server timezone offset (minutes)",
+            default: 0 - (new Date()).getTimezoneOffset()
+        },
+        {
+            type: "confirm",
+            name: "verify",
+            default: true,
+            message: "Verify your server's identity",
+            when(previousAnswers) {
+                return previousAnswers.hostname.startsWith("https://");
+            }
+        },
+        {
+            type: "input",
+            name: "database",
+            message: "Database filename"
+        },
+        {
+            type: "input",
+            name: "username",
+            message: "Database username"
+        },
+        {
+            type: "password",
+            name: "password",
+            message: "Database password",
+            mask: "*"
+        }
+    ]);
+    const HOST = new FMHost(data.hostname, data.timezoneOffset, data.verify);
+    const DATABASE = HOST.database({
+        database: data.database,
+        credentials: {
+            method: "filemaker",
+            username: data.username,
+            password: data.password
+        },
+        externalSources: []
     });
+    await DATABASE.login();
+    // Create file write stream
+    const stream = fs.createWriteStream("./types.ts");
+    let layouts = await DATABASE.listLayouts();
+    stream.write(`import FMHost, {Container, FieldBase, LayoutInterface, Portal} from "@jd-data-limited/easy-fm";\n`);
+    stream.write("// " + layouts.length + " layouts found\n\n");
+    let layoutInterfaces = new Map();
+    for (let layout of layouts) {
+        let substituteName = sub(layout.name);
+        if (!substituteName)
+            continue;
+        console.log(substituteName);
+        let metadata = await layout.getLayoutMeta();
+        let fields = processFieldsChunk(metadata.fieldMetaData);
+        let portals = metadata.portalMetaData;
+        let portalsProcessed = Object.keys(portals).map(portalName => {
+            return `${JSON.stringify(portalName)}: Portal<{${processFieldsChunk(portals[portalName])}}>`;
+        });
+        let interfaceName = substituteName + "LayoutInterface";
+        layoutInterfaces.set(layout.name, {
+            interfaceName,
+            interface: `export interface ${interfaceName} extends LayoutInterface {
+            fields: {${fields.join(",\n    ")}},
+            portals: {${portalsProcessed.join(",\n   ")}}
+        }`
+        });
+    }
+    let layoutInterfaceLinks = [];
+    for (let layout of layoutInterfaces) {
+        layoutInterfaceLinks.push([
+            `${JSON.stringify(layout[0])}: ${layout[1].interfaceName}`,
+            `${sub(camelToSnakeCase(layout[0]).toUpperCase().replace(" ", "_"))}: HOST.getLayout<${layout[1].interfaceName}>(${JSON.stringify(layout[0])})`
+        ]);
+    }
+    stream.write(safeStringInjection `const HOST = new FMHost(${data.hostname}, ${data.timezoneOffset}, ${data.verify});`);
+    stream.write(`HOST.database<{layouts:{${layoutInterfaceLinks.map(i => i[0]).join(",")}}}>();`);
+    stream.write("\n\n");
+    stream.write(`const LAYOUTS = {${layoutInterfaceLinks.map(i => i[1]).join(",")}};`);
+    for (let layout of layoutInterfaces) {
+        stream.write("\n\n");
+        stream.write(layout[1].interface + ";");
+    }
+    // StructureKind
+    //
+    // const project = new Project({
+    //     tsConfigFilePath: "../tsconfig.json"
+    // })
+    // project.resolveSourceFileDependencies()
+    await DATABASE.logout();
+    console.log("DONE! Wrote database types to ./types.ts");
 }
-exports.generateTypesCLI = generateTypesCLI;
-var templateObject_1;

package/src/connection/database.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { type LayoutInterface } from '../layouts/layoutInterface.js';
 import { Layout } from '../layouts/layout.js';
@@ -8,7 +7,7 @@ import { type HostBase } from './HostBase.js';
 import { type DatabaseBase } from './databaseBase.js';
 import { type ApiResults } from '../models/apiResults.js';
 import { type DatabaseStructure } from '../databaseStructure.js';
-import { type IncomingMessage } from 'http';
+import { type RequestInfo, type RequestInit, type Response } from 'node-fetch';
 /**
  * Represents a database connection.
  * @template T - The structure of the database.
@@ -38,7 +37,7 @@ export declare class Database<T extends DatabaseStructure> extends EventEmitter
      * @throws {FMError} - Throws an FMError if login fails.
      * @return {Promise<string>} - Returns a promise that resolves to the access token upon successful login.
      */
-    login(forceLogin?: boolean): Promise<string>;
+    login(forceLogin?: boolean): Promise<string | undefined>;
     get token(): string;
     /**
      * Returns the endpoint URL for the database connection.
@@ -46,10 +45,12 @@ export declare class Database<T extends DatabaseStructure> extends EventEmitter
      * @returns {string} The endpoint URL.
      */
     get endpoint(): string;
-    _apiRequestRaw(url: string | Request, options?: RequestInit & {
+    _apiRequestRaw(url: URL | RequestInfo, options?: RequestInit & {
         headers?: Record<string, string>;
+        useCookieJar?: boolean;
     }, autoRelogin?: boolean): Promise<Response>;
-    _apiRequestJSON<T = any>(url: string | Request, options?: RequestInit & {
+    private _generateCookieHeader;
+    _apiRequestJSON<T = any>(url: URL | RequestInfo, options?: RequestInit & {
         headers?: Record<string, string>;
     }): Promise<ApiResults<T>>;
     /**
@@ -62,5 +63,4 @@ export declare class Database<T extends DatabaseStructure> extends EventEmitter
     layout<R extends keyof T['layouts']>(name: R): Layout<T['layouts'][R]>;
     layout<R extends LayoutInterface>(name: string): Layout<R>;
     script(name: string, parameter?: string): Script;
-    streamURL(url: string): Promise<IncomingMessage>;
 }

package/src/connection/database.js

@@ -5,7 +5,9 @@ import { EventEmitter } from 'events';
 import { generateAuthorizationHeaders } from './generateAuthorizationHeaders.js';
 import { FMError } from '../FMError.js';
 import { Layout } from '../layouts/layout.js';
-import HTTP_REDIRECT from 'follow-redirects';
+import fetch from 'node-fetch';
+// @ts-expect-error
+import fetchWithCookies, { CookieJar } from 'node-fetch-cookies';
 /**
  * Represents a database connection.
  * @template T - The structure of the database.
@@ -14,7 +16,7 @@ export class Database extends EventEmitter {
     _token = '';
     host;
     connection_details;
-    cookies = {};
+    cookies = new CookieJar();
     name;
     debug;
     constructor(host, conn) {
@@ -55,7 +57,6 @@ export class Database extends EventEmitter {
             }
         });
         await _fetch.json();
-        // console.log(data)
         this._token = '';
     }
     /**
@@ -67,18 +68,16 @@ export class Database extends EventEmitter {
      * @return {Promise<string>} - Returns a promise that resolves to the access token upon successful login.
      */
     async login(forceLogin = false) {
-        // console.trace()
+        if (this.token !== '' && !forceLogin)
+            return;
         // Reset cookies
-        this.cookies = {};
+        this.cookies = new CookieJar();
         await this.host.getMetadata();
-        if (this.token !== '' && !forceLogin)
-            throw new Error('Already logged in. Run logout() first');
         if (this.connection_details.credentials.method === 'token') {
             this._token = (this.connection_details.credentials).token;
             return this.token;
         }
         else {
-            console.time();
             const url = new URL(`${this.endpoint}/sessions`);
             url.hostname = this.host.hostname;
             const res = await fetch(url, {
@@ -91,7 +90,6 @@ export class Database extends EventEmitter {
                     })
                 })
             });
-            console.time();
             const _res = (await res.json());
             if (res.status === 200) {
                 this._token = res.headers.get('x-fm-data-access-token') ?? '';
@@ -121,19 +119,38 @@ export class Database extends EventEmitter {
         if (!options.headers)
             options.headers = {};
         options.headers.authorization = 'Bearer ' + this._token;
+        // options.redirect = "manual"
+        // options.headers.cookies = this._generateCookieHeader()
+        // console.log(options.headers.cookies)
         // options.rejectUnauthorized = this.host.verify
-        const _fetch = await fetch(url, options);
-        if (_fetch.headers.get('set-cookie')) {
-            for (const cookie of _fetch.headers.get('set-cookie') ?? []) {
-                const cookieSplit = cookie.split('=');
-                this.cookies[cookieSplit[0]] = cookieSplit[1];
-            }
-        }
+        const _fetch = options.useCookieJar
+            ? await fetchWithCookies(this.cookies, url, options)
+            : await fetch(url, options);
+        // if (_fetch.headers.get('set-cookie')) {
+        //     console.log(_fetch.headers.get('set-cookie'))
+        //     for (const cookie of (_fetch.headers.get("Set-Cookie") ?? "").split("; ")) {
+        //         const cookieSplit = cookie.split('=')
+        //         console.log("COOKIE SPLIT:", cookieSplit)
+        //         if (cookieSplit[1]) this.cookies[cookieSplit[0]] = cookieSplit[1]
+        //     }
+        // }
+        // console.log(this.cookies, _fetch.status)
+        // // console.log(this, this.cookies, url)
+        // console.trace()
         if (_fetch.status === 401 && autoRelogin) {
+            console.trace();
             await this.login(true);
             return await this._apiRequestRaw(url, options, false);
         }
-        return _fetch;
+        else
+            return _fetch;
+    }
+    _generateCookieHeader() {
+        const out = [];
+        for (const key of Object.keys(this.cookies)) {
+            out.push(`${key}=${this.cookies[key]}`);
+        }
+        return out.join('; ');
     }
     async _apiRequestJSON(url, options = {}) {
         if (!options.headers)
@@ -179,37 +196,4 @@ export class Database extends EventEmitter {
     script(name, parameter = '') {
         return ({ name, parameter });
     }
-    async streamURL(url) {
-        return await new Promise((resolve, reject) => {
-            if (!url || typeof url !== 'string') {
-                throw new Error('URL is empty, or has invalid value');
-            }
-            const headers = {};
-            if (Object.keys(this.cookies).length !== 0) {
-                headers.Cookie = Object.keys(this.cookies)
-                    .map(key => {
-                    return key + '=' + this.cookies[key];
-                })
-                    .join('; ');
-            }
-            const checkForCookies = (res) => {
-                // Check for the 'set-cookie' header. If it exists, remember it and strip it for better security.
-                if (res.headers['set-cookie']) {
-                    for (const cookie of res.headers['set-cookie']) {
-                        const cookieSplit = cookie.split('=');
-                        this.cookies[cookieSplit[0]] = cookieSplit[1];
-                    }
-                    res.headers['set-cookie'] = undefined;
-                }
-            };
-            // Automatically switch between the http and https modules, based on which is needed
-            (url.startsWith('https') ? HTTP_REDIRECT.https : HTTP_REDIRECT.http).get(url, {
-                headers,
-                beforeRedirect: (options, res) => { checkForCookies(res); }
-            }, (res) => {
-                checkForCookies(res);
-                resolve(res);
-            });
-        });
-    }
 }