@jd-data-limited/easy-fm 1.0.2-alpha3 → 1.0.2-alpha5

package/index.js

@@ -30,22 +30,10 @@ class database {
     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 => {
@@ -120,7 +108,7 @@ export default class FileMakerConnection {
                 return db.pairHost(this, con);
             });
             if (this.databaseConDetails[0].method === "filemaker") {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(`${this.databases[0].endpoint}/sessions`, {
                     hostname: this.hostname,
                     port: 443,
                     method: "POST",
@@ -150,7 +138,7 @@ export default class FileMakerConnection {
                 resolve(this.token);
             }
             else if (this.databaseConDetails[0].method === "oauth") {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(`${this.databases[0].endpoint}/sessions`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
@@ -169,7 +157,7 @@ export default class FileMakerConnection {
                 });
             }
             else if (this.databaseConDetails[0].method === "claris") {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(`${this.databases[0].endpoint}/sessions`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
@@ -195,6 +183,18 @@ export default class FileMakerConnection {
     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) {
@@ -230,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"
             })
@@ -250,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);
             })
@@ -302,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"
             })
@@ -335,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)
@@ -361,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)
@@ -568,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)
@@ -631,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 => {
@@ -205,7 +194,7 @@ export default class FileMakerConnection {
             })
 
             if (this.databaseConDetails[0].method === "filemaker") {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(`${this.databases[0].endpoint}/sessions`, {
                     hostname: this.hostname,
                     port: 443,
                     method: "POST",
@@ -232,7 +221,7 @@ export default class FileMakerConnection {
                 this._token = (<loginOptionsToken>this.databaseConDetails[0]).token
                 resolve(this.token)
             } else if (this.databaseConDetails[0].method === "oauth") {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(`${this.databases[0].endpoint}/sessions`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
@@ -250,7 +239,7 @@ export default class FileMakerConnection {
                         resolve(this.token)
                     })
             } else if (this.databaseConDetails[0].method === "claris") {
-                fetch(`${this.endpoint}/sessions`, {
+                fetch(`${this.databases[0].endpoint}/sessions`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",
@@ -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.2alpha3",
+  "version": "1.0.2alpha5",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",