@jd-data-limited/easy-fm 3.2.4 → 3.2.6

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",
-    "follow-redirects": "^1.15.3",
     "moment": "^2.29.4",
     "node-fetch": "3.2.8",
     "typescript": "^5.2.2",

package/src/connection/database.d.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from "events";
 import { Request } from "node-fetch";
 import { LayoutInterface } from "../layouts/layoutInterface.js";
 import { Layout } from "../layouts/layout.js";
-import { http } from "follow-redirects";
+import HTTP_REDIRECT from "follow-redirects";
 import { databaseOptionsWithExternalSources, DatabaseStructure, Script } from "../types.js";
 import { HostBase } from "./HostBase.js";
 import { DatabaseBase } from "./databaseBase";
@@ -25,5 +25,5 @@ export declare class Database<T extends DatabaseStructure> extends EventEmitter
     setGlobals(globalFields: any): Promise<void>;
     script(name: any, parameter?: string): Script;
     _tokenExpired(): void;
-    streamContainer(field: any, url: any): Promise<http.IncomingMessage>;
+    streamContainer(field: any, url: any): Promise<HTTP_REDIRECT.http.IncomingMessage>;
 }

package/src/connection/database.js

@@ -15,7 +15,7 @@ import fetch from "node-fetch";
 import { generateAuthorizationHeaders } from "./generateAuthorizationHeaders.js";
 import { FMError } from "../FMError.js";
 import { Layout } from "../layouts/layout.js";
-import { http, https } from "follow-redirects";
+import HTTP_REDIRECT from "follow-redirects";
 export class Database extends EventEmitter {
     constructor(host, conn) {
         super();
@@ -175,10 +175,7 @@ export class Database extends EventEmitter {
                 })
                     .join("; ");
             }
-            // Automatically switch between the http and https modules, based on which is needed
-            (url.startsWith("https") ? https : http).get(url, {
-                headers
-            }, (res) => {
+            const check_for_cookies = (res) => {
                 // Check for the 'set-cookie' header. If it exists, remember it and strip it for better security.
                 if (res.headers['set-cookie']) {
                     for (let cookie of res.headers['set-cookie']) {
@@ -187,6 +184,13 @@ export class Database extends EventEmitter {
                     }
                     res.headers['set-cookie'] = null;
                 }
+            };
+            // 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, req) => check_for_cookies(res)
+            }, (res) => {
+                check_for_cookies(res);
                 resolve(res);
             });
         });

package/src/connection/database.ts

@@ -8,7 +8,7 @@ import {generateAuthorizationHeaders} from "./generateAuthorizationHeaders.js";
 import {FMError} from "../FMError.js";
 import {LayoutInterface} from "../layouts/layoutInterface.js";
 import {Layout} from "../layouts/layout.js";
-import {http, https} from "follow-redirects"
+import HTTP_REDIRECT  from "follow-redirects"
 import {
     databaseOptionsBase,
     databaseOptionsWithExternalSources, DatabaseStructure,
@@ -180,7 +180,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         this.emit("token_expired")
     }
 
-    streamContainer(field, url): Promise<http.IncomingMessage> {
+    streamContainer(field, url): Promise<HTTP_REDIRECT.http.IncomingMessage> {
         return new Promise((resolve, reject) => {
             if (field.metadata.result !== "container") {
                 reject("Cannot stream the field " + field.id + " as it is not a container")
@@ -200,10 +200,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                     .join("; ")
             }
 
-            // Automatically switch between the http and https modules, based on which is needed
-            (url.startsWith("https") ? https : http).get(url, {
-                headers
-            }, (res) => {
+            const check_for_cookies = (res) => {
                 // Check for the 'set-cookie' header. If it exists, remember it and strip it for better security.
                 if (res.headers['set-cookie']) {
                     for (let cookie of res.headers['set-cookie']) {
@@ -212,6 +209,14 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                     }
                     res.headers['set-cookie'] = null
                 }
+            }
+
+            // 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, req) => check_for_cookies(res)
+            }, (res) => {
+                check_for_cookies(res)
 
                 resolve(res)
             })