prostgles-server 2.0.200 → 2.0.203

package/lib/DboBuilder.js

@@ -52,6 +52,8 @@ const QueryBuilder_1 = require("./QueryBuilder");
 const PubSubManager_1 = require("./PubSubManager");
 const insertDataParse_1 = require("./DboBuilder/insertDataParse");
 const insert_1 = require("./DboBuilder/insert");
+const update_1 = require("./DboBuilder/update");
+const delete_1 = require("./DboBuilder/delete");
 const Filtering_1 = require("./Filtering");
 exports.pgp = pgPromise({
     promiseLib: Bluebird
@@ -127,10 +129,15 @@ exports.makeErr = makeErr;
 exports.EXISTS_KEYS = ["$exists", "$notExists", "$existsJoined", "$notExistsJoined"];
 const FILTER_FUNCS = QueryBuilder_1.FUNCTIONS.filter(f => f.canBeUsedForFilter);
 function parseError(e) {
-    // console.trace("INTERNAL ERROR: ", e);
     let res = e instanceof Error ? e.message : (!Object.keys(e || {}).length ? e : (e && e.toString) ? e.toString() : e);
-    if (isPlainObject(e))
-        res = JSON.stringify(e, null, 2);
+    if (isPlainObject(e)) {
+        if (typeof e.err === "string") {
+            res = e.err;
+        }
+        else {
+            res = JSON.stringify(e, null, 2);
+        }
+    }
     return res;
 }
 exports.parseError = parseError;
@@ -1676,76 +1683,7 @@ class TableHandler extends ViewHandler {
         };
     }
     async update(filter, newData, params, tableRules, localParams) {
-        try {
-            const parsedRules = await this.parseUpdateRules(filter, newData, params, tableRules, localParams);
-            if (localParams?.testRule) {
-                return parsedRules;
-            }
-            const { fields, validateRow, forcedData, finalUpdateFilter, returningFields, forcedFilter, filterFields } = parsedRules;
-            let { returning, multi = true, onConflictDoNothing = false, fixIssues = false } = params || {};
-            const { returnQuery = false } = localParams ?? {};
-            if (params) {
-                const good_params = ["returning", "multi", "onConflictDoNothing", "fixIssues"];
-                const bad_params = Object.keys(params).filter(k => !good_params.includes(k));
-                if (bad_params && bad_params.length)
-                    throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
-            }
-            const { data, allowedCols } = this.validateNewData({ row: newData, forcedData, allowedFields: fields, tableRules, fixIssues });
-            /* Patch data */
-            let patchedTextData = [];
-            this.columns.map(c => {
-                const d = data[c.name];
-                if (c.data_type === "text" && d && isPlainObject(d) && !["from", "to"].find(key => typeof d[key] !== "number")) {
-                    const unrecProps = Object.keys(d).filter(k => !["from", "to", "text", "md5"].includes(k));
-                    if (unrecProps.length)
-                        throw "Unrecognised params in textPatch field: " + unrecProps.join(", ");
-                    patchedTextData.push({ ...d, fieldName: c.name });
-                }
-            });
-            if (patchedTextData && patchedTextData.length) {
-                if (tableRules && !tableRules.select)
-                    throw "Select needs to be permitted to patch data";
-                const rows = await this.find(filter, { select: patchedTextData.reduce((a, v) => ({ ...a, [v.fieldName]: 1 }), {}) }, undefined, tableRules);
-                if (rows.length !== 1) {
-                    throw "Cannot patch data within a filter that affects more/less than 1 row";
-                }
-                patchedTextData.map(p => {
-                    data[p.fieldName] = (0, prostgles_types_1.unpatchText)(rows[0][p.fieldName], p);
-                });
-                // https://w3resource.com/PostgreSQL/overlay-function.p hp
-                //  overlay(coalesce(status, '') placing 'hom' from 2 for 0)
-            }
-            let nData = { ...data };
-            // if(tableRules && tableRules.update && tableRules?.update?.validate){
-            //     nData = await tableRules.update.validate(nData);
-            // }
-            let query = await this.colSet.getUpdateQuery(nData, allowedCols, validateRow); //pgp.helpers.update(nData, columnSet) + " ";
-            query += (await this.prepareWhere({
-                filter,
-                forcedFilter,
-                filterFields,
-                localParams,
-                tableRule: tableRules
-            })).where;
-            if (onConflictDoNothing)
-                query += " ON CONFLICT DO NOTHING ";
-            let qType = "none";
-            if (returning) {
-                qType = multi ? "any" : "one";
-                query += this.makeReturnQuery(await this.prepareReturning(returning, this.parseFieldFilter(returningFields)));
-            }
-            if (returnQuery)
-                return query;
-            if (this.t) {
-                return this.t[qType](query).catch((err) => makeErr(err, localParams, this, fields));
-            }
-            return this.db.tx(t => t[qType](query)).catch(err => makeErr(err, localParams, this, fields));
-        }
-        catch (e) {
-            if (localParams && localParams.testRule)
-                throw e;
-            throw { err: parseError(e), msg: `Issue with dbo.${this.name}.update(${JSON.stringify(filter || {}, null, 2)}, ${JSON.stringify(newData || {}, null, 2)}, ${JSON.stringify(params || {}, null, 2)})` };
-        }
+        return update_1.update.bind(this)(filter, newData, params, tableRules, localParams);
     }
     ;
     validateNewData({ row, forcedData, allowedFields, tableRules, fixIssues = false }) {
@@ -1779,105 +1717,7 @@ class TableHandler extends ViewHandler {
         return "";
     }
     async delete(filter, params, param3_unused, table_rules, localParams) {
-        try {
-            const { returning } = params || {};
-            filter = filter || {};
-            this.checkFilter(filter);
-            // table_rules = table_rules || {};
-            let forcedFilter = {}, filterFields = "*", returningFields = "*", validate;
-            const { testRule = false, returnQuery = false } = localParams || {};
-            if (table_rules) {
-                if (!table_rules.delete)
-                    throw "delete rules missing";
-                forcedFilter = table_rules.delete.forcedFilter;
-                filterFields = table_rules.delete.filterFields;
-                returningFields = table_rules.delete.returningFields;
-                validate = table_rules.delete.validate;
-                if (!returningFields)
-                    returningFields = (0, utils_1.get)(table_rules, "select.fields");
-                if (!returningFields)
-                    returningFields = (0, utils_1.get)(table_rules, "delete.filterFields");
-                if (!filterFields)
-                    throw ` Invalid delete rule for ${this.name}. filterFields missing `;
-                /* Safely test publish rules */
-                if (testRule) {
-                    await this.validateViewRules({ filterFields, returningFields, forcedFilter, rule: "delete" });
-                    return true;
-                }
-            }
-            if (params) {
-                const good_params = ["returning"];
-                const bad_params = Object.keys(params).filter(k => !good_params.includes(k));
-                if (bad_params && bad_params.length)
-                    throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
-            }
-            let queryType = 'none';
-            let _query = "DELETE FROM " + this.escapedName;
-            const filterOpts = (await this.prepareWhere({
-                filter,
-                forcedFilter,
-                filterFields,
-                localParams,
-                tableRule: table_rules
-            }));
-            _query += filterOpts.where;
-            if (validate) {
-                const _filter = filterOpts.filter;
-                await validate(_filter);
-            }
-            let returningQuery = "";
-            if (returning) {
-                queryType = "any";
-                if (!returningFields) {
-                    throw "Returning dissallowed";
-                }
-                returningQuery = this.makeReturnQuery(await this.prepareReturning(returning, this.parseFieldFilter(returningFields)));
-                _query += returningQuery;
-            }
-            if (returnQuery)
-                return _query;
-            /**
-             * Delete file
-             */
-            const dbHandler = (this.t || this.db);
-            if (this.is_media && this.dboBuilder.prostgles.fileManager) {
-                if (this.dboBuilder.prostgles.opts.fileTable?.delayedDelete) {
-                    return dbHandler[queryType](`UPDATE ${(0, prostgles_types_1.asName)(this.name)} SET deleted = now() ${filterOpts.where} ${returningQuery};`);
-                }
-                else {
-                    const txDelete = async (tbl) => {
-                        if (!tbl.t)
-                            throw new Error("Missing transaction object t");
-                        const files = await this.find(filterOpts.filter);
-                        for await (const file of files) {
-                            await tbl.dboBuilder.prostgles.fileManager?.deleteFile(file.name);
-                            await tbl.t?.any(`DELETE FROM ${(0, prostgles_types_1.asName)(this.name)} WHERE id = ` + "${id}", file);
-                        }
-                        if (returning) {
-                            return files.map(f => (0, PubSubManager_1.pickKeys)(f, ["id", "name"]));
-                        }
-                    };
-                    if (localParams?.dbTX) {
-                        return txDelete(localParams.dbTX[this.name]);
-                    }
-                    else if (this.t) {
-                        return txDelete(this);
-                    }
-                    else {
-                        return this.dboBuilder.getTX(tx => {
-                            return txDelete(tx[this.name]);
-                        });
-                    }
-                }
-            }
-            return dbHandler[queryType](_query).catch((err) => makeErr(err, localParams));
-        }
-        catch (e) {
-            // console.trace(e)
-            if (localParams && localParams.testRule)
-                throw e;
-            throw { err: parseError(e), msg: `Issue with dbo.${this.name}.delete(${JSON.stringify(filter || {}, null, 2)}, ${JSON.stringify(params || {}, null, 2)})` };
-        }
+        return delete_1._delete.bind(this)(filter, params, param3_unused, table_rules, localParams);
     }
     ;
     remove(filter, params, param3_unused, tableRules, localParams) {
@@ -2020,8 +1860,6 @@ class DboBuilder {
                 if (this.prostgles.isSuperUser) {
                     this._pubSubManager = await PubSubManager_1.PubSubManager.create({
                         dboBuilder: this,
-                        db: this.db,
-                        dbo: this.dbo,
                         onSchemaChange
                     });
                 }

package/lib/DboBuilder.ts

@@ -40,6 +40,8 @@ export type Media = {
     "name"?: string;
     "original_name"?: string;
     "etag"?: string;
+    deleted?: string | null;
+    deleted_from_storage?: string | null;
 }
 
 export type TxCB = {
@@ -88,6 +90,8 @@ import {
 import { PubSubManager, asValue, BasicCallback, pickKeys, omitKeys } from "./PubSubManager";
 import { insertDataParse } from "./DboBuilder/insertDataParse";
 import { insert } from "./DboBuilder/insert";
+import { update } from "./DboBuilder/update";
+import { _delete } from "./DboBuilder/delete";
 
 import { parseFilterItem } from "./Filtering";
 
@@ -215,7 +219,7 @@ export type Aggregation = {
     getQuery: (alias: string) => string;
 };
 
-export type Filter = object | { $and: Filter[] } | { $or: Filter[] } | {};
+export type Filter = AnyObject | { $and: Filter[] } | { $or: Filter[] };
 
 type SelectFunc = {
     alias: string;
@@ -378,9 +382,14 @@ const FILTER_FUNCS = FUNCTIONS.filter(f => f.canBeUsedForFilter);
 
 export function parseError(e: any){
     
-    // console.trace("INTERNAL ERROR: ", e);
     let res = e instanceof Error? e.message : (!Object.keys(e || {}).length? e : (e && e.toString)? e.toString() : e);
-    if(isPlainObject(e)) res = JSON.stringify(e, null, 2)
+    if(isPlainObject(e)) {
+        if(typeof e.err === "string"){
+            res = e.err;
+        } else {
+            res = JSON.stringify(e, null, 2)
+        }
+    }
     return res;
 }
 
@@ -2223,92 +2232,7 @@ export class TableHandler extends ViewHandler {
     }
 
     async update(filter: Filter, newData: AnyObject, params?: UpdateParams, tableRules?: TableRule, localParams?: LocalParams): Promise<AnyObject | void>{
-        try {
-
-            const parsedRules = await this.parseUpdateRules(filter, newData, params, tableRules, localParams)
-            if(localParams?.testRule){
-                return parsedRules;
-            }
-
-            const { fields, validateRow, forcedData, finalUpdateFilter, returningFields, forcedFilter, filterFields } = parsedRules;
-
-
-            let { returning, multi = true, onConflictDoNothing = false, fixIssues = false } = params || {};
-            const { returnQuery = false } = localParams ?? {};
-
-
-            if(params){
-                const good_params = ["returning", "multi", "onConflictDoNothing", "fixIssues"];
-                const bad_params = Object.keys(params).filter(k => !good_params.includes(k));
-                if(bad_params && bad_params.length) throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
-            }
-
-
-            const { data, allowedCols } = this.validateNewData({ row: newData, forcedData, allowedFields: fields, tableRules, fixIssues });
-
-            /* Patch data */
-            let patchedTextData: { 
-                fieldName: string; 
-                from: number; 
-                to: number; 
-                text: string; 
-                md5: string
-            }[] = [];
-            this.columns.map(c => {
-                const d = data[c.name];
-                if(c.data_type === "text" && d && isPlainObject(d) && !["from", "to"].find(key => typeof d[key] !== "number")){
-                    const unrecProps = Object.keys(d).filter(k => !["from", "to", "text", "md5"].includes(k));
-                    if(unrecProps.length) throw "Unrecognised params in textPatch field: " + unrecProps.join(", ");
-                    patchedTextData.push({ ...d, fieldName: c.name } as (typeof patchedTextData)[number]);
-                }
-            });
-
-            if(patchedTextData && patchedTextData.length){
-                if(tableRules && !tableRules.select) throw "Select needs to be permitted to patch data";
-                const rows = await this.find(filter, { select: patchedTextData.reduce((a, v) => ({ ...a, [v.fieldName]: 1 }), {}) }, undefined, tableRules);
-                
-                if(rows.length !== 1) {
-                    throw "Cannot patch data within a filter that affects more/less than 1 row";
-                }
-                patchedTextData.map(p => {
-                    data[p.fieldName] = unpatchText(rows[0][p.fieldName], p);
-                })
-
-                // https://w3resource.com/PostgreSQL/overlay-function.p hp
-                //  overlay(coalesce(status, '') placing 'hom' from 2 for 0)
-            }
-
-            let nData = { ...data };
-            // if(tableRules && tableRules.update && tableRules?.update?.validate){
-            //     nData = await tableRules.update.validate(nData);
-            // }
-            
-            let query = await this.colSet.getUpdateQuery(nData, allowedCols, validateRow) //pgp.helpers.update(nData, columnSet) + " ";
-            query += (await this.prepareWhere({
-                filter, 
-                forcedFilter, 
-                filterFields,
-                localParams,
-                tableRule: tableRules
-            })).where;
-            if(onConflictDoNothing) query += " ON CONFLICT DO NOTHING ";
-
-            let qType = "none";
-            if(returning){
-                qType = multi? "any" : "one";
-                query += this.makeReturnQuery(await this.prepareReturning(returning, this.parseFieldFilter(returningFields)));
-            }
-
-            if(returnQuery) return query as unknown as void;
-            
-            if(this.t){
-                return (this.t as any)[qType](query).catch((err: any) => makeErr(err, localParams, this, fields));
-            }
-            return this.db.tx(t => (t as any)[qType](query)).catch(err => makeErr(err, localParams, this, fields));
-        } catch(e){
-            if(localParams && localParams.testRule) throw e;
-            throw { err: parseError(e), msg: `Issue with dbo.${this.name}.update(${JSON.stringify(filter || {}, null, 2)}, ${JSON.stringify(newData || {}, null, 2)}, ${JSON.stringify(params || {}, null, 2)})` };
-        }
+        return update.bind(this)(filter, newData, params, tableRules, localParams);
     };
 
     validateNewData({ row, forcedData, allowedFields, tableRules, fixIssues = false }: ValidatedParams): { data: any; allowedCols: string[] } {
@@ -2367,115 +2291,8 @@ export class TableHandler extends ViewHandler {
         return "";
     }
     
-    async delete(filter?: Filter, params?: DeleteParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<any> {    //{ socket, func, has_rules = false, socketDb } = {}
-        try {
-            const { returning } = params || {};
-            filter = filter || {};
-            this.checkFilter(filter);
-
-            // table_rules = table_rules || {};
-
-            let forcedFilter: AnyObject | undefined = {},
-                filterFields: FieldFilter | undefined = "*",
-                returningFields: FieldFilter | undefined = "*",
-                validate: DeleteRule["validate"];
-
-            const { testRule = false, returnQuery = false } = localParams || {};
-            if(table_rules){
-                if(!table_rules.delete) throw "delete rules missing";
-                forcedFilter = table_rules.delete.forcedFilter;
-                filterFields = table_rules.delete.filterFields;
-                returningFields = table_rules.delete.returningFields;
-                validate = table_rules.delete.validate;
-
-                if(!returningFields) returningFields = get(table_rules, "select.fields");
-                if(!returningFields) returningFields = get(table_rules, "delete.filterFields");
-
-                if(!filterFields)  throw ` Invalid delete rule for ${this.name}. filterFields missing `;
-
-                /* Safely test publish rules */
-                if(testRule){
-                    await this.validateViewRules({ filterFields, returningFields, forcedFilter, rule: "delete" });
-                    return true;
-                }
-            }
-
-
-            if(params){
-                const good_params = ["returning"];
-                const bad_params = Object.keys(params).filter(k => !good_params.includes(k));
-                if(bad_params && bad_params.length) throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
-            }
-
-            let queryType: keyof pgPromise.ITask<{}> = 'none';
-            let _query = "DELETE FROM " + this.escapedName;
-            const filterOpts = (await this.prepareWhere({
-                filter, 
-                forcedFilter, 
-                filterFields, 
-                localParams, 
-                tableRule: table_rules
-            }))
-            _query += filterOpts.where;
-            if(validate){
-                const _filter = filterOpts.filter;
-                await validate(_filter);
-            }
-
-            let returningQuery = "";
-            if(returning){
-                queryType = "any";
-                if(!returningFields) {
-                    throw "Returning dissallowed";
-                }
-                returningQuery = this.makeReturnQuery(await this.prepareReturning(returning, this.parseFieldFilter(returningFields)));
-                _query += returningQuery
-            }
-            
-            if(returnQuery) return _query;
-
-            /**
-             * Delete file
-             */
-            const dbHandler = (this.t || this.db)
-            if(this.is_media && this.dboBuilder.prostgles.fileManager){
-                
-                if(this.dboBuilder.prostgles.opts.fileTable?.delayedDelete){
-                    return dbHandler[queryType](`UPDATE ${asName(this.name)} SET deleted = now() ${filterOpts.where} ${returningQuery};`)
-                } else {
-                    
-                    const txDelete = async (tbl: TableHandler) => {
-                        if(!tbl.t) throw new Error("Missing transaction object t");
-                        const files = await this.find(filterOpts.filter);
-                        for await(const file of files){
-                            await tbl.dboBuilder.prostgles.fileManager?.deleteFile(file.name);
-                            await tbl.t?.any(`DELETE FROM ${asName(this.name)} WHERE id = ` + "${id}", file);
-                        }
-
-                        if(returning){
-                            return files.map(f => pickKeys(f, ["id", "name"]));
-                        }
-                    }
-
-                    if(localParams?.dbTX){
-                        return txDelete(localParams.dbTX[this.name] as TableHandler)
-                    } else if(this.t) {
-                        return txDelete(this)
-                    } else {
-
-                        return this.dboBuilder.getTX(tx => {
-                            return txDelete(tx[this.name] as any)
-                        })
-                    }
-                }
-            }
-
-            return dbHandler[queryType](_query).catch((err: any) => makeErr(err, localParams));
-        } catch(e){
-            // console.trace(e)
-            if(localParams && localParams.testRule) throw e;
-            throw { err: parseError(e), msg: `Issue with dbo.${this.name}.delete(${JSON.stringify(filter || {}, null, 2)}, ${JSON.stringify(params || {}, null, 2)})` };
-        }
+    async delete(filter?: Filter, params?: DeleteParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<any> {
+        return _delete.bind(this)(filter, params, param3_unused, table_rules, localParams);
     };
    
     remove(filter: Filter, params?: UpdateParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams){
@@ -2643,8 +2460,6 @@ export class DboBuilder {
             if(this.prostgles.isSuperUser){
                 this._pubSubManager = await PubSubManager.create({
                     dboBuilder: this,
-                    db: this.db, 
-                    dbo: this.dbo as unknown as DBHandlerServer,
                     onSchemaChange
                 });
             } else {
@@ -2655,6 +2470,7 @@ export class DboBuilder {
             console.trace("Could not create this._pubSubManager")
             throw "Could not create this._pubSubManager";
         }
+        
         return this._pubSubManager;
     }
 

package/lib/FileManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["FileManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["FileManager.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,EAAE,EAAO,MAAM,SAAS,CAAC;AAMlC,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAkD,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAK/I,eAAO,MAAM,eAAe,SAAgB,MAAM,aAAW,QAAQ,MAAM,CAE1E,CAAA;AAED,oBAAY,YAAY,GAAG;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC;IACV;;OAEG;IACD;QAAE,MAAM,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAC7C;QAAE,OAAO,EACL;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,GACjB;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KACrB,CAAA;CACN,CAAA;AAED,oBAAY,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAA;AAED,oBAAY,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAA;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,oBAAY,YAAY,GAAG;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,OAAO,GAAG,MAAM,SAAS,CAAC;AAC1B,MAAM,CAAC,OAAO,OAAO,WAAW;IAE9B,MAAM,CAAC,eAAe,gBAAuB,MAAM,mBAAmB,MAAM,2GAS3E;IAED,QAAQ,CAAC,EAAE,EAAE,CAAC;IAEd,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,GAAG,IAAI,eAAe,CAGzB;IACD,IAAI,EAAE,IAAI,EAAE,CAGX;IAED,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAiB;gBAE3B,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY;IA6BhE,UAAU,CAAC,IAAI,EAAE,MAAM;IAevB,SAAS,CAAC,IAAI,EAAE;QACpB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC;QACV,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC;QACpC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;KAIjC,CAAC;YAuEY,MAAM;IAiEpB,aAAa,WAAkB;QAC7B,IAAI,EAAE,UAAU,CAAC;QACjB,iBAAiB,CAAC,EAAE,MAAM,iBAAiB,CAAC,CAAC;QAC7C,qBAAqB,CAAC,EAAE,MAAM,iBAAiB,CAAC,CAAC;QACjD,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,KAAG,QAAQ,YAAY,CAAC,CA6CxB;YAEa,UAAU;IASxB,OAAO,CAAC,kBAAkB,CAAuE;IAEjG,UAAU,SAAU;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,SAAS,CAWnG;IAED,IAAI,QAAe,SAAS,mBAyN3B;CACF;AAED,eAAO,MAAM,uBAAuB,aAAc,MAAM;UAAW,oBAAoB;SAAO,iBAAiB,GAAG,MAAM;CAevH,CAAA;AAKD,eAAO,MAAM,WAAW,SAAgB,MAAM,GAAG,MAAM,YAAY,MAAM,KAAG,QAAQ;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAwBzI,CAAA;AAGD;;;;;;;;;;;;;;;;;;;GAmBG"}

package/lib/FileManager.js

@@ -338,6 +338,8 @@ class FileManager {
                 throw `File ${path} could not be found`;
             }
             fs.unlinkSync(path);
+            if (fs.existsSync(path))
+                throw new Error("Could not delete file");
         }
         return true;
     }

package/lib/FileManager.ts

@@ -133,6 +133,7 @@ export default class FileManager {
         throw `File ${path} could not be found`;
       }
       fs.unlinkSync(path);
+      if(fs.existsSync(path)) throw new Error("Could not delete file");
     }
     return true
   }

package/lib/PubSubManager.d.ts

@@ -63,8 +63,6 @@ declare type AddSubscriptionParams = SubscriptionParams & {
 };
 export declare type PubSubManagerOptions = {
     dboBuilder: DboBuilder;
-    db: DB;
-    dbo: DBHandlerServer;
     wsChannelNamePrefix?: string;
     pgChannelName?: string;
     onSchemaChange?: (event: {
@@ -75,8 +73,8 @@ export declare type PubSubManagerOptions = {
 export declare class PubSubManager {
     static DELIMITER: string;
     dboBuilder: DboBuilder;
-    db: DB;
-    dbo: DBHandlerServer;
+    get db(): DB;
+    get dbo(): DBHandlerServer;
     _triggers?: Record<string, string[]>;
     sockets: any;
     subs: {

package/lib/PubSubManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["PubSubManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["PubSubManager.ts"],"names":[],"mappings":"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"}

package/lib/PubSubManager.js

@@ -973,12 +973,10 @@ class PubSubManager {
         `, [this.appID]);
         };
         this.addTriggerPool = undefined;
-        const { db, dbo, wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
-        if (!db || !dbo) {
+        const { wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
+        if (!dboBuilder.db || !dboBuilder.dbo) {
             throw 'MISSING: db_pg, db';
         }
-        this.db = db;
-        this.dbo = dbo;
         this.onSchemaChange = onSchemaChange;
         this.dboBuilder = dboBuilder;
         this.sockets = {};
@@ -987,6 +985,12 @@ class PubSubManager {
         this.socketChannelPreffix = wsChannelNamePrefix || "_psqlWS_";
         (0, exports.log)("Created PubSubManager");
     }
+    get db() {
+        return this.dboBuilder.db;
+    }
+    get dbo() {
+        return this.dboBuilder.dbo;
+    }
     isReady() {
         if (!this.postgresNotifListenManager)
             throw "this.postgresNotifListenManager missing";
@@ -1013,8 +1017,9 @@ class PubSubManager {
         return new Promise(async (resolve, reject) => {
             /* TODO: Retire subOne -> it's redundant */
             // this.dbo[table_name][subOne? "findOne" : "find"](filter, params, null, table_rules)
-            if (!this.dbo?.[table_name]?.find)
-                throw "1107 this.dbo[table_name].find";
+            if (!this.dbo?.[table_name]?.find) {
+                throw new Error(`1107 this.dbo.${table_name}.find`);
+            }
             this.dbo?.[table_name]?.find?.(filter, params, undefined, table_rules)
                 .then(data => {
                 if (socket_id && this.sockets[socket_id]) {
@@ -1023,7 +1028,7 @@ class PubSubManager {
                         resolve(data);
                     });
                     /* TO DO: confirm receiving data or server will unsubscribe
-                            { data }, (cb)=> { console.log(cb) });
+                      { data }, (cb)=> { console.log(cb) });
                     */
                 }
                 else if (func) {