prostgles-server 2.0.267 → 2.0.270

package/lib/FileManager.js

@@ -41,6 +41,7 @@ const asSQLIdentifier = async (name, db) => {
 };
 exports.asSQLIdentifier = asSQLIdentifier;
 const aws_sdk_2 = __importDefault(require("aws-sdk"));
+const runSQL_1 = require("./DboBuilder/runSQL");
 class FileManager {
     constructor(config, imageOptions) {
         this.getFileUrl = (name) => this.fileRoute ? `${this.fileRoute}/${name}` : "";
@@ -185,14 +186,19 @@ class FileManager {
             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`);
             // throw `this.db.tx(d => do everything in a transaction pls!!!!`;
-            // throw "Why are constraints dissapearing?"
+            const canCreate = await (0, runSQL_1.canCreateTables)(this.db);
+            const runQuery = (q) => {
+                if (!canCreate)
+                    throw "File table creation failed. Your postgres user does not have CREATE table privileges";
+                return this.db.any(q);
+            };
             /**
              * 1. Create media table
              */
             if (!this.dbo[tableName]) {
                 console.log(`Creating fileTable ${(0, prostgles_types_1.asName)(tableName)} ...`);
-                await this.db.any(`CREATE EXTENSION IF NOT EXISTS pgcrypto `);
-                await this.db.any(`CREATE TABLE IF NOT EXISTS ${(0, prostgles_types_1.asName)(tableName)} (
+                await runQuery(`CREATE EXTENSION IF NOT EXISTS pgcrypto `);
+                await runQuery(`CREATE TABLE IF NOT EXISTS ${(0, prostgles_types_1.asName)(tableName)} (
           id                    UUID PRIMARY KEY DEFAULT gen_random_uuid(),
           name                  TEXT NOT NULL,
           extension             TEXT NOT NULL,
@@ -208,6 +214,7 @@ class FileManager {
           etag                  TEXT,
           deleted               BIGINT,
           deleted_from_storage  BIGINT,
+          UNIQUE(id),
           UNIQUE(name)
       )`);
                 console.log(`Created fileTable ${(0, prostgles_types_1.asName)(tableName)}`);
@@ -231,9 +238,9 @@ class FileManager {
                             else {
                                 if (existingCol.udt_name === "uuid") {
                                     try {
-                                        const query = `ALTER TABLE ${(0, prostgles_types_1.asName)(tableName)} ADD CONSTRAINT FOREIGN KEY (${(0, prostgles_types_1.asName)(colName)}) REFERENCES ${(0, prostgles_types_1.asName)(tableName)} (id);`;
+                                        const query = `ALTER TABLE ${(0, prostgles_types_1.asName)(refTable)} ADD FOREIGN KEY (${(0, prostgles_types_1.asName)(colName)}) REFERENCES ${(0, prostgles_types_1.asName)(tableName)} (id);`;
                                         console.log(`Referenced file column ${refTable} (${colName}) exists but is not referencing file table. Trying to add REFERENCE constraing...\n${query}`);
-                                        await this.db.any(query);
+                                        await runQuery(query);
                                         console.log("SUCCESS: " + query);
                                     }
                                     catch (e) {
@@ -249,7 +256,7 @@ class FileManager {
                             try {
                                 const query = `ALTER TABLE ${(0, prostgles_types_1.asName)(tableName)} ADD COLUMN ${(0, prostgles_types_1.asName)(colName)} UUID REFERENCES ${(0, prostgles_types_1.asName)(tableName)} (id);`;
                                 console.log(`Creating referenced file column ${refTable} (${colName})...\n${query}`);
-                                await this.db.any(query);
+                                await runQuery(query);
                                 console.log("SUCCESS: " + query);
                             }
                             catch (e) {
@@ -275,7 +282,7 @@ class FileManager {
           )
           `;
                         console.log(`Creating ${action} ...`, lookupTableName);
-                        await this.db.any(query);
+                        await runQuery(query);
                         console.log(`Created ${action}`);
                     }
                     else {
@@ -284,10 +291,7 @@ class FileManager {
                         await Promise.all(badCols.map(async (badCol) => {
                             console.error(`Prostgles: media ${lookupTableName} joining table has lost a reference constraint for column ${badCol.name}.` +
                                 ` This may have been caused by a DROP TABLE ... CASCADE.`);
-                            let q = `
-              ALTER TABLE ${(0, prostgles_types_1.asName)(lookupTableName)} 
-              ADD CONSTRAINT ${(lookupTableName + "_" + badCol.name + "_r")} FOREIGN KEY (${badCol.name})
-            `;
+                            let q = ` ALTER TABLE ${(0, prostgles_types_1.asName)(lookupTableName)} ADD FOREIGN KEY (${badCol.name}) `;
                             console.log("Trying to add the missing constraint back");
                             if (badCol.name === "foreign_id") {
                                 q += `REFERENCES ${(0, prostgles_types_1.asName)(refTable)}(${(0, prostgles_types_1.asName)(pkField.name)}) `;
@@ -297,7 +301,7 @@ class FileManager {
                             }
                             if (q) {
                                 try {
-                                    await this.db.any(q);
+                                    await runQuery(q);
                                     console.log("Added missing constraint back");
                                 }
                                 catch (e) {

package/lib/FileManager.ts

@@ -76,6 +76,7 @@ export type UploadedItem = {
   content_length: number;
 };
 import AWS from 'aws-sdk';
+import { canCreateTables } from "./DboBuilder/runSQL";
 export default class FileManager {
 
   static testCredentials = async (accessKeyId: string, secretAccessKey: string) => {
@@ -487,14 +488,19 @@ export default class FileManager {
 
     // throw `this.db.tx(d => do everything in a transaction pls!!!!`;
 
-    // throw "Why are constraints dissapearing?"
+    const canCreate = await canCreateTables(this.db);
+    const runQuery = (q: string): Promise<any[]> => {
+      if(!canCreate) throw "File table creation failed. Your postgres user does not have CREATE table privileges";
+      return this.db.any(q)
+    }
     /**
      * 1. Create media table
      */
     if(!this.dbo[tableName]){
+      
       console.log(`Creating fileTable ${asName(tableName)} ...`);
-      await this.db.any(`CREATE EXTENSION IF NOT EXISTS pgcrypto `);
-      await this.db.any(`CREATE TABLE IF NOT EXISTS ${asName(tableName)} (
+      await runQuery(`CREATE EXTENSION IF NOT EXISTS pgcrypto `);
+      await runQuery(`CREATE TABLE IF NOT EXISTS ${asName(tableName)} (
           id                    UUID PRIMARY KEY DEFAULT gen_random_uuid(),
           name                  TEXT NOT NULL,
           extension             TEXT NOT NULL,
@@ -510,6 +516,7 @@ export default class FileManager {
           etag                  TEXT,
           deleted               BIGINT,
           deleted_from_storage  BIGINT,
+          UNIQUE(id),
           UNIQUE(name)
       )`);
       console.log(`Created fileTable ${asName(tableName)}`);
@@ -536,9 +543,9 @@ export default class FileManager {
             } else {
               if(existingCol.udt_name === "uuid"){
                 try {
-                  const query = `ALTER TABLE ${asName(tableName)} ADD CONSTRAINT FOREIGN KEY (${asName(colName)}) REFERENCES ${asName(tableName)} (id);`;
+                  const query = `ALTER TABLE ${asName(refTable)} ADD FOREIGN KEY (${asName(colName)}) REFERENCES ${asName(tableName)} (id);`;
                   console.log(`Referenced file column ${refTable} (${colName}) exists but is not referencing file table. Trying to add REFERENCE constraing...\n${query}`);
-                  await this.db.any(query);
+                  await runQuery(query);
                   console.log("SUCCESS: " + query);
                 } catch(e){
                   throw new Error(`Could not add constraing. Err: ${e instanceof Error? e.message : JSON.stringify(e)}`)
@@ -551,7 +558,7 @@ export default class FileManager {
             try {
               const query = `ALTER TABLE ${asName(tableName)} ADD COLUMN ${asName(colName)} UUID REFERENCES ${asName(tableName)} (id);`
               console.log(`Creating referenced file column ${refTable} (${colName})...\n${query}`);
-              await this.db.any(query);
+              await runQuery(query);
               console.log("SUCCESS: " + query);
             } catch(e){
               throw new Error(`FAILED. Err: ${e instanceof Error? e.message : JSON.stringify(e)}`)
@@ -579,7 +586,7 @@ export default class FileManager {
           )
           `;
           console.log(`Creating ${action} ...`, lookupTableName);
-          await this.db.any(query);
+          await runQuery(query);
           console.log(`Created ${action}`);
   
         } else {
@@ -590,10 +597,7 @@ export default class FileManager {
               `Prostgles: media ${lookupTableName} joining table has lost a reference constraint for column ${badCol.name}.` + 
               ` This may have been caused by a DROP TABLE ... CASCADE.`
             );
-            let q = `
-              ALTER TABLE ${asName(lookupTableName)} 
-              ADD CONSTRAINT ${(lookupTableName + "_" + badCol.name + "_r")} FOREIGN KEY (${badCol.name})
-            `;
+            let q = ` ALTER TABLE ${asName(lookupTableName)} ADD FOREIGN KEY (${badCol.name}) `;
             console.log("Trying to add the missing constraint back");
             if(badCol.name === "foreign_id"){
               q += `REFERENCES ${asName(refTable)}(${asName(pkField.name)}) `;
@@ -604,7 +608,7 @@ export default class FileManager {
             if(q){
   
               try {
-                await this.db.any(q)
+                await runQuery(q)
                 console.log("Added missing constraint back");
   
               } catch(e){

package/lib/Prostgles.js

@@ -522,7 +522,7 @@ class Prostgles {
                         let valid_table_command_rules = await this.publishParser.getValidatedRequestRule({ tableName, command, localParams: { socket } }, clientInfo);
                         if (valid_table_command_rules) {
                             //@ts-ignore
-                            let res = await this.dbo[tableName][command](param1, param2, param3, valid_table_command_rules, { socket, has_rules: true });
+                            let res = await this.dbo[tableName][command](param1, param2, param3, valid_table_command_rules, { socket, isRemoteRequest: true });
                             cb(null, res);
                         }
                         else

package/lib/Prostgles.ts

@@ -704,7 +704,7 @@ export class Prostgles {
             let valid_table_command_rules = await this.publishParser.getValidatedRequestRule({ tableName, command, localParams: { socket } }, clientInfo);
             if (valid_table_command_rules) {
               //@ts-ignore
-              let res = await this.dbo[tableName][command]!(param1, param2, param3, valid_table_command_rules, { socket, has_rules: true });
+              let res = await this.dbo[tableName][command]!(param1, param2, param3, valid_table_command_rules, { socket, isRemoteRequest: true });
               cb(null, res);
             } else throw `Invalid OR disallowed request: ${tableName}.${command} `;
 

package/lib/PublishParser.js

@@ -347,7 +347,7 @@ class PublishParser {
                                     let err = null;
                                     try {
                                         let valid_table_command_rules = await this.getValidatedRequestRule({ tableName, command: method, localParams: { socket } }, clientInfo);
-                                        await this.dbo[tableName][method]({}, {}, {}, valid_table_command_rules, { socket, has_rules: true, testRule: true });
+                                        await this.dbo[tableName][method]({}, {}, {}, valid_table_command_rules, { socket, isRemoteRequest: true, testRule: true });
                                     }
                                     catch (e) {
                                         err = "INTERNAL PUBLISH ERROR";
@@ -357,7 +357,7 @@ class PublishParser {
                                 }
                                 if (method === "getInfo" || method === "getColumns") {
                                     let tableRules = await this.getValidatedRequestRule({ tableName, command: method, localParams: { socket } }, clientInfo);
-                                    const res = await this.dbo[tableName][method](undefined, undefined, undefined, tableRules, { socket, has_rules: true });
+                                    const res = await this.dbo[tableName][method](undefined, undefined, undefined, tableRules, { socket, isRemoteRequest: true });
                                     if (method === "getInfo") {
                                         tableInfo = res;
                                     }

package/lib/PublishParser.ts

@@ -682,7 +682,7 @@ export class PublishParser {
                                       let err = null;
                                       try {
                                           let valid_table_command_rules = await this.getValidatedRequestRule({ tableName, command: method, localParams: {socket} }, clientInfo);
-                                          await (this.dbo[tableName] as any)[method]({}, {}, {}, valid_table_command_rules, { socket, has_rules: true, testRule: true });
+                                          await (this.dbo[tableName] as any)[method]({}, {}, {}, valid_table_command_rules, { socket, isRemoteRequest: true, testRule: true });
                                               
                                       } catch(e) {
                                           err = "INTERNAL PUBLISH ERROR";
@@ -695,7 +695,7 @@ export class PublishParser {
 
                                   if(method === "getInfo" || method === "getColumns"){
                                       let tableRules = await this.getValidatedRequestRule({ tableName, command: method, localParams: {socket} }, clientInfo);
-                                      const res = await (this.dbo[tableName] as any)[method](undefined, undefined, undefined , tableRules, { socket, has_rules: true });
+                                      const res = await (this.dbo[tableName] as any)[method](undefined, undefined, undefined , tableRules, { socket, isRemoteRequest: true });
                                       if(method === "getInfo"){
                                           tableInfo = res;
                                       } else if(method === "getColumns"){

package/package.json

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

package/tests/client/PID.txt

@@ -1 +1 @@
-14047
+23202

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.266",
+      "version": "2.0.269",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",