@jd-data-limited/easy-fm 1.1.3-alpha2 → 1.1.3-alpha3

package/index.js

@@ -22,8 +22,9 @@ import { fileURLToPath } from "url";
 import * as https from "https";
 // @ts-ignore
 const errs = JSON.parse(fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), 'fmErrors.json')).toString());
-export default class FileMakerConnection {
+export default class FileMakerConnection extends EventEmitter {
     constructor(conn, rejectUnauthorized = true) {
+        super();
         this.hostname = conn.hostname;
         this.name = conn.database.database;
         this.databaseConDetails = conn;
@@ -180,6 +181,9 @@ export default class FileMakerConnection {
     script(name, parameter) {
         return { name, parameter };
     }
+    _tokenExpired() {
+        this.emit("token_expired");
+    }
 }
 class layout {
     constructor(database, name) {
@@ -201,7 +205,7 @@ class layout {
                     fields[_field.name] = "";
                 }
                 resolve(new record(this, -1, 0, fields));
-            });
+            }).catch(e => { reject(e); });
         });
     }
     getRecord(recordId) {
@@ -212,9 +216,9 @@ class layout {
     }
     runScript(script) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            let url = `${this.endpoint}/script/${encodeURI(script.name)}`;
+            let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`;
             if (script.parameter)
-                url += "?" + encodeURI(script.parameter);
+                url += "?" + encodeURIComponent(script.parameter);
             this.database.apiRequest(url, {
                 port: 443,
                 method: "GET"

package/index.ts

@@ -88,7 +88,7 @@ interface recordObject {
     fieldData: any
 }
 
-export default class FileMakerConnection {
+export default class FileMakerConnection extends EventEmitter {
     private _token: any;
     private hostname: string;
     public readonly rejectUnauthroized: boolean;
@@ -96,6 +96,7 @@ export default class FileMakerConnection {
     public name: string;
 
     constructor(conn: hostConnectionOptions, rejectUnauthorized = true) {
+        super()
         this.hostname = conn.hostname
         this.name = conn.database.database
         this.databaseConDetails = conn
@@ -253,6 +254,10 @@ export default class FileMakerConnection {
     script(name, parameter): Script {
         return ({name, parameter} as Script)
     }
+
+    _tokenExpired() {
+        this.emit("token_expired")
+    }
 }
 
 class layout {
@@ -282,7 +287,7 @@ class layout {
                     fields[_field.name] = ""
                 }
                 resolve(new record(this, -1, 0, fields))
-            })
+            }).catch(e => {reject(e)})
         })
     }
 
@@ -296,8 +301,8 @@ class layout {
 
     runScript(script): Promise<string | FMError | Error> {
         return new Promise(async (resolve, reject) => {
-            let url = `${this.endpoint}/script/${encodeURI(script.name)}`
-            if (script.parameter) url += "?" + encodeURI(script.parameter)
+            let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`
+            if (script.parameter) url += "?" + 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.3alpha2",
+  "version": "1.1.3alpha3",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",