prostgles-server 4.2.187 → 4.2.188

package/lib/FileManager/initFileManager.ts

@@ -5,7 +5,7 @@ import { canCreateTables } from "../DboBuilder/runSQL";
 import { Prostgles } from "../Prostgles";
 import { FileManager, HOUR, LocalConfig } from "./FileManager";
 import { runClientRequest } from "../runClientRequest";
-import { HTTPCODES } from "../Auth/AuthHandler";
+import { HTTP_FAIL_CODES } from "../Auth/AuthHandler";
 
 export async function initFileManager(this: FileManager, prg: Prostgles) {
   this.prostgles = prg;
@@ -17,10 +17,9 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
   const { tableName = "files", referencedTables = {} } = fileTable;
   this.tableName = tableName;
 
-  const maxBfSizeMB =
-    (prg.opts.io?.engine?.opts?.maxHttpBufferSize || 1e6) / 1e6;
+  const maxBfSizeMB = (prg.opts.io?.engine.opts.maxHttpBufferSize || 1e6) / 1e6;
   console.log(
-    `Prostgles: Initiated file manager. Max allowed file size: ${maxBfSizeMB}MB (maxHttpBufferSize = 1e6). To increase this set maxHttpBufferSize in socket.io server init options`,
+    `Prostgles: Initiated file manager. Max allowed file size: ${maxBfSizeMB}MB (maxHttpBufferSize = 1e6). To increase this set maxHttpBufferSize in socket.io server init options`
   );
 
   const canCreate = await canCreateTables(this.db);
@@ -66,7 +65,7 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
         UNIQUE(id),
         UNIQUE(name)
     )`,
-      `Create fileTable ${asName(tableName)}`,
+      `Create fileTable ${asName(tableName)}`
     );
     await prg.refreshDBO();
   }
@@ -85,9 +84,7 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
     for (const [colName] of Object.entries(tableConfig.referenceColumns)) {
       const existingCol = cols.find((c) => c.name === colName);
       if (existingCol) {
-        if (
-          existingCol.references?.some(({ ftable }) => ftable === tableName)
-        ) {
+        if (existingCol.references?.some(({ ftable }) => ftable === tableName)) {
           // All ok
         } else {
           if (existingCol.udt_name === "uuid") {
@@ -97,12 +94,12 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
               await runQuery(query, msg);
             } catch (e) {
               console.error(
-                `Could not add constraing. Err: ${e instanceof Error ? e.message : JSON.stringify(e)}`,
+                `Could not add constraing. Err: ${e instanceof Error ? e.message : JSON.stringify(e)}`
               );
             }
           } else {
             console.error(
-              `Referenced file column ${refTable} (${colName}) exists but is not of required type (UUID). Choose a different column name or ALTER the existing column to match the type and the data found in file table ${tableName}(id)`,
+              `Referenced file column ${refTable} (${colName}) exists but is not of required type (UUID). Choose a different column name or ALTER the existing column to match the type and the data found in file table ${tableName}(id)`
             );
           }
         }
@@ -118,7 +115,7 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
         // }
         // await createColumn();
         console.error(
-          `Referenced file column ${refTable} (${colName}) does not exist. Create it using this query:\n${query}`,
+          `Referenced file column ${refTable} (${colName}) does not exist. Create it using this query:\n${query}`
         );
       }
     }
@@ -136,76 +133,71 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
   }
   this.fileRoute = fileServeRoute;
 
-  if (app) {
-    app.get(this.fileRouteExpress, async (req, res) => {
-      if (!this.dbo[tableName]) {
-        res
-          .status(HTTPCODES.INTERNAL_SERVER_ERROR)
-          .json(`Internal error: media table (${tableName}) not valid`);
-        return false;
-      }
+  app.get(this.fileRouteExpress, async (req, res) => {
+    if (!this.dbo[tableName]) {
+      res
+        .status(HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR)
+        .json(`Internal error: media table (${tableName}) not valid`);
+      return false;
+    }
 
-      const mediaTable = this.dbo[tableName] as unknown as TableHandler;
+    const mediaTable = this.dbo[tableName] as unknown as TableHandler;
 
-      try {
-        const { name } = req.params;
-        if (typeof name !== "string" || !name) {
-          throw "Invalid media name";
-        }
-        if (!this.prostgles) {
-          throw "Prostgles instance missing";
-        }
-        const id = name.slice(0, 36);
-        const selectParams = {
-          select: {
-            id: 1,
-            name: 1,
-            signed_url: 1,
-            signed_url_expires: 1,
-            content_type: 1,
-          },
-        };
-        const media = await runClientRequest.bind(this.prostgles)({
-          type: "http",
-          httpReq: req,
-          command: "findOne",
-          tableName,
-          param1: { id },
-          param2: selectParams,
-          param3: undefined,
-        });
-
-        if (!media) {
-          res.status(HTTPCODES.NOT_FOUND).send("File not found or not allowed");
-          return;
-        }
+    try {
+      const { name } = req.params;
+      if (typeof name !== "string" || !name) {
+        throw "Invalid media name";
+      }
+      if (!this.prostgles) {
+        throw "Prostgles instance missing";
+      }
+      const id = name.slice(0, 36);
+      const selectParams = {
+        select: {
+          id: 1,
+          name: 1,
+          signed_url: 1,
+          signed_url_expires: 1,
+          content_type: 1,
+        },
+      };
+      const media = await runClientRequest.bind(this.prostgles)({
+        type: "http",
+        httpReq: req,
+        command: "findOne",
+        tableName,
+        param1: { id },
+        param2: selectParams,
+        param3: undefined,
+      });
+
+      if (!media) {
+        res.status(HTTP_FAIL_CODES.NOT_FOUND).send("File not found or not allowed");
+        return;
+      }
 
-        if (this.cloudClient) {
-          let url = media.signed_url;
-          const expires = +(media.signed_url_expires || 0);
+      if (this.cloudClient) {
+        let url = media.signed_url;
+        const expires = +(media.signed_url_expires || 0);
 
-          const EXPIRES = Date.now() + HOUR;
-          if (!url || expires < EXPIRES) {
-            url = await this.getFileCloudDownloadURL(media.name, 60 * 60);
-            await mediaTable.update(
-              { name },
-              { signed_url: url, signed_url_expires: EXPIRES },
-            );
-          }
+        const EXPIRES = Date.now() + HOUR;
+        if (!url || expires < EXPIRES) {
+          url = await this.getFileCloudDownloadURL(media.name, 60 * 60);
+          await mediaTable.update({ name }, { signed_url: url, signed_url_expires: EXPIRES });
+        }
 
-          res.redirect(url);
-        } else {
-          const pth = `${(this.config as LocalConfig).localFolderPath}/${media.name}`;
-          if (!fs.existsSync(pth)) {
-            throw new Error("File not found");
-          }
-          res.contentType(media.content_type);
-          res.sendFile(pth);
+        res.redirect(url);
+      } else {
+        const pth = `${(this.config as LocalConfig).localFolderPath}/${media.name}`;
+        if (!fs.existsSync(pth)) {
+          throw new Error("File not found");
         }
-      } catch (e) {
-        console.log(e);
-        res.status(HTTPCODES.BAD_REQUEST).send("Invalid/disallowed file");
+        res.contentType(media.content_type);
+        res.sendFile(pth);
       }
-    });
-  }
+    } catch (e) {
+      console.log(e);
+      res.status(HTTP_FAIL_CODES.BAD_REQUEST).send("Invalid/disallowed file");
+    }
+  });
 }

package/lib/FileManager/uploadStream.ts

@@ -42,7 +42,7 @@ export function uploadStream(
           const now = Date.now();
           if (now - lastProgress > throttle) {
             lastProgress = now;
-            onProgress?.({ loaded, total: expectedSizeBytes ?? 0 });
+            onProgress({ loaded, total: expectedSizeBytes ?? 0 });
           }
         });
       }
@@ -54,7 +54,7 @@ export function uploadStream(
           try {
             content_length = fs.statSync(filePath).size;
 
-            onEnd?.({
+            onEnd({
               url,
               filePath,
               etag: `none`,

package/lib/Filtering.ts

@@ -41,12 +41,10 @@ export const FILTER_OPERAND_TO_SQL_OPERAND = Object.fromEntries(
     else if (filterOperand === "$nin") sqlOperand = "NOT IN";
     else if (filterOperand === "$between") sqlOperand = "BETWEEN";
     else if (filterOperand === "$notBetween") sqlOperand = "NOT BETWEEN";
-    else if (filterOperand === "$isDistinctFrom")
-      sqlOperand = "IS DISTINCT FROM";
-    else if (filterOperand === "$isNotDistinctFrom")
-      sqlOperand = "IS NOT DISTINCT FROM";
+    else if (filterOperand === "$isDistinctFrom") sqlOperand = "IS DISTINCT FROM";
+    else if (filterOperand === "$isNotDistinctFrom") sqlOperand = "IS NOT DISTINCT FROM";
     return [filterOperand, sqlOperand];
-  }),
+  })
 ) as Record<(typeof FILTER_OPERANDS)[number], string>;
 
 /**
@@ -54,7 +52,7 @@ export const FILTER_OPERAND_TO_SQL_OPERAND = Object.fromEntries(
  * Ensure only single key objects reach this point
  */
 type ParseFilterItemArgs = {
-  filter: FullFilter<void, void>;
+  filter: FullFilter<void, void> | undefined;
   select: SelectItem[] | undefined;
   tableAlias: string | undefined;
   allowedColumnNames: string[];
@@ -85,7 +83,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
           select,
           tableAlias,
           allowedColumnNames,
-        }),
+        })
       )
       .sort() /*  sorted to ensure duplicate subscription channels are not created due to different condition order */
       .join(" AND ");
@@ -102,20 +100,15 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
   const validateSelectedItemFilter = (selectedItem: SelectItem | undefined) => {
     const fields = selectedItem?.getFields();
     if (Array.isArray(fields) && fields.length > 1) {
-      const dissallowedFields = fields.filter(
-        (fname) => !allowedColumnNames.includes(fname),
-      );
+      const dissallowedFields = fields.filter((fname) => !allowedColumnNames.includes(fname));
       if (dissallowedFields.length) {
-        throw new Error(
-          `Invalid/disallowed columns found in filter: ${dissallowedFields}`,
-        );
+        throw new Error(`Invalid/disallowed columns found in filter: ${dissallowedFields}`);
       }
     }
   };
   const getLeftQ = (selItm: SelectItem) => {
     validateSelectedItemFilter(selItem);
-    if (selItm.type === "function" || selItm.type === "aggregation")
-      return selItm.getQuery();
+    if (selItm.type === "function" || selItm.type === "aggregation") return selItm.getQuery();
     return selItm.getQuery(tableAlias);
   };
 
@@ -133,16 +126,14 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
     /* See if dot notation. Pick the best matching starting string */
     if (select) {
       selItem = select.find((s) =>
-        dot_notation_delims.find((delimiter) =>
-          fKey.startsWith(s.alias + delimiter),
-        ),
+        dot_notation_delims.find((delimiter) => fKey.startsWith(s.alias + delimiter))
       );
       validateSelectedItemFilter(selItem);
     }
     if (!selItem) {
       return mErr(
         "Bad filter. Could not match to a column or alias or dot notation" +
-          select?.map((s) => s.alias),
+          select?.map((s) => s.alias)
       );
     }
 
@@ -152,7 +143,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
     if (remainingStr.startsWith("->")) {
       /** Has shorthand operand 'col->>key.<>'  */
       const matchingOperand = CompareFilterKeys.find((operand) =>
-        remainingStr.endsWith(`.${operand}`),
+        remainingStr.endsWith(`.${operand}`)
       );
       if (matchingOperand) {
         remainingStr = remainingStr.slice(0, -matchingOperand.length - 1);
@@ -195,10 +186,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
         }
 
         leftQ +=
-          currSep.sep +
-          asValue(
-            remainingStr.slice(currSep.idx + currSep.sep.length, nextIdx),
-          );
+          currSep.sep + asValue(remainingStr.slice(currSep.idx + currSep.sep.length, nextIdx));
         currSep = nextSep;
       }
 
@@ -238,9 +226,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
       rightF = res;
     } else {
       // console.trace(141, select, selItem, remainingStr)
-      mErr(
-        "Bad filter. Could not find the valid col name or alias or col json path",
-      );
+      mErr("Bad filter. Could not find the valid col name or alias or col json path");
     }
   } else {
     leftQ = getLeftQ(selItem);
@@ -248,10 +234,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
 
   if (!leftQ) mErr("Internal error: leftQ missing?!");
 
-  const parseRightVal = (
-    val: any,
-    expect?: "csv" | "array" | "json" | "jsonb",
-  ) => {
+  const parseRightVal = (val: any, expect?: "csv" | "array" | "json" | "jsonb") => {
     try {
       return parseFilterRightValue(val, { selectItem: selItem, expect });
     } catch (e: any) {
@@ -265,26 +248,17 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
     let filterOperand: (typeof FILTER_OPERANDS)[number] = filterKeys[0] as any;
 
     /** JSON cannot be compared so we'll cast it to TEXT */
-    if (
-      selItem?.column_udt_type === "json" ||
-      TextFilterKeys.includes(filterOperand as any)
-    ) {
+    if (selItem.column_udt_type === "json" || TextFilterKeys.includes(filterOperand as any)) {
       leftQ += "::TEXT ";
     }
 
     /** It's an object key which means it's an equality comparison against a json object */
-    if (
-      selItem?.column_udt_type?.startsWith("json") &&
-      !FILTER_OPERANDS.includes(filterOperand)
-    ) {
+    if (selItem.column_udt_type?.startsWith("json") && !FILTER_OPERANDS.includes(filterOperand)) {
       return leftQ + " = " + parseRightVal(rightF);
     }
 
     let filterValue = rightF[filterOperand];
-    const ALLOWED_FUNCS = [
-      ...GeomFilter_Funcs,
-      ...TextFilter_FullTextSearchFilterKeys,
-    ] as const;
+    const ALLOWED_FUNCS = [...GeomFilter_Funcs, ...TextFilter_FullTextSearchFilterKeys] as const;
     let funcName: undefined | (typeof ALLOWED_FUNCS)[number];
     let funcArgs: undefined | any[];
 
@@ -349,9 +323,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
         return " FALSE ";
       }
 
-      const filterNonNullValues: any[] = filterValue.filter(
-        (v: any) => v !== null,
-      );
+      const filterNonNullValues: any[] = filterValue.filter((v: any) => v !== null);
       let c1 = "",
         c2 = "";
       if (filterNonNullValues.length) {
@@ -366,9 +338,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
         return " TRUE ";
       }
 
-      const nonNullFilterValues: any[] = filterValue.filter(
-        (v: any) => v !== null,
-      );
+      const nonNullFilterValues: any[] = filterValue.filter((v: any) => v !== null);
       let c1 = "",
         c2 = "";
       if (nonNullFilterValues.length)
@@ -379,13 +349,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
       if (!Array.isArray(filterValue) || filterValue.length !== 2) {
         return mErr("Between filter expects an array of two values");
       }
-      return (
-        leftQ +
-        " BETWEEN " +
-        asValue(filterValue[0]) +
-        " AND " +
-        asValue(filterValue[1])
-      );
+      return leftQ + " BETWEEN " + asValue(filterValue[0]) + " AND " + asValue(filterValue[1]);
     } else if (["$ilike"].includes(filterOperand)) {
       return leftQ + " ILIKE " + asValue(filterValue);
     } else if (["$like"].includes(filterOperand)) {
@@ -394,33 +358,19 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
       return leftQ + " NOT ILIKE " + asValue(filterValue);
     } else if (["$nlike"].includes(filterOperand)) {
       return leftQ + " NOT LIKE " + asValue(filterValue);
-    } else if (
-      filterOperand === "$isDistinctFrom" ||
-      filterOperand === "$isNotDistinctFrom"
-    ) {
+    } else if (filterOperand === "$isDistinctFrom" || filterOperand === "$isNotDistinctFrom") {
       const operator = FILTER_OPERAND_TO_SQL_OPERAND[filterOperand];
       return leftQ + ` ${operator} ` + asValue(filterValue);
 
       /* MAYBE TEXT OR MAYBE ARRAY */
     } else if (
-      [
-        "@>",
-        "<@",
-        "$contains",
-        "$containedBy",
-        "$overlaps",
-        "&&",
-        "@@",
-      ].includes(filterOperand)
+      ["@>", "<@", "$contains", "$containedBy", "$overlaps", "&&", "@@"].includes(filterOperand)
     ) {
       const operand =
-        filterOperand === "@@"
-          ? "@@"
-          : ["@>", "$contains"].includes(filterOperand)
-            ? "@>"
-            : ["&&", "$overlaps"].includes(filterOperand)
-              ? "&&"
-              : "<@";
+        filterOperand === "@@" ? "@@"
+        : ["@>", "$contains"].includes(filterOperand) ? "@>"
+        : ["&&", "$overlaps"].includes(filterOperand) ? "&&"
+        : "<@";
 
       /* Array for sure */
       if (Array.isArray(filterValue)) {
@@ -432,10 +382,9 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
         TextFilter_FullTextSearchFilterKeys.includes(funcName! as any)
       ) {
         let lq = `to_tsvector(${leftQ}::text)`;
-        if (selItem && selItem.columnPGDataType === "tsvector") lq = leftQ!;
+        if (selItem.columnPGDataType === "tsvector") lq = leftQ!;
 
-        const res =
-          `${lq} ${operand} ` + `${funcName}${parseRightVal(funcArgs, "csv")}`;
+        const res = `${lq} ${operand} ` + `${funcName}${parseRightVal(funcArgs, "csv")}`;
 
         return res;
       } else {
@@ -453,10 +402,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
        * Ensure that when comparing an array to a json column, the array is cast to json
        */
       let valueStr = asValue(rightF);
-      if (
-        selItem?.column_udt_type?.startsWith("json") &&
-        Array.isArray(rightF)
-      ) {
+      if (selItem.column_udt_type?.startsWith("json") && Array.isArray(rightF)) {
         valueStr = pgp.as.format(`$1::jsonb`, [JSON.stringify(rightF)]);
       }
       return `${leftQ} = ${valueStr}`;
@@ -468,10 +414,7 @@ type ParseRightValOpts = {
   expect?: "csv" | "array" | "json" | "jsonb";
   selectItem: SelectItem | undefined;
 };
-export const parseFilterRightValue = (
-  val: any,
-  { expect, selectItem }: ParseRightValOpts,
-) => {
+export const parseFilterRightValue = (val: any, { expect, selectItem }: ParseRightValOpts) => {
   const asValue = (v: any) => pgp.as.format("$1", [v]);
   const checkIfArr = () => {
     if (!Array.isArray(val)) {