prostgles-server 4.2.575 → 4.2.577

package/lib/StorageClient/getFileTableConfig.ts

@@ -1,6 +1,6 @@
 import { omitKeys } from "prostgles-types";
 import { updateFile } from "../DboBuilder/TableHandler/updateFile";
-import { assertFileObjectValid, uploadFile } from "../DboBuilder/uploadFile";
+import { assertFileObjectValid, uploadFile } from "../DboBuilder/TableHandler/uploadFile";
 import type { Prostgles } from "../Prostgles";
 import type { TableConfig } from "../TableConfig/TableConfigTypes";
 import { setupFileServeHandler } from "./setupFileServeHandler";
@@ -8,27 +8,33 @@ import { onDeleteFromFileTable } from "../DboBuilder/TableHandler/onDeleteFromFi
 import type { BeforeEachTsTrigger } from "../PublishParser/publishTypesAndUtils";
 
 const FILE_TABLE_COLUMN_DEFINITIONS = {
-  name: `TEXT NOT NULL UNIQUE`,
-  extension: `TEXT NOT NULL`,
-  content_type: `TEXT NOT NULL`,
-  content_length: `BIGINT NOT NULL DEFAULT 0`,
-  added: `TIMESTAMP NOT NULL DEFAULT NOW()`,
-  url: `TEXT NOT NULL`,
   id: `UUID PRIMARY KEY DEFAULT gen_random_uuid()`,
+  extension: `TEXT NOT NULL DEFAULT ''`,
+  content_type: `TEXT NOT NULL DEFAULT ''`,
+  content_length: `BIGINT NOT NULL DEFAULT 0`,
+  etag: `TEXT NOT NULL DEFAULT ''`,
   original_name: `TEXT NOT NULL`,
+  original_last_modified: `TIMESTAMPTZ`,
   description: `TEXT`,
+  url: `TEXT NOT NULL DEFAULT ''`,
   cloud_url: `TEXT`,
   signed_url: `TEXT`,
   signed_url_expires: `BIGINT`,
-  etag: `TEXT NOT NULL`,
-  deleted: `BIGINT`,
-  deleted_from_storage: `BIGINT`,
+  added: `TIMESTAMP NOT NULL DEFAULT NOW()`,
+  updated: `TIMESTAMP NOT NULL DEFAULT NOW()`,
+  deleted: `TIMESTAMPTZ`,
+  deleted_from_storage: `TIMESTAMPTZ`,
+  data: `BYTEA NOT NULL CHECK (data = decode('01', 'hex'))`, // Used as a placeholder to ensure insert types are correct. Actual data is uploaded to storageClient and not stored in the DB
 } as const;
 
 type FileTableColumnDefinitions = typeof FILE_TABLE_COLUMN_DEFINITIONS;
 
 export type FileTableRow = {
   [K in keyof FileTableColumnDefinitions as K]: FileTableColumnDefinitions[K] extends (
+    `BYTEA NOT NULL${string}`
+  ) ?
+    Buffer
+  : FileTableColumnDefinitions[K] extends (
     `${string} NOT NULL${string}` | `${string}PRIMARY KEY${string}`
   ) ?
     string
@@ -101,14 +107,20 @@ export const getFileTableConfig = (prg: Prostgles): TableConfig | undefined => {
               if (!tableHandler) throw "Storage tableHandler not found";
               assertFileObjectValid(insertData);
 
-              const { data: dataBlob, name, id } = insertData;
+              const {
+                data: dataBlob,
+                original_name,
+                id,
+                original_last_modified = null,
+              } = insertData;
               const data = dataBlob as unknown as Buffer;
               if (command === "update") {
                 const { newData } = await updateFile(tableHandler, fileTable, {
                   filter: filter ?? {},
                   localParams,
                   data,
-                  name,
+                  original_name,
+                  original_last_modified,
                 });
                 return {
                   row: newData,
@@ -120,9 +132,10 @@ export const getFileTableConfig = (prg: Prostgles): TableConfig | undefined => {
 
               const media = await uploadFile(fileTable, {
                 data,
-                name,
+                original_name,
                 localParams,
                 mediaId: id,
+                original_last_modified,
               });
 
               return {

package/lib/StorageClient/setupFileServeHandler.ts

@@ -27,19 +27,18 @@ export const setupFileServeHandler = (
 ) => {
   const fileTableName = config.tableName;
   const fileServeRoute = getFileServeRoute(config);
-  const fileRouteExpress = fileServeRoute + "/:name";
+  const fileRouteExpress = fileServeRoute + "/:id";
 
   app.get(fileRouteExpress, async (req, res) => {
     try {
-      const { name } = req.params;
-      if (typeof name !== "string" || !name) {
+      const { id } = req.params;
+      if (typeof id !== "string" || !id) {
         throw "Invalid media name";
       }
-      const id = name.slice(0, 36);
+
       const selectParams = {
         select: {
           id: 1,
-          name: 1,
           signed_url: 1,
           signed_url_expires: 1,
           content_type: 1,
@@ -72,7 +71,7 @@ export const setupFileServeHandler = (
         const HOUR = 3600 * 1000;
         const EXPIRES = Date.now() + HOUR;
         if (!url || expires < EXPIRES) {
-          url = await storageClient.getSignedUrlForDownload(file.name, 60 * 60);
+          url = await storageClient.getSignedUrlForDownload(file.id, 60 * 60);
 
           await db.any(
             "UPDATE ${fileTableName:name} SET signed_url = ${signed_url}, signed_url_expires = ${signed_url_expires} WHERE id = ${id}",
@@ -87,7 +86,7 @@ export const setupFileServeHandler = (
 
         res.redirect(url);
       } else {
-        const localFilePath = join(storageClient.localFolderPath, file.name);
+        const localFilePath = join(storageClient.localFolderPath, file.id);
         if (!fs.existsSync(localFilePath)) {
           throw new Error("File not found");
         }

package/lib/updateConfiguration.ts

@@ -73,4 +73,5 @@ export const clientOnlyUpdateKeys = [
   "publish",
   "functions",
   "publishRawSQL",
+  "modifyClientSchema",
 ] as const satisfies (keyof UpdatableOptions)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.575",
+  "version": "4.2.577",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "pg": "^8.21.0",
     "pg-cursor": "^2.21.0",
     "pg-promise": "^12.7.0",
-    "prostgles-types": "^4.0.273"
+    "prostgles-types": "^4.0.274"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",

package/dist/DboBuilder/uploadFile.d.ts

@@ -1,26 +0,0 @@
-import { type JSONB } from "prostgles-types";
-import type { FileTableConfig } from "../ProstglesTypes";
-import type { FileTableRow } from "../StorageClient/getFileTableConfig";
-import type { LocalParams } from "./DboBuilder";
-declare const FILE_SCHEMA: {
-    readonly id: {
-        readonly type: "string";
-        readonly optional: true;
-    };
-    readonly name: "string";
-    readonly data: "Blob";
-};
-type AssertFileObjectValid = (row: any) => asserts row is JSONB.GetObjectType<typeof FILE_SCHEMA>;
-export declare const assertFileObjectValid: AssertFileObjectValid;
-type UploadFileArgs = {
-    data: Buffer<ArrayBufferLike>;
-    name: string;
-    localParams: LocalParams | undefined;
-    /**
-     * Used to update an existing file
-     */
-    mediaId: string | undefined;
-};
-export declare const uploadFile: (config: FileTableConfig, { data, name, localParams, mediaId }: UploadFileArgs) => Promise<FileTableRow>;
-export {};
-//# sourceMappingURL=uploadFile.d.ts.map

package/dist/DboBuilder/uploadFile.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAkC,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,QAAA,MAAM,WAAW;;;;;;;CAIP,CAAC;AAEX,KAAK,qBAAqB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,WAAW,CAAC,CAAC;AAElG,eAAO,MAAM,qBAAqB,EAAE,qBAEnC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,QAAQ,eAAe,EACvB,sCAAsC,cAAc,KACnD,OAAO,CAAC,YAAY,CAgDtB,CAAC"}

package/dist/DboBuilder/uploadFile.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../lib/DboBuilder/uploadFile.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,qDAA6E;AAG7E,gFAA6E;AAC7E,kFAA2E;AAG3E,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,MAAM;CACJ,CAAC;AAIJ,MAAM,qBAAqB,GAA0B,CAAC,GAAG,EAAE,EAAE;IAClE,IAAA,gDAA8B,EAAC,WAAW,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAYK,MAAM,UAAU,GAAG,KAAK,EAC7B,MAAuB,EACvB,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAkB,EAC7B,EAAE;IACzB,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAE3C,MAAM,QAAQ,GAAG,OAAO,IAAI,IAAA,mBAAU,GAAE,CAAC;IACzC,MAAM,YAAY,GAAG,WAAW,EAAE,YAAY,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE;QAC9C,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,YAAY,EAAE,aAAa;QACtC,OAAO,EAAE,YAAY,EAAE,iBAAiB;KACzC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,GAAG,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7C,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,CAAU,CAAC;IAC/F,MAAM,QAAQ,GAAoE;QAChF,EAAE,EAAE,QAAQ;QACZ,IAAI,EAAE,UAAU;QAChB,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,YAAY,EAAE,IAAI,CAAC,IAAI;KACxB,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC;QAC9C,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,WAAW,EAAE,QAAQ,CAAC,YAAY;KACnC,CAAC,CAAC;IAEH,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAElE,MAAM,cAAc,GAAG,IAAA,yCAAiB,EAAC,MAAM,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAiB;QAC7B,UAAU,EAAE,IAAI;QAChB,kBAAkB,EAAE,IAAI;QACxB,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC/B,OAAO,EAAE,IAAI;QACb,oBAAoB,EAAE,IAAI;QAC1B,WAAW,EAAE,EAAE;QACf,GAAG,QAAQ;QACX,SAAS,EAAE,GAAG,IAAI,EAAE;QACpB,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,GAAG,EAAE,CAAC,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC9C,cAAc,EAAE,MAAM,CAAC,aAAa,CAAC;KACtC,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAnDW,QAAA,UAAU,cAmDrB"}