prostgles-server 3.0.36 → 3.0.37

package/lib/PubSubManager.ts

@@ -5,7 +5,7 @@
 
 import { PostgresNotifListenManager } from "./PostgresNotifListenManager";
 import { get } from "./utils";
-import { TableOrViewInfo, TableInfo, DBHandlerServer, TableHandler, DboBuilder, PRGLIOSocket } from "./DboBuilder";
+import { TableOrViewInfo, TableInfo, DBHandlerServer, DboBuilder, PRGLIOSocket, canEXECUTE } from "./DboBuilder";
 import { DB, isSuperUser } from "./Prostgles";
 
 import * as Bluebird from "bluebird";
@@ -143,8 +143,9 @@ export class PubSubManager {
   NOTIF_CHANNEL = {
     preffix: 'prostgles_',
     getFull: (appID?: string) => {
-      if (!this.appID && !appID) throw "No appID";
-      return this.NOTIF_CHANNEL.preffix + (appID || this.appID);
+      const finalAppId = appID ?? this.appID;
+      if (!finalAppId) throw "No appID";
+      return this.NOTIF_CHANNEL.preffix + finalAppId;
     }
   }
 
@@ -170,6 +171,12 @@ export class PubSubManager {
   //         WHERE application_name IS NOT NULL AND application_name != '' -- state = 'active';
   //     `))
 
+  public static canCreate = async (db: DB) => {
+
+    const canExecute = await canEXECUTE(db);
+    const isSuperUs = await isSuperUser(db);
+    return { canExecute, isSuperUs, yes: canExecute && isSuperUs };
+  }
 
   public static create = async (options: PubSubManagerOptions) => {
     const res = new PubSubManager(options);
@@ -665,29 +672,33 @@ export class PubSubManager {
                             
                                 --RAISE NOTICE 'SCHEMA_WATCH: %', tg_tag;
                     
+                                /* 
+                                  This event trigger will outlive a prostgles app instance. 
+                                  Must ensure it only fires if an app instance is running  
+                                */
                                 IF
-                                    EXISTS (
-                                        SELECT 1 
-                                        FROM information_schema.tables 
-                                        WHERE  table_schema = 'prostgles'
-                                        AND    table_name   = 'apps'
-                                    )          
+                                  EXISTS (
+                                    SELECT 1 
+                                    FROM information_schema.tables 
+                                    WHERE  table_schema = 'prostgles'
+                                    AND    table_name   = 'apps'
+                                  )          
                                 THEN
 
                                     SELECT LEFT(COALESCE(current_query(), ''), 5000)
                                     INTO curr_query;
                                     
                                     FOR arw IN 
-                                        SELECT * FROM prostgles.apps WHERE watching_schema IS TRUE
+                                      SELECT * FROM prostgles.apps WHERE watching_schema IS TRUE
 
                                     LOOP
-                                        PERFORM pg_notify( 
-                                            ${asValue(this.NOTIF_CHANNEL.preffix)} || arw.id, 
-                                            concat_ws(
-                                                ${asValue(PubSubManager.DELIMITER)}, 
-                                                ${asValue(this.NOTIF_TYPE.schema)}, tg_tag , TG_event, curr_query
-                                            )
-                                        );
+                                      PERFORM pg_notify( 
+                                        ${asValue(this.NOTIF_CHANNEL.preffix)} || arw.id, 
+                                        concat_ws(
+                                          ${asValue(PubSubManager.DELIMITER)}, 
+                                          ${asValue(this.NOTIF_TYPE.schema)}, tg_tag , TG_event, curr_query
+                                        )
+                                      );
                                     END LOOP;
 
                                 END IF;

package/lib/SchemaWatch.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import { DboBuilder } from "./DboBuilder";
+import { ProstglesInitOptions } from "./Prostgles";
+export declare type VoidFunction = () => void;
+export declare class SchemaWatch {
+    schema_checkIntervalMillis?: NodeJS.Timeout;
+    loaded: boolean;
+    constructor({ watchSchema, watchSchemaType, tsGeneratedTypesDir, currDbuilder, onSchemaChanged }: ProstglesInitOptions & {
+        currDbuilder: DboBuilder;
+        onSchemaChanged: VoidFunction;
+    });
+}
+//# sourceMappingURL=SchemaWatch.d.ts.map

package/lib/SchemaWatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaWatch.d.ts","sourceRoot":"","sources":["SchemaWatch.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,oBAAY,YAAY,GAAG,MAAM,IAAI,CAAC;AAEtC,qBAAa,WAAW;IACtB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC5C,MAAM,UAAS;gBAEH,EAAE,WAAW,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAE,EAAE,oBAAoB,GAAG;QAAE,YAAY,EAAE,UAAU,CAAC;QAAC,eAAe,EAAE,YAAY,CAAA;KAAE;CA8BrL"}

package/lib/SchemaWatch.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaWatch = void 0;
+const prostgles_types_1 = require("prostgles-types");
+const DboBuilder_1 = require("./DboBuilder");
+class SchemaWatch {
+    constructor({ watchSchema, watchSchemaType, tsGeneratedTypesDir, currDbuilder, onSchemaChanged }) {
+        this.loaded = false;
+        if (!watchSchema)
+            return;
+        if (watchSchema === "hotReloadMode" && !tsGeneratedTypesDir) {
+            throw "tsGeneratedTypesDir option is needed for watchSchema: hotReloadMode to work ";
+        }
+        else if ((0, prostgles_types_1.isObject)(watchSchemaType) &&
+            "checkIntervalMillis" in watchSchemaType &&
+            typeof watchSchemaType.checkIntervalMillis === "number") {
+            if (this.schema_checkIntervalMillis) {
+                clearInterval(this.schema_checkIntervalMillis);
+            }
+            this.schema_checkIntervalMillis = setInterval(async () => {
+                if (!this.loaded)
+                    return;
+                const dbuilder = await DboBuilder_1.DboBuilder.create(this);
+                if (dbuilder.tsTypesDefinition !== currDbuilder.tsTypesDefinition) {
+                    onSchemaChanged();
+                }
+            }, watchSchemaType.checkIntervalMillis);
+        }
+        else if (watchSchemaType === "DDL_trigger") {
+        }
+    }
+}
+exports.SchemaWatch = SchemaWatch;

package/lib/SchemaWatch.ts

@@ -0,0 +1,40 @@
+import { isObject } from "prostgles-types";
+import { DboBuilder } from "./DboBuilder";
+import { ProstglesInitOptions } from "./Prostgles";
+export type VoidFunction = () => void;
+
+export class SchemaWatch {
+  schema_checkIntervalMillis?: NodeJS.Timeout;
+  loaded = false;
+
+  constructor({ watchSchema, watchSchemaType, tsGeneratedTypesDir, currDbuilder, onSchemaChanged }: ProstglesInitOptions & { currDbuilder: DboBuilder; onSchemaChanged: VoidFunction }){
+    if(!watchSchema) return;
+
+    if (watchSchema === "hotReloadMode" && !tsGeneratedTypesDir) {
+      throw "tsGeneratedTypesDir option is needed for watchSchema: hotReloadMode to work ";
+
+    } else if (
+      isObject(watchSchemaType) &&
+      "checkIntervalMillis" in watchSchemaType &&
+      typeof watchSchemaType.checkIntervalMillis === "number"
+    ) {
+
+      if (this.schema_checkIntervalMillis) {
+        clearInterval(this.schema_checkIntervalMillis);
+      }
+      this.schema_checkIntervalMillis = setInterval(async () => {
+        if(!this.loaded) return;
+        const dbuilder = await DboBuilder.create(this as any);
+        if (dbuilder.tsTypesDefinition !== currDbuilder.tsTypesDefinition) {
+          onSchemaChanged();
+        }
+      }, watchSchemaType.checkIntervalMillis);
+
+    } else if(watchSchemaType === "DDL_trigger"){
+
+    }
+
+  }
+  
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.36",
+  "version": "3.0.37",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-36737
+103710

package/tests/server/package-lock.json

@@ -12,7 +12,7 @@
         "@types/node": "^14.14.19",
         "express": "^4.17.1",
         "prostgles-server": "file:../..",
-        "socket.io": "^4.5.3"
+        "socket.io": "^4.5.4"
       },
       "devDependencies": {
         "tsc-watch": "^4.5.0",
@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.35",
+      "version": "3.0.36",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",
@@ -223,9 +223,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
-      "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "dependencies": {
         "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
@@ -510,7 +510,7 @@
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -697,16 +697,16 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
-      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
+      "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.2.0",
+        "engine.io": "~6.2.1",
         "socket.io-adapter": "~2.4.0",
-        "socket.io-parser": "~4.2.0"
+        "socket.io-parser": "~4.2.1"
       },
       "engines": {
         "node": ">=10.0.0"
@@ -1088,9 +1088,9 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "engine.io": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
-      "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "requires": {
         "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
@@ -1315,7 +1315,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "on-finished": {
       "version": "2.3.0",
@@ -1477,16 +1477,16 @@
       "dev": true
     },
     "socket.io": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
-      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
+      "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.2.0",
+        "engine.io": "~6.2.1",
         "socket.io-adapter": "~2.4.0",
-        "socket.io-parser": "~4.2.0"
+        "socket.io-parser": "~4.2.1"
       },
       "dependencies": {
         "debug": {

package/tests/server/package.json

@@ -16,7 +16,7 @@
     "@types/node": "^14.14.19",
     "express": "^4.17.1",
     "prostgles-server": "file:../..",
-    "socket.io": "^4.5.3"
+    "socket.io": "^4.5.4"
   },
   "devDependencies": {
     "tsc-watch": "^4.5.0",

package/dist/QueryBuilder.d.ts

@@ -1,150 +0,0 @@
-import { Filter, LocalParams, TableHandler } from "./DboBuilder";
-import { TableRule } from "./PublishParser";
-import { SelectParams, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, Select } from "prostgles-types";
-export declare type SelectItem = {
-    type: "column" | "function" | "aggregation" | "joinedColumn" | "computed";
-    getFields: (args?: any[]) => string[] | "*";
-    getQuery: (tableAlias?: string) => string;
-    columnPGDataType?: string;
-    column_udt_type?: PG_COLUMN_UDT_DATA_TYPE;
-    alias: string;
-    selected: boolean;
-};
-export declare type NewQuery = {
-    allFields: string[];
-    /**
-     * Contains user selection and all the allowed columns. Allowed columns not selected are marked with  selected: false
-     */
-    select: SelectItem[];
-    table: string;
-    where: string;
-    orderBy: string[];
-    having: string;
-    limit: number;
-    offset: number;
-    isLeftJoin: boolean;
-    joins?: NewQuery[];
-    tableAlias?: string;
-    $path?: string[];
-};
-export declare const asNameAlias: (field: string, tableAlias?: string) => string;
-export declare const parseFunctionObject: (funcData: any) => {
-    funcName: string;
-    args: any[];
-};
-export declare const parseFunction: (funcData: {
-    func: string | FunctionSpec;
-    args: any[];
-    functions: FunctionSpec[];
-    allowedFields: string[];
-}) => FunctionSpec;
-declare type GetQueryArgs = {
-    allColumns: ColumnInfo[];
-    allowedFields: string[];
-    args: any[];
-    tableAlias?: string;
-    ctidField?: string;
-};
-export declare type FieldSpec = {
-    name: string;
-    type: "column" | "computed";
-    /**
-     * allowedFields passed for multicol functions (e.g.: $rowhash)
-     */
-    getQuery: (params: Omit<GetQueryArgs, "args">) => string;
-};
-export declare type FunctionSpec = {
-    name: string;
-    description?: string;
-    /**
-     * If true then it can be used in filters and is expected to return boolean
-     */
-    canBeUsedForFilter?: boolean;
-    /**
-     * If true then the first argument is expected to be a column name
-     */
-    singleColArg: boolean;
-    /**
-     * If true then this func can be used within where clause
-     */
-    /**
-     * Number of arguments expected
-     */
-    numArgs: number;
-    /**
-     * If provided then the number of column names provided to the function (from getFields()) must not be less than this
-     * By default every function is checked against numArgs
-     */
-    minCols?: number;
-    type: "function" | "aggregation" | "computed";
-    /**
-     * getFields: string[] -> used to validate user supplied field names. It will be fired before querying to validate against allowed columns
-     *      if not field names are used from arguments then return an empty array
-     */
-    getFields: (args: any[]) => "*" | string[];
-    /**
-     * allowedFields passed for multicol functions (e.g.: $rowhash)
-     */
-    getQuery: (params: GetQueryArgs) => string;
-    returnType?: PG_COLUMN_UDT_DATA_TYPE;
-};
-/**
-* Each function expects a column at the very least
-*/
-export declare const FUNCTIONS: FunctionSpec[];
-export declare const COMPUTED_FIELDS: FieldSpec[];
-export declare class SelectItemBuilder {
-    select: SelectItem[];
-    private allFields;
-    private allowedFields;
-    private computedFields;
-    private functions;
-    private allowedFieldsIncludingComputed;
-    private isView;
-    private columns;
-    constructor(params: {
-        allowedFields: string[];
-        computedFields: FieldSpec[];
-        functions: FunctionSpec[];
-        allFields: string[];
-        isView: boolean;
-        columns: ColumnInfo[];
-    });
-    private checkField;
-    private addItem;
-    private addFunction;
-    addColumn: (fieldName: string, selected: boolean) => void;
-    parseUserSelect: (userSelect: Select, joinParse?: ((key: string, val: any, throwErr: (msg: string) => any) => any) | undefined) => Promise<never[] | undefined>;
-}
-export declare function getNewQuery(_this: TableHandler, filter: Filter, selectParams: ({
-    limit?: number | undefined;
-    offset?: number | undefined;
-    groupBy?: boolean | undefined;
-    returnType?: "values" | "row" | "value" | "statement" | undefined;
-} & {
-    select?: import("prostgles-types").AnyObject | ("" | "*" | {
-        "*": 1;
-    }) | {
-        [x: string]: Record<string, import("prostgles-types").AnyObject>;
-    } | {
-        [x: string]: Record<string, any[]>;
-    } | {
-        [key: string]: string | true | 1 | Record<string, any[]>;
-    } | ({
-        [x: string]: string | true | 1;
-    } & {
-        [x: string]: Record<string, any[]>;
-    }) | {
-        [x: string]: string | true | 1;
-    } | {
-        [x: string]: false | 0;
-    } | {
-        [x: string]: false | 0;
-    } | undefined;
-    orderBy?: import("prostgles-types").OrderBy<any> | undefined;
-} & {
-    alias?: string | undefined;
-}) | undefined, param3_unused: null | undefined, tableRules: TableRule | undefined, localParams: LocalParams | undefined, columns: ColumnInfo[]): Promise<NewQuery>;
-export declare function makeQuery(_this: TableHandler, q: NewQuery, depth?: number, joinFields?: string[], selectParams?: SelectParams): string;
-export {};
-//# sourceMappingURL=QueryBuilder.d.ts.map

package/dist/QueryBuilder.d.ts.map

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