prostgles-server 4.2.337 → 4.2.339
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAElF,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAElF,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAG/D,eAAO,MAAM,oBAAoB,gCAG9B,KAAK,oBAAoB,EAAE,WAAW,GAAG,aAAa,CAAC;;;;;;;;;;;;aAsDzD,CAAC;AAEF,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,iBA+KtE"}
|
|
@@ -7,6 +7,7 @@ const AuthHandler_1 = require("../Auth/AuthHandler");
|
|
|
7
7
|
const runSQL_1 = require("../DboBuilder/runSQL");
|
|
8
8
|
const runClientRequest_1 = require("../runClientRequest");
|
|
9
9
|
const FileManager_1 = require("./FileManager");
|
|
10
|
+
const path_1 = require("path");
|
|
10
11
|
const getFileManagerSchema = ({ fileTable, tableConfig, }) => {
|
|
11
12
|
if (!fileTable) {
|
|
12
13
|
return;
|
|
@@ -195,12 +196,12 @@ async function initFileManager(prg) {
|
|
|
195
196
|
const EXPIRES = Date.now() + FileManager_1.HOUR;
|
|
196
197
|
if (!url || expires < EXPIRES) {
|
|
197
198
|
url = await this.getFileCloudDownloadURL(media.name, 60 * 60);
|
|
198
|
-
await mediaTableHandler.update({
|
|
199
|
+
await mediaTableHandler.update({ id: media.id }, { signed_url: url, signed_url_expires: EXPIRES });
|
|
199
200
|
}
|
|
200
201
|
res.redirect(url);
|
|
201
202
|
}
|
|
202
203
|
else {
|
|
203
|
-
const pth =
|
|
204
|
+
const pth = (0, path_1.join)(this.config.localFolderPath, media.name);
|
|
204
205
|
if (!fs.existsSync(pth)) {
|
|
205
206
|
throw new Error("File not found");
|
|
206
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,qDAAqD;AACrD,qDAAsD;AAGtD,iDAAuD;AAGvD,0DAAuD;AACvD,+CAA+D;
|
|
1
|
+
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { Prostgles } from "../Prostgles";
|
|
|
8
8
|
import type { SchemaRelatedOptions } from "../TableConfig/getCreateSchemaQueries";
|
|
9
9
|
import { runClientRequest } from "../runClientRequest";
|
|
10
10
|
import { FileManager, HOUR, LocalConfig } from "./FileManager";
|
|
11
|
+
import { join } from "path";
|
|
11
12
|
|
|
12
13
|
export const getFileManagerSchema = ({
|
|
13
14
|
fileTable,
|
|
@@ -224,14 +225,14 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
|
|
|
224
225
|
if (!url || expires < EXPIRES) {
|
|
225
226
|
url = await this.getFileCloudDownloadURL(media.name, 60 * 60);
|
|
226
227
|
await mediaTableHandler.update(
|
|
227
|
-
{
|
|
228
|
+
{ id: media.id },
|
|
228
229
|
{ signed_url: url, signed_url_expires: EXPIRES }
|
|
229
230
|
);
|
|
230
231
|
}
|
|
231
232
|
|
|
232
233
|
res.redirect(url);
|
|
233
234
|
} else {
|
|
234
|
-
const pth =
|
|
235
|
+
const pth = join((this.config as LocalConfig).localFolderPath, media.name);
|
|
235
236
|
if (!fs.existsSync(pth)) {
|
|
236
237
|
throw new Error("File not found");
|
|
237
238
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.339",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"pg": "^8.15.6",
|
|
57
57
|
"pg-cursor": "^2.14.6",
|
|
58
58
|
"pg-promise": "^11.13.0",
|
|
59
|
-
"prostgles-types": "^4.0.
|
|
59
|
+
"prostgles-types": "^4.0.182"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@eslint/js": "^9.22.0",
|