@jd-data-limited/easy-fm 1.0.2-alpha2 → 1.0.2-alpha4

package/index.js

@@ -23,34 +23,17 @@ import * as https from "https";
 // @ts-ignore
 const errs = JSON.parse(fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), 'fmErrors.json')).toString());
 class database {
-    constructor(props, host = null) {
-        this.props = props;
-        this.name = this.props.database;
-        if (host)
-            this.host = host;
-    }
+    constructor() { }
     get token() {
         return this.host.token;
     }
     getLayout(name) {
         return new layout(this, name);
     }
-    apiRequest(url, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!options.headers)
-                options.headers = {};
-            options.headers["content-type"] = options.headers["content-type"] ? options.headers["content-type"] : "application/json";
-            options.headers["authorization"] = "Bearer " + this.host.token;
-            options.rejectUnauthorized = this.host.rejectUnauthroized;
-            let _fetch = yield fetch(url, options);
-            let data = yield _fetch.json();
-            return data;
-        });
-    }
     setGlobals(globalFields) {
         // console.log({globalFields})
         return new Promise((resolve, reject) => {
-            this.apiRequest(`${this.endpoint}/globals`, {
+            this.host.apiRequest(`${this.endpoint}/globals`, {
                 method: "PATCH",
                 body: JSON.stringify({ globalFields })
             }).then(res => {
@@ -71,42 +54,29 @@ class database {
         return { name, parameter };
     }
     get endpoint() {
-        return `https://${this.hostname || this.host.hostname}/fmi/data/v2/databases/${encodeURI(this.name)}`;
-    }
-    get externalLoginInfo() {
-        // Returns an object that can be used when using this database object as an external source
-        let out = {
-            database: this.name,
-            username: undefined,
-            password: undefined,
-            oauthRequestId: undefined,
-            oauthIdentifier: undefined
-        };
-        switch (this.props.method) {
-            case "filemaker":
-                out.username = this.props.username;
-                out.password = this.props.password;
-            case "token":
-                throw "Token logins cannot be used for connecting to external sources. Please either use no login method, or open a second connection.";
-            case "oauth":
-                out.oauthRequestId = this.props.oauth.requestId;
-                out.oauthIdentifier = this.props.oauth.requestIdentifier;
-            case "claris":
-                throw "Claris logins cannot be used for connecting to external sources. Please either use no login method, or open a second connection.";
+        return `${this.host.endpoint}/${encodeURI(this.name)}`;
+    }
+    pairHost(db, details, returnConDetails = true) {
+        this.host = db;
+        this.name = details.database;
+        if (returnConDetails) {
+            if (details.method === "filemaker") {
+                return {
+                    database: this.name,
+                    username: details.username,
+                    password: details.password
+                };
+            }
+            else {
+                throw `Authentication method used for '${this.name}' is not supported for external data source connections`;
+            }
         }
-        return out;
     }
 }
-export default class FileMakerConnection extends database {
-    constructor(conn, externalDataSources = [], rejectUnauthorized = true) {
-        super(conn.database);
-        this.host = this;
+export default class FileMakerConnection {
+    constructor(conn, rejectUnauthorized = true) {
         this.hostname = conn.hostname;
-        this.externalSources = externalDataSources.map(i => {
-            let e = new database(i, this);
-            e.external = true;
-            return e;
-        });
+        this.databaseConDetails = conn.databases;
         this.rejectUnauthroized = rejectUnauthorized;
     }
     logout() {
@@ -122,7 +92,6 @@ export default class FileMakerConnection extends database {
             let data = yield _fetch.json();
             // console.log(data)
             this._token = null;
-            this.name = null;
             this.hostname = null;
             resolve();
         }));
@@ -131,17 +100,25 @@ export default class FileMakerConnection extends database {
         return new Promise((resolve, reject) => {
             if (this.token)
                 throw new Error("Already logged in. Run logout() first");
-            if (this.props.method === "filemaker") {
-                this.username = this.props.username;
-                this.name = this.props.database;
+            this.databases = [new database()];
+            this.databases[0].pairHost(this, this.databaseConDetails[0], false);
+            let external_sources_cons = this.databaseConDetails.slice(1).map(con => {
+                let db = new database();
+                this.databases.push(db);
+                return db.pairHost(this, con);
+            });
+            if (this.databaseConDetails[0].method === "filemaker") {
                 fetch(`${this.endpoint}/sessions`, {
                     hostname: this.hostname,
                     port: 443,
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
-                        "Authorization": "Basic " + Buffer.from(this.username + ":" + this.props.password).toString("base64")
-                    }
+                        "Authorization": "Basic " + Buffer.from(this.databaseConDetails[0].username + ":" + this.databaseConDetails[0].password).toString("base64")
+                    },
+                    body: JSON.stringify({
+                        fmDataSource: external_sources_cons
+                    })
                 }).then((res) => __awaiter(this, void 0, void 0, function* () {
                     if (res.status === 200) {
                         this._token = res.headers.get('x-fm-data-access-token');
@@ -156,21 +133,21 @@ export default class FileMakerConnection extends database {
                     reject(e);
                 });
             }
-            else if (this.props.method === "token") {
-                this._token = this.props.token;
-                this.name = this.props.database;
+            else if (this.databaseConDetails[0].method === "token") {
+                this._token = this.databaseConDetails[0].token;
                 resolve(this.token);
             }
-            else if (this.props.method === "oauth") {
-                this.name = this.props.database;
+            else if (this.databaseConDetails[0].method === "oauth") {
                 fetch(`${this.endpoint}/sessions`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
-                        "X-FM-Data-OAuth-RequestId": this.props.oauth.requestId,
-                        "X-FM-Data-OAuth-Identifier": this.props.oauth.requestIdentifier
+                        "X-FM-Data-OAuth-RequestId": this.databaseConDetails[0].oauth.requestId,
+                        "X-FM-Data-OAuth-Identifier": this.databaseConDetails[0].oauth.requestIdentifier
                     },
-                    body: "{}"
+                    body: external_sources_cons.length === 0 ? "{}" : JSON.stringify({
+                        fmDataSource: external_sources_cons
+                    })
                 })
                     .then(res => res.json())
                     .then(res => {
@@ -179,13 +156,12 @@ export default class FileMakerConnection extends database {
                     resolve(this.token);
                 });
             }
-            else if (this.props.method === "claris") {
-                this.name = this.props.database;
+            else if (this.databaseConDetails[0].method === "claris") {
                 fetch(`${this.endpoint}/sessions`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
-                        "Authorization": this.props.claris.fmid,
+                        "Authorization": this.databaseConDetails[0].claris.fmid,
                     },
                     body: "{}"
                 })
@@ -198,9 +174,27 @@ export default class FileMakerConnection extends database {
             }
         });
     }
+    getDatabase(database_name) {
+        return this.databases.find(db => db.name === database_name);
+    }
     get token() {
         return this._token;
     }
+    get endpoint() {
+        return `https://${this.hostname}/fmi/data/v2/databases/`;
+    }
+    apiRequest(url, options = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.headers)
+                options.headers = {};
+            options.headers["content-type"] = options.headers["content-type"] ? options.headers["content-type"] : "application/json";
+            options.headers["authorization"] = "Bearer " + this._token;
+            options.rejectUnauthorized = this.rejectUnauthroized;
+            let _fetch = yield fetch(url, options);
+            let data = yield _fetch.json();
+            return data;
+        });
+    }
 }
 class layout {
     constructor(database, name) {
@@ -236,7 +230,7 @@ class layout {
             let url = `${this.endpoint}/script/${encodeURI(script.name)}`;
             if (script.parameter)
                 url += "?" + encodeURI(script.parameter);
-            this.database.apiRequest(url, {
+            this.database.host.apiRequest(url, {
                 port: 443,
                 method: "GET"
             })
@@ -256,7 +250,7 @@ class layout {
     }
     getLayoutMeta() {
         return new Promise((resolve, reject) => {
-            this.database.apiRequest(this.endpoint).then(res => {
+            this.database.host.apiRequest(this.endpoint).then(res => {
                 this.metadata = res.response;
                 resolve(this);
             })
@@ -308,7 +302,7 @@ class record extends EventEmitter {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             if (!this.layout.metadata)
                 yield this.layout.getLayoutMeta();
-            this.layout.database.apiRequest(this.endpoint, {
+            this.layout.database.host.apiRequest(this.endpoint, {
                 port: 443,
                 method: "GET"
             })
@@ -341,7 +335,7 @@ class record extends EventEmitter {
             if (this.recordId === -1) {
                 // This is a new record
                 extraBody.fieldData = data.fieldData;
-                this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
+                this.layout.database.host.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
                     body: JSON.stringify(extraBody)
@@ -367,7 +361,7 @@ class record extends EventEmitter {
             }
             for (let item of Object.keys(extraBody))
                 data[item] = extraBody[item];
-            this.layout.database.apiRequest(this.endpoint, {
+            this.layout.database.host.apiRequest(this.endpoint, {
                 port: 443,
                 method: "PATCH",
                 body: JSON.stringify(data)
@@ -574,7 +568,7 @@ class recordGetRange extends recordGetOperation {
     run() {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
-            this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams()}`, {
+            this.layout.database.host.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams()}`, {
                 method: "GET"
             }).then((res) => __awaiter(this, void 0, void 0, function* () {
                 // // console.log(res)
@@ -637,7 +631,7 @@ class find extends recordGetOperation {
     run() {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
-            this.layout.database.apiRequest(`${this.layout.endpoint}/_find`, {
+            this.layout.database.host.apiRequest(`${this.layout.endpoint}/_find`, {
                 port: 443,
                 method: "POST",
                 body: JSON.stringify(this.toObject())

package/index.ts

@@ -91,7 +91,7 @@ class database {
     external: boolean;
     public name: string;
 
-    protected host: FileMakerConnection;
+    host: FileMakerConnection;
     protected props: databaseOptions;
 
     public hostname: string;
@@ -106,21 +106,10 @@ class database {
         return new layout(this, name)
     }
 
-    async apiRequest(url: string | Request, options: any = {}): Promise<any> {
-        if (!options.headers) options.headers = {}
-        options.headers["content-type"] = options.headers["content-type"] ? options.headers["content-type"] : "application/json"
-        options.headers["authorization"] = "Bearer " + this.host.token
-        options.rejectUnauthorized = this.host.rejectUnauthroized
-
-        let _fetch = await fetch(url, options)
-        let data = await _fetch.json()
-        return (data as any)
-    }
-
     setGlobals(globalFields): Promise<void> {
         // console.log({globalFields})
         return new Promise((resolve, reject) => {
-            this.apiRequest(`${this.endpoint}/globals`, {
+            this.host.apiRequest(`${this.endpoint}/globals`, {
                 method: "PATCH",
                 body: JSON.stringify({globalFields})
             }).then(res => {
@@ -279,6 +268,17 @@ export default class FileMakerConnection {
     get endpoint(): string {
         return `https://${this.hostname}/fmi/data/v2/databases/`
     }
+
+    async apiRequest(url: string | Request, options: any = {}): Promise<any> {
+        if (!options.headers) options.headers = {}
+        options.headers["content-type"] = options.headers["content-type"] ? options.headers["content-type"] : "application/json"
+        options.headers["authorization"] = "Bearer " + this._token
+        options.rejectUnauthorized = this.rejectUnauthroized
+
+        let _fetch = await fetch(url, options)
+        let data = await _fetch.json()
+        return (data as any)
+    }
 }
 
 class layout {
@@ -324,7 +324,7 @@ class layout {
         return new Promise(async (resolve, reject) => {
             let url = `${this.endpoint}/script/${encodeURI(script.name)}`
             if (script.parameter) url += "?" + encodeURI(script.parameter)
-            this.database.apiRequest(url, {
+            this.database.host.apiRequest(url, {
                 port: 443,
                 method: "GET"
             })
@@ -344,7 +344,7 @@ class layout {
 
     public getLayoutMeta(): Promise<layout | FMError> {
         return new Promise((resolve, reject) => {
-            this.database.apiRequest(this.endpoint).then(res => {
+            this.database.host.apiRequest(this.endpoint).then(res => {
                 this.metadata = res.response
                 resolve(this)
             })
@@ -408,7 +408,7 @@ class record extends EventEmitter {
         return new Promise(async (resolve, reject) => {
             if (!this.layout.metadata) await this.layout.getLayoutMeta()
 
-            this.layout.database.apiRequest(this.endpoint, {
+            this.layout.database.host.apiRequest(this.endpoint, {
                 port: 443,
                 method: "GET"
             })
@@ -442,7 +442,7 @@ class record extends EventEmitter {
                 // This is a new record
                 extraBody.fieldData = data.fieldData
 
-                this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
+                this.layout.database.host.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
                     body: JSON.stringify(extraBody)
@@ -467,7 +467,7 @@ class record extends EventEmitter {
             }
 
             for (let item of Object.keys(extraBody)) data[item] = extraBody[item]
-            this.layout.database.apiRequest(this.endpoint, {
+            this.layout.database.host.apiRequest(this.endpoint, {
                 port: 443,
                 method: "PATCH",
                 body: JSON.stringify(data)
@@ -699,7 +699,7 @@ class recordGetRange extends recordGetOperation {
     run() {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
-            this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams()}`, {
+            this.layout.database.host.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams()}`, {
                 method: "GET"
             }).then(async res => {
                 // // console.log(res)
@@ -765,7 +765,7 @@ class find extends recordGetOperation {
     run() {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
-            this.layout.database.apiRequest(`${this.layout.endpoint}/_find`, {
+            this.layout.database.host.apiRequest(`${this.layout.endpoint}/_find`, {
                 port: 443,
                 method: "POST",
                 body: JSON.stringify(this.toObject())

package/package.json

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