prostgles-server 4.1.3 → 4.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/FileManager/FileManager.d.ts +29 -35
- package/dist/FileManager/FileManager.d.ts.map +1 -1
- package/dist/FileManager/FileManager.js +10 -51
- package/dist/FileManager/FileManager.js.map +1 -1
- package/dist/FileManager/initFileManager.d.ts.map +1 -1
- package/dist/FileManager/initFileManager.js +3 -3
- package/dist/FileManager/initFileManager.js.map +1 -1
- package/dist/FileManager/upload.d.ts.map +1 -1
- package/dist/FileManager/upload.js +18 -36
- package/dist/FileManager/upload.js.map +1 -1
- package/dist/FileManager/uploadStream.d.ts.map +1 -1
- package/dist/FileManager/uploadStream.js +2 -3
- package/dist/FileManager/uploadStream.js.map +1 -1
- package/dist/Prostgles.d.ts +2 -2
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js +3 -3
- package/dist/Prostgles.js.map +1 -1
- package/lib/FileManager/FileManager.ts +33 -65
- package/lib/FileManager/initFileManager.ts +3 -4
- package/lib/FileManager/upload.ts +43 -64
- package/lib/FileManager/uploadStream.ts +2 -3
- package/lib/Prostgles.ts +6 -6
- package/package.json +1 -4
- package/tests/client/PID.txt +1 -1
- package/tests/server/package-lock.json +1 -7
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import { S3 } from 'aws-sdk';
|
|
4
3
|
import * as stream from 'stream';
|
|
5
4
|
import { DB, DBHandlerServer, ExpressApp, Prostgles } from '../Prostgles';
|
|
6
5
|
import { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION, ValidatedColumnInfo } from 'prostgles-types';
|
|
7
|
-
import AWS from 'aws-sdk';
|
|
8
6
|
export declare const HOUR: number;
|
|
9
7
|
export declare const asSQLIdentifier: (name: string, db: DB) => Promise<string>;
|
|
10
|
-
export type OnProgress = (progress:
|
|
8
|
+
export type OnProgress = (progress: {
|
|
9
|
+
total: number;
|
|
10
|
+
loaded: number;
|
|
11
|
+
}) => void;
|
|
11
12
|
export type ImageOptions = {
|
|
12
13
|
keepMetadata?: boolean;
|
|
13
14
|
compression?:
|
|
@@ -27,11 +28,24 @@ export type ImageOptions = {
|
|
|
27
28
|
};
|
|
28
29
|
};
|
|
29
30
|
};
|
|
30
|
-
export type
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
export type UploadedCloudFile = {
|
|
32
|
+
cloud_url: string;
|
|
33
|
+
etag: string;
|
|
34
|
+
content_length: number;
|
|
35
|
+
};
|
|
36
|
+
type FileUploadArgs = {
|
|
37
|
+
fileName: string;
|
|
38
|
+
contentType: string;
|
|
39
|
+
file: string | Buffer | stream.PassThrough;
|
|
40
|
+
onFinish: (...args: [error: Error, result: undefined] | [error: undefined, result: UploadedCloudFile]) => void;
|
|
41
|
+
onProgress?: (bytesUploaded: number) => void;
|
|
42
|
+
};
|
|
43
|
+
export type CloudClient = {
|
|
44
|
+
upload: (file: FileUploadArgs) => Promise<void>;
|
|
45
|
+
download: (fileName: string) => Promise<Buffer>;
|
|
46
|
+
downloadAsStream: (name: string) => Promise<stream.Readable>;
|
|
47
|
+
delete: (fileName: string) => Promise<void>;
|
|
48
|
+
getSignedUrlForDownload: (fileName: string, expiresInSeconds: number) => Promise<string>;
|
|
35
49
|
};
|
|
36
50
|
export type LocalConfig = {
|
|
37
51
|
/**
|
|
@@ -59,18 +73,17 @@ export type UploadedItem = {
|
|
|
59
73
|
filePath?: string;
|
|
60
74
|
etag: string;
|
|
61
75
|
/**
|
|
62
|
-
*
|
|
76
|
+
* Cloud url of the resource
|
|
63
77
|
*/
|
|
64
|
-
|
|
78
|
+
cloud_url?: string;
|
|
65
79
|
/**
|
|
66
80
|
* Total uploaded file size in bytes
|
|
67
81
|
*/
|
|
68
82
|
content_length: number;
|
|
69
83
|
};
|
|
70
84
|
export declare class FileManager {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
config: S3Config | LocalConfig;
|
|
85
|
+
cloudClient?: CloudClient;
|
|
86
|
+
config: CloudClient | LocalConfig;
|
|
74
87
|
imageOptions?: ImageOptions;
|
|
75
88
|
prostgles?: Prostgles;
|
|
76
89
|
get dbo(): DBHandlerServer;
|
|
@@ -81,7 +94,7 @@ export declare class FileManager {
|
|
|
81
94
|
private checkInterval?;
|
|
82
95
|
constructor(config: FileManager["config"], imageOptions?: ImageOptions);
|
|
83
96
|
getFileStream(name: string): Promise<stream.Readable>;
|
|
84
|
-
deleteFile(name: string): Promise<true |
|
|
97
|
+
deleteFile(name: string): Promise<true | void>;
|
|
85
98
|
parseFile: (args: {
|
|
86
99
|
file: string | Buffer;
|
|
87
100
|
fileName: string;
|
|
@@ -101,7 +114,7 @@ export declare class FileManager {
|
|
|
101
114
|
dissallowedExtensions?: Array<ALLOWED_EXTENSION>;
|
|
102
115
|
imageOptions?: ImageOptions;
|
|
103
116
|
}) => Promise<UploadedItem>;
|
|
104
|
-
|
|
117
|
+
getFileCloudDownloadURL(fileName: string, expiresInSeconds?: number): Promise<string | undefined>;
|
|
105
118
|
parseSQLIdentifier: (name: string) => Promise<string>;
|
|
106
119
|
getColInfo: (args: {
|
|
107
120
|
tableName: string;
|
|
@@ -120,24 +133,5 @@ export declare const getFileType: (file: Buffer | string, fileName: string) => P
|
|
|
120
133
|
ext: ALLOWED_EXTENSION;
|
|
121
134
|
}>;
|
|
122
135
|
export declare function bytesToSize(bytes: number): string;
|
|
123
|
-
|
|
124
|
-
*
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
// if(content_type && typeof content_type !== "string") throw "Invalid content_type provided";
|
|
128
|
-
// if(title && typeof title !== "string") throw "Invalid title provided";
|
|
129
|
-
// let fExt = name.split(".").pop()
|
|
130
|
-
// if(content_type && name.split(".").length > 1 && fExt && fExt.length <= 4){
|
|
131
|
-
// type = {
|
|
132
|
-
// mime: content_type,
|
|
133
|
-
// ext: fExt,
|
|
134
|
-
// fileName: name,
|
|
135
|
-
// }
|
|
136
|
-
// } else {
|
|
137
|
-
// type = await this.getMIME(data, name);//, ["png", "jpg", "ogg", "webm", "pdf", "doc"]);
|
|
138
|
-
// }
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
*/
|
|
136
|
+
export {};
|
|
143
137
|
//# sourceMappingURL=FileManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.bytesToSize = exports.getFileType = exports.getFileTypeFromFilename = exports.removeExpressRoute = exports.FileManager = exports.asSQLIdentifier = exports.HOUR = void 0;
|
|
4
|
-
const aws_sdk_1 = require("aws-sdk");
|
|
5
4
|
// import { PutObjectCommand, S3 } from "@aws-sdk/client-s3";
|
|
6
5
|
const fs = require("fs");
|
|
7
6
|
const sharp = require("sharp");
|
|
8
7
|
const check_disk_space_1 = require("check-disk-space");
|
|
9
8
|
const prostgles_types_1 = require("prostgles-types");
|
|
10
|
-
const aws_sdk_2 = require("aws-sdk");
|
|
11
9
|
const path = require("path");
|
|
12
10
|
const initFileManager_1 = require("./initFileManager");
|
|
13
11
|
const parseFile_1 = require("./parseFile");
|
|
@@ -19,22 +17,12 @@ const asSQLIdentifier = async (name, db) => {
|
|
|
19
17
|
};
|
|
20
18
|
exports.asSQLIdentifier = asSQLIdentifier;
|
|
21
19
|
class FileManager {
|
|
22
|
-
|
|
23
|
-
const sts = new aws_sdk_2.default.STS();
|
|
24
|
-
aws_sdk_2.default.config.credentials = {
|
|
25
|
-
accessKeyId,
|
|
26
|
-
secretAccessKey
|
|
27
|
-
};
|
|
28
|
-
const ident = await sts.getCallerIdentity({}).promise();
|
|
29
|
-
return ident;
|
|
30
|
-
};
|
|
31
|
-
s3Client;
|
|
20
|
+
cloudClient;
|
|
32
21
|
config;
|
|
33
22
|
imageOptions;
|
|
34
23
|
prostgles;
|
|
35
24
|
get dbo() {
|
|
36
25
|
if (!this.prostgles?.dbo) {
|
|
37
|
-
// this.prostgles?.refreshDBO();
|
|
38
26
|
throw "this.prostgles.dbo missing";
|
|
39
27
|
}
|
|
40
28
|
return this.prostgles.dbo;
|
|
@@ -53,12 +41,8 @@ class FileManager {
|
|
|
53
41
|
constructor(config, imageOptions) {
|
|
54
42
|
this.config = config;
|
|
55
43
|
this.imageOptions = imageOptions;
|
|
56
|
-
if ("
|
|
57
|
-
|
|
58
|
-
this.s3Client = new aws_sdk_1.S3({
|
|
59
|
-
region,
|
|
60
|
-
credentials: { accessKeyId, secretAccessKey },
|
|
61
|
-
});
|
|
44
|
+
if ("upload" in config) {
|
|
45
|
+
this.cloudClient = config;
|
|
62
46
|
}
|
|
63
47
|
const fullConfig = this.prostgles?.opts.fileTable;
|
|
64
48
|
if (fullConfig?.delayedDelete) {
|
|
@@ -78,8 +62,8 @@ class FileManager {
|
|
|
78
62
|
}
|
|
79
63
|
}
|
|
80
64
|
async getFileStream(name) {
|
|
81
|
-
if (
|
|
82
|
-
return this.
|
|
65
|
+
if (this.cloudClient) {
|
|
66
|
+
return this.cloudClient.downloadAsStream(name);
|
|
83
67
|
}
|
|
84
68
|
else if ("localFolderPath" in this.config) {
|
|
85
69
|
const filePath = path.resolve(`${this.config.localFolderPath}/${name}`);
|
|
@@ -92,8 +76,8 @@ class FileManager {
|
|
|
92
76
|
throw new Error("Not expected");
|
|
93
77
|
}
|
|
94
78
|
async deleteFile(name) {
|
|
95
|
-
if (
|
|
96
|
-
const res = await this.
|
|
79
|
+
if (this.cloudClient) {
|
|
80
|
+
const res = await this.cloudClient?.delete(name);
|
|
97
81
|
return res;
|
|
98
82
|
}
|
|
99
83
|
else if ("localFolderPath" in this.config) {
|
|
@@ -110,7 +94,7 @@ class FileManager {
|
|
|
110
94
|
parseFile = parseFile_1.parseFile.bind(this);
|
|
111
95
|
getLocalFileUrl = (name) => this.fileRoute ? `${this.fileRoute}/${name}` : "";
|
|
112
96
|
checkFreeSpace = async (folderPath, fileSize = 0) => {
|
|
113
|
-
if (!this.
|
|
97
|
+
if (!this.cloudClient && "localFolderPath" in this.config) {
|
|
114
98
|
const { minFreeBytes = 1.048e6 } = this.config;
|
|
115
99
|
const required = Math.max(fileSize, minFreeBytes);
|
|
116
100
|
if (required) {
|
|
@@ -172,13 +156,8 @@ class FileManager {
|
|
|
172
156
|
const res = await this.upload(_data, name, content_type);
|
|
173
157
|
return res;
|
|
174
158
|
};
|
|
175
|
-
async
|
|
176
|
-
|
|
177
|
-
Bucket: this.config.bucket,
|
|
178
|
-
Key: fileName,
|
|
179
|
-
Expires: Math.round(expiresInSeconds || 30 * 60) // Error if float
|
|
180
|
-
};
|
|
181
|
-
return await this.s3Client?.getSignedUrlPromise("getObject", params);
|
|
159
|
+
async getFileCloudDownloadURL(fileName, expiresInSeconds = 30 * 60) {
|
|
160
|
+
return await this.cloudClient?.getSignedUrlForDownload(fileName, expiresInSeconds);
|
|
182
161
|
}
|
|
183
162
|
parseSQLIdentifier = async (name) => (0, exports.asSQLIdentifier)(name, this.prostgles.db); // this.prostgles.dbo.sql<"value">("select format('%I', $1)", [name], { returnType: "value" } )
|
|
184
163
|
getColInfo = (args) => {
|
|
@@ -255,24 +234,4 @@ function bytesToSize(bytes) {
|
|
|
255
234
|
return (bytes / Math.pow(1024, i)).toFixed(1) + ' ' + sizes[i];
|
|
256
235
|
}
|
|
257
236
|
exports.bytesToSize = bytesToSize;
|
|
258
|
-
/**
|
|
259
|
-
*
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
// if(content_type && typeof content_type !== "string") throw "Invalid content_type provided";
|
|
263
|
-
// if(title && typeof title !== "string") throw "Invalid title provided";
|
|
264
|
-
// let fExt = name.split(".").pop()
|
|
265
|
-
// if(content_type && name.split(".").length > 1 && fExt && fExt.length <= 4){
|
|
266
|
-
// type = {
|
|
267
|
-
// mime: content_type,
|
|
268
|
-
// ext: fExt,
|
|
269
|
-
// fileName: name,
|
|
270
|
-
// }
|
|
271
|
-
// } else {
|
|
272
|
-
// type = await this.getMIME(data, name);//, ["png", "jpg", "ogg", "webm", "pdf", "doc"]);
|
|
273
|
-
// }
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
*/
|
|
278
237
|
//# sourceMappingURL=FileManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":";;;AACA,6DAA6D;AAC7D,yBAAyB;AAGzB,+BAA+B;AAC/B,uDAA8C;AAG9C,qDAAwI;AAExI,6BAA6B;AAC7B,uDAAoD;AACpD,2CAAwC;AACxC,qCAAkC;AAClC,iDAA8C;AAEjC,QAAA,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAEzB,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,EAAM,EAAmB,EAAE;IAC7E,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,iCAAiC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAA;AACxE,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AA4ED,MAAa,WAAW;IAEtB,WAAW,CAAe;IAE1B,MAAM,CAA4B;IAClC,YAAY,CAAgB;IAE5B,SAAS,CAAa;IACtB,IAAI,GAAG;QACL,IAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;YACvB,MAAM,4BAA4B,CAAC;SACpC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAA;IAC3B,CAAC;IAED,IAAI,EAAE;QACJ,IAAG,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YAAE,MAAM,2BAA2B,CAAA;QACzD,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAA;IAC1B,CAAC;IAED,SAAS,CAAU;IAEnB,SAAS,CAAU;IACnB,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IACnC,CAAC;IACO,aAAa,CAAkB;IAEvC,YAAY,MAA6B,EAAE,YAA2B;QACpE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAG,QAAQ,IAAI,MAAM,EAAC;YACpB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;SAC3B;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;QAClD,IAAG,UAAU,EAAE,aAAa,EAAC;YAC3B,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;gBAC1C,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;gBACvC,MAAM,SAAS,GAAG,UAAU,CAAC,aAAa,EAAE,gBAAgB,IAAI,CAAC,CAAC;gBAClE,IAAG,SAAS,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,SAAS,EAAC;oBACvD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,GAAG,YAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;oBACtJ,IAAI,KAAK,EAAC,MAAM,IAAI,IAAI,aAAa,EAAC;wBACpC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBACjC;iBACF;qBAAM;oBACL,OAAO,CAAC,KAAK,CAAC,iGAAiG,CAAC,CAAA;iBACjH;YACH,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,IAAI,CAAC,CAAC,GAAG,YAAI,CAAC,CAAC,CAAA;SAC/E;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAY;QAC9B,IAAG,IAAI,CAAC,WAAW,EAAC;YAClB,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;SAC/C;aAAM,IAAG,iBAAiB,IAAI,IAAI,CAAC,MAAM,EAAC;YACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,IAAI,EAAE,CAAC,CAAC;YACxE,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC;gBAC1B,MAAM,QAAQ,QAAQ,qBAAqB,CAAC;aAC7C;YACD,OAAO,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;SAC9D;;YAAM,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QAC3B,IAAG,IAAI,CAAC,WAAW,EAAC;YAClB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,GAAG,CAAC;SACZ;aAAM,IAAG,iBAAiB,IAAI,IAAI,CAAC,MAAM,EAAC;YACzC,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,IAAI,EAAE,CAAC;YACtD,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC;gBACtB,MAAM,QAAQ,IAAI,qBAAqB,CAAC;aACzC;YACD,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACpB,IAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAClE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjC,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAErF,cAAc,GAAG,KAAK,EAAE,UAAkB,EAAE,QAAQ,GAAG,CAAC,EAAE,EAAE;QAC1D,IAAG,CAAC,IAAI,CAAC,WAAW,IAAI,iBAAiB,IAAI,IAAI,CAAC,MAAM,EAAE;YACxD,MAAM,EAAE,YAAY,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;YACjD,IAAG,QAAQ,EAAC;gBACV,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAc,EAAC,UAAU,CAAC,CAAC;gBACnD,IAAG,SAAS,CAAC,IAAI,GAAG,QAAQ,EAAC;oBAC3B,MAAM,GAAG,GAAI,kEAAkE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAA;oBAC5L,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;iBACtB;aACF;SACF;IACH,CAAC,CAAA;IAED,YAAY,GAAG,2BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEvC,MAAM,GAAG,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3B,aAAa,GAAG,KAAK,EAAE,MAKtB,EAAyB,EAAE;QAC1B,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QACrD,IAAG,CAAC,IAAI;YAAE,MAAM,kBAAkB,CAAC;QACnC,IAAG,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,MAAM,yBAAyB,CAAC;QAEtE,yFAAyF;QAEzF,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,8CAA8C;QAC9C,IAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,KAAK,EAAC;YAEvE,MAAM,WAAW,GAAG,YAAY,EAAE,WAAW,CAAA;YAC7C,IAAG,WAAW,EAAC;gBACb,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;gBAC7B,IAAI,IAAI,CAAC;gBACT,IAAG,SAAS,IAAI,WAAW,EAAC;oBAC1B,IAAI,GAAG;wBACL,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO;wBACtB,GAAG,WAAW,CAAC,OAAO;qBACvB,CAAA;iBACF;qBAAM,IAAG,QAAQ,IAAI,WAAW,EAAC;oBAChC,IAAI,GAAG;wBACL,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,MAAM;wBACrB,GAAG,WAAW,CAAC,MAAM;qBACtB,CAAA;iBACF;gBACD,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC;qBACtB,MAAM,CAAC,IAAW,CAAC;qBACnB,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAQ,CAAC;oBACzD,yBAAyB;qBACxB,QAAQ,EAAE,CAAA;aACd;iBAAM,IAAG,CAAC,YAAY,EAAE,YAAY,EAAE;gBACrC;;mBAEG;gBACH,0CAA0C;gBAC1C,kCAAkC;gBAElC,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,YAAY,CAAC;oBAC3C,IAAI,EAAE,EAAE;iBACT,CAAC;qBACD,QAAQ,EAAE,CAAA;aACd;SACF;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAEzD,OAAO,GAAG,CAAA;IACZ,CAAC,CAAA;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB,EAAE,mBAA2B,EAAE,GAAG,EAAE;QAChF,OAAO,MAAM,IAAI,CAAC,WAAW,EAAE,uBAAuB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACrF,CAAC;IAED,kBAAkB,GAAG,KAAK,EAAE,IAAY,EAAG,EAAE,CAAC,IAAA,uBAAe,EAAC,IAAI,EAAE,IAAI,CAAC,SAAU,CAAC,EAAG,CAAC,CAAC,CAAA,gGAAgG;IAEzL,UAAU,GAAG,CAAC,IAA4C,EAA2C,EAAE;QACrG,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QACpC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC,SAAS,CAAC,CAAC;QAClF,MAAM,sBAAsB,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAE,CAAC,CAAC;QAC7K,IAAG,sBAAsB,EAAC;YACxB,IAAG,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAC;gBAChD,OAAO,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;aAC9C;YACD,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC;SACjC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAA;IAED,IAAI,GAAG,iCAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,GAAG,GAAG,EAAE;QACb,IAAA,0BAAkB,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1F,CAAC,CAAA;CACF;AAvLD,kCAuLC;AAEM,MAAM,kBAAkB,GAAG,CAAC,GAA2B,EAAE,UAAkC,EAAE,EAAE;IAEpG,MAAM,MAAM,GAAG,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;IACnC,IAAG,MAAM,EAAC;QACR,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC1B,IAAG,UAAU,CAAC,MAAM,CAAC,2BAAS,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,IAAW,CAAC,EAAC;gBACjE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACrB;QACH,CAAC,CAAC,CAAA;KACH;AACH,CAAC,CAAA;AAVY,QAAA,kBAAkB,sBAU9B;AAEM,MAAM,uBAAuB,GAAG,CAAC,QAAgB,EAA+E,EAAE;IAEvI,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAG,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAE1C,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,CAAE,qCAAmB,CAAC,CAAC,CAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEjH,IAAG,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAE3B,OAAO;QACL,IAAI;QACJ,GAAG,EAAE,OAA4B;KAClC,CAAA;AACH,CAAC,CAAA;AAfY,QAAA,uBAAuB,2BAenC;AAED,yCAAyC;AACzC,qGAAqG;AAE9F,MAAM,WAAW,GAAG,KAAK,EAAE,IAAqB,EAAE,QAAgB,EAAmE,EAAE;IAE5I,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAO,IAAI,CAAC,qBAAqB,CAAyC,CAAC;IAE1G,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,QAAQ,CAAC,CAAC;IACvD,IAAG,CAAC,YAAY,EAAE,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IACzE,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAA,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEjG,IAAG,CAAC,GAAG,EAAE;QAEP,mCAAmC;QACnC,MAAM,OAAO,GAAG,YAAY,EAAE,GAAG,CAAC;QAClC,IAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,IAAI,EAAC;YACnF,OAAO,YAAmB,CAAC;SAC5B;QAED,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;SAAM;QAEL,IAAG,CAAC,GAAG,CAAC,GAAG,IAAI,YAAY,EAAE,GAAG,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,EAAC;YACvE,MAAM,IAAI,KAAK,CAAC,gFAAgF,YAAY,EAAE,GAAI,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA;SACpI;KACF;IACD,OAAO,GAAU,CAAC;AACpB,CAAC,CAAA;AAxBY,QAAA,WAAW,eAwBvB;AAED,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAChD,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC;IAChC,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACtE,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AALD,kCAKC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAG/D,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,iBAmOtE"}
|
|
@@ -41,7 +41,7 @@ async function initFileManager(prg) {
|
|
|
41
41
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
42
42
|
original_name TEXT NOT NULL,
|
|
43
43
|
description TEXT,
|
|
44
|
-
|
|
44
|
+
cloud_url TEXT,
|
|
45
45
|
signed_url TEXT,
|
|
46
46
|
signed_url_expires BIGINT,
|
|
47
47
|
etag TEXT,
|
|
@@ -179,12 +179,12 @@ async function initFileManager(prg) {
|
|
|
179
179
|
// }
|
|
180
180
|
throw "Invalid media";
|
|
181
181
|
}
|
|
182
|
-
if (this.
|
|
182
|
+
if (this.cloudClient) {
|
|
183
183
|
let url = media.signed_url;
|
|
184
184
|
const expires = +(media.signed_url_expires || 0);
|
|
185
185
|
const EXPIRES = Date.now() + FileManager_1.HOUR;
|
|
186
186
|
if (!url || expires < EXPIRES) {
|
|
187
|
-
url = await this.
|
|
187
|
+
url = await this.getFileCloudDownloadURL(media.name, 60 * 60);
|
|
188
188
|
await mediaTable.update({ name }, { signed_url: url, signed_url_expires: EXPIRES });
|
|
189
189
|
}
|
|
190
190
|
res.redirect(url);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,iDAAuD;AAGvD,+CAA+D;AAC/D,yBAAyB;
|
|
1
|
+
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,iDAAuD;AAGvD,+CAA+D;AAC/D,yBAAyB;AAElB,KAAK,UAAU,eAAe,CAAoB,GAAc;IACrE,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IAErB,iCAAiC;IAEjC,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IAC/B,IAAG,CAAC,SAAS;QAAE,MAAM,mBAAmB,CAAC;IACzC,MAAM,EAAE,SAAS,GAAG,OAAO,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;IACjE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAE3B,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,IAAI,GAAG,CAAC,GAAC,GAAG,CAAC;IAC9E,OAAO,CAAC,GAAG,CAAC,6DAA6D,WAAW,uGAAuG,CAAC,CAAC;IAE7L,kEAAkE;IAElE,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAe,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAkB,EAAE;QAC7C,IAAG,CAAC,SAAS;YAAE,MAAM,sFAAsF,CAAC;QAC5G,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;QACf,CAAC;KACJ,CAAC,CAAC;QACH,yDAAyD;IAC3D,CAAC,CAAA;IACD;;OAEG;IACH,IAAG,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAC;QAEtB,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAA,wBAAM,EAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,QAAQ,CAAC,0CAA0C,CAAC,CAAC;QAC3D,MAAM,QAAQ,CAAC,8BAA8B,IAAA,wBAAM,EAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;MAkB5D,CAAC,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAA,wBAAM,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACtD,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;KACxB;IAED;;OAEG;IACH,KAAI,MAAM,QAAQ,IAAI,gBAAgB,EAAC;QAErC,IAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACtB,MAAM,qBAAqB,QAAQ,wEAAwE,CAAC;SAC7G;QACD,MAAM,IAAI,GAAG,MAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAkB,CAAC,UAAU,EAAE,CAAC;QAErE,MAAM,WAAW,GAAG,gBAAgB,CAAC,QAAQ,CAAE,CAAC;QAChD,IAAG,OAAO,WAAW,KAAK,QAAQ,EAAC;YAEjC,KAAK,MAAM,OAAO,IAAI,IAAA,yBAAO,EAAC,WAAW,CAAC,gBAAgB,CAAC,EAAC;gBAE1D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;gBACvD,IAAG,WAAW,EAAC;oBACb,IAAG,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,EAAC;wBACpE,SAAS;qBACV;yBAAM;wBACL,IAAG,WAAW,CAAC,QAAQ,KAAK,MAAM,EAAC;4BACjC,IAAI;gCACF,MAAM,KAAK,GAAG,eAAe,IAAA,wBAAM,EAAC,QAAQ,CAAC,qBAAqB,IAAA,wBAAM,EAAC,OAAO,CAAC,gBAAgB,IAAA,wBAAM,EAAC,SAAS,CAAC,QAAQ,CAAC;gCAC3H,OAAO,CAAC,GAAG,CAAC,0BAA0B,QAAQ,KAAK,OAAO,sFAAsF,KAAK,EAAE,CAAC,CAAC;gCACzJ,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;gCACtB,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC;6BAClC;4BAAC,OAAM,CAAC,EAAC;gCACR,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,YAAY,KAAK,CAAA,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;6BACrG;yBACF;6BAAM;4BACL,OAAO,CAAC,KAAK,CAAC,0BAA0B,QAAQ,KAAK,OAAO,+JAA+J,SAAS,MAAM,CAAC,CAAC;yBAC7O;qBACF;iBACF;qBAAM;oBACL,IAAI;wBACF,MAAM,KAAK,GAAG,eAAe,IAAA,wBAAM,EAAC,QAAQ,CAAC,eAAe,IAAA,wBAAM,EAAC,OAAO,CAAC,oBAAoB,IAAA,wBAAM,EAAC,SAAS,CAAC,QAAQ,CAAA;wBACxH,OAAO,CAAC,GAAG,CAAC,mCAAmC,QAAQ,KAAK,OAAO,SAAS,KAAK,EAAE,CAAC,CAAC;wBACrF,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;wBACtB,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC;qBAClC;oBAAC,OAAM,CAAC,EAAC;wBACR,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,KAAK,CAAA,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;qBACnF;iBACF;aAEF;SACF;aAAM;YAEL,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,SAAS,IAAI,QAAQ,EAAE,CAAC,CAAC;YACnG,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAE/C,IAAG,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,OAAO,CAAC,KAAK,CAAC,iCAAiC,QAAQ,KAAK,UAAU,6DAA6D,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACnK;YAED,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAE3C,IAAG,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,EAAC;gBAC5B,uGAAuG;gBACvG,MAAM,MAAM,GAAG,KAAK,SAAS,QAAQ,QAAQ,gBAAgB,eAAe,EAAE,CAAC,CAAC,eAAe;gBAC/F,MAAM,KAAK,GAAG;uBACC,eAAe;wBACd,OAAO,CAAC,QAAQ,IAAI,OAAO,KAAK,KAAK,CAAA,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,IAAA,wBAAM,EAAC,QAAQ,CAAC,IAAI,IAAA,wBAAM,EAAC,OAAO,CAAC,IAAI,CAAC;iDACzF,IAAA,wBAAM,EAAC,SAAS,CAAC;;SAEzD,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,YAAY,MAAM,MAAM,EAAE,eAAe,CAAC,CAAC;gBACvD,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACtB,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;aAElC;iBAAM;gBACL,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC,UAAW,EAAE,CAAC;gBAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAChD,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;oBAC3C,OAAO,CAAC,KAAK,CACX,oBAAoB,eAAe,6DAA6D,MAAM,CAAC,IAAI,GAAG;wBAC9G,yDAAyD,CAC1D,CAAC;oBACF,IAAI,CAAC,GAAG,gBAAgB,IAAA,wBAAM,EAAC,eAAe,CAAC,qBAAqB,MAAM,CAAC,IAAI,IAAI,CAAC;oBACpF,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;oBACzD,IAAG,MAAM,CAAC,IAAI,KAAK,YAAY,EAAC;wBAC9B,CAAC,IAAI,cAAc,IAAA,wBAAM,EAAC,QAAQ,CAAC,IAAI,IAAA,wBAAM,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;qBACjE;yBAAM,IAAG,MAAM,CAAC,IAAI,KAAK,UAAU,EAAC;wBACnC,CAAC,IAAI,cAAc,IAAA,wBAAM,EAAC,SAAS,CAAC,OAAO,CAAC;qBAC7C;oBAED,IAAG,CAAC,EAAC;wBAEH,IAAI;4BACF,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAA;4BACjB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;yBAE9C;wBAAC,OAAM,CAAC,EAAC;4BACR,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC,CAAC,CAAA;yBACrD;qBACF;gBAEH,CAAC,CAAC,CAAC,CAAC;aACL;SACF;QAGD,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;KACxB;IAED;;OAEG;IACH,MAAM,EACJ,cAAc,GAAG,IAAI,SAAS,EAAE,EAChC,UAAU,EAAE,GAAG,EAChB,GAAG,SAAS,CAAC;IAEd,IAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAC;QAC9B,MAAM,wCAAwC,CAAA;KAC/C;IACD,IAAI,CAAC,SAAS,GAAG,cAAc,CAAC;IAEhC,IAAG,GAAG,EAAC;QACL,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAChD,IAAG,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAC;gBACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,gCAAgC,SAAS,aAAa,EAAE,CAAC,CAAC;gBACtF,OAAO,KAAK,CAAC;aACd;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAA4B,CAAC;YAElE,IAAI;gBAEF,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC5B,IAAG,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI;oBAAE,MAAM,oBAAoB,CAAC;gBAEjE,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAS,CAAC,CAAC;gBAEjK,IAAG,CAAC,KAAK,EAAE;oBACT;;uBAEG;oBACH,wDAAwD;oBACxD,iDAAiD;oBAEjD,WAAW;oBACX,2BAA2B;oBAC3B,IAAI;oBACJ,MAAM,eAAe,CAAC;iBACvB;gBAED,IAAG,IAAI,CAAC,WAAW,EAAC;oBAClB,IAAI,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC;oBAC3B,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,CAAC,CAAC;oBAEjD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAI,CAAC;oBAClC,IAAG,CAAC,GAAG,IAAI,OAAO,GAAG,OAAO,EAAC;wBAC3B,GAAG,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;wBAC9D,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAC;qBACrF;oBAED,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;iBAEnB;qBAAM;oBACL,MAAM,GAAG,GAAG,GAAI,IAAI,CAAC,MAAsB,CAAC,eAAe,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;oBAC5E,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;qBACnC;oBACD,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBACpC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;iBACnB;aAEF;YAAC,OAAM,CAAC,EAAC;gBACR,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAC;aACxD;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAnOD,0CAmOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAAe,UAAU,
|
|
1
|
+
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAAe,UAAU,EAAe,YAAY,EAAE,MAAM,eAAe,CAAC;AAChG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,wBAAsB,MAAM,CAC1B,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,WAAW,EAC1C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,YAAY,CAAC,CAmDvB"}
|
|
@@ -6,14 +6,13 @@ const fs = require("fs");
|
|
|
6
6
|
async function upload(file, name, mime, onProgress) {
|
|
7
7
|
return new Promise(async (resolve, reject) => {
|
|
8
8
|
if (!file) {
|
|
9
|
-
throw "No file. Expecting: Buffer | String | stream";
|
|
9
|
+
throw "No file. Expecting: Buffer | String | stream.PassThrough";
|
|
10
10
|
}
|
|
11
11
|
if (!name) {
|
|
12
|
-
throw "No name. Expecting: String";
|
|
12
|
+
throw "No file name. Expecting: String";
|
|
13
13
|
}
|
|
14
|
-
// let type = await this.getMIME(file, name, allowedExtensions);
|
|
15
14
|
const url = this.getLocalFileUrl(name);
|
|
16
|
-
if (!this.
|
|
15
|
+
if (!this.cloudClient) {
|
|
17
16
|
if (file instanceof stream.PassThrough) {
|
|
18
17
|
throw new Error("S3 config missing. Can only upload streams to S3");
|
|
19
18
|
}
|
|
@@ -34,40 +33,23 @@ async function upload(file, name, mime, onProgress) {
|
|
|
34
33
|
}
|
|
35
34
|
}
|
|
36
35
|
else {
|
|
37
|
-
/* S3 Upload */
|
|
38
|
-
// ACL: "public-read",
|
|
39
|
-
/* ACL needs this permission:
|
|
40
|
-
"s3:PutObject",
|
|
41
|
-
"s3:PutObjectAcl",
|
|
42
|
-
"s3:GetObject",
|
|
43
|
-
"s3:GetObjectAcl",
|
|
44
|
-
*/
|
|
45
|
-
const params = {
|
|
46
|
-
Bucket: this.config.bucket,
|
|
47
|
-
Key: name,
|
|
48
|
-
ContentType: mime,
|
|
49
|
-
Body: file
|
|
50
|
-
};
|
|
51
36
|
let content_length = 0;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
37
|
+
this.cloudClient.upload({
|
|
38
|
+
fileName: name,
|
|
39
|
+
contentType: mime,
|
|
40
|
+
file,
|
|
41
|
+
onFinish: (err, uploaded) => {
|
|
42
|
+
if (err) {
|
|
43
|
+
reject(err.toString());
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
resolve({ ...uploaded, url });
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
onProgress: loaded => {
|
|
50
|
+
content_length = loaded;
|
|
51
|
+
onProgress?.({ loaded, total: content_length });
|
|
57
52
|
}
|
|
58
|
-
else {
|
|
59
|
-
// console.log("Uploaded file:", res)
|
|
60
|
-
resolve({
|
|
61
|
-
url,
|
|
62
|
-
etag: res.ETag,
|
|
63
|
-
s3_url: res.Location,
|
|
64
|
-
content_length // await fileMgr.s3Client?.headObject({ Bucket: ..., Key: ... }).promise() ).ContentLength;
|
|
65
|
-
});
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
manager.on('httpUploadProgress', prog => {
|
|
69
|
-
content_length = prog.total;
|
|
70
|
-
onProgress?.(prog);
|
|
71
53
|
});
|
|
72
54
|
}
|
|
73
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AACjC,yBAAyB;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AACjC,yBAAyB;AAElB,KAAK,UAAU,MAAM,CAE1B,IAA0C,EAC1C,IAAY,EACZ,IAAY,EACZ,UAAuB;IAGvB,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAG,CAAC,IAAI,EAAC;YACP,MAAM,0DAA0D,CAAC;SAClE;QACD,IAAG,CAAC,IAAI,EAAC;YACP,MAAM,iCAAiC,CAAC;SACzC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,IAAG,CAAC,IAAI,CAAC,WAAW,EAAC;YACnB,IAAG,IAAI,YAAY,MAAM,CAAC,WAAW,EAAC;gBACpC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;aACrE;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAqB,CAAC;YAC1C,IAAI;gBACF,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrE,MAAM,QAAQ,GAAG,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,EAAE,CAAC;gBACrD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACjC,OAAO,CAAC;oBACN,GAAG;oBACH,IAAI,EAAE,MAAM;oBACZ,cAAc,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI;iBAC3C,CAAC,CAAC;aACJ;YAAC,OAAM,GAAG,EAAC;gBACV,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;gBAChD,MAAM,CAAC,gBAAgB,CAAC,CAAA;aACzB;SACF;aAAM;YAEL,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;gBACtB,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,IAAI;gBACjB,IAAI;gBACJ,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;oBAC1B,IAAG,GAAG,EAAC;wBACL,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;qBACxB;yBAAM;wBACL,OAAO,CAAC,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;qBAC/B;gBACH,CAAC;gBACD,UAAU,EAAE,MAAM,CAAC,EAAE;oBACnB,cAAc,GAAG,MAAM,CAAC;oBACxB,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;gBAClD,CAAC;aACF,CAAC,CAAC;SACJ;IAEH,CAAC,CAAC,CAAC;AACL,CAAC;AAzDD,wBAyDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadStream.d.ts","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,wBAAgB,YAAY,CAC1B,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAG,IAAI,EAC5B,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAG,IAAI,EAClC,iBAAiB,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"uploadStream.d.ts","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,wBAAgB,YAAY,CAC1B,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAG,IAAI,EAC5B,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAG,IAAI,EAClC,iBAAiB,CAAC,EAAE,MAAM,sBAkE3B"}
|
|
@@ -6,8 +6,7 @@ const stream = require("stream");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
function uploadStream(name, mime, onProgress, onError, onEnd, expectedSizeBytes) {
|
|
8
8
|
const passThrough = new stream.PassThrough();
|
|
9
|
-
if (!this.
|
|
10
|
-
// throw new Error("S3 config missing. Can only upload streams to S3");
|
|
9
|
+
if (!this.cloudClient && "localFolderPath" in this.config) {
|
|
11
10
|
try {
|
|
12
11
|
this.checkFreeSpace(this.config.localFolderPath, expectedSizeBytes).catch(err => {
|
|
13
12
|
onError?.(err);
|
|
@@ -31,7 +30,7 @@ function uploadStream(name, mime, onProgress, onError, onEnd, expectedSizeBytes)
|
|
|
31
30
|
const now = Date.now();
|
|
32
31
|
if (now - lastProgress > throttle) {
|
|
33
32
|
lastProgress = now;
|
|
34
|
-
onProgress?.({ loaded, total: 0 });
|
|
33
|
+
onProgress?.({ loaded, total: expectedSizeBytes ?? 0 });
|
|
35
34
|
}
|
|
36
35
|
});
|
|
37
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadStream.js","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":";;;AACA,yBAAyB;AACzB,iCAAiC;AACjC,6BAA6B;AAE7B,SAAgB,YAAY,CAE1B,IAAY,EACZ,IAAY,EACZ,UAAuB,EACvB,OAA4B,EAC5B,KAAkC,EAClC,iBAA0B;IAE1B,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;IAE7C,IAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"uploadStream.js","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":"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"}
|
package/dist/Prostgles.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import * as pgPromise from 'pg-promise';
|
|
3
3
|
import pg = require('pg-promise/typescript/pg-subset');
|
|
4
|
-
import { FileManager, ImageOptions, LocalConfig,
|
|
4
|
+
import { FileManager, ImageOptions, LocalConfig, CloudClient } from "./FileManager/FileManager";
|
|
5
5
|
import { SchemaWatch } from "./SchemaWatch";
|
|
6
6
|
import { EventTriggerTagFilter } from "./Event_Trigger_Tags";
|
|
7
7
|
import AuthHandler, { Auth, SessionUser, AuthRequestParams } from "./AuthHandler";
|
|
@@ -84,7 +84,7 @@ export type FileTableConfig = {
|
|
|
84
84
|
* GET path used in serving media. defaults to /${tableName}
|
|
85
85
|
*/
|
|
86
86
|
fileServeRoute?: string;
|
|
87
|
-
|
|
87
|
+
cloudClient?: CloudClient;
|
|
88
88
|
localConfig?: LocalConfig;
|
|
89
89
|
/**
|
|
90
90
|
* If defined the the files will not be deleted immediately
|
package/dist/Prostgles.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prostgles.d.ts","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":";AAMA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,GAAG,QAAQ,iCAAiC,CAAC,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"Prostgles.d.ts","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
|
package/dist/Prostgles.js
CHANGED
|
@@ -272,11 +272,11 @@ class Prostgles {
|
|
|
272
272
|
/* Create media table if required */
|
|
273
273
|
initFileTable = async () => {
|
|
274
274
|
if (this.opts.fileTable) {
|
|
275
|
-
const {
|
|
275
|
+
const { cloudClient, localConfig, imageOptions } = this.opts.fileTable;
|
|
276
276
|
await this.refreshDBO();
|
|
277
|
-
if (!
|
|
277
|
+
if (!cloudClient && !localConfig)
|
|
278
278
|
throw "fileTable missing param: Must provide awsS3Config OR localConfig";
|
|
279
|
-
this.fileManager = new FileManager_1.FileManager(
|
|
279
|
+
this.fileManager = new FileManager_1.FileManager(cloudClient || localConfig, imageOptions);
|
|
280
280
|
try {
|
|
281
281
|
await this.fileManager.init(this);
|
|
282
282
|
}
|
package/dist/Prostgles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prostgles.js","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Prostgles.js","sourceRoot":"","sources":["../lib/Prostgles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
import { S3, IAM } from 'aws-sdk';
|
|
3
2
|
// import { PutObjectCommand, S3 } from "@aws-sdk/client-s3";
|
|
4
3
|
import * as fs from 'fs';
|
|
5
4
|
import * as stream from 'stream';
|
|
@@ -10,7 +9,6 @@ import checkDiskSpace from 'check-disk-space';
|
|
|
10
9
|
import { DB, DBHandlerServer, ExpressApp, Prostgles } from '../Prostgles';
|
|
11
10
|
import { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION, CONTENT_TYPE_TO_EXT, getKeys, isDefined, ValidatedColumnInfo } from 'prostgles-types';
|
|
12
11
|
|
|
13
|
-
import AWS from 'aws-sdk';
|
|
14
12
|
import * as path from "path";
|
|
15
13
|
import { initFileManager } from "./initFileManager";
|
|
16
14
|
import { parseFile } from "./parseFile";
|
|
@@ -23,7 +21,7 @@ export const asSQLIdentifier = async (name: string, db: DB): Promise<string> =>
|
|
|
23
21
|
return (await db.one("select format('%I', $1) as name", [name]))?.name
|
|
24
22
|
}
|
|
25
23
|
|
|
26
|
-
export type OnProgress = (progress:
|
|
24
|
+
export type OnProgress = (progress: { total: number; loaded: number; }) => void
|
|
27
25
|
|
|
28
26
|
export type ImageOptions = {
|
|
29
27
|
keepMetadata?: boolean;
|
|
@@ -38,11 +36,24 @@ export type ImageOptions = {
|
|
|
38
36
|
}
|
|
39
37
|
}
|
|
40
38
|
|
|
41
|
-
export type
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
39
|
+
export type UploadedCloudFile = {
|
|
40
|
+
cloud_url: string;
|
|
41
|
+
etag: string;
|
|
42
|
+
content_length: number;
|
|
43
|
+
};
|
|
44
|
+
type FileUploadArgs = {
|
|
45
|
+
fileName: string;
|
|
46
|
+
contentType: string;
|
|
47
|
+
file: string | Buffer | stream.PassThrough;
|
|
48
|
+
onFinish: (...args: [error: Error, result: undefined] | [error: undefined, result: UploadedCloudFile]) => void;
|
|
49
|
+
onProgress?: (bytesUploaded: number) => void;
|
|
50
|
+
}
|
|
51
|
+
export type CloudClient = {
|
|
52
|
+
upload: (file: FileUploadArgs) => Promise<void>;
|
|
53
|
+
download: (fileName: string) => Promise<Buffer>;
|
|
54
|
+
downloadAsStream: (name: string) => Promise<stream.Readable>;
|
|
55
|
+
delete: (fileName: string) => Promise<void>;
|
|
56
|
+
getSignedUrlForDownload: (fileName: string, expiresInSeconds: number) => Promise<string>;
|
|
46
57
|
}
|
|
47
58
|
|
|
48
59
|
export type LocalConfig = {
|
|
@@ -74,9 +85,9 @@ export type UploadedItem = {
|
|
|
74
85
|
etag: string;
|
|
75
86
|
|
|
76
87
|
/**
|
|
77
|
-
*
|
|
88
|
+
* Cloud url of the resource
|
|
78
89
|
*/
|
|
79
|
-
|
|
90
|
+
cloud_url?: string;
|
|
80
91
|
|
|
81
92
|
/**
|
|
82
93
|
* Total uploaded file size in bytes
|
|
@@ -86,27 +97,15 @@ export type UploadedItem = {
|
|
|
86
97
|
|
|
87
98
|
export class FileManager {
|
|
88
99
|
|
|
89
|
-
|
|
90
|
-
const sts = new AWS.STS();
|
|
91
|
-
AWS.config.credentials = {
|
|
92
|
-
accessKeyId,
|
|
93
|
-
secretAccessKey
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
const ident = await sts.getCallerIdentity({}).promise();
|
|
97
|
-
return ident;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
s3Client?: S3;
|
|
100
|
+
cloudClient?: CloudClient;
|
|
101
101
|
|
|
102
|
-
config:
|
|
102
|
+
config: CloudClient | LocalConfig;
|
|
103
103
|
imageOptions?: ImageOptions;
|
|
104
104
|
|
|
105
105
|
prostgles?: Prostgles;
|
|
106
106
|
get dbo(): DBHandlerServer {
|
|
107
107
|
if(!this.prostgles?.dbo) {
|
|
108
|
-
|
|
109
|
-
throw "this.prostgles.dbo missing"
|
|
108
|
+
throw "this.prostgles.dbo missing";
|
|
110
109
|
}
|
|
111
110
|
return this.prostgles.dbo
|
|
112
111
|
}
|
|
@@ -128,12 +127,8 @@ export class FileManager {
|
|
|
128
127
|
this.config = config;
|
|
129
128
|
this.imageOptions = imageOptions;
|
|
130
129
|
|
|
131
|
-
if("
|
|
132
|
-
|
|
133
|
-
this.s3Client = new S3({
|
|
134
|
-
region,
|
|
135
|
-
credentials: { accessKeyId, secretAccessKey },
|
|
136
|
-
});
|
|
130
|
+
if("upload" in config){
|
|
131
|
+
this.cloudClient = config;
|
|
137
132
|
}
|
|
138
133
|
|
|
139
134
|
const fullConfig = this.prostgles?.opts.fileTable;
|
|
@@ -154,8 +149,8 @@ export class FileManager {
|
|
|
154
149
|
}
|
|
155
150
|
|
|
156
151
|
async getFileStream(name: string): Promise<stream.Readable> {
|
|
157
|
-
if(
|
|
158
|
-
return this.
|
|
152
|
+
if(this.cloudClient){
|
|
153
|
+
return this.cloudClient.downloadAsStream(name)
|
|
159
154
|
} else if("localFolderPath" in this.config){
|
|
160
155
|
const filePath = path.resolve(`${this.config.localFolderPath}/${name}`);
|
|
161
156
|
if(!fs.existsSync(filePath)){
|
|
@@ -166,8 +161,8 @@ export class FileManager {
|
|
|
166
161
|
}
|
|
167
162
|
|
|
168
163
|
async deleteFile(name: string) {
|
|
169
|
-
if(
|
|
170
|
-
const res = await this.
|
|
164
|
+
if(this.cloudClient){
|
|
165
|
+
const res = await this.cloudClient?.delete(name);
|
|
171
166
|
return res;
|
|
172
167
|
} else if("localFolderPath" in this.config){
|
|
173
168
|
const path = `${this.config.localFolderPath}/${name}`;
|
|
@@ -185,7 +180,7 @@ export class FileManager {
|
|
|
185
180
|
getLocalFileUrl = (name: string) => this.fileRoute? `${this.fileRoute}/${name}` : "";
|
|
186
181
|
|
|
187
182
|
checkFreeSpace = async (folderPath: string, fileSize = 0) => {
|
|
188
|
-
if(!this.
|
|
183
|
+
if(!this.cloudClient && "localFolderPath" in this.config) {
|
|
189
184
|
const { minFreeBytes = 1.048e6 } = this.config;
|
|
190
185
|
const required = Math.max(fileSize, minFreeBytes)
|
|
191
186
|
if(required){
|
|
@@ -259,13 +254,8 @@ export class FileManager {
|
|
|
259
254
|
return res
|
|
260
255
|
}
|
|
261
256
|
|
|
262
|
-
async
|
|
263
|
-
|
|
264
|
-
Bucket: (this.config as S3Config).bucket,
|
|
265
|
-
Key: fileName,
|
|
266
|
-
Expires: Math.round(expiresInSeconds || 30 * 60) // Error if float
|
|
267
|
-
};
|
|
268
|
-
return await this.s3Client?.getSignedUrlPromise("getObject", params);
|
|
257
|
+
async getFileCloudDownloadURL(fileName: string, expiresInSeconds: number = 30 * 60){
|
|
258
|
+
return await this.cloudClient?.getSignedUrlForDownload(fileName, expiresInSeconds);
|
|
269
259
|
}
|
|
270
260
|
|
|
271
261
|
parseSQLIdentifier = async (name: string ) => asSQLIdentifier(name, this.prostgles!.db!);// this.prostgles.dbo.sql<"value">("select format('%I', $1)", [name], { returnType: "value" } )
|
|
@@ -354,25 +344,3 @@ export function bytesToSize(bytes: number) {
|
|
|
354
344
|
const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)) + "");
|
|
355
345
|
return (bytes / Math.pow(1024, i)).toFixed(1) + ' ' + sizes[i];
|
|
356
346
|
}
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
/**
|
|
360
|
-
*
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
// if(content_type && typeof content_type !== "string") throw "Invalid content_type provided";
|
|
364
|
-
// if(title && typeof title !== "string") throw "Invalid title provided";
|
|
365
|
-
// let fExt = name.split(".").pop()
|
|
366
|
-
// if(content_type && name.split(".").length > 1 && fExt && fExt.length <= 4){
|
|
367
|
-
// type = {
|
|
368
|
-
// mime: content_type,
|
|
369
|
-
// ext: fExt,
|
|
370
|
-
// fileName: name,
|
|
371
|
-
// }
|
|
372
|
-
// } else {
|
|
373
|
-
// type = await this.getMIME(data, name);//, ["png", "jpg", "ogg", "webm", "pdf", "doc"]);
|
|
374
|
-
// }
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
*/
|
|
@@ -4,7 +4,6 @@ import { TableHandler } from "../DboBuilder/TableHandler";
|
|
|
4
4
|
import { Prostgles } from "../Prostgles";
|
|
5
5
|
import { FileManager, HOUR, LocalConfig } from "./FileManager";
|
|
6
6
|
import * as fs from 'fs';
|
|
7
|
-
import { PubSubManager } from "../PubSubManager/PubSubManager";
|
|
8
7
|
|
|
9
8
|
export async function initFileManager(this: FileManager, prg: Prostgles){
|
|
10
9
|
this.prostgles = prg;
|
|
@@ -46,7 +45,7 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
|
|
|
46
45
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
47
46
|
original_name TEXT NOT NULL,
|
|
48
47
|
description TEXT,
|
|
49
|
-
|
|
48
|
+
cloud_url TEXT,
|
|
50
49
|
signed_url TEXT,
|
|
51
50
|
signed_url_expires BIGINT,
|
|
52
51
|
etag TEXT,
|
|
@@ -206,13 +205,13 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
|
|
|
206
205
|
throw "Invalid media";
|
|
207
206
|
}
|
|
208
207
|
|
|
209
|
-
if(this.
|
|
208
|
+
if(this.cloudClient){
|
|
210
209
|
let url = media.signed_url;
|
|
211
210
|
const expires = +(media.signed_url_expires || 0);
|
|
212
211
|
|
|
213
212
|
const EXPIRES = Date.now() + HOUR;
|
|
214
213
|
if(!url || expires < EXPIRES){
|
|
215
|
-
url = await this.
|
|
214
|
+
url = await this.getFileCloudDownloadURL(media.name, 60 * 60);
|
|
216
215
|
await mediaTable.update({ name }, { signed_url: url, signed_url_expires: EXPIRES });
|
|
217
216
|
}
|
|
218
217
|
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { FileManager, LocalConfig, OnProgress,
|
|
1
|
+
import { FileManager, LocalConfig, OnProgress, CloudClient, UploadedItem } from "./FileManager";
|
|
2
2
|
import * as stream from 'stream';
|
|
3
3
|
import * as fs from 'fs';
|
|
4
|
-
import { ManagedUpload } from "aws-sdk/clients/s3";
|
|
5
4
|
|
|
6
5
|
export async function upload(
|
|
7
6
|
this: FileManager,
|
|
@@ -11,73 +10,53 @@ export async function upload(
|
|
|
11
10
|
onProgress?: OnProgress
|
|
12
11
|
): Promise<UploadedItem> {
|
|
13
12
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
return new Promise(async (resolve, reject) => {
|
|
14
|
+
if(!file){
|
|
15
|
+
throw "No file. Expecting: Buffer | String | stream.PassThrough";
|
|
16
|
+
}
|
|
17
|
+
if(!name){
|
|
18
|
+
throw "No file name. Expecting: String";
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
const url = this.getLocalFileUrl(name);
|
|
22
|
+
if(!this.cloudClient){
|
|
23
|
+
if(file instanceof stream.PassThrough){
|
|
24
|
+
throw new Error("S3 config missing. Can only upload streams to S3");
|
|
17
25
|
}
|
|
18
|
-
|
|
19
|
-
|
|
26
|
+
const config = this.config as LocalConfig;
|
|
27
|
+
try {
|
|
28
|
+
await fs.promises.mkdir(config.localFolderPath, { recursive: true });
|
|
29
|
+
const filePath = `${config.localFolderPath}/${name}`;
|
|
30
|
+
fs.writeFileSync(filePath, file);
|
|
31
|
+
resolve({
|
|
32
|
+
url,
|
|
33
|
+
etag: `none`,
|
|
34
|
+
content_length: fs.statSync(filePath).size
|
|
35
|
+
});
|
|
36
|
+
} catch(err){
|
|
37
|
+
console.error("Error saving file locally", err);
|
|
38
|
+
reject("Internal error")
|
|
20
39
|
}
|
|
40
|
+
} else {
|
|
21
41
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const config = this.config as LocalConfig;
|
|
29
|
-
try {
|
|
30
|
-
await fs.promises.mkdir(config.localFolderPath, { recursive: true });
|
|
31
|
-
const filePath = `${config.localFolderPath}/${name}`;
|
|
32
|
-
fs.writeFileSync(filePath, file);
|
|
33
|
-
resolve({
|
|
34
|
-
url,
|
|
35
|
-
etag: `none`,
|
|
36
|
-
content_length: fs.statSync(filePath).size
|
|
37
|
-
})
|
|
38
|
-
} catch(err){
|
|
39
|
-
console.error("Error saving file locally", err);
|
|
40
|
-
reject("Internal error")
|
|
41
|
-
}
|
|
42
|
-
} else {
|
|
43
|
-
|
|
44
|
-
/* S3 Upload */
|
|
45
|
-
// ACL: "public-read",
|
|
46
|
-
/* ACL needs this permission:
|
|
47
|
-
"s3:PutObject",
|
|
48
|
-
"s3:PutObjectAcl",
|
|
49
|
-
"s3:GetObject",
|
|
50
|
-
"s3:GetObjectAcl",
|
|
51
|
-
*/
|
|
52
|
-
const params = {
|
|
53
|
-
Bucket: (this.config as S3Config).bucket,
|
|
54
|
-
Key: name,
|
|
55
|
-
ContentType: mime,
|
|
56
|
-
Body: file
|
|
57
|
-
};
|
|
58
|
-
|
|
59
|
-
let content_length = 0;
|
|
60
|
-
const manager = this.s3Client.upload(params, (err: Error, res: ManagedUpload.SendData) => {
|
|
61
|
-
// const manager = this.s3Client.send(new PutObjectCommand(params), (err: Error, res) => {
|
|
62
|
-
|
|
42
|
+
let content_length = 0;
|
|
43
|
+
this.cloudClient.upload({
|
|
44
|
+
fileName: name,
|
|
45
|
+
contentType: mime,
|
|
46
|
+
file,
|
|
47
|
+
onFinish: (err, uploaded) => {
|
|
63
48
|
if(err){
|
|
64
49
|
reject(err.toString());
|
|
65
|
-
console.error(err)
|
|
66
50
|
} else {
|
|
67
|
-
|
|
68
|
-
resolve({
|
|
69
|
-
url,
|
|
70
|
-
etag: res.ETag,
|
|
71
|
-
s3_url: res.Location,
|
|
72
|
-
content_length // await fileMgr.s3Client?.headObject({ Bucket: ..., Key: ... }).promise() ).ContentLength;
|
|
73
|
-
});
|
|
51
|
+
resolve({ ...uploaded, url });
|
|
74
52
|
}
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
content_length =
|
|
78
|
-
onProgress?.(
|
|
79
|
-
}
|
|
80
|
-
}
|
|
53
|
+
},
|
|
54
|
+
onProgress: loaded => {
|
|
55
|
+
content_length = loaded;
|
|
56
|
+
onProgress?.({ loaded, total: content_length });
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
}
|
|
81
60
|
|
|
82
|
-
|
|
83
|
-
|
|
61
|
+
});
|
|
62
|
+
}
|
|
@@ -14,8 +14,7 @@ export function uploadStream(
|
|
|
14
14
|
){
|
|
15
15
|
const passThrough = new stream.PassThrough();
|
|
16
16
|
|
|
17
|
-
if(!this.
|
|
18
|
-
// throw new Error("S3 config missing. Can only upload streams to S3");
|
|
17
|
+
if(!this.cloudClient && "localFolderPath" in this.config) {
|
|
19
18
|
|
|
20
19
|
try {
|
|
21
20
|
this.checkFreeSpace(this.config.localFolderPath, expectedSizeBytes).catch(err => {
|
|
@@ -42,7 +41,7 @@ export function uploadStream(
|
|
|
42
41
|
const now = Date.now();
|
|
43
42
|
if(now - lastProgress > throttle){
|
|
44
43
|
lastProgress = now;
|
|
45
|
-
onProgress?.({ loaded, total: 0 });
|
|
44
|
+
onProgress?.({ loaded, total: expectedSizeBytes ?? 0 });
|
|
46
45
|
}
|
|
47
46
|
});
|
|
48
47
|
}
|
package/lib/Prostgles.ts
CHANGED
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
import * as promise from "bluebird";
|
|
7
7
|
import * as pgPromise from 'pg-promise';
|
|
8
8
|
import pg = require('pg-promise/typescript/pg-subset');
|
|
9
|
-
import { FileManager, ImageOptions, LocalConfig,
|
|
10
|
-
import { SchemaWatch
|
|
9
|
+
import { FileManager, ImageOptions, LocalConfig, CloudClient } from "./FileManager/FileManager";
|
|
10
|
+
import { SchemaWatch } from "./SchemaWatch";
|
|
11
11
|
import { EventTriggerTagFilter } from "./Event_Trigger_Tags";
|
|
12
12
|
|
|
13
13
|
const { version } = require('../package.json');
|
|
@@ -186,7 +186,7 @@ export type FileTableConfig = {
|
|
|
186
186
|
*/
|
|
187
187
|
fileServeRoute?: string;
|
|
188
188
|
|
|
189
|
-
|
|
189
|
+
cloudClient?: CloudClient;
|
|
190
190
|
localConfig?: LocalConfig;
|
|
191
191
|
// {
|
|
192
192
|
// region: string;
|
|
@@ -576,11 +576,11 @@ export class Prostgles {
|
|
|
576
576
|
initFileTable = async () => {
|
|
577
577
|
|
|
578
578
|
if (this.opts.fileTable) {
|
|
579
|
-
const {
|
|
579
|
+
const { cloudClient, localConfig, imageOptions } = this.opts.fileTable;
|
|
580
580
|
await this.refreshDBO();
|
|
581
|
-
if (!
|
|
581
|
+
if (!cloudClient && !localConfig) throw "fileTable missing param: Must provide awsS3Config OR localConfig";
|
|
582
582
|
|
|
583
|
-
this.fileManager = new FileManager(
|
|
583
|
+
this.fileManager = new FileManager(cloudClient || localConfig!, imageOptions);
|
|
584
584
|
|
|
585
585
|
try {
|
|
586
586
|
await this.fileManager.init(this);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -33,10 +33,8 @@
|
|
|
33
33
|
],
|
|
34
34
|
"homepage": "https://prostgles.com",
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@aws-sdk/client-s3": "^3.363.0",
|
|
37
36
|
"@types/express": "^4.17.13",
|
|
38
37
|
"@types/json-schema": "^7.0.11",
|
|
39
|
-
"aws-sdk": "^2.1395.0",
|
|
40
38
|
"bluebird": "^3.7.2",
|
|
41
39
|
"check-disk-space": "^3.3.1",
|
|
42
40
|
"file-type": "^17.1.4",
|
|
@@ -45,7 +43,6 @@
|
|
|
45
43
|
"sharp": "^0.32.1"
|
|
46
44
|
},
|
|
47
45
|
"devDependencies": {
|
|
48
|
-
"@aws-sdk/types": "^3.110.0",
|
|
49
46
|
"@types/bluebird": "^3.5.36",
|
|
50
47
|
"@types/node": "^18.0.3",
|
|
51
48
|
"@types/sharp": "^0.30.4",
|
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
35212
|
|
@@ -21,13 +21,11 @@
|
|
|
21
21
|
},
|
|
22
22
|
"../..": {
|
|
23
23
|
"name": "prostgles-server",
|
|
24
|
-
"version": "4.1.
|
|
24
|
+
"version": "4.1.4",
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@aws-sdk/client-s3": "^3.363.0",
|
|
28
27
|
"@types/express": "^4.17.13",
|
|
29
28
|
"@types/json-schema": "^7.0.11",
|
|
30
|
-
"aws-sdk": "^2.1395.0",
|
|
31
29
|
"bluebird": "^3.7.2",
|
|
32
30
|
"check-disk-space": "^3.3.1",
|
|
33
31
|
"file-type": "^17.1.4",
|
|
@@ -36,7 +34,6 @@
|
|
|
36
34
|
"sharp": "^0.32.1"
|
|
37
35
|
},
|
|
38
36
|
"devDependencies": {
|
|
39
|
-
"@aws-sdk/types": "^3.110.0",
|
|
40
37
|
"@types/bluebird": "^3.5.36",
|
|
41
38
|
"@types/node": "^18.0.3",
|
|
42
39
|
"@types/sharp": "^0.30.4",
|
|
@@ -1513,8 +1510,6 @@
|
|
|
1513
1510
|
"prostgles-server": {
|
|
1514
1511
|
"version": "file:../..",
|
|
1515
1512
|
"requires": {
|
|
1516
|
-
"@aws-sdk/client-s3": "^3.363.0",
|
|
1517
|
-
"@aws-sdk/types": "^3.110.0",
|
|
1518
1513
|
"@types/bluebird": "^3.5.36",
|
|
1519
1514
|
"@types/express": "^4.17.13",
|
|
1520
1515
|
"@types/json-schema": "^7.0.11",
|
|
@@ -1522,7 +1517,6 @@
|
|
|
1522
1517
|
"@types/sharp": "^0.30.4",
|
|
1523
1518
|
"@typescript-eslint/eslint-plugin": "^5.53.0",
|
|
1524
1519
|
"@typescript-eslint/parser": "^5.53.0",
|
|
1525
|
-
"aws-sdk": "^2.1395.0",
|
|
1526
1520
|
"bluebird": "^3.7.2",
|
|
1527
1521
|
"check-disk-space": "^3.3.1",
|
|
1528
1522
|
"eslint": "^8.44.0",
|