@jd-data-limited/easy-fm 1.1.3-alpha3 → 1.1.4-alpha1

package/index.js

@@ -143,7 +143,7 @@ export default class FileMakerConnection extends EventEmitter {
     get endpoint() {
         return `https://${this.hostname}/fmi/data/v2/databases/${this.name}`;
     }
-    apiRequest(url, options = {}) {
+    apiRequest(url, options = {}, autoRelogin = true) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!options.headers)
                 options.headers = {};
@@ -152,6 +152,11 @@ export default class FileMakerConnection extends EventEmitter {
             options.rejectUnauthorized = this.rejectUnauthroized;
             let _fetch = yield fetch(url, options);
             let data = yield _fetch.json();
+            if (data.messages[0].code == "952" && autoRelogin) {
+                this._token = null;
+                yield this.login();
+                yield this.apiRequest(url, options, false);
+            }
             return data;
         });
     }
@@ -218,7 +223,7 @@ class layout {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`;
             if (script.parameter)
-                url += "?" + encodeURIComponent(script.parameter);
+                url += "?script.param=" + encodeURIComponent(script.parameter);
             this.database.apiRequest(url, {
                 port: 443,
                 method: "GET"

package/index.ts

@@ -216,7 +216,7 @@ export default class FileMakerConnection extends EventEmitter {
         return `https://${this.hostname}/fmi/data/v2/databases/${this.name}`
     }
 
-    async apiRequest(url: string | Request, options: any = {}): Promise<any> {
+    async apiRequest(url: string | Request, options: any = {}, autoRelogin = true): 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
@@ -224,6 +224,11 @@ export default class FileMakerConnection extends EventEmitter {
 
         let _fetch = await fetch(url, options)
         let data = await _fetch.json()
+        if (data.messages[0].code == "952" && autoRelogin) {
+            this._token = null
+            await this.login()
+            await this.apiRequest(url, options,false)
+        }
         return (data as any)
     }
 
@@ -302,7 +307,7 @@ class layout {
     runScript(script): Promise<string | FMError | Error> {
         return new Promise(async (resolve, reject) => {
             let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`
-            if (script.parameter) url += "?" + encodeURIComponent(script.parameter)
+            if (script.parameter) url += "?script.param=" + encodeURIComponent(script.parameter)
             this.database.apiRequest(url, {
                 port: 443,
                 method: "GET"

package/package.json

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