prostgles-server 4.2.570 → 4.2.572

package/dist/{FileManager → StorageClient}/getFileTableConfig.js

@@ -19,7 +19,7 @@ const FILE_TABLE_COLUMN_DEFINITIONS = {
     cloud_url: `TEXT`,
     signed_url: `TEXT`,
     signed_url_expires: `BIGINT`,
-    etag: `TEXT`,
+    etag: `TEXT NOT NULL`,
     deleted: `BIGINT`,
     deleted_from_storage: `BIGINT`,
 };
@@ -72,7 +72,7 @@ const getFileTableConfig = (prg) => {
                         validate: async ({ data, localParams, command, filter }) => {
                             const tableHandler = prg.dboBuilder.dboMap.get(fileTableName);
                             if (!tableHandler)
-                                throw "FileManager tableHandler not found";
+                                throw "Storage tableHandler not found";
                             if (command === "update") {
                                 const { newData } = await (0, updateFile_1.updateFile)(tableHandler, fileTable, {
                                     filter: filter ?? {},

package/dist/StorageClient/getFileTableConfig.js.map

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

package/dist/StorageClient/getFileType.d.ts

@@ -0,0 +1,10 @@
+import type { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION } from "prostgles-types";
+export declare const getFileType: (file: Buffer | string, fileName: string) => Promise<{
+    mime: ALLOWED_CONTENT_TYPE;
+    ext: ALLOWED_EXTENSION;
+}>;
+export declare const getFileTypeFromFilename: (fileName: string) => {
+    mime: ALLOWED_CONTENT_TYPE;
+    ext: ALLOWED_EXTENSION;
+} | undefined;
+//# sourceMappingURL=getFileType.d.ts.map

package/dist/StorageClient/getFileType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFileType.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getFileType.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAG/E,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,GAAG,MAAM,EACrB,UAAU,MAAM,KACf,OAAO,CAAC;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CA0BhE,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,UAAU,MAAM,KACf;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAgB3D,CAAC"}

package/dist/{FileManager/FileManager.js → StorageClient/getFileType.js}

@@ -1,24 +1,9 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileType = exports.getFileTypeFromFilename = exports.HOUR = void 0;
-exports.bytesToSize = bytesToSize;
-const prostgles_types_1 = require("prostgles-types");
-exports.HOUR = 3600 * 1000;
-const getFileTypeFromFilename = (fileName) => {
-    const nameParts = fileName.split(".");
-    if (nameParts.length < 2)
-        return undefined;
-    const nameExt = nameParts.at(-1).toLowerCase(), mime = (0, prostgles_types_1.getKeys)(prostgles_types_1.CONTENT_TYPE_TO_EXT).find((k) => prostgles_types_1.CONTENT_TYPE_TO_EXT[k].includes(nameExt));
-    if (!mime)
-        return undefined;
-    return {
-        mime,
-        ext: nameExt,
-    };
-};
-exports.getFileTypeFromFilename = getFileTypeFromFilename;
 // const fileType = require("file-type");
 // const res = await fileType.fromBuffer(typeof file === "string"? Buffer.from(file, 'utf8') : file);
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFileTypeFromFilename = exports.getFileType = void 0;
+const prostgles_types_1 = require("prostgles-types");
 const getFileType = async (file, fileName) => {
     const { fileTypeFromBuffer } = await eval('import("file-type")');
     const fileNameMime = (0, exports.getFileTypeFromFilename)(fileName);
@@ -41,11 +26,17 @@ const getFileType = async (file, fileName) => {
     return res;
 };
 exports.getFileType = getFileType;
-function bytesToSize(bytes) {
-    const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
-    if (bytes == 0)
-        return "0 Byte";
-    const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)) + "");
-    return (bytes / Math.pow(1024, i)).toFixed(1) + " " + sizes[i];
-}
-//# sourceMappingURL=FileManager.js.map
+const getFileTypeFromFilename = (fileName) => {
+    const nameParts = fileName.split(".");
+    if (nameParts.length < 2)
+        return undefined;
+    const nameExt = nameParts.at(-1).toLowerCase(), mime = (0, prostgles_types_1.getKeys)(prostgles_types_1.CONTENT_TYPE_TO_EXT).find((k) => prostgles_types_1.CONTENT_TYPE_TO_EXT[k].includes(nameExt));
+    if (!mime)
+        return undefined;
+    return {
+        mime,
+        ext: nameExt,
+    };
+};
+exports.getFileTypeFromFilename = getFileTypeFromFilename;
+//# sourceMappingURL=getFileType.js.map

package/dist/StorageClient/getFileType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFileType.js","sourceRoot":"","sources":["../../lib/StorageClient/getFileType.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,qGAAqG;;;AAKrG,qDAA+D;AAExD,MAAM,WAAW,GAAG,KAAK,EAC9B,IAAqB,EACrB,QAAgB,EACiD,EAAE;IACnE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAO,IAAI,CAAC,qBAAqB,CAG9D,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,QAAQ,CAAC,CAAC;IACvD,IAAI,CAAC,YAAY,EAAE,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAC5E,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAElG,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,mCAAmC;QACnC,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACjE,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,IAAI,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CACb,gFAAgF,YAAY,CAAC,GAAG,OAAO,GAAG,CAAC,GAAG,EAAE,CACjH,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,GAAU,CAAC;AACpB,CAAC,CAAC;AA7BW,QAAA,WAAW,eA6BtB;AAEK,MAAM,uBAAuB,GAAG,CACrC,QAAgB,EACoD,EAAE;IACtE,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAE3C,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,WAAW,EAAE,EAC7C,IAAI,GAAG,IAAA,yBAAO,EAAC,qCAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5C,qCAAmB,CAAC,CAAC,CAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAChE,CAAC;IAEJ,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAE5B,OAAO;QACL,IAAI;QACJ,GAAG,EAAE,OAA4B;KAClC,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC"}

package/dist/StorageClient/getLocalStorageClient.d.ts

@@ -0,0 +1,15 @@
+import type { LocalStorageClient } from "./StorageClientTypes";
+export type LocalConfig = {
+    /**
+     * example: path.join(__dirname+'/media')
+     * note that this location will be relative to the compiled file location
+     */
+    localFolderPath: string;
+    /**
+     * Minimum amount of free bytes available to allow saving files
+     * Defaults to 100MB
+     */
+    minFreeBytes?: number;
+};
+export declare const getLocalStorageClient: (localConfig: LocalConfig) => LocalStorageClient;
+//# sourceMappingURL=getLocalStorageClient.d.ts.map

package/dist/StorageClient/getLocalStorageClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLocalStorageClient.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getLocalStorageClient.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,aAAa,WAAW,KAAG,kBAyGhE,CAAC"}

package/dist/{FileManager → StorageClient}/getLocalStorageClient.js

@@ -30,7 +30,6 @@ const getLocalStorageClient = (localConfig) => {
         type: "local",
         localFolderPath: localConfig.localFolderPath,
         upload: async (args) => {
-            // Ensure the target directory exists
             await fs_1.default.promises.mkdir(localFolderPath, { recursive: true });
             await checkFreeSpace();
             const filePath = path_1.default.join(localFolderPath, args.fileName);
@@ -41,12 +40,12 @@ const getLocalStorageClient = (localConfig) => {
                 writeStream.on("error", reject);
                 writeStream.on("finish", () => {
                     resolve({
-                        cloud_url: filePath,
-                        etag: hash.digest("hex"),
-                        content_length: contentLength,
+                        type: "local",
+                        filePath,
+                        contentHash: hash.digest("hex"),
+                        contentLength: contentLength,
                     });
                 });
-                // Handle raw string or Buffer
                 if (typeof args.file === "string" || Buffer.isBuffer(args.file)) {
                     const buffer = Buffer.isBuffer(args.file) ? args.file : Buffer.from(args.file);
                     contentLength = buffer.length;

package/dist/StorageClient/getLocalStorageClient.js.map

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

package/dist/StorageClient/getValidatedFileType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getValidatedFileType.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getValidatedFileType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAG5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,eAAe,EACvB,MAAM,IAAI,KACT,OAAO,CAAC;IACT,IAAI,EAAE,oBAAoB,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;CAIb,CAsEA,CAAC"}

package/dist/{FileManager → StorageClient}/getValidatedFileType.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getValidatedFileType = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const parseFieldFilter_1 = require("../DboBuilder/ViewHandler/parseFieldFilter");
-const FileManager_1 = require("./FileManager");
+const getFileType_1 = require("./getFileType");
 const getValidatedFileType = async (config, args) => {
     const { file, fileName, tableName, colName } = args;
     const buffer = typeof file === "string" ? Buffer.from(file, "utf8") : file;
-    const result = (0, FileManager_1.getFileTypeFromFilename)(fileName);
+    const result = (0, getFileType_1.getFileTypeFromFilename)(fileName);
     if (tableName && colName) {
         const tableConfig = config.referencedTables?.[tableName];
         if (tableConfig && (0, prostgles_types_1.isObject)(tableConfig) && tableConfig.referenceColumns[colName]) {
@@ -21,7 +21,7 @@ const getValidatedFileType = async (config, args) => {
             if ("acceptedContent" in colConfig &&
                 colConfig.acceptedContent &&
                 colConfig.acceptedContent !== "*") {
-                const mime = await (0, FileManager_1.getFileType)(buffer, fileName);
+                const mime = await (0, getFileType_1.getFileType)(buffer, fileName);
                 const CONTENTS = ["image", "audio", "video", "text", "application"];
                 const allowedContent = (0, parseFieldFilter_1.parseFieldFilter)(colConfig.acceptedContent, false, CONTENTS);
                 if (!allowedContent.some((c) => mime.mime.startsWith(c))) {
@@ -31,7 +31,7 @@ const getValidatedFileType = async (config, args) => {
             else if ("acceptedContentType" in colConfig &&
                 colConfig.acceptedContentType &&
                 colConfig.acceptedContentType !== "*") {
-                const mime = await (0, FileManager_1.getFileType)(buffer, fileName);
+                const mime = await (0, getFileType_1.getFileType)(buffer, fileName);
                 const allowedContentTypes = (0, parseFieldFilter_1.parseFieldFilter)(colConfig.acceptedContentType, false, (0, prostgles_types_1.getKeys)(prostgles_types_1.CONTENT_TYPE_TO_EXT));
                 if (!allowedContentTypes.some((c) => c === mime.mime)) {
                     throw new Error(`Disallowed MIME provided: ${mime.mime}. Allowed MIME values: ${allowedContentTypes} `);
@@ -40,7 +40,7 @@ const getValidatedFileType = async (config, args) => {
             else if ("acceptedFileTypes" in colConfig &&
                 colConfig.acceptedFileTypes &&
                 colConfig.acceptedFileTypes !== "*") {
-                const mime = await (0, FileManager_1.getFileType)(buffer, fileName);
+                const mime = await (0, getFileType_1.getFileType)(buffer, fileName);
                 const allowedExtensions = (0, parseFieldFilter_1.parseFieldFilter)(colConfig.acceptedFileTypes, false, Object.values(prostgles_types_1.CONTENT_TYPE_TO_EXT).flat());
                 if (!allowedExtensions.some((c) => c === mime.ext)) {
                     throw new Error(`Disallowed extension provided: ${mime.ext}. Allowed extension values: ${allowedExtensions} `);

package/dist/StorageClient/getValidatedFileType.js.map

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

package/dist/{FileManager → StorageClient}/setupFileServeHandler.d.ts

@@ -2,7 +2,8 @@ import type e from "express";
 import type { DB } from "../initProstgles";
 import type { Prostgles } from "../Prostgles";
 import type { FileTableConfig } from "../ProstglesTypes";
-import type { StorageClient } from "./FileManager";
+import type { StorageClient } from "./StorageClientTypes";
+export declare const getFileServeRoute: (config: FileTableConfig) => string;
 export declare const setupFileServeHandler: (db: DB, config: FileTableConfig, storageClient: StorageClient, app: e.Express, prg: Prostgles) => {
     destroy: () => void;
 };

package/dist/StorageClient/setupFileServeHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupFileServeHandler.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/setupFileServeHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAI7B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,iBAAiB,GAAI,QAAQ,eAAe,WAOxD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,IAAI,EAAE,EACN,QAAQ,eAAe,EACvB,eAAe,aAAa,EAC5B,KAAK,CAAC,CAAC,OAAO,EACd,KAAK,SAAS;;CAkFf,CAAC"}

package/dist/{FileManager → StorageClient}/setupFileServeHandler.js

@@ -33,18 +33,23 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupFileServeHandler = void 0;
+exports.setupFileServeHandler = exports.getFileServeRoute = void 0;
 const fs = __importStar(require("fs"));
 const path_1 = require("path");
 const AuthHandler_1 = require("../Auth/AuthHandler");
 const runClientRequest_1 = require("../runClientRequest");
-const FileManager_1 = require("./FileManager");
-const setupFileServeHandler = (db, config, storageClient, app, prg) => {
+const getFileServeRoute = (config) => {
     const fileTableName = config.tableName;
     const fileServeRoute = config.fileServePath ?? `/${fileTableName}`;
     if (fileServeRoute.endsWith("/")) {
         throw `fileServeRoute must not end with a '/'`;
     }
+    return fileServeRoute;
+};
+exports.getFileServeRoute = getFileServeRoute;
+const setupFileServeHandler = (db, config, storageClient, app, prg) => {
+    const fileTableName = config.tableName;
+    const fileServeRoute = (0, exports.getFileServeRoute)(config);
     const fileRouteExpress = fileServeRoute + "/:name";
     app.get(fileRouteExpress, async (req, res) => {
         try {
@@ -79,7 +84,8 @@ const setupFileServeHandler = (db, config, storageClient, app, prg) => {
             if (storageClient.type === "cloud") {
                 let url = file.signed_url;
                 const expires = +(file.signed_url_expires || 0);
-                const EXPIRES = Date.now() + FileManager_1.HOUR;
+                const HOUR = 3600 * 1000;
+                const EXPIRES = Date.now() + HOUR;
                 if (!url || expires < EXPIRES) {
                     url = await storageClient.getSignedUrlForDownload(file.name, 60 * 60);
                     await db.any("UPDATE ${fileTableName:name} SET signed_url = ${signed_url}, signed_url_expires = ${signed_url_expires} WHERE id = ${id}", {

package/dist/StorageClient/setupFileServeHandler.js.map

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

package/dist/index.d.ts

@@ -7,8 +7,8 @@ export * from "./Auth/AuthTypes";
 export type { PublishParams } from "./PublishParser/publishTypesAndUtils";
 export type { DBOFullyTyped } from "./DBSchemaBuilder/DBSchemaBuilder";
 export type { DBHandlerServer } from "./Prostgles";
-export type { StorageClient as CloudClient, LocalConfig } from "./FileManager/FileManager";
-export * from "./FileManager/getLocalStorageClient";
+export type { StorageClient as CloudClient } from "./StorageClient/StorageClientTypes";
+export * from "./StorageClient/getLocalStorageClient";
 export type { DB } from "./initProstgles";
 export type * from "./TableConfig/TableConfigTypes";
 export * from "./Auth/utils/upsertNamedExpressMiddleware";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAClE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,CAAC,GAKrB,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAC/C;AACD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,YAAY,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,IAAI,WAAW,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC3F,cAAc,qCAAqC,CAAC;AACpD,YAAY,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,mBAAmB,gCAAgC,CAAC;AACpD,cAAc,2CAA2C,CAAC;AAC1D,YAAY,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAClE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,CAAC,GAKrB,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAC/C;AACD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,YAAY,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACvF,cAAc,uCAAuC,CAAC;AACtD,YAAY,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,mBAAmB,gCAAgC,CAAC;AACpD,cAAc,2CAA2C,CAAC;AAC1D,YAAY,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,eAAe,SAAS,CAAC"}

package/dist/index.js

@@ -23,7 +23,7 @@ function prostgles(params) {
 }
 __exportStar(require("./PublishParser/defineServerFunction"), exports);
 __exportStar(require("./Auth/AuthTypes"), exports);
-__exportStar(require("./FileManager/getLocalStorageClient"), exports);
+__exportStar(require("./StorageClient/getLocalStorageClient"), exports);
 __exportStar(require("./Auth/utils/upsertNamedExpressMiddleware"), exports);
 exports.default = prostgles;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,2CAAwC;AAGxC,SAAS,SAAS,CAChB,MAAsC;IAEtC,MAAM,IAAI,GAAG,IAAI,qBAAS,CAAC,MAA8B,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0C,EAAE;QAClE,IAAI,EAAE,MAAM;KACb,CAA6C,CAAC;AACjD,CAAC;AACD,uEAAqD;AACrD,mDAAiC;AAKjC,sEAAoD;AAGpD,4EAA0D;AAE1D,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,2CAAwC;AAGxC,SAAS,SAAS,CAChB,MAAsC;IAEtC,MAAM,IAAI,GAAG,IAAI,qBAAS,CAAC,MAA8B,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0C,EAAE;QAClE,IAAI,EAAE,MAAM;KACb,CAA6C,CAAC;AACjD,CAAC;AACD,uEAAqD;AACrD,mDAAiC;AAKjC,wEAAsD;AAGtD,4EAA0D;AAE1D,kBAAe,SAAS,CAAC"}

package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts

@@ -3,7 +3,7 @@ import type { AnyObject } from "prostgles-types";
 import { asName, pickKeys } from "prostgles-types";
 import type { FileTableConfig } from "../../ProstglesTypes";
 import type { TableHandlers } from "../DboBuilder";
-import type { FileTableRow } from "../../FileManager/getFileTableConfig";
+import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
 
 type OnDeleteFromFileTableArgs = {
   returningQuery: undefined | string;

package/lib/DboBuilder/TableHandler/updateFile.ts

@@ -1,6 +1,6 @@
 import type { AnyObject } from "prostgles-types";
 import { getJSONBObjectSchemaValidationError, omitKeys } from "prostgles-types";
-import type { FileTableRow } from "../../FileManager/getFileTableConfig";
+import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
 import type { FileTableConfig } from "../../ProstglesTypes";
 import type { LocalParams } from "../DboBuilder";
 import { isFile, uploadFile } from "../uploadFile";

package/lib/DboBuilder/uploadFile.ts

@@ -1,10 +1,11 @@
 import { randomUUID } from "crypto";
 import type { AnyObject } from "prostgles-types";
 import { getKeys, isObject } from "prostgles-types";
-import type { FileTableRow } from "../FileManager/getFileTableConfig";
-import { getValidatedFileType } from "../FileManager/getValidatedFileType";
+import type { FileTableRow } from "../StorageClient/getFileTableConfig";
+import { getValidatedFileType } from "../StorageClient/getValidatedFileType";
 import type { FileTableConfig } from "../ProstglesTypes";
 import type { LocalParams } from "./DboBuilder";
+import { getFileServeRoute } from "../StorageClient/setupFileServeHandler";
 
 export const isFile = (row: any): row is { data: Buffer; name: string } => {
   return Boolean(
@@ -65,6 +66,11 @@ export const uploadFile = async (
     contentType: coreInfo.content_type,
   });
 
+  const { contentLength, contentHash } = uploadedInfo;
+  const { filePath } = uploadedInfo.type === "local" ? uploadedInfo : {};
+  const { url } = uploadedInfo.type === "cloud" ? uploadedInfo : {};
+
+  const fileServeRoute = getFileServeRoute(config);
   const mediaRow: FileTableRow = {
     signed_url: null,
     signed_url_expires: null,
@@ -73,10 +79,11 @@ export const uploadFile = async (
     deleted_from_storage: null,
     description: "",
     ...coreInfo,
-    ...uploadedInfo,
+    cloud_url: url ?? "",
+    etag: contentHash,
     extension: type.ext,
-    url: uploadedInfo.cloud_url,
-    content_length: String(uploadedInfo.content_length),
+    url: [fileServeRoute, coreInfo.name].join("/"),
+    content_length: String(contentLength),
   };
 
   return mediaRow;

package/lib/Logging.ts

@@ -1,4 +1,4 @@
-import type { ABORTABLE_METHODS, AnyObject, ClientSchema, TableHandler } from "prostgles-types";
+import type { AnyObject, ClientSchema, TableHandler } from "prostgles-types";
 import type { LocalParams } from "./DboBuilder/DboBuilder";
 import type { PubSubManagerTriggers, SyncParams } from "./PubSubManager/PubSubManager";
 import type { NotifTypeName } from "./PubSubManager/PubSubManagerUtils";

package/lib/Prostgles.ts

@@ -60,7 +60,7 @@ import { randomUUID } from "crypto";
 import * as fs from "fs";
 import type { getAdminClient } from "./DboBuilder/runSql/getAdminClient";
 import type { TableHandler } from "./DboBuilder/TableHandler/TableHandler";
-import { getFileTableConfig } from "./FileManager/getFileTableConfig";
+import { getFileTableConfig } from "./StorageClient/getFileTableConfig";
 
 export class Prostgles {
   /**
@@ -232,12 +232,8 @@ export class Prostgles {
   };
 
   initRestApi = () => {
-    if (this.opts.restApi) {
-      this.restApi = new RestApi({ prostgles: this, ...this.opts.restApi });
-    } else {
-      this.restApi?.destroy();
-      this.restApi = undefined;
-    }
+    this.restApi?.destroy();
+    this.restApi = this.opts.restApi && new RestApi({ prostgles: this, ...this.opts.restApi });
   };
 
   initAuthHandler = () => {

package/lib/ProstglesTypes.ts

@@ -6,7 +6,7 @@ import type {
   SessionUser,
 } from "./Auth/AuthTypes";
 import type { EventTriggerTagFilter } from "./Event_Trigger_Tags";
-import type { StorageClient } from "./FileManager/FileManager";
+import type { StorageClient } from "./StorageClient/StorageClientTypes";
 import type { DbConnection, OnReadyCallback } from "./initProstgles";
 import type { EventInfo } from "./Logging";
 import type { RestApiConfig } from "./RestApi";

package/lib/PubSubManager/SyncReplication/getSyncUtilFunctions.ts

@@ -84,38 +84,29 @@ export const getSyncUtilFunctions = ({
         s_count: count,
       };
     },
-    getClientRowInfo = (args: SyncBatchInfo = {}) => {
+    getClientRowInfo = async (args: SyncBatchInfo = {}) => {
       const { from_synced = undefined, to_synced = undefined, end_offset = null } = args;
       const onSyncRequest = { from_synced, to_synced, end_offset };
-      const result = withTimeout(
-        new Promise<ClientSyncInfo>(async (resolve, reject) => {
-          const res = await handlers.ServerSyncRequest(onSyncRequest);
-          if (res.state === "error") {
-            reject(res.err);
-          } else {
-            resolve(res);
-          }
-        }),
-        5000,
-      );
 
-      return result;
+      const res = await withTimeout(handlers.ServerSyncRequest(onSyncRequest), 5000);
+      if (res.state === "error") {
+        throw res.err;
+      }
+      return res;
     },
-    getClientData = (from_synced: number | undefined, offset = 0): Promise<AnyObject[]> => {
-      return new Promise(async (resolve, reject) => {
-        const onPullRequest = {
-          from_synced,
-          offset,
-          limit: batch_size,
-          to_synced: undefined,
-        };
-        const res = await handlers.PullRequest(onPullRequest);
-        if (!res.success) {
-          reject(res.err);
-        } else {
-          resolve(sortClientData(res.data));
-        }
-      });
+    getClientData = async (from_synced: number | undefined, offset = 0): Promise<AnyObject[]> => {
+      const onPullRequest = {
+        from_synced,
+        offset,
+        limit: batch_size,
+        to_synced: undefined,
+      };
+      const res = await handlers.PullRequest(onPullRequest);
+      if (!res.success) {
+        throw res.err;
+      } else {
+        return sortClientData(res.data);
+      }
 
       function sortClientData(data: AnyObject[]) {
         return data.sort((a, b) => {
@@ -273,22 +264,18 @@ export const getSyncUtilFunctions = ({
     ) => {
       const items = request.state === "syncing-data" ? request.data : undefined;
       const start = Date.now();
-      const result = await new Promise<{
-        pushed: number;
-      }>(async (resolve, reject) => {
-        const resp = await handlers.UpdateRequest(
-          request.state === "synced" ?
-            { state: "synced", isSynced: true }
-          : { state: "syncing", data: request.data },
-        );
-        if (resp.success) {
-          // console.log("PUSHED to client: fr/lr", data[0], data[data.length - 1]);
-          resolve({ pushed: items?.length ?? 0 });
-        } else {
-          reject(resp);
-          console.error("Unexpected response");
-        }
-      });
+
+      const resp = await handlers.UpdateRequest(
+        request.state === "synced" ?
+          { state: "synced", isSynced: true }
+        : { state: "syncing", data: request.data },
+      );
+      if (!resp.success) {
+        console.error("Unexpected response");
+        throw resp;
+      }
+
+      const result = { pushed: items?.length ?? 0 };
 
       await pubSubManager._log({
         type: "sync",

package/lib/PubSubManager/SyncReplication/syncData.ts

@@ -123,7 +123,14 @@ export async function syncData(
       /**
        * After all data was inserted request SyncInfo from client and sync again if necessary
        */
-      void this.syncData(sync, undefined, source);
+      void this.syncData(sync, undefined, source).catch((error) => {
+        console.error("Follow-up replication failed", {
+          tableName: sync.table_name,
+          channelName: sync.channel_name,
+          socketId: sync.socket_id,
+          error,
+        });
+      });
     },
   });
 

package/lib/PubSubManager/notifListener.ts

@@ -117,14 +117,21 @@ export async function notifListener(this: PubSubManager, data: { payload: string
        */
       const changedColumns =
         !changedColumnsByTriggerId ? "*" : (changedColumnsByTriggerId[table_condition_id] ?? "*");
-      log(
-        "notifListener",
-        subs.map((s) => s.channel_name),
-        syncs.map((s) => s.channel_name),
-      );
-
-      syncs.map((s) => {
-        void this.syncData(s, undefined, "trigger");
+      // log(
+      //   "notifListener",
+      //   subs.map((s) => s.channel_name),
+      //   syncs.map((s) => s.channel_name),
+      // );
+
+      syncs.forEach((sync) => {
+        void this.syncData(sync, undefined, "trigger").catch((error) => {
+          console.error("Triggered replication failed", {
+            tableName: sync.table_name,
+            channelName: sync.channel_name,
+            socketId: sync.socket_id,
+            error,
+          });
+        });
       });
 
       const operation = (op_name?.toLowerCase() || "insert") as "insert" | "delete" | "update";

package/lib/StorageClient/StorageClientTypes.ts

@@ -0,0 +1,37 @@
+import type * as stream from "stream";
+
+export type LocalUploadedFileDetails = {
+  type: "local";
+  filePath: string;
+  contentHash: string;
+  contentLength: number;
+};
+export type CloudUploadedFileDetails = {
+  type: "cloud";
+  url: string;
+  /**
+   * The ETag  
+   */
+  contentHash: string;
+  contentLength: number;
+};
+export type UploadFileOptions = {
+  fileName: string;
+  contentType: string;
+  file: string | Buffer | stream.PassThrough;
+  onProgress?: (bytesUploaded: number) => void;
+};
+export type StorageClientBase<T> = {
+  upload: (file: UploadFileOptions) => Promise<T>;
+  downloadAsStream: (name: string) => Promise<stream.Readable>;
+  delete: (fileName: string) => Promise<void>;
+};
+export type LocalStorageClient = StorageClientBase<LocalUploadedFileDetails> & {
+  type: "local";
+  localFolderPath: string;
+};
+export type CloudStorageClient = StorageClientBase<CloudUploadedFileDetails> & {
+  type: "cloud";
+  getSignedUrlForDownload: (fileName: string, expiresInSeconds: number) => Promise<string>;
+};
+export type StorageClient = LocalStorageClient | CloudStorageClient;

package/lib/{FileManager → StorageClient}/getFileTableConfig.ts

@@ -20,7 +20,7 @@ const FILE_TABLE_COLUMN_DEFINITIONS = {
   cloud_url: `TEXT`,
   signed_url: `TEXT`,
   signed_url_expires: `BIGINT`,
-  etag: `TEXT`,
+  etag: `TEXT NOT NULL`,
   deleted: `BIGINT`,
   deleted_from_storage: `BIGINT`,
 } as const;
@@ -98,7 +98,7 @@ export const getFileTableConfig = (prg: Prostgles): TableConfig | undefined => {
             },
             validate: async ({ data, localParams, command, filter }) => {
               const tableHandler = prg.dboBuilder.dboMap.get(fileTableName);
-              if (!tableHandler) throw "FileManager tableHandler not found";
+              if (!tableHandler) throw "Storage tableHandler not found";
 
               if (command === "update") {
                 const { newData } = await updateFile(tableHandler, fileTable, {