prostgles-server 3.0.77 → 3.0.79

package/lib/Filtering.ts

@@ -4,7 +4,7 @@ import { SelectItem } from "./DboBuilder/QueryBuilder/QueryBuilder";
 import { 
   isEmpty, getKeys, FullFilter, EXISTS_KEYS, FilterDataType, 
   GeomFilterKeys, GeomFilter_Funcs, 
-  TextFilter_FullTextSearchFilterKeys, CompareFilterKeys, isObject 
+  TextFilter_FullTextSearchFilterKeys, CompareFilterKeys, isObject, TextFilterKeys, JsonbFilterKeys, CompareInFilterKeys 
 } from "prostgles-types";
 import { isPlainObject } from "./DboBuilder";
 
@@ -19,13 +19,17 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
   if(!_f || isEmpty(_f)) return "";
 
   const mErr = (msg: string) => {
-      throw `${msg}: ${JSON.stringify(_f, null, 2)}`
-    }, 
-    asValue = (v: any) => pgp.as.format("$1", [v]);
+    throw `${msg}: ${JSON.stringify(_f, null, 2)}`
+  };
+  const asValue = (v: any) => pgp.as.format("$1", [v]);
 
   const fKeys = getKeys(_f)
   if(fKeys.length === 0){
-      return "";
+    return "";
+    
+  /**
+   * { field1: cond1, field2: cond2 }
+   */
   } else if(fKeys.length > 1){
     return fKeys.map(fk => parseFilterItem({
       filter: { [fk]: _f[fk] },
@@ -58,20 +62,21 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
     */
   let leftQ: string | undefined;// = asName(selItem.alias);
 
-  /* Check if string notation. Build obj if necessary */
+  /* 
+    Select item not found. 
+    Check if dot/json notation. Build obj if necessary 
+    */
   const dot_notation_delims = ["->", "."];
   if(!selItem){
     
     /* See if dot notation. Pick the best matching starting string */
     if(select){
       selItem = select.find(s => 
-        fKey.startsWith(s.alias) && 
-        dot_notation_delims.find(dn => fKey.slice(s.alias.length).startsWith(dn)) 
+        dot_notation_delims.find(delimiter => fKey.startsWith(s.alias + delimiter))
       );
     }
     if(!selItem) {
-      mErr("Bad filter. Could not match to a column or alias: ");
-      throw " "
+      return mErr("Bad filter. Could not match to a column or alias or dot notation: "); 
     }
 
     let remainingStr = fKey.slice(selItem.alias.length);
@@ -174,7 +179,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
   if(!leftQ) mErr("Internal error: leftQ missing?!");
 
   /* Matching sel item */
-  if(isPlainObject(rightF) && selItem.column_udt_type !== "jsonb"){
+  if(isPlainObject(rightF)){
     const parseRightVal = (val: any, expect: "csv" | "array" | null = null) => {
       const checkIfArr = () => {
         if(!Array.isArray(val)) return mErr("This type of filter/column expects an Array of items");
@@ -192,128 +197,148 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
       return asValue(val);
     }
 
+    const OPERANDS = [
+      ...TextFilterKeys,
+      ...JsonbFilterKeys,
+      ...CompareFilterKeys,
+      ...CompareInFilterKeys
+    ] as const;
+
     const filterKeys = Object.keys(rightF);
-    if(filterKeys.length !== 1) {
-      mErr("Bad filter. Expecting one key only");
+    const filterOperand: typeof 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)){
+      leftQ += "::TEXT "
     }
 
-    const fOpType = filterKeys[0];
-    const fVal = rightF[fOpType];
-    let sOpType: string | undefined;
-    let sVal: any;
+    /** It's an object key which means it's an equality comparison against a json object */
+    if(selItem?.column_udt_type?.startsWith("json") && !OPERANDS.includes(filterOperand)){
+      return leftQ + " = " + parseRightVal(rightF);
+    }
+
+    if(filterKeys.length !== 1 && selItem.column_udt_type !== "jsonb") {
+      return mErr("Bad filter. Expecting one key only");
+    }
 
-    if(fVal && isPlainObject(fVal)){
-      const keys = Object.keys(fVal);
-      if(!keys.length || keys.length !== 1){
+    const filterValue = rightF[filterOperand];
+    const ALLOWED_FUNCS = [ ...GeomFilter_Funcs, ...TextFilter_FullTextSearchFilterKeys] as const;
+    let funcName: undefined | typeof ALLOWED_FUNCS[number];
+    let funcArgs: any[] | undefined;
+
+    /**
+     * Filter notation
+     * geom && st_makeenvelope(funcArgs)
+     */
+    if(isObject(filterValue) && selItem.column_udt_type !== "jsonb"){
+      const filterValueKeys = Object.keys(filterValue);
+      if(!filterValueKeys.length || filterValueKeys.length !== 1){
         return mErr("Bad filter. Expecting a nested object with one key only ");
       }
-      sOpType = keys[0];
-      sVal = fVal[sOpType];
-
+      funcName = filterValueKeys[0] as any;
+      funcArgs = filterValue[funcName as any];
+      if(!ALLOWED_FUNCS.includes(funcName as any)){
+        return mErr(`Bad filter. Nested function ${funcName} could not be found. Expecting one of: ${ALLOWED_FUNCS}`);
+      }
     }
     // console.log({ fOpType, fVal, sOpType })
 
-    /** JSON cannot be compared so we'll cast it to TEXT */
-    if(selItem?.column_udt_type === "json" || ["$ilike", "$like", "$nilike", "$nlike"].includes(fOpType)){
-      leftQ += "::TEXT "
-    }
-
     /** st_makeenvelope */
-    if(GeomFilterKeys.includes(fOpType as any) && sOpType && GeomFilter_Funcs.includes(sOpType)){
+    if(GeomFilterKeys.includes(filterOperand as any) && funcName && GeomFilter_Funcs.includes(funcName as any)){
       /** If leftQ is geography then this err can happen: 'Antipodal (180 degrees long) edge detected!' */
-      if(sOpType.toLowerCase() === "st_makeenvelope") leftQ += "::geometry"
-      return leftQ + ` ${fOpType} ` + `${sOpType}${parseRightVal(sVal, "csv")}`;
+      if(funcName.toLowerCase() === "st_makeenvelope") {
+        leftQ += "::geometry";
+      }
+      return `${leftQ} ${filterOperand} ${funcName}${parseRightVal(funcArgs, "csv")}`;
 
-    } else if(["=", "$eq"].includes(fOpType) && !sOpType){
-      if(fVal === null) return leftQ + " IS NULL ";
-      return leftQ + " = " + parseRightVal(fVal);
+    } else if(["=", "$eq"].includes(filterOperand) && !funcName){
+      if(filterValue === null) return leftQ + " IS NULL ";
+      return leftQ + " = " + parseRightVal(filterValue);
 
-    } else if(["<>", "$ne"].includes(fOpType)){
-      if(fVal === null) return leftQ + " IS NOT NULL ";
-      return leftQ + " <> " + parseRightVal(fVal);
+    } else if(["<>", "$ne"].includes(filterOperand)){
+      if(filterValue === null) return leftQ + " IS NOT NULL ";
+      return leftQ + " <> " + parseRightVal(filterValue);
 
-    } else if([">", "$gt"].includes(fOpType)){
-      return leftQ + " > " + parseRightVal(fVal);
+    } else if([">", "$gt"].includes(filterOperand)){
+      return leftQ + " > " + parseRightVal(filterValue);
 
-    } else if(["<", "$lt"].includes(fOpType)){
-      return leftQ + " < " + parseRightVal(fVal);
+    } else if(["<", "$lt"].includes(filterOperand)){
+      return leftQ + " < " + parseRightVal(filterValue);
 
-    } else if([">=", "$gte"].includes(fOpType)){
-      return leftQ + " >=  " + parseRightVal(fVal);
+    } else if([">=", "$gte"].includes(filterOperand)){
+      return leftQ + " >=  " + parseRightVal(filterValue);
 
-    } else if(["<=", "$lte"].includes(fOpType)){
-      return leftQ + " <= " + parseRightVal(fVal);
+    } else if(["<=", "$lte"].includes(filterOperand)){
+      return leftQ + " <= " + parseRightVal(filterValue);
 
-    } else if(["$in"].includes(fOpType)){
-      if(!fVal?.length) {
+    } else if(["$in"].includes(filterOperand)){
+      if(!filterValue?.length) {
         return " FALSE ";
       }
 
-      let _fVal: any[] = fVal.filter((v: any) => v !== null);
+      let _fVal: any[] = filterValue.filter((v: any) => v !== null);
       let c1 = "", c2 = "";
-      if(_fVal.length) c1 = leftQ + " IN " + parseRightVal(_fVal, "csv");
-      if(fVal.includes(null)) c2 = ` ${leftQ} IS NULL `;
+      if(_fVal.length) {
+        c1 = leftQ + " IN " + parseRightVal(_fVal, "csv");
+      }
+      if(filterValue.includes(null)) c2 = ` ${leftQ} IS NULL `;
       return [c1, c2].filter(c => c).join(" OR ");
 
-    } else if(["$nin"].includes(fOpType)){
-      if(!fVal?.length) {
+    } else if(["$nin"].includes(filterOperand)){
+      if(!filterValue?.length) {
         return " TRUE ";
       }
 
-      let _fVal: any[] = fVal.filter((v: any) => v !== null);
+      let _fVal: any[] = filterValue.filter((v: any) => v !== null);
       let c1 = "", c2 = "";
       if(_fVal.length) c1 = leftQ + " NOT IN " + parseRightVal(_fVal, "csv");
-      if(fVal.includes(null)) c2 = ` ${leftQ} IS NOT NULL `;
+      if(filterValue.includes(null)) c2 = ` ${leftQ} IS NOT NULL `;
       return [c1, c2].filter(c => c).join(" AND ");
 
-    } else if(["$between"].includes(fOpType)){
-      if(!Array.isArray(fVal) || fVal.length !== 2){
+    } else if(["$between"].includes(filterOperand)){
+      if(!Array.isArray(filterValue) || filterValue.length !== 2){
         return mErr("Between filter expects an array of two values");
       }
-      return leftQ + " BETWEEN " + asValue(fVal[0]) + " AND " + asValue(fVal[1]);
+      return leftQ + " BETWEEN " + asValue(filterValue[0]) + " AND " + asValue(filterValue[1]);
 
-    } else if(["$ilike"].includes(fOpType)){
-      return leftQ + " ILIKE " + asValue(fVal);
+    } else if(["$ilike"].includes(filterOperand)){
+      return leftQ + " ILIKE " + asValue(filterValue);
 
-    } else if(["$like"].includes(fOpType)){
-      return leftQ + " LIKE " + asValue(fVal);
+    } else if(["$like"].includes(filterOperand)){
+      return leftQ + " LIKE " + asValue(filterValue);
 
-    } else if(["$nilike"].includes(fOpType)){
-      return leftQ + " NOT ILIKE " + asValue(fVal);
+    } else if(["$nilike"].includes(filterOperand)){
+      return leftQ + " NOT ILIKE " + asValue(filterValue);
 
-    } else if(["$nlike"].includes(fOpType)){
-      return leftQ + " NOT LIKE " + asValue(fVal);
+    } else if(["$nlike"].includes(filterOperand)){
+      return leftQ + " NOT LIKE " + asValue(filterValue);
 
     /* MAYBE TEXT OR MAYBE ARRAY */
-    } else if(["@>", "<@", "$contains", "$containedBy", "&&", "@@"].includes(fOpType)){
-      let operand = fOpType === "@@"? "@@": 
-          ["@>", "$contains"].includes(fOpType)? "@>" : 
-          ["&&"].includes(fOpType)? "&&" : 
+    } else if(["@>", "<@", "$contains", "$containedBy", "&&", "@@"].includes(filterOperand)){
+      let operand = filterOperand === "@@"? "@@": 
+          ["@>", "$contains"].includes(filterOperand)? "@>" : 
+          ["&&"].includes(filterOperand)? "&&" : 
           "<@";
 
       /* Array for sure */
-      if(Array.isArray(fVal)){
-        return leftQ + operand + parseRightVal(fVal, "array");
+      if(Array.isArray(filterValue)){
+        return leftQ + operand + parseRightVal(filterValue, "array");
           
       /* FTSQuery */
-      } else if(["@@"].includes(fOpType) && TextFilter_FullTextSearchFilterKeys.includes(sOpType! as any)) {
+      } else if(["@@"].includes(filterOperand) && TextFilter_FullTextSearchFilterKeys.includes(funcName! as any)) {
         let lq = `to_tsvector(${leftQ}::text)`;
         if(selItem && selItem.columnPGDataType === "tsvector") lq = leftQ!;
 
-        let res = `${lq} ${operand} ` + `${sOpType}${parseRightVal(sVal, "csv")}`;
+        let res = `${lq} ${operand} ` + `${funcName}${parseRightVal(funcArgs, "csv")}`;
 
         return res;
       } else {
-        return mErr("Unrecognised filter operand: " + fOpType + " ");
+        return mErr("Unrecognised filter operand: " + filterOperand + " ");
       }
 
     } else {
-      /** Maybe it's an object key which means it's an equality comparison against a json object */
-      if(selItem?.column_udt_type?.startsWith("json")){
-        return leftQ + " = " + parseRightVal(rightF);
-      }
 
-      return mErr("Unrecognised filter operand: " + fOpType + " ");
+      return mErr("Unrecognised filter operand: " + filterOperand + " ");
     }
 
 

package/lib/PubSubManager/initPubSubManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initPubSubManager.d.ts","sourceRoot":"","sources":["initPubSubManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAioB/F"}
+{"version":3,"file":"initPubSubManager.d.ts","sourceRoot":"","sources":["initPubSubManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0oB/F"}

package/lib/PubSubManager/initPubSubManager.js

@@ -7,6 +7,7 @@ const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to ma
 async function initPubSubManager() {
     if (!this.canContinue())
         return undefined;
+    let tries = 5;
     try {
         const schema_version = 10;
         const initQuery = `
@@ -605,13 +606,20 @@ async function initPubSubManager() {
                               END $$;
                           `;
                         await this.db.any(appQ);
+                        tries = 5;
                         (0, PubSubManager_1.log)("updated last_check");
                     }
                     catch (e) {
+                        tries--;
                         /** In some cases a query idles and blocks everything else. Terminate all similar queries */
                         this.db.any("SELECT state, pg_terminate_backend(pid) from pg_stat_activity WHERE query ilike ${qid} and pid <>  pg_backend_pid();", { qid: "%" + REALTIME_TRIGGER_CHECK_QUERY + "%" });
-                        /** If this database was dropped then stop interval */
-                        if (e?.code === "3D000") { //  && e.message.includes(this.db.$cn.database)
+                        /** If no tries left
+                         * OR
+                         * If this database was dropped
+                         *
+                         * then stop interval
+                         * */
+                        if (tries <= 0 || e?.code === "3D000") { //  && e.message.includes(this.db.$cn.database)
                             clearInterval(this.appCheck);
                         }
                         console.error("appCheck FAILED: \n", e, appQ);

package/lib/PubSubManager/initPubSubManager.ts

@@ -5,6 +5,7 @@ const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to ma
 export async function initPubSubManager(this: PubSubManager): Promise<PubSubManager | undefined> {
   if (!this.canContinue()) return undefined;
 
+  let tries = 5;
   try {
     const schema_version = 10;
 
@@ -617,13 +618,21 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                               END $$;
                           `
             await this.db.any(appQ);
+            tries = 5;
             log("updated last_check");
           } catch (e: any) {
+            tries --;
+
             /** In some cases a query idles and blocks everything else. Terminate all similar queries */
             this.db.any("SELECT state, pg_terminate_backend(pid) from pg_stat_activity WHERE query ilike ${qid} and pid <>  pg_backend_pid();", { qid: "%" + REALTIME_TRIGGER_CHECK_QUERY + "%" });
 
-            /** If this database was dropped then stop interval */
-            if(e?.code === "3D000"){ //  && e.message.includes(this.db.$cn.database)
+            /** If no tries left
+             * OR
+             * If this database was dropped 
+             * 
+             * then stop interval 
+             * */
+            if(tries <= 0 || e?.code === "3D000"){ //  && e.message.includes(this.db.$cn.database)
               clearInterval(this.appCheck);
             }
             console.error("appCheck FAILED: \n", e, appQ);

package/lib/PublishParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["PublishParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["PublishParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,SAAS,EAAO,oBAAoB,EAAE,aAAa,EAAwB,UAAU,EAAY,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACjK,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAyB,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtI,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,EAAiB,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE1E,oBAAY,cAAc,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAAC;AAE3L,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE1C,aAAK,OAAO,GAAG;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAA;AAED,aAAK,QAAQ,GAAG,OAAO,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAA;AACD,aAAK,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAA;AA6ED,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK5D,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACvB,SAAS,EAAE,WAAW,CAAC;CACxB,CAAA;AACD,oBAAY,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,YAAY,CAAC;CACtB,CAAA;AACD,oBAAY,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,WAAW,CAAC;CACxB,CAAA;AACD,oBAAY,oBAAoB,CAAC,CAAC,SAAS,SAAS,IAAI;IACtD,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;IACrB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjB,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC3B,CAAA;AACD,oBAAY,SAAS,CAAC,CAAC,SAAS,SAAS,IAAI;IAC3C,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;IACrB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CAClB,CAAA;AACD,oBAAY,sBAAsB,CAAC,CAAC,SAAS,SAAS,IAAI;IACxD,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;CACtB,CAAA;AACD,oBAAY,iBAAiB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI,oBAAoB,CAAC,CAAC,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAErH,oBAAY,WAAW,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACvH,oBAAY,iBAAiB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAAE,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAG1K,oBAAY,UAAU,CAAC,IAAI,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI;IAErE;;;OAGG;IACH,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAE1B;;;OAGG;IACH,aAAa,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB;;OAEG;IACH,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEnC;;SAEK;IACL,YAAY,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,CAAC,IAAI,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAEpF,CAAA;AACD,oBAAY,UAAU,CAAC,IAAI,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI;IAErE;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;IAElC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3B;;OAEG;IACH,eAAe,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;IAE5C;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEnC;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEhC;;;OAGG;IACH,YAAY,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C,CAAA;AACD,oBAAY,UAAU,CAAC,IAAI,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI;IAErE;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;IAElC;;;;;;OAMG;IACH,aAAa,CAAC,EAAE;QACd,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5B,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;KACnC,EAAE,CAAC;IAEJ;;;OAGG;IACH,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAA;IAElD;;OAEG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;IAE9C;;OAEG;IACH,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;IAEzC;;OAEG;IACH,eAAe,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;IAE5C;;OAEG;IACH,QAAQ,CAAC,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEtC;;;OAGG;IACH,YAAY,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,oBAAY,UAAU,CAAC,IAAI,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI;IAErE;;OAEG;IACH,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAA;IAElD;;OAEG;IACH,YAAY,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAEhC;;OAEG;IACH,eAAe,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAA;IAElD;;OAEG;IACH,QAAQ,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;CAC5C,CAAA;AACD,oBAAY,QAAQ,CAAC,IAAI,SAAS,SAAS,GAAG,SAAS,IAAI;IAEzD;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;IAE1B;;OAEG;IACH,YAAY,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAA;AACD,oBAAY,aAAa,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,oBAAY,QAAQ,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI,gBAAgB,GAAG;IACzE;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACxB,CAAC;AACF,oBAAY,SAAS,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG;IAC3F,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IACzB,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B,CAAC;AACF,oBAAY,eAAe,CAAC,GAAG,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI;IACzE,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,mBAAmB,CAAA;IACjD,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AACF,oBAAY,gBAAgB,CAAC,GAAG,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,GAAG,IAAI,IAAI,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG;IACpG,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,mBAAmB,CAAA;IACjD,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,mBAAmB,CAAA;IACjD,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,mBAAmB,CAAA;IACjD,IAAI,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrB,SAAS,CAAC,EAAE,aAAa,GAAG,mBAAmB,CAAC;CACjD,CAAC;AAGF,oBAAY,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAA;AAKD,oBAAY,aAAa,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI;IAC7E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,eAAe,CAAC;QACtB,OAAO,EAAE,iBAAiB,EAAE,CAAC;KAC9B,EAAE,CAAC;CACL,CAAA;AACD,oBAAY,aAAa,GAAG;IAAE,GAAG,CAAC,EAAE,eAAe,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC;AACpE,oBAAY,mBAAmB,GAAG,IAAI,GAAG,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC;AAC5D,aAAK,aAAa,GAAG;IACnB,CAAC,UAAU,EAAE,MAAM,GAAG,CAAC,gBAAgB,GAAG,eAAe,GAAG,mBAAmB,CAAC,CAAA;CACjF,CAAC;AACF,oBAAY,mBAAmB,GAAG;IAChC,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,CAAA;CACzC,CAAC;AACF,oBAAY,eAAe,CAAC,MAAM,GAAG,IAAI,IAAI,mBAAmB,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;AAC7F,oBAAY,OAAO,CAAC,MAAM,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAEvL,qBAAa,aAAa;IACxB,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC;IACrF,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAA;IACN,SAAS,EAAE,SAAS,CAAC;gBAET,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,GAAG,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS;IAW/K,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAe3F,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IAqBhG;;;;OAIG;IACG,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAcrF,2BAA2B,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAKrG,uBAAuB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IAyC1H,aAAa,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAuKrH,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,oBAAoB,CAAC;QAAC,MAAM,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC;CA2GnI"}

package/lib/PublishParser.js

@@ -199,9 +199,11 @@ class PublishParser {
             let parsed_table = {};
             /* Get view or table specific rules */
             const tHandler = this.dbo[tableName];
-            if (!tHandler)
-                throw { stack: ["getTableRules()"], message: `${tableName} could not be found in dbo` };
             const is_view = tHandler.is_view;
+            const canSubscribe = (!is_view || tHandler.columns.some(c => c.references));
+            if (!tHandler) {
+                throw { stack: ["getTableRules()"], message: `${tableName} could not be found in dbo` };
+            }
             const MY_RULES = RULE_TO_METHODS.filter(r => {
                 /** Check PG User privileges */
                 const pgUserIsAllowedThis = tHandler.tableOrViewInfo.privileges[r.sqlRule];
@@ -215,6 +217,9 @@ class PublishParser {
                         throw `Cannot publish realtime rule ${tableName}.${r.rule}. Superuser is required for this`;
                     }
                 }
+                if (r.rule === "subscribe" && !canSubscribe) {
+                    result = false;
+                }
                 return result;
             });
             /* All methods allowed. Add no limits for table rules */
@@ -279,7 +284,7 @@ class PublishParser {
                     const subKey = "subscribe";
                     if (method === "select" && !dissallowedRuleKeys.includes(subKey)) {
                         const sr = MY_RULES.find(r => r.rule === subKey);
-                        if (sr && (!is_view || tHandler.columns.some(c => c.references))) {
+                        if (sr && canSubscribe) {
                             parsed_table[subKey] = { ...sr.no_limits };
                             parsed_table.subscribeOne = { ...sr.no_limits };
                         }

package/lib/PublishParser.ts

@@ -507,10 +507,12 @@ export class PublishParser {
 
       /* Get view or table specific rules */
       const tHandler = (this.dbo[tableName] as TableHandler | ViewHandler);
-
-      if (!tHandler) throw { stack: ["getTableRules()"], message: `${tableName} could not be found in dbo` };
-
       const is_view = tHandler.is_view;
+      const canSubscribe = (!is_view || tHandler.columns.some(c => c.references));
+      if (!tHandler) {
+        throw { stack: ["getTableRules()"], message: `${tableName} could not be found in dbo` };
+      }
+
       const MY_RULES = RULE_TO_METHODS.filter(r => {
 
         /** Check PG User privileges */
@@ -528,6 +530,10 @@ export class PublishParser {
           }
         }
 
+        if(r.rule === "subscribe" && !canSubscribe){
+          result = false;
+        }
+
         return result;
       });
 
@@ -605,7 +611,7 @@ export class PublishParser {
 
             if (method === "select" && !dissallowedRuleKeys.includes(subKey)) {
               const sr = MY_RULES.find(r => r.rule === subKey);
-              if (sr && (!is_view || tHandler.columns.some(c => c.references))) {
+              if (sr && canSubscribe) {
                 parsed_table[subKey] = { ...sr.no_limits as SubscribeRule };
                 parsed_table.subscribeOne = { ...sr.no_limits as SubscribeRule };
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.77",
+  "version": "3.0.79",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,15 +31,15 @@
   ],
   "homepage": "https://prostgles.com",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.121.0",
+    "@aws-sdk/client-s3": "^3.272.0",
     "@types/express": "^4.17.13",
-    "aws-sdk": "^2.1256.0",
+    "aws-sdk": "^2.1318.0",
     "bluebird": "^3.7.2",
     "check-disk-space": "^3.3.1",
     "file-type": "^17.1.4",
     "g": "^2.0.1",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^3.0.18",
+    "prostgles-types": "^3.0.20",
     "sharp": "^0.31.0",
     "typescript": "^4.9.5"
   },

package/tests/client/PID.txt

@@ -1 +1 @@
-93383
+124772

package/tests/server/package-lock.json

@@ -21,18 +21,18 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.76",
+      "version": "3.0.78",
       "license": "MIT",
       "dependencies": {
-        "@aws-sdk/client-s3": "^3.121.0",
+        "@aws-sdk/client-s3": "^3.272.0",
         "@types/express": "^4.17.13",
-        "aws-sdk": "^2.1256.0",
+        "aws-sdk": "^2.1318.0",
         "bluebird": "^3.7.2",
         "check-disk-space": "^3.3.1",
         "file-type": "^17.1.4",
         "g": "^2.0.1",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.18",
+        "prostgles-types": "^3.0.20",
         "sharp": "^0.31.0",
         "typescript": "^4.9.5"
       },
@@ -1500,19 +1500,19 @@
     "prostgles-server": {
       "version": "file:../..",
       "requires": {
-        "@aws-sdk/client-s3": "^3.121.0",
+        "@aws-sdk/client-s3": "^3.272.0",
         "@aws-sdk/types": "^3.110.0",
         "@types/bluebird": "^3.5.36",
         "@types/express": "^4.17.13",
         "@types/node": "^18.0.3",
         "@types/sharp": "^0.30.4",
-        "aws-sdk": "^2.1256.0",
+        "aws-sdk": "^2.1318.0",
         "bluebird": "^3.7.2",
         "check-disk-space": "^3.3.1",
         "file-type": "^17.1.4",
         "g": "^2.0.1",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.18",
+        "prostgles-types": "^3.0.20",
         "sharp": "^0.31.0",
         "typescript": "^4.9.5"
       }