prostgles-server 2.0.201 → 2.0.202

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.t?.any(`DELETE FROM ${asName(this.name)} WHERE id = ` + "${id}", file);
-                            await tbl.dboBuilder.prostgles.fileManager?.deleteFile(file.name);
-                        }
-
-                        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){

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":"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"}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.201",
+  "version": "2.0.202",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "bluebird": "^3.7.2",
     "file-type": "^17.1.2",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^1.5.163",
+    "prostgles-types": "^1.5.165",
     "sharp": "^0.30.7"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-15439
+53371

package/tests/isomorphic_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBA2vB/F"}
+{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBAgyB/F"}

package/tests/isomorphic_queries.js

@@ -510,7 +510,39 @@ async function isomorphic(db) {
         // });
     });
     await tryRun("Local file delete", async () => {
-        const file = await db.media.delete({ name: fileName }, { returning: "*" });
+        const file = {
+            data: Buffer.from("str", "utf-8"),
+            name: "will delete.txt"
+        };
+        await db.media.insert(file);
+        const files = await db.media.find({ original_name: file.name });
+        assert_1.strict.equal(files.length, 1);
+        const exists0 = fs.existsSync(__dirname + "/server/media/" + files[0].name);
+        assert_1.strict.equal(exists0, true);
+        await db.media.delete({ original_name: file.name }, { returning: "*" });
+        const exists = fs.existsSync(__dirname + "/server/media/" + files[0].name);
+        assert_1.strict.equal(exists, false);
+    });
+    await tryRun("Local file update", async () => {
+        const initialStr = "str";
+        const newStr = "str new";
+        const file = {
+            data: Buffer.from(initialStr, "utf-8"),
+            name: "will update.txt"
+        };
+        const newFile = {
+            data: Buffer.from(newStr, "utf-8"),
+            name: "will update new.txt"
+        };
+        await db.media.insert(file);
+        const original = await db.media.findOne({ original_name: file.name });
+        const initialFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+        assert_1.strict.equal(initialStr, initialFileStr);
+        await db.media.update({ id: original.id }, newFile);
+        const newFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+        assert_1.strict.equal(newStr, newFileStr);
+        const newF = await db.media.findOne({ id: original.id });
+        assert_1.strict.equal(newF.original_name, newFile.name);
     });
     await tryRun("Exists filter example", async () => {
         const fo = await db.items.findOne(), f = await db.items.find();

package/tests/isomorphic_queries.ts

@@ -581,12 +581,49 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
     // });
   });
 
-  await tryRun("Local file delete", async () => {
 
-    const file = await db.media.delete({ name: fileName }, { returning: "*" });
+  await tryRun("Local file delete", async () => {
+    const file = { 
+      data: Buffer.from("str", "utf-8"), 
+      name: "will delete.txt" 
+    }
+    await db.media.insert(file);
     
+    const files = await db.media.find({ original_name: file.name });
+    assert.equal(files.length, 1);
+    const exists0 = fs.existsSync(__dirname + "/server/media/"+files[0].name);
+    assert.equal(exists0, true);
+    await db.media.delete({ original_name: file.name }, { returning: "*" });
+    const exists = fs.existsSync(__dirname + "/server/media/"+files[0].name);
+    assert.equal(exists, false);
   })
 
+  await tryRun("Local file update", async () => {
+    const initialStr = "str";
+    const newStr = "str new";
+    const file = { 
+      data: Buffer.from(initialStr, "utf-8"), 
+      name: "will update.txt" 
+    }
+    const newFile = { 
+      data: Buffer.from(newStr, "utf-8"), 
+      name: "will update new.txt" 
+    }
+    await db.media.insert(file);
+    const original = await db.media.findOne({ original_name: file.name });
+    
+    const initialFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+    assert.equal(initialStr, initialFileStr);
+
+    await db.media.update({ id: original.id }, newFile);
+    
+    const newFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+    assert.equal(newStr, newFileStr);
+    
+    const newF = await db.media.findOne({ id: original.id });
+
+    assert.equal(newF.original_name, newFile.name)
+  })
   
   await tryRun("Exists filter example", async () => {
   

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.200",
+      "version": "2.0.201",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",
@@ -29,7 +29,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^17.1.2",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.163",
+        "prostgles-types": "^1.5.165",
         "sharp": "^0.30.7"
       },
       "devDependencies": {
@@ -1371,7 +1371,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^17.1.2",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.163",
+        "prostgles-types": "^1.5.165",
         "sharp": "^0.30.7",
         "typescript": "^4.7.4"
       }