@jd-data-limited/easy-fm 3.2.7 → 3.2.9

package/src/records/field.ts

@@ -7,6 +7,7 @@ import fetch, {File, FormData} from "node-fetch";
 import * as http from "http";
 import {ContainerBufferResult, DOWNLOAD_MODES, FieldMetaData} from "../types.js";
 import {FMError} from "../FMError.js";
+import {ApiFieldDisplayTypes, ApiFieldMetadata, ApiFieldResultTypes, ApiFieldTypes} from "../models/apiResults.js";
 
 export type FieldValue = string | number | Date | Container
 export type Container = null
@@ -41,14 +42,14 @@ export class Field<T extends FieldValue> {
         this.edited = true
     }
 
-    get metadata(): FieldMetaData {
+    get metadata(): ApiFieldMetadata {
         if (!this.record.layout.metadata) {
             // Default to a regular text field
             return {
                 name: this.id.toString(),
-                type: 'normal',
-                displayType: 'editText',
-                result: 'text',
+                type: ApiFieldTypes.NORMAL,
+                displayType: ApiFieldDisplayTypes.EDIT_TEXT,
+                result: ApiFieldResultTypes.TEXT,
                 global: false,
                 autoEnter: true,
                 fourDigitYear: false,
@@ -57,9 +58,9 @@ export class Field<T extends FieldValue> {
                 notEmpty: false,
                 numeric: false,
                 timeOfDay: false,
-                repetitionStart: 1,
-                repetitionEnd: 1
-            } as FieldMetaData
+                repetitions: 1,
+                valueList: ""
+            }
         }
         if (this.record.type === RecordTypes.PORTAL) {
             // @ts-ignore
@@ -81,11 +82,11 @@ export class Field<T extends FieldValue> {
             } as FieldMetaData
         }
         else {
-            return this.record.layout.metadata.fieldMetaData.find(i => i.name === this.id) as FieldMetaData || {
+            return this.record.layout.metadata.fieldMetaData.find(i => i.name === this.id) || {
                 name: this.id.toString(),
-                type: 'normal',
-                displayType: 'editText',
-                result: 'text',
+                type: ApiFieldTypes.NORMAL,
+                displayType: ApiFieldDisplayTypes.EDIT_TEXT,
+                result: ApiFieldResultTypes.TEXT,
                 global: false,
                 autoEnter: true,
                 fourDigitYear: false,
@@ -94,9 +95,9 @@ export class Field<T extends FieldValue> {
                 notEmpty: false,
                 numeric: false,
                 timeOfDay: false,
-                repetitionStart: 1,
-                repetitionEnd: 1
-            } as FieldMetaData
+                repetitions: 1,
+                valueList: ""
+            }
         }
     }
 
@@ -130,64 +131,45 @@ export class Field<T extends FieldValue> {
         throw "Field value is not a number"
     }
 
-    upload(buffer: Buffer, filename: string, mime: string): Promise<void> {
+    async upload(buffer: Buffer, filename: string, mime: string): Promise<void> {
         let trace = new Error()
         if (this.metadata.result !== "container") throw "Cannot upload a file to the field; " + this.id + " (not a container field)"
-        return new Promise(async (resolve, reject) => {
-            let form = new FormData()
-            form.append("upload", new File([buffer], filename, {type: mime}))
-
-            let _fetch = await fetch(`${this.record.endpoint}/containers/${this.id}/1`, {
-                method: "POST",
-                // @ts-ignore
-                headers: {"Authorization": "Bearer " + this.record.layout.database.token},
-                body: form
-            }).then(res => res.json())
-                .then(data => {
-                    let _res = data as any
-                    if (_res.messages[0].code === "0") {
-                        resolve()
-                    }
-                    else {
-                        reject(new FMError(_res.messages[0].code, _res.status, data, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
+        let form = new FormData()
+        form.append("upload", new File([buffer], filename, {type: mime}))
+
+        await this.record.layout.database.apiRequest<null>(`${this.record.endpoint}/containers/${this.id}/1`, {
+            method: "POST",
+            // @ts-ignore
+            headers: {"Authorization": "Bearer " + this.record.layout.database.token, "Content-Type": "multipart/form-data"},
+            body: form
         })
     }
 
     download(mode: DOWNLOAD_MODES.Stream): Promise<http.IncomingMessage>
     download(mode: DOWNLOAD_MODES.Buffer): Promise<ContainerBufferResult>
-    download(mode: DOWNLOAD_MODES = DOWNLOAD_MODES.Stream): Promise<http.IncomingMessage | ContainerBufferResult> {
+    async download(mode: DOWNLOAD_MODES = DOWNLOAD_MODES.Stream): Promise<http.IncomingMessage | ContainerBufferResult> {
+        if (this.metadata.result !== ApiFieldResultTypes.CONTAINER) throw new Error("Cannot perform download() on a non-container field")
+
+        let stream = await this.record.layout.database.streamURL(this.string)
+        if (mode === DOWNLOAD_MODES.Stream) {
+            return stream
+        }
+
+        let body = []
         return new Promise((resolve, reject) => {
-            // @ts-ignore
-            this.record.layout.database.streamContainer(this, this._value)
-                .then(stream => {
-                    if (mode === DOWNLOAD_MODES.Stream) {
-                        resolve(stream)
-                        return
-                    }
-
-                    let body = []
-                    stream.on("data", chunk => {
-                        body.push(chunk)
-                    })
-                    stream.on("error", (e) => {
-                        reject(e)
-                    })
-                    stream.on("end", () => {
-                        resolve({
-                            buffer: Buffer.concat(body),
-                            mime: stream.headers["content-type"],
-                            request: stream
-                        } as ContainerBufferResult)
-                    })
-                })
-                .catch(e => {
-                    reject(e)
-                })
+            stream.on("data", chunk => {
+                body.push(chunk)
+            })
+            stream.on("error", (e) => {
+                reject(e)
+            })
+            stream.on("end", () => {
+                resolve({
+                    buffer: Buffer.concat(body),
+                    mime: stream.headers["content-type"],
+                    request: stream
+                } as ContainerBufferResult)
+            })
         })
     }
 }

package/src/records/getOperations/find.js

@@ -56,35 +56,25 @@ export class Find extends RecordGetOperation {
         return this.fetch();
     }
     fetch() {
-        let trace = new Error();
-        return new Promise((resolve, reject) => {
-            // console.log(this.#toObject())
-            this.layout.getLayoutMeta()
-                .then(() => {
-                return this.layout.database.apiRequest(`${this.layout.endpoint}/_find`, {
-                    port: 443,
-                    method: "POST",
-                    body: JSON.stringify(this.toObject())
-                });
-            })
-                .then((res) => __awaiter(this, void 0, void 0, function* () {
-                // // console.log(res)
-                if (res.messages[0].code === "0") {
-                    // console.log("RESOLVING")
-                    if (!this.layout.metadata)
-                        yield this.layout.getLayoutMeta();
-                    let data = res.response.data.map(item => {
-                        return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
-                    });
-                    resolve(data);
-                }
-                else {
-                    reject(new FMError(res.messages[0].code, res.status, res, trace));
-                }
-            }))
-                .catch(e => {
-                reject(e);
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            yield this.layout.getLayoutMeta();
+            let res = yield this.layout.database.apiRequest(`${this.layout.endpoint}/_find`, {
+                port: 443,
+                method: "POST",
+                body: JSON.stringify(this.toObject())
             });
+            if (res.messages[0].code === "0") {
+                // console.log("RESOLVING")
+                if (!this.layout.metadata)
+                    yield this.layout.getLayoutMeta();
+                return res.response.data.map(item => {
+                    return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
+                });
+            }
+            else {
+                throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
+            }
         });
     }
 }

package/src/records/getOperations/find.ts

@@ -7,6 +7,7 @@ import {LayoutRecord} from "../layoutRecord.js";
 import {LayoutInterface} from "../../layouts/layoutInterface";
 import {LayoutBase} from "../../layouts/layoutBase.js";
 import {FMError} from "../../FMError.js";
+import {ApiRecordResponseObj} from "../../models/apiResults";
 
 export class Find<T extends LayoutInterface> extends RecordGetOperation<T> {
     protected queries: object[]
@@ -54,35 +55,23 @@ export class Find<T extends LayoutInterface> extends RecordGetOperation<T> {
         return this.fetch()
     }
 
-    fetch(): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
+    async fetch(): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
         let trace = new Error()
-        return new Promise((resolve, reject) => {
-            // console.log(this.#toObject())
-            this.layout.getLayoutMeta()
-                .then(() => {
-                    return this.layout.database.apiRequest(`${this.layout.endpoint}/_find`, {
-                        port: 443,
-                        method: "POST",
-                        body: JSON.stringify(this.toObject())
-                    })
-                })
-                .then(async res => {
-                    // // console.log(res)
-                    if (res.messages[0].code === "0") {
-                        // console.log("RESOLVING")
-                        if (!this.layout.metadata) await this.layout.getLayoutMeta()
-                        let data = res.response.data.map(item => {
-                            return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
-                        })
-                        resolve(data)
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
+        await this.layout.getLayoutMeta()
+        let res = await this.layout.database.apiRequest<ApiRecordResponseObj>(`${this.layout.endpoint}/_find`, {
+            port: 443,
+            method: "POST",
+            body: JSON.stringify(this.toObject())
         })
+        if (res.messages[0].code === "0") {
+            // console.log("RESOLVING")
+            if (!this.layout.metadata) await this.layout.getLayoutMeta()
+            return res.response.data.map(item => {
+                return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
+            })
+        }
+        else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res, trace)
+        }
     }
 }

package/src/records/getOperations/recordGetRange.js

@@ -64,32 +64,25 @@ export class RecordGetRange extends RecordGetOperation {
         return this.fetch(extraBody);
     }
     fetch(extraBody = {}) {
-        let trace = new Error();
-        return new Promise((resolve, reject) => {
-            // console.log(this.#toObject())
-            this.layout.getLayoutMeta().then(() => {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            let res = yield this.layout.getLayoutMeta().then(() => {
                 return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
                     method: "GET"
                 });
-            })
-                .then((res) => __awaiter(this, void 0, void 0, function* () {
-                // // console.log(res)
-                if (res.messages[0].code === "0") {
-                    // console.log("RESOLVING")
-                    if (!this.layout.metadata)
-                        yield this.layout.getLayoutMeta();
-                    let data = res.response.data.map(item => {
-                        return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
-                    });
-                    resolve(data);
-                }
-                else {
-                    reject(new FMError(res.messages[0].code, res.status, res, trace));
-                }
-            }))
-                .catch(e => {
-                reject(e);
             });
+            if (res.messages[0].code === "0") {
+                // console.log("RESOLVING")
+                if (!this.layout.metadata)
+                    yield this.layout.getLayoutMeta();
+                let data = res.response.data.map(item => {
+                    return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
+                });
+                return data;
+            }
+            else {
+                throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
+            }
         });
     }
 }

package/src/records/getOperations/recordGetRange.ts

@@ -7,6 +7,7 @@ import {RecordGetOperation} from "./recordGetOperation.js";
 import {LayoutRecord} from "../layoutRecord.js";
 import {extraBodyOptions} from "../../types.js";
 import {FMError} from "../../FMError.js";
+import {ApiRecordResponseObj} from "../../models/apiResults";
 
 export class RecordGetRange<T extends LayoutInterface> extends RecordGetOperation<T> {
     constructor(layout, start = 0, limit = 100) {
@@ -53,32 +54,24 @@ export class RecordGetRange<T extends LayoutInterface> extends RecordGetOperatio
         return this.fetch(extraBody)
     }
 
-    fetch(extraBody: extraBodyOptions = {}): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
+    async fetch(extraBody: extraBodyOptions = {}): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
         let trace = new Error()
-        return new Promise((resolve, reject) => {
-            // console.log(this.#toObject())
-            this.layout.getLayoutMeta().then(() => {
-                return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
-                    method: "GET"
-                })
+        let res = await this.layout.getLayoutMeta().then(() => {
+            return this.layout.database.apiRequest<ApiRecordResponseObj>(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
+                method: "GET"
             })
-                .then(async res => {
-                    // // console.log(res)
-                    if (res.messages[0].code === "0") {
-                        // console.log("RESOLVING")
-                        if (!this.layout.metadata) await this.layout.getLayoutMeta()
-                        let data = res.response.data.map(item => {
-                            return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
-                        })
-                        resolve(data)
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
         })
+
+        if (res.messages[0].code === "0") {
+            // console.log("RESOLVING")
+            if (!this.layout.metadata) await this.layout.getLayoutMeta()
+            let data = res.response.data.map(item => {
+                return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
+            })
+            return data
+        }
+        else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res, trace)
+        }
     }
 }

package/src/records/layoutRecord.js

@@ -28,9 +28,8 @@ export class LayoutRecord extends RecordBase {
         return Object.values(this.portals);
     }
     commit(extraBody = {}) {
-        let trace = new Error();
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
             let data = this.toObject();
             delete data.recordId;
             delete data.modId;
@@ -51,52 +50,41 @@ export class LayoutRecord extends RecordBase {
             }
             if (this.recordId === -1) {
                 // This is a new LayoutRecord
-                this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
+                let res = yield this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
                     body: JSON.stringify(data)
-                })
-                    .then(res => {
-                    if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res, trace));
-                    }
-                    else if (res.messages[0].code === "0") {
-                        this.recordId = parseInt(res.response.recordId);
-                        this.modId = parseInt(res.response.modId);
-                        resolve(this);
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace));
-                    }
-                })
-                    .catch(e => {
-                    reject(e);
                 });
-                return;
-            }
-            // for (let item of Object.keys(data)) extraBody[item] = data[item]
-            this.layout.database.apiRequest(this.endpoint, {
-                port: 443,
-                method: "PATCH",
-                body: JSON.stringify(data)
-            })
-                .then(res => {
                 if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                    reject(new FMError(res.response.scriptError, res.status, res, trace));
+                    throw new FMError(res.response.scriptError, res.httpStatus, res);
                 }
                 else if (res.messages[0].code === "0") {
-                    this.modId = res.response.modId;
-                    this._onSave();
-                    resolve(this);
+                    this.recordId = parseInt(res.response.recordId);
+                    this.modId = parseInt(res.response.modId);
+                    return this;
                 }
                 else {
-                    reject(new FMError(res.messages[0].code, res.status, res, trace));
+                    throw new FMError(res.messages[0].code, res.httpStatus, res);
                 }
-            })
-                .catch(e => {
-                reject(e);
+            }
+            // for (let item of Object.keys(data)) extraBody[item] = data[item]
+            let res = yield this.layout.database.apiRequest(this.endpoint, {
+                port: 443,
+                method: "PATCH",
+                body: JSON.stringify(data)
             });
-        }));
+            if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
+                throw new FMError(res.response.scriptError, res.httpStatus, res);
+            }
+            else if (res.messages[0].code === "0") {
+                this.modId = +res.response.modId;
+                this._onSave();
+                return this;
+            }
+            else {
+                throw new FMError(res.messages[0].code, res.httpStatus, res);
+            }
+        });
     }
     processPortalData(portalData) {
         for (let portalName of Object.keys(portalData)) {
@@ -112,88 +100,71 @@ export class LayoutRecord extends RecordBase {
         }
     }
     get() {
-        let trace = new Error();
-        if (this.recordId === -1) {
-            throw "Cannot get this RecordBase until a commit() is done.";
-        }
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            if (this.recordId === -1) {
+                throw "Cannot get this RecordBase until a commit() is done.";
+            }
             if (!this.layout.metadata)
                 yield this.layout.getLayoutMeta();
-            this.layout.database.apiRequest(this.endpoint, {
+            let res = yield this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
                 method: "GET"
-            })
-                .then(res => {
-                if (res.messages[0].code === "0") {
-                    // console.log(res, res.response.data)
-                    this.modId = res.response.data[0].modId;
-                    this.processFieldData(res.response.data[0].fieldData);
-                    this.portalData = [];
-                    if (res.response.data[0].portalData)
-                        this.processPortalData(res.response.data[0].portalData);
-                    resolve(this);
-                }
-                else {
-                    reject(new FMError(res.messages[0].code, res.status, res, trace));
-                }
-            })
-                .catch(e => {
-                reject(e);
             });
-        }));
+            if (res.messages[0].code === "0") {
+                // console.log(res, res.response.data)
+                this.modId = +res.response.data[0].modId;
+                this.processFieldData(res.response.data[0].fieldData);
+                this.portalData = [];
+                if (res.response.data[0].portalData)
+                    this.processPortalData(res.response.data[0].portalData);
+                return this;
+            }
+        });
     }
     getPortal(portal) {
         return this.portalsArray.find(p => p.name === portal);
     }
     duplicate() {
-        let trace = new Error();
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            this.layout.database.apiRequest(this.endpoint, {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            let res = yield this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
                 method: "POST"
-            })
-                .then(res => {
-                if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                    reject(new FMError(res.response.scriptError, res.status, res, trace));
-                }
-                else if (res.messages[0].code === "0") {
-                    let data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false);
-                    let _res = new LayoutRecord(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData);
-                    this.emit("duplicated");
-                    resolve(_res);
-                }
-                else {
-                    reject(new FMError(res.messages[0].code, res.status, res, trace));
-                }
-            })
-                .catch(e => {
-                reject(e);
             });
-        }));
+            if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
+                throw new FMError(res.response.scriptError, res.httpStatus, res, trace);
+            }
+            else if (res.messages[0].code === "0") {
+                let data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false);
+                let _res = new LayoutRecord(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData);
+                this.emit("duplicated");
+                return _res;
+            }
+            else {
+                throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
+            }
+        });
     }
     delete() {
-        let trace = new Error();
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            this.layout.database.apiRequest(this.endpoint, {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            let res = yield this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
                 method: "DELETE"
-            })
-                .then(res => {
-                if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                    reject(new FMError(res.response.scriptError, res.status, res, trace));
-                }
-                else if (res.messages[0].code === "0") {
-                    this.emit("deleted");
-                    resolve();
-                }
-                else {
-                    reject(new FMError(res.messages[0].code, res.status, res, trace));
-                }
-            })
-                .catch(e => {
-                reject(e);
             });
-        }));
+            console.log(res);
+            if (typeof ((_a = res.response) === null || _a === void 0 ? void 0 : _a.scriptError) !== "undefined" && ((_b = res.response) === null || _b === void 0 ? void 0 : _b.scriptError) !== '0') {
+                throw new FMError(res.response.scriptError, res.httpStatus, res);
+            }
+            else if (res.messages[0].code === "0") {
+                this.emit("deleted");
+                return;
+            }
+            else {
+                throw new FMError(res.messages[0].code, res.httpStatus, res);
+            }
+        });
     }
     toObject(filter = (a) => a.edited, portalFilter = (a) => a.records.find(record => record.edited), portalRowFilter = (a) => a.edited, portalFieldFilter = (a) => a.edited) {
         let obj = super.toObject(filter, portalFilter, portalRowFilter, portalFieldFilter);