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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",

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 redirecter 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<redirecter.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 redirecter from "follow-redirects";
 export class Database extends EventEmitter {
     constructor(host, conn) {
         super();
@@ -176,7 +176,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, {
+            (url.startsWith("https") ? redirecter.https : redirecter.http).get(url, {
                 headers
             }, (res) => {
                 // Check for the 'set-cookie' header. If it exists, remember it and strip it for better security.

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 redirecter 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<redirecter.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")
@@ -201,7 +201,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
             }
 
             // Automatically switch between the http and https modules, based on which is needed
-            (url.startsWith("https") ? https : http).get(url, {
+            (url.startsWith("https") ? redirecter.https : redirecter.http).get(url, {
                 headers
             }, (res) => {
                 // Check for the 'set-cookie' header. If it exists, remember it and strip it for better security.