prostgles-server 2.0.189 → 2.0.192

package/lib/FileManager.ts

@@ -3,12 +3,11 @@ import { S3 } from 'aws-sdk';
 import { ManagedUpload } from 'aws-sdk/clients/s3';
 import * as fs from 'fs';
 
-import * as FileType from "file-type";
 import * as sharp from "sharp";
 
 import { DB, DBHandlerServer, Prostgles } from './Prostgles';
-import { asName, getKeys } from 'prostgles-types';
-import { TableHandler } from './DboBuilder';
+import { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION, asName, CONTENT_TYPE_TO_EXT, getKeys, isObject, ValidatedColumnInfo } from 'prostgles-types';
+import { TableHandler, ViewHandler } from './DboBuilder';
 
 const HOUR = 3600 * 1000;
 
@@ -89,7 +88,7 @@ export default class FileManager {
     this.imageOptions = imageOptions;
 
     if("region" in config){
-      const { region,accessKeyId, secretAccessKey } = config;
+      const { region, accessKeyId, secretAccessKey } = config;
       this.s3Client = new S3({ 
         region, 
         credentials: { accessKeyId, secretAccessKey },
@@ -97,81 +96,136 @@ export default class FileManager {
     }
   }
 
-  async getMIME(
-    file: Buffer | String, 
-    fileName: string, 
-    allowedExtensions?: Array<ALLOWED_EXTENSION>,
-    dissallowedExtensions?: Array<ALLOWED_EXTENSION>,
-    onlyFromName = true
-  ): Promise<{
-    mime: string;
-    ext: string | ALLOWED_EXTENSION;
+  async parseFile(args: {
+    file: Buffer | string;
     fileName: string;
-  }> {
-
-    const nameParts = fileName.split(".");
-    
-    const nameExt = nameParts[nameParts.length - 1].toLowerCase(),
-      mime = getKeys(CONTENT_TYPE_TO_EXT).find(k => (CONTENT_TYPE_TO_EXT[k] as readonly string[]).includes(nameExt));
-
-    let type = {
-      fileName,
-      mime,
-      ext: nameExt,
-    }
+    colName?: string;
+    tableName?: string;
+  }): Promise<{
+    mime: string | ALLOWED_CONTENT_TYPE;
+    ext: string | ALLOWED_EXTENSION;
 
-    if(onlyFromName && !mime) throw `Invalid file extension: content_type could not be found for extension(${nameExt})`;
-
-    if(!mime){
-      /* Set correct/missing extension */
-      if(["xml", "txt", "csv", "tsv", "doc"].includes(nameExt)){
-        type = { ...type, mime: ("text/" + nameExt) as any, ext: nameExt };
-      } else if(["svg"].includes(nameExt)){
-        type = { ...type, mime: "image/svg+xml", ext: nameExt };
-      } else if(Buffer.isBuffer(file)){
-        const res: any = await FileType.fromBuffer(file);
-        type = {
-          ...res,
-          fileName,
+    /** File name is not returned because we fail if the extensions do not match */
+    // fileName: string;
+  }> {
+    const { file, fileName, tableName, colName } = args;
+    const config = this.prostgles?.opts.fileTable;
+    if(!config) throw new Error("File table config missing");
+
+    const buffer = typeof file === "string"? Buffer.from(file, 'utf8') : file;
+    const mime = await getFileType(buffer, fileName);
+
+    if(tableName && colName){
+      const tableConfig = config.referencedTables?.[tableName];
+
+      if(tableConfig && isObject(tableConfig) && tableConfig.referenceColumns[colName]){
+        const colConfig = tableConfig.referenceColumns[colName];
+        if(colConfig.maxFileSizeMB){
+          const actualBufferSize = Buffer.byteLength(buffer);
+          if((actualBufferSize/1e6) > colConfig.maxFileSizeMB){
+            throw new Error(`Provided file is larger than the ${colConfig.maxFileSizeMB}MB limit`);
+          }
         }
-      } else if(typeof file === "string"){
-        const res: any = await FileType.fromFile(file);
-        type = {
-          ...res,
-          fileName,
+        
+        if("acceptedContent" in colConfig && colConfig.acceptedContent){
+          const CONTENTS = [ 
+            "image",
+            "audio",
+            "video",
+            "text",
+            "application",
+          ];
+          const allowedContent = ViewHandler._parseFieldFilter(colConfig.acceptedContent, false, CONTENTS);
+          if(!allowedContent.some(c => mime.mime.startsWith(c))){
+            throw new Error(`Dissallowed content type provided: ${mime.mime.split("/")[0]}. Allowed content types: ${allowedContent} `)
+          }
+        } else if("acceptedContentType" in colConfig && colConfig.acceptedContentType){
+          const allowedContentTypes = ViewHandler._parseFieldFilter(colConfig.acceptedContentType, false, getKeys(CONTENT_TYPE_TO_EXT));
+          
+          if(!allowedContentTypes.some(c => c === mime.mime)){
+            throw new Error(`Dissallowed MIME provided: ${mime.mime}. Allowed MIME values: ${allowedContentTypes} `)
+          }
+        } else if("acceptedFileTypes" in colConfig && colConfig.acceptedFileTypes){
+          const allowedExtensions = ViewHandler._parseFieldFilter(colConfig.acceptedFileTypes, false, Object.values(CONTENT_TYPE_TO_EXT).flat());
+          
+          if(!allowedExtensions.some(c => c === mime.ext)){
+            throw new Error(`Dissallowed extension provided: ${mime.ext}. Allowed extension values: ${allowedExtensions} `)
+          }
         }
-      } else {
-        throw "Unexpected file. Expecting: Buffer | String";
-      }
+      } 
     }
 
-    if(
-      allowedExtensions &&
-      !allowedExtensions.map(v => v.toLowerCase())?.includes(type.ext)
-    ){
-      throw fileName + " -> File type ( " + type.ext + " ) not allowed. Expecting one of: " + allowedExtensions.map(v => v.toLowerCase()).join(", ");
-
-    } else if(
-      dissallowedExtensions &&
-      dissallowedExtensions.map(v => v.toLowerCase())?.includes(type.ext)
-    ){
-      throw fileName + " -> File type ( " + type.ext + " ) not allowed";
-
-    }
-
-    if(!onlyFromName){
-      let { ext } = type;
-      if(nameExt !== ext) fileName = nameParts.slice(0, -1).join('') + "." + ext;
-    }
-
-    const res = {
-      ...type,
-      fileName
-    }
-    if(!res.mime) throw "Could not find mime"
-    return res as any;
+    return mime;
   }
 
+  // private async getMIME(
+  //   file: Buffer | string, 
+  //   fileName: string, 
+  //   allowedExtensions?: Array<ALLOWED_EXTENSION>,
+  //   dissallowedExtensions?: Array<ALLOWED_EXTENSION>,
+  //   onlyFromName = true
+  // ): Promise<{
+  //   mime: string;
+  //   ext: string | ALLOWED_EXTENSION;
+  //   fileName: string;
+  // }> {
+
+  //   const nameParts = fileName.split(".");
+    
+  //   const nameExt = nameParts[nameParts.length - 1].toLowerCase(),
+  //     mime = getKeys(CONTENT_TYPE_TO_EXT).find(k => (CONTENT_TYPE_TO_EXT[k] as readonly string[]).includes(nameExt));
+
+  //   let type = {
+  //     fileName,
+  //     mime,
+  //     ext: nameExt,
+  //   }
+
+  //   if(onlyFromName && !mime) throw `Invalid file extension: content_type could not be found for extension(${nameExt})`;
+
+  //   if(!mime){
+  //     /* Set correct/missing extension */
+  //     if(["xml", "txt", "csv", "tsv"].includes(nameExt)){
+  //       type = { ...type, mime: ("text/" + nameExt) as any, ext: nameExt };
+  //     } else if(["svg"].includes(nameExt)){
+  //       type = { ...type, mime: "image/svg+xml", ext: nameExt };
+  //     } else {
+  //       const res = await getFileTypeFromBuffer(file);
+        
+  //       type = {
+  //         ...(res as any),
+  //         fileName,
+  //       }
+  //     }
+  //   }
+
+  //   if(
+  //     allowedExtensions &&
+  //     !allowedExtensions.map(v => v.toLowerCase())?.includes(type.ext)
+  //   ){
+  //     throw fileName + " -> File type ( " + type.ext + " ) not allowed. Expecting one of: " + allowedExtensions.map(v => v.toLowerCase()).join(", ");
+
+  //   } else if(
+  //     dissallowedExtensions &&
+  //     dissallowedExtensions.map(v => v.toLowerCase())?.includes(type.ext)
+  //   ){
+  //     throw fileName + " -> File type ( " + type.ext + " ) not allowed";
+
+  //   }
+
+  //   if(!onlyFromName){
+  //     let { ext } = type;
+  //     if(nameExt !== ext) fileName = nameParts.slice(0, -1).join('') + "." + ext;
+  //   }
+
+  //   const res = {
+  //     ...type,
+  //     fileName
+  //   }
+  //   if(!res.mime) throw "Could not find mime"
+  //   return res as any;
+  // }
+
   // async getUploadURL(fileName: string): Promise<string> {
   //   const thisHour = new Date();
   //   thisHour.setMilliseconds(0);
@@ -317,6 +371,19 @@ export default class FileManager {
 
   private parseSQLIdentifier = async (name: string ) => asSQLIdentifier(name, this.prostgles!.db!);//  this.prostgles.dbo.sql<"value">("select format('%I', $1)", [name], { returnType: "value" } )
 
+  getColInfo = (args: { tableName: string; colName: string }): ValidatedColumnInfo["file"] | undefined => {
+    const { colName, tableName } = args;
+    const tableConfig = this.prostgles?.opts.fileTable?.referencedTables?.[tableName];
+    const isReferencingFileTable = this.dbo[tableName]?.columns?.some(c => c.name === colName && c.references && c.references?.ftable === this.tableName);
+    if(isReferencingFileTable){
+      if(tableConfig && typeof tableConfig !== "string"){
+        return tableConfig.referenceColumns[colName];
+      }
+      return { acceptedContent: "*" };
+    }
+    return undefined;
+  }
+
   init = async (prg: Prostgles) => {
     this.prostgles = prg;
     
@@ -330,6 +397,8 @@ export default 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?"
     /**
      * 1. Create media table
@@ -361,64 +430,103 @@ export default class FileManager {
     /**
      * 2. Create media lookup tables 
      */
-    await Promise.all(Object.keys(referencedTables).map(async refTable => {
-      if(!this.dbo[refTable]) throw `Referenced table (${refTable}) from fileTable.referencedTables record is missing`;
-      // const lookupTableName = asName(`lookup_${tableName}_${refTable}`);
-
-      const lookupTableName = await this.parseSQLIdentifier(`prostgles_lookup_${tableName}_${refTable}`);
-      const pKeyFields = (await (this.dbo[refTable] as unknown as TableHandler).getColumns()).filter(f => f.is_pkey);
-
-      if(pKeyFields.length !== 1) throw `Could not make link table for ${refTable}. ${pKeyFields} must have exactly one primary key column. Current pkeys: ${pKeyFields.map(f => f.name)}`;
-
-      const pkField = pKeyFields[0];
-      const refType = referencedTables[refTable];
-
-      if(!this.dbo[lookupTableName]){
-        // if(!(await dbo[lookupTableName].count())) await db.any(`DROP TABLE IF EXISTS  ${lookupTableName};`);
-        const action = ` (${tableName} <-> ${refTable}) join table ${lookupTableName}`; //  PRIMARY KEY
-        const query = `        
-        CREATE TABLE ${lookupTableName} (
-          foreign_id  ${pkField.udt_name} ${refType === "one"? " PRIMARY KEY " : ""} REFERENCES ${asName(refTable)}(${asName(pkField.name)}),
-          media_id    UUID NOT NULL REFERENCES ${asName(tableName)}(id)
-        )
-        `;
-        console.log(`Creating ${action} ...`, lookupTableName);
-        await this.db.any(query);
-        console.log(`Created ${action}`);
-
-      } else {
-        const cols = await this.dbo[lookupTableName].getColumns!();
-        const badCols = cols.filter(c => !c.references);
-        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 ${asName(lookupTableName)} 
-            ADD CONSTRAINT ${(lookupTableName + "_" + badCol.name + "_r")} 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)}) `;
-          } else if(badCol.name === "media_id"){
-            q += `REFERENCES ${asName(tableName)}(id) `;
-          }
-
-          if(q){
-
+    await Promise.all(getKeys(referencedTables).map(async refTable => {
+      if(!this.dbo[refTable]) throw `Referenced table (${refTable}) from fileTable.referencedTables prostgles init config is missing`;
+      const cols = await (this.dbo[refTable] as unknown as TableHandler).getColumns();
+
+      const tableConfig = referencedTables[refTable];
+      if(typeof tableConfig !== "string"){
+        
+        for await (const colName of getKeys(tableConfig.referenceColumns)){
+          
+          const existingCol = cols.find(c => c.name === colName);
+          if(existingCol){
+            if(existingCol.references?.ftable === tableName){
+              // All ok
+            } else {
+              if(existingCol.udt_name === "uuid"){
+                try {
+                  const query = `ALTER TABLE ${asName(tableName)} ADD CONSTRAINT 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);
+                  console.log("SUCCESS: " + query);
+                } catch(e){
+                  throw new Error(`Could not add constraing. Err: ${e instanceof Error? e.message : JSON.stringify(e)}`)
+                }
+              } else {
+                throw new 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)`);
+              }
+            }
+          } else {
             try {
-              await this.db.any(q)
-              console.log("Added missing constraint back");
-
+              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);
+              console.log("SUCCESS: " + query);
             } catch(e){
-              console.error("Failed to add missing constraint", e)
+              throw new Error(`FAILED. Err: ${e instanceof Error? e.message : JSON.stringify(e)}`)
             }
           }
+          
+        }
+      } else {
 
-        }));
+        const lookupTableName = await this.parseSQLIdentifier(`prostgles_lookup_${tableName}_${refTable}`);
+        const pKeyFields = cols.filter(f => f.is_pkey);
+  
+        if(pKeyFields.length !== 1) throw `Could not make link table for ${refTable}. ${pKeyFields} must have exactly one primary key column. Current pkeys: ${pKeyFields.map(f => f.name)}`;
+  
+        const pkField = pKeyFields[0];
+        const refType = referencedTables[refTable];
+  
+        if(!this.dbo[lookupTableName]){
+          // if(!(await dbo[lookupTableName].count())) await db.any(`DROP TABLE IF EXISTS  ${lookupTableName};`);
+          const action = ` (${tableName} <-> ${refTable}) join table ${lookupTableName}`; //  PRIMARY KEY
+          const query = `        
+          CREATE TABLE ${lookupTableName} (
+            foreign_id  ${pkField.udt_name} ${refType === "one"? " PRIMARY KEY " : ""} REFERENCES ${asName(refTable)}(${asName(pkField.name)}),
+            media_id    UUID NOT NULL REFERENCES ${asName(tableName)}(id)
+          )
+          `;
+          console.log(`Creating ${action} ...`, lookupTableName);
+          await this.db.any(query);
+          console.log(`Created ${action}`);
+  
+        } else {
+          const cols = await this.dbo[lookupTableName].getColumns!();
+          const badCols = cols.filter(c => !c.references);
+          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 ${asName(lookupTableName)} 
+              ADD CONSTRAINT ${(lookupTableName + "_" + badCol.name + "_r")} 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)}) `;
+            } else if(badCol.name === "media_id"){
+              q += `REFERENCES ${asName(tableName)}(id) `;
+            }
+  
+            if(q){
+  
+              try {
+                await this.db.any(q)
+                console.log("Added missing constraint back");
+  
+              } catch(e){
+                console.error("Failed to add missing constraint", e)
+              }
+            }
+  
+          }));
+        }
       }
 
+
       await prg.refreshDBO();
       return true;
     }));
@@ -493,76 +601,51 @@ export default class FileManager {
   }
 }
 
-const CONTENT_TYPE_TO_EXT = {
-  "text/html":                             ["html", "htm", "shtml"],
-  "text/css":                              ["css"],
-  "text/xml":                              ["xml"],
-  "text/mathml":                           ["mml"],
-  "text/plain":                            ["txt"],
-  "text/vnd.sun.j2me.app-descriptor":      ["jad"],
-  "text/vnd.wap.wml":                      ["wml"],
-  "text/x-component":                      ["htc"],
-  "image/gif":                             ["gif"],
-  "image/jpeg":                            ["jpeg", "jpg"], 
-  "image/png":                             ["png"],
-  "image/tiff":                            ["tif", "tiff"], 
-  "image/vnd.wap.wbmp":                    ["wbmp"],
-  "image/x-icon":                          ["ico"],
-  "image/x-jng":                           ["jng"],
-  "image/x-ms-bmp":                        ["bmp"],
-  "image/svg+xml":                         ["svg"],
-  "image/webp":                            ["webp"],
-  "application/x-javascript":              ["js"],
-  "application/atom+xml":                  ["atom"],
-  "application/rss+xml":                   ["rss"],
-  "application/java-archive":              ["jar", "war", "ear"],
-  "application/mac-binhex40":              ["hqx"],
-  "application/msword":                    ["doc", "docx"],
-  "application/pdf":                       ["pdf"],
-  "application/postscript":                ["ps", "eps", "ai"],
-  "application/rtf":                       ["rtf"],
-  "application/vnd.ms-excel":              ["xls", "xlsx"],
-  "application/vnd.ms-powerpoint":         ["ppt", "pptx"],
-  "application/vnd.wap.wmlc":              ["wmlc"],
-  "application/vnd.google-earth.kml+xml":  ["kml"],
-  "application/vnd.google-earth.kmz":      ["kmz"],
-  "application/x-7z-compressed":           ["7z"],
-  "application/x-cocoa":                   ["cco"],
-  "application/x-java-archive-diff":       ["jardiff"],
-  "application/x-java-jnlp-file":          ["jnlp"],
-  "application/x-makeself":                ["run"],
-  "application/x-perl":                    ["pl", "pm"], 
-  "application/x-pilot":                   ["prc", "pdb"],
-  "application/x-rar-compressed":          ["rar"],
-  "application/x-redhat-package-manager":  ["rpm"],
-  "application/x-sea":                     ["sea"],
-  "application/x-shockwave-flash":         ["swf"],
-  "application/x-stuffit":                 ["sit"],
-  "application/x-tcl":                     ["tcl", "tk"], 
-  "application/x-x509-ca-cert":            ["der", "pem", "crt"],
-  "application/x-xpinstall":               ["xpi"],
-  "application/xhtml+xml":                 ["xhtml"],
-  "application/zip":                       ["zip"],
-  "application/octet-stream":              ["bin", "exe", "dll", "deb", "dmg", "eot", "iso", "img", "msi", "msp", "msm"],
-  "audio/midi":                            ["mid", "midi", "kar"],
-  "audio/mpeg":                            ["mp3"],
-  "audio/ogg":                             ["ogg"],
-  "audio/x-realaudio":                     ["ra"],
-  "video/3gpp":                            ["3gpp", "3gp"],
-  "video/mpeg":                            ["mpeg", "mpg"], 
-  "video/quicktime":                       ["mov"],
-  "video/x-flv":                           ["flv"],
-  "video/x-mng":                           ["mng"],
-  "video/x-ms-asf":                        ["asx", "asf"],
-  "video/x-ms-wmv":                        ["wmv"],
-  "video/x-msvideo":                       ["avi"],
-  "video/mp4":                             ["m4v", "mp4"],
-  "video/webm":                            ["webm"],
-} as const;
-
-export type ALLOWED_CONTENT_TYPE = keyof typeof CONTENT_TYPE_TO_EXT;
-export type ALLOWED_EXTENSION = (typeof CONTENT_TYPE_TO_EXT)[ALLOWED_CONTENT_TYPE][number];
+export const getFileTypeFromFilename = (fileName: string): { mime: ALLOWED_CONTENT_TYPE; ext: ALLOWED_EXTENSION } | undefined => {
+
+  const nameParts = fileName.split(".");
+
+  if(!nameParts.length) return undefined;
+
+  const nameExt = nameParts[nameParts.length - 1].toLowerCase(),
+    mime = getKeys(CONTENT_TYPE_TO_EXT).find(k => (CONTENT_TYPE_TO_EXT[k] as readonly string[]).includes(nameExt));
+
+  if(!mime) return undefined;
+
+  return {
+    mime,
+    ext: nameExt as ALLOWED_EXTENSION,
+  }
+}
+
+// const fileType = require("file-type");
+// const res = await fileType.fromBuffer(typeof file === "string"? Buffer.from(file, 'utf8') : file);
 
+export const getFileType = async (file: Buffer | string, fileName: string): Promise<{ mime: ALLOWED_CONTENT_TYPE; ext: ALLOWED_EXTENSION }> => {
+
+  const { fileTypeFromBuffer } = await (eval('import("file-type")') as Promise<typeof import('file-type')>);
+  
+  const fileNameMime = getFileTypeFromFilename(fileName);
+  if(!fileNameMime?.ext) throw new Error("File name must contain extenions")
+  const res = await fileTypeFromBuffer(typeof file === "string"? Buffer.from(file, 'utf8') : file);
+  
+  if(!res) {
+
+    /* Set correct/missing extension */
+    const nameExt = fileNameMime?.ext;
+    if(["xml", "txt", "csv", "tsv", "svg"].includes(nameExt)){
+      return fileNameMime
+    } 
+    
+    throw new Error("Could not get the file type from file buffer");
+  } else {
+
+    if(!res.ext || fileNameMime?.ext.toLowerCase() !== res.ext.toLowerCase()){
+      throw new Error(`There is a mismatch between file name extension and actual buffer extension: ${fileNameMime?.ext } vs ${res.ext}`)
+    }
+  }
+  return res as any;
+}
 
 
 /**

package/lib/PostgresNotifListenManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresNotifListenManager.d.ts","sourceRoot":"","sources":["PostgresNotifListenManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;CAAE,KAAK,IAAI,CAAC;AACvI,qBAAa,0BAA0B;IACnC,UAAU,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAClD,KAAK,EAAE,EAAE,CAAC;IACV,aAAa,EAAE,iBAAiB,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IAEZ,MAAM,CAAC,MAAM,6BAA8B,iBAAiB,mBAAmB,MAAM,KAAG,QAAQ,0BAA0B,CAAC,CAG1H;gBAEW,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,UAAQ;IAS1F,IAAI,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAQjD,OAAO;IAIP,cAAc;IA+Bd,OAAO,aAEN;IAED,aAAa,aAKZ;IAED,SAAS,CAAC,KAAK,GAAE,MAAM,GAAG,SAAa,EAAE,WAAW,GAAE,MAAM,GAAG,SAAa;CAsD/E"}
+{"version":3,"file":"PostgresNotifListenManager.d.ts","sourceRoot":"","sources":["PostgresNotifListenManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;CAAE,KAAK,IAAI,CAAC;AACvI,qBAAa,0BAA0B;IACnC,UAAU,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAClD,KAAK,EAAE,EAAE,CAAC;IACV,aAAa,EAAE,iBAAiB,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IAEZ,MAAM,CAAC,MAAM,6BAA8B,iBAAiB,mBAAmB,MAAM,KAAG,QAAQ,0BAA0B,CAAC,CAG1H;gBAEW,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,UAAQ;IAS1F,IAAI,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAQjD,OAAO;IAIP,cAAc;IA+Bd,OAAO,aAKN;IAED,aAAa,aAKZ;IAED,SAAS,CAAC,KAAK,GAAE,MAAM,GAAG,SAAa,EAAE,WAAW,GAAE,MAAM,GAAG,SAAa;CAsD/E"}

package/lib/PostgresNotifListenManager.js

@@ -8,8 +8,10 @@ exports.PostgresNotifListenManager = void 0;
 class PostgresNotifListenManager {
     constructor(db_pg, notifListener, db_channel_name, noInit = false) {
         this.destroy = () => {
-            if (this.connection)
+            if (this.connection) {
                 this.connection.done();
+                this.connection = undefined;
+            }
         };
         this.stopListening = () => {
             if (this.db_channel_name) {

package/lib/PostgresNotifListenManager.ts

@@ -74,7 +74,10 @@ export class PostgresNotifListenManager {
     }
 
     destroy = () => {
-        if(this.connection) this.connection.done();
+        if(this.connection) {
+            this.connection.done();
+            this.connection = undefined;
+        }
     }
 
     stopListening = () => {

package/lib/Prostgles.d.ts

@@ -7,7 +7,7 @@ import TableConfigurator, { TableConfig } from "./TableConfig";
 import { DboBuilder, DBHandlerServer, PRGLIOSocket } from "./DboBuilder";
 export { DBHandlerServer };
 export declare type PGP = pgPromise.IMain<{}, pg.IClient>;
-import { AnyObject } from "prostgles-types";
+import { AnyObject, FileColumnConfig } from "prostgles-types";
 import { Publish, PublishMethods, PublishParams, PublishParser } from "./PublishParser";
 import { DBEventsManager } from "./DBEventsManager";
 export declare type DB = pgPromise.IDatabase<{}, pg.IClient>;
@@ -76,7 +76,18 @@ export declare type FileTableConfig = {
     localConfig?: LocalConfig;
     expressApp: ExpressApp;
     referencedTables?: {
-        [tableName: string]: "one" | "many";
+        [tableName: string]: "one" | "many"
+        /**
+         * If defined then will try to create (if necessary) a column in the files table which will reference this table's primary key (must have one)
+         * */
+        /**
+         * If defined then will try to create (if necessary) this column which will reference files_table(id)
+         * Prostgles UI will use these hints (obtained through tableHandler.getInfo())
+         * */
+         | {
+            type: "column";
+            referenceColumns: Record<string, FileColumnConfig>;
+        };
     };
     imageOptions?: ImageOptions;
 };

package/lib/Prostgles.d.ts.map

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

package/lib/Prostgles.js

@@ -116,9 +116,13 @@ class Prostgles {
         this.loaded = false;
         this.destroyed = false;
         this.refreshDBO = async () => {
-            if (this._dboBuilder)
-                this._dboBuilder.destroy();
-            this.dboBuilder = await DboBuilder_1.DboBuilder.create(this);
+            if (this._dboBuilder) {
+                await this._dboBuilder.build();
+                // this._dboBuilder.destroy();
+            }
+            else {
+                this.dboBuilder = await DboBuilder_1.DboBuilder.create(this);
+            }
             if (!this.dboBuilder)
                 throw "this.dboBuilder";
             this.dbo = this.dboBuilder.dbo;
@@ -316,7 +320,7 @@ class Prostgles {
                 this.schema_checkIntervalMillis = setInterval(async () => {
                     const dbuilder = await DboBuilder_1.DboBuilder.create(this);
                     if (dbuilder.tsTypesDefinition !== this.dboBuilder.tsTypesDefinition) {
-                        this.refreshDBO();
+                        await this.refreshDBO();
                         this.init(onReady);
                     }
                 }, this.opts.watchSchemaType.checkIntervalMillis);