@jd-data-limited/easy-fm 3.2.1 → 3.2.3

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",
     "moment": "^2.29.4",
     "node-fetch": "3.2.8",
+    "node-fetch-cookies": "^2.1.0",
     "typescript": "^5.2.2",
     "ytdl-core": "^4.11.4"
   },

package/src/connection/database.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
-import { Request } from "node-fetch";
+import { Request } from "node-fetch-cookies";
 import { LayoutInterface } from "../layouts/layoutInterface.js";
 import { Layout } from "../layouts/layout.js";
 import { databaseOptionsWithExternalSources, DatabaseStructure, Script } from "../types.js";
@@ -10,7 +10,7 @@ export declare class Database<T extends DatabaseStructure> extends EventEmitter
     private _token;
     readonly host: HostBase;
     private connection_details;
-    private cookies;
+    private cookieJar;
     readonly name: string;
     constructor(host: HostBase, conn: databaseOptionsWithExternalSources);
     private generateExternalSourceLogin;
@@ -24,5 +24,5 @@ export declare class Database<T extends DatabaseStructure> extends EventEmitter
     setGlobals(globalFields: any): Promise<void>;
     script(name: any, parameter?: string): Script;
     _tokenExpired(): void;
-    streamContainer(url: any): Promise<import("node-fetch").Response>;
+    streamContainer(url: any): Promise<any>;
 }

package/src/connection/database.js

@@ -11,14 +11,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { EventEmitter } from "events";
-import fetch from "node-fetch";
+import { fetch, CookieJar } from "node-fetch-cookies";
 import { generateAuthorizationHeaders } from "./generateAuthorizationHeaders.js";
 import { FMError } from "../FMError.js";
 import { Layout } from "../layouts/layout.js";
 export class Database extends EventEmitter {
     constructor(host, conn) {
         super();
-        this.cookies = {};
+        this.cookieJar = new CookieJar();
         this.host = host;
         this.name = conn.database;
         this.connection_details = conn;
@@ -40,7 +40,7 @@ export class Database extends EventEmitter {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             if (!this.token)
                 reject(new Error("Not logged in"));
-            let _fetch = yield fetch(`${this.endpoint}/sessions/${this.token}`, {
+            let _fetch = yield fetch(this.cookieJar, `${this.endpoint}/sessions/${this.token}`, {
                 method: "DELETE",
                 headers: {
                     "content-type": "application/json"
@@ -55,7 +55,7 @@ export class Database extends EventEmitter {
     login() {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             // Reset cookies
-            this.cookies = {};
+            this.cookieJar = {};
             try {
                 yield this.host.getMetadata();
             }
@@ -70,7 +70,7 @@ export class Database extends EventEmitter {
                 resolve(this.token);
             }
             else {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(this.cookieJar, `${this.endpoint}/sessions`, {
                     hostname: this.host.hostname,
                     port: 443,
                     method: "POST",
@@ -110,11 +110,11 @@ export class Database extends EventEmitter {
             options.headers["content-type"] = options.headers["content-type"] ? options.headers["content-type"] : "application/json";
             options.headers["authorization"] = "Bearer " + this._token;
             options.rejectUnauthorized = this.host.verify;
-            let _fetch = yield fetch(url, options);
+            let _fetch = yield fetch(this.cookieJar, url, options);
             if (_fetch.headers.get('set-cookie')) {
                 for (let cookie of _fetch.headers.get('set-cookie')) {
                     let cookie_split = cookie.split("=");
-                    this.cookies[cookie_split[0]] = cookie_split[1];
+                    this.cookieJar[cookie_split[0]] = cookie_split[1];
                 }
             }
             let data = yield _fetch.json();
@@ -159,23 +159,23 @@ export class Database extends EventEmitter {
     streamContainer(url) {
         return __awaiter(this, void 0, void 0, function* () {
             let headers = {};
-            if (Object.keys(this.cookies).length !== 0) {
-                headers["Cookie"] = Object.keys(this.cookies)
+            if (Object.keys(this.cookieJar).length !== 0) {
+                headers["Cookie"] = Object.keys(this.cookieJar)
                     .map(key => {
-                    return key + "=" + this.cookies[key];
+                    return key + "=" + this.cookieJar[key];
                 })
                     .join("; ");
             }
             // Automatically switch between the http and https modules, based on which is needed
-            let res = yield fetch(url, {
+            let res = yield fetch(this.cookieJar, url, {
                 headers
             });
-            if (res.headers['set-cookie']) {
+            if (res.headers.get('set-cookie')) {
                 for (let cookie of res.headers['set-cookie']) {
                     let cookie_split = cookie.split("=");
-                    this.cookies[cookie_split[0]] = cookie_split[1];
+                    this.cookieJar[cookie_split[0]] = cookie_split[1];
                 }
-                res.headers['set-cookie'] = null;
+                res.headers.set('set-cookie', null);
             }
             return res;
         });

package/src/connection/database.ts

@@ -3,7 +3,8 @@
  */
 
 import {EventEmitter} from "events";
-import fetch, {HeadersInit, Request} from "node-fetch";
+import {HeadersInit} from "node-fetch";
+import {fetch, CookieJar, Request} from "node-fetch-cookies"
 import {generateAuthorizationHeaders} from "./generateAuthorizationHeaders.js";
 import {FMError} from "../FMError.js";
 import {LayoutInterface} from "../layouts/layoutInterface.js";
@@ -27,7 +28,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
     private _token: any;
     readonly host: HostBase;
     private connection_details: databaseOptionsWithExternalSources
-    private cookies: { [key: string]: string } = {}
+    private cookieJar = new CookieJar()
     readonly name: string;
 
     constructor(host: HostBase, conn: databaseOptionsWithExternalSources) {
@@ -55,7 +56,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         return new Promise(async (resolve, reject) => {
             if (!this.token) reject(new Error("Not logged in"))
 
-            let _fetch = await fetch(`${this.endpoint}/sessions/${this.token}`, {
+            let _fetch = await fetch(this.cookieJar, `${this.endpoint}/sessions/${this.token}`, {
                 method: "DELETE",
                 headers: {
                     "content-type": "application/json"
@@ -71,7 +72,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
     login() {
         return new Promise<string>(async (resolve, reject) => {
             // Reset cookies
-            this.cookies = {}
+            this.cookieJar = {}
 
             try {
                 await this.host.getMetadata()
@@ -86,7 +87,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                 resolve(this.token)
             }
             else {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(this.cookieJar, `${this.endpoint}/sessions`, {
                     hostname: this.host.hostname,
                     port: 443,
                     method: "POST",
@@ -128,11 +129,11 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         options.headers["authorization"] = "Bearer " + this._token
         options.rejectUnauthorized = this.host.verify
 
-        let _fetch = await fetch(url, options)
+        let _fetch = await fetch(this.cookieJar, url, options)
         if (_fetch.headers.get('set-cookie')) {
             for (let cookie of _fetch.headers.get('set-cookie')) {
                 let cookie_split = cookie.split("=")
-                this.cookies[cookie_split[0]] = cookie_split[1]
+                this.cookieJar[cookie_split[0]] = cookie_split[1]
             }
         }
         let data = await _fetch.json() as fileMakerResponse
@@ -185,25 +186,25 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
 
 
         let headers = {}
-        if (Object.keys(this.cookies).length !== 0) {
-            headers["Cookie"] = Object.keys(this.cookies)
+        if (Object.keys(this.cookieJar).length !== 0) {
+            headers["Cookie"] = Object.keys(this.cookieJar)
                 .map(key => {
-                    return key + "=" + this.cookies[key]
+                    return key + "=" + this.cookieJar[key]
                 })
                 .join("; ")
         }
 
         // Automatically switch between the http and https modules, based on which is needed
-        let res = await fetch(url, {
+        let res = await fetch(this.cookieJar, url, {
             headers
         })
 
-        if (res.headers['set-cookie']) {
+        if (res.headers.get('set-cookie')) {
             for (let cookie of res.headers['set-cookie']) {
                 let cookie_split = cookie.split("=")
-                this.cookies[cookie_split[0]] = cookie_split[1]
+                this.cookieJar[cookie_split[0]] = cookie_split[1]
             }
-            res.headers['set-cookie'] = null
+            res.headers.set('set-cookie', null)
         }
         return res
     }