@social-mail/social-mail-web-server 1.7.198 → 1.7.200
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/common/BaseDiskCache.d.ts +6 -2
- package/dist/common/BaseDiskCache.d.ts.map +1 -1
- package/dist/common/BaseDiskCache.js +38 -6
- package/dist/common/BaseDiskCache.js.map +1 -1
- package/dist/server/services/cache/DiskCacheService.d.ts +1 -0
- package/dist/server/services/cache/DiskCacheService.d.ts.map +1 -1
- package/dist/server/services/cache/DiskCacheService.js +14 -93
- package/dist/server/services/cache/DiskCacheService.js.map +1 -1
- package/dist/server/storage/TempFileService.d.ts.map +1 -1
- package/dist/server/storage/TempFileService.js +6 -2
- package/dist/server/storage/TempFileService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/BaseDiskCache.ts +43 -7
- package/src/server/services/cache/DiskCacheService.ts +16 -91
- package/src/server/storage/TempFileService.ts +6 -2
|
@@ -4,15 +4,19 @@ export default class BaseDiskCache {
|
|
|
4
4
|
protected readonly keepTTLSeconds: number;
|
|
5
5
|
protected readonly minSize: number;
|
|
6
6
|
protected readonly updateAccessTime: boolean;
|
|
7
|
-
|
|
7
|
+
protected readonly maxAge: number;
|
|
8
|
+
constructor({ root, keepTTLSeconds, minSize, updateAccessTime, maxAge }: {
|
|
8
9
|
root: string;
|
|
9
10
|
keepTTLSeconds?: number;
|
|
10
11
|
minSize?: number;
|
|
11
12
|
updateAccessTime?: boolean;
|
|
13
|
+
maxAge?: number;
|
|
12
14
|
});
|
|
13
15
|
get(path: string): Promise<LocalFile>;
|
|
14
16
|
getOrCreateAsync(path: string, factory: (fx: LocalFile) => Promise<void>, ext?: string): Promise<LocalFile>;
|
|
15
|
-
|
|
17
|
+
createTempFileDeleteOnExit(pathFragments: string[], name: string, contentType: string): LocalFile;
|
|
18
|
+
protected deleteFile(path: string): Promise<void>;
|
|
19
|
+
protected clean(): Promise<void>;
|
|
16
20
|
private getFilesToDelete;
|
|
17
21
|
}
|
|
18
22
|
//# sourceMappingURL=BaseDiskCache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDiskCache.d.ts","sourceRoot":"","sources":["../../src/common/BaseDiskCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAa/E,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseDiskCache.d.ts","sourceRoot":"","sources":["../../src/common/BaseDiskCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAa/E,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAE9B,EACI,IAAI,EACJ,cAAqB,EACrB,OAAiC,EACjC,gBAAuB,EACvB,MAAU,EACb,EAAE;QACC,IAAI,EAAE,MAAM,CAAC;QACb,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB;IAWC,GAAG,CAAC,IAAI,EAAE,MAAM;IAWhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,SAAS;IAyC5F,0BAA0B,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;cAUrE,UAAU,CAAC,IAAI,EAAE,MAAM;cAuBvB,KAAK;YAkCP,gBAAgB;CA8BjC"}
|
|
@@ -49,7 +49,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
|
|
|
49
49
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
50
50
|
import ensureDir from "./FileApi.js";
|
|
51
51
|
import LockFile from "../server/storage/LockFile.js";
|
|
52
|
-
import fsp, { stat, unlink } from "node:fs/promises";
|
|
52
|
+
import fsp, { rmdir, stat, unlink } from "node:fs/promises";
|
|
53
53
|
import sleep from "./sleep.js";
|
|
54
54
|
import { existsSync } from "node:fs";
|
|
55
55
|
import { join, parse } from "node:path";
|
|
@@ -58,7 +58,7 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
|
|
|
58
58
|
import { toKMBString } from "./NumberFormats.js";
|
|
59
59
|
const doNothing = () => void 0;
|
|
60
60
|
export default class BaseDiskCache {
|
|
61
|
-
constructor({ root, keepTTLSeconds = 3600, minSize = Number.MAX_SAFE_INTEGER, updateAccessTime = true }) {
|
|
61
|
+
constructor({ root, keepTTLSeconds = 3600, minSize = Number.MAX_SAFE_INTEGER, updateAccessTime = true, maxAge = 1 }) {
|
|
62
62
|
this.root = root;
|
|
63
63
|
this.keepTTLSeconds = keepTTLSeconds;
|
|
64
64
|
this.minSize = minSize;
|
|
@@ -94,6 +94,7 @@ export default class BaseDiskCache {
|
|
|
94
94
|
return new LocalFile(path, void 0, void 0, doNothing);
|
|
95
95
|
}
|
|
96
96
|
const tmpPath = join(this.root, randomUUID() + (parsedPath.ext || ext));
|
|
97
|
+
// console.log(`Downloading for ${path}`);
|
|
97
98
|
await factory(new LocalFile(tmpPath, void 0, void 0, doNothing));
|
|
98
99
|
try {
|
|
99
100
|
await fsp.rename(tmpPath, path);
|
|
@@ -118,21 +119,52 @@ export default class BaseDiskCache {
|
|
|
118
119
|
}
|
|
119
120
|
throw new EntityAccessError(`Failed to write file due to error ${error.stack ?? error}`);
|
|
120
121
|
}
|
|
122
|
+
createTempFileDeleteOnExit(pathFragments, name, contentType) {
|
|
123
|
+
const fileName = pathFragments.pop();
|
|
124
|
+
if (pathFragments.length) {
|
|
125
|
+
const folder = join(this.root, ...pathFragments);
|
|
126
|
+
ensureDir(folder);
|
|
127
|
+
}
|
|
128
|
+
const path = join(this.root, ...pathFragments, fileName);
|
|
129
|
+
return new LocalFile(path, name, contentType, () => this.deleteFile(path).catch(console.error));
|
|
130
|
+
}
|
|
131
|
+
async deleteFile(path) {
|
|
132
|
+
if (!path.startsWith(this.root)) {
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
// console.log(`Deleting ${path}`);
|
|
136
|
+
await unlink(path);
|
|
137
|
+
for (;;) {
|
|
138
|
+
const parsed = parse(path);
|
|
139
|
+
if (parsed.dir === this.root) {
|
|
140
|
+
break;
|
|
141
|
+
}
|
|
142
|
+
path = parsed.dir;
|
|
143
|
+
try {
|
|
144
|
+
// console.log(`Deleting folder ${path}`);
|
|
145
|
+
await rmdir(path);
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
// do nothing
|
|
149
|
+
console.error(error);
|
|
150
|
+
break;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
121
154
|
async clean() {
|
|
122
155
|
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
123
156
|
try {
|
|
124
157
|
const l = __addDisposableResource(env_2, await LockFile.lock("clean-" + this.root, void 0, 10000), false);
|
|
125
158
|
let total = 0;
|
|
126
|
-
for (let i =
|
|
159
|
+
for (let i = this.maxAge; i > 0; i--) {
|
|
127
160
|
const s = await fsp.statfs(this.root);
|
|
128
161
|
const freeSize = s.bavail * s.bsize;
|
|
129
162
|
if (freeSize < this.minSize) {
|
|
130
163
|
try {
|
|
131
|
-
const keep = Date.now() - this.keepTTLSeconds * i;
|
|
164
|
+
const keep = Date.now() - this.keepTTLSeconds * 1000 * i;
|
|
132
165
|
const files = await this.getFilesToDelete(keep);
|
|
133
166
|
for (const file of files) {
|
|
134
|
-
|
|
135
|
-
await unlink(file.path);
|
|
167
|
+
await this.deleteFile(file.path);
|
|
136
168
|
total += file.statInfo.size;
|
|
137
169
|
}
|
|
138
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDiskCache.js","sourceRoot":"","sources":["../../src/common/BaseDiskCache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,QAAQ,MAAM,+BAA+B,CAAC;AACrD,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseDiskCache.js","sourceRoot":"","sources":["../../src/common/BaseDiskCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
2
2
|
import BaseDiskCache from "../../../common/BaseDiskCache.js";
|
|
3
3
|
export default class DiskCacheService extends BaseDiskCache {
|
|
4
|
+
private tmp;
|
|
4
5
|
constructor();
|
|
5
6
|
link(localFile: LocalFile, fileName: string, contentType: string): Promise<LocalFile>;
|
|
6
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiskCacheService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/cache/DiskCacheService.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAG/E,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAc7D,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa;;
|
|
1
|
+
{"version":3,"file":"DiskCacheService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/cache/DiskCacheService.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAG/E,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAc7D,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa;IAEvD,OAAO,CAAC,GAAG,CAAgB;;IAiBrB,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAQzE"}
|
|
@@ -14,8 +14,6 @@ import { globalEnv } from "../../../common/globalEnv.js";
|
|
|
14
14
|
import { link } from "node:fs/promises";
|
|
15
15
|
import FileSize from "../../../common/FileSize.js";
|
|
16
16
|
import ensureDir from "../../../common/FileApi.js";
|
|
17
|
-
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
18
|
-
import { unlinkSync } from "fs";
|
|
19
17
|
import { randomUUID } from "crypto";
|
|
20
18
|
import BaseDiskCache from "../../../common/BaseDiskCache.js";
|
|
21
19
|
const cacheRoot = globalEnv.cacheDir;
|
|
@@ -25,103 +23,26 @@ const tempSize = FileSize.parse(globalEnv.tmpSize);
|
|
|
25
23
|
const minSize = tempSize / 2;
|
|
26
24
|
const doNothing = () => void 0;
|
|
27
25
|
let DiskCacheService = class DiskCacheService extends BaseDiskCache {
|
|
28
|
-
// } catch (e) {
|
|
29
|
-
// if (existsSync(tmpPath)) {
|
|
30
|
-
// unlink(tmpPath).catch(doNothing);
|
|
31
|
-
// }
|
|
32
|
-
// error = e;
|
|
33
|
-
// await sleep(3000);
|
|
34
|
-
// continue;
|
|
35
|
-
// }
|
|
36
|
-
// return new LocalFile(path, void 0, void 0, doNothing);
|
|
37
|
-
// }
|
|
38
|
-
// throw new EntityAccessError(`Failed to write file due to error ${error.stack ?? error}`);
|
|
39
|
-
// }
|
|
40
|
-
// async clear() {
|
|
41
|
-
// try {
|
|
42
|
-
// using l = await LockFile.lock("clean-" + cacheRoot, void 0, 10000);
|
|
43
|
-
// const s = await fsp.statfs(cacheRoot);
|
|
44
|
-
// const freeSize = s.bavail * s.bsize;
|
|
45
|
-
// if (freeSize < minSize) {
|
|
46
|
-
// let target = minSize - freeSize;
|
|
47
|
-
// const finalTarget = target;
|
|
48
|
-
// console.log(`Clearing temp files to delete ${target} bytes.`);
|
|
49
|
-
// let old = DateTime.now.addDays(-8);
|
|
50
|
-
// while(target > 0) {
|
|
51
|
-
// old = old.addDays(1);
|
|
52
|
-
// const dir = await fsp.opendir(cacheRoot, { recursive: true });
|
|
53
|
-
// const filesToDelete = [];
|
|
54
|
-
// try {
|
|
55
|
-
// for await (const entry of dir) {
|
|
56
|
-
// if (!entry.isFile()) {
|
|
57
|
-
// continue;
|
|
58
|
-
// }
|
|
59
|
-
// try {
|
|
60
|
-
// const filePath = join(entry.parentPath, entry.name);
|
|
61
|
-
// const st = await fsp.stat(filePath);
|
|
62
|
-
// if (st.mtimeMs < old.msSinceEpoch) {
|
|
63
|
-
// target -= st.size;
|
|
64
|
-
// if (filesToDelete.length < 100) {
|
|
65
|
-
// filesToDelete.push(filePath);
|
|
66
|
-
// } else {
|
|
67
|
-
// break;
|
|
68
|
-
// }
|
|
69
|
-
// // console.log(`${filePath} deleted.`);
|
|
70
|
-
// // await fsp.unlink(filePath);
|
|
71
|
-
// if (target < 0) {
|
|
72
|
-
// break;
|
|
73
|
-
// }
|
|
74
|
-
// }
|
|
75
|
-
// } catch {
|
|
76
|
-
// // we will ignore the error...
|
|
77
|
-
// }
|
|
78
|
-
// }
|
|
79
|
-
// } finally {
|
|
80
|
-
// try {
|
|
81
|
-
// await dir.close();
|
|
82
|
-
// } catch {
|
|
83
|
-
// // ignore error..
|
|
84
|
-
// }
|
|
85
|
-
// }
|
|
86
|
-
// for (const element of filesToDelete) {
|
|
87
|
-
// console.log(`${element} deleted.`);
|
|
88
|
-
// try {
|
|
89
|
-
// await fsp.unlink(element);
|
|
90
|
-
// } catch {
|
|
91
|
-
// // ignore this error as someone else might have deleted
|
|
92
|
-
// // it
|
|
93
|
-
// }
|
|
94
|
-
// }
|
|
95
|
-
// }
|
|
96
|
-
// console.log(`Temp folder cleared, ${finalTarget-target} bytes freed.`);
|
|
97
|
-
// }
|
|
98
|
-
// } catch (error) {
|
|
99
|
-
// console.error(error);
|
|
100
|
-
// }
|
|
101
|
-
// await sleep(30000);
|
|
102
|
-
// setTimeout(() => this.clear().catch(console.error), 60000);
|
|
103
|
-
// }
|
|
104
|
-
// async link(localFile: LocalFile, fileName: string, contentType: string) {
|
|
105
|
-
// const dir = join(serverCache, "tmp", randomUUID());
|
|
106
|
-
// ensureDir(dir);
|
|
107
|
-
// const path = join(dir, fileName);
|
|
108
|
-
// await link(localFile.path, path);
|
|
109
|
-
// return new LocalFile(path, fileName, contentType, () => unlinkSync(path));
|
|
110
|
-
// }
|
|
111
|
-
// }
|
|
112
26
|
constructor() {
|
|
113
27
|
super({
|
|
114
|
-
root: cacheRoot,
|
|
28
|
+
root: join(cacheRoot),
|
|
115
29
|
keepTTLSeconds: 86400,
|
|
116
|
-
minSize
|
|
30
|
+
minSize,
|
|
31
|
+
maxAge: 7
|
|
32
|
+
});
|
|
33
|
+
this.tmp = new BaseDiskCache({
|
|
34
|
+
root: join(cacheRoot, "tmp"),
|
|
35
|
+
keepTTLSeconds: 60 * 60,
|
|
36
|
+
maxAge: 7
|
|
117
37
|
});
|
|
118
38
|
}
|
|
119
39
|
async link(localFile, fileName, contentType) {
|
|
120
|
-
const
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
40
|
+
const file = this.tmp.createTempFileDeleteOnExit([
|
|
41
|
+
randomUUID(),
|
|
42
|
+
fileName
|
|
43
|
+
], fileName, contentType);
|
|
44
|
+
await link(localFile.path, file.path);
|
|
45
|
+
return file;
|
|
125
46
|
}
|
|
126
47
|
};
|
|
127
48
|
DiskCacheService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiskCacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/DiskCacheService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,QAAQ,MAAM,6BAA6B,CAAC;AACnD,OAAO,SAAS,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"DiskCacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/DiskCacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TempFileService.d.ts","sourceRoot":"","sources":["../../../src/server/storage/TempFileService.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,OAAO,MAAM,8BAA8B,CAAC;AACnD,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAc/E;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAe;IAEhC,OAAO,CAAC,KAAK,CAAmB;IAGhC,OAAO,CAAC,OAAO,CAAc;IAG7B,OAAO,CAAC,SAAS,CAAmB;IAE9B,eAAe,CAAC,OAAO,EAAE,OAAO;IAWhC,mBAAmB,CACrB,EAAE,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EAC1C,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"TempFileService.d.ts","sourceRoot":"","sources":["../../../src/server/storage/TempFileService.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,OAAO,MAAM,8BAA8B,CAAC;AACnD,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAc/E;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAe;IAEhC,OAAO,CAAC,KAAK,CAAmB;IAGhC,OAAO,CAAC,OAAO,CAAc;IAG7B,OAAO,CAAC,SAAS,CAAmB;IAE9B,eAAe,CAAC,OAAO,EAAE,OAAO;IAWhC,mBAAmB,CACrB,EAAE,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EAC1C,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAcnC,wBAAwB,CAAC,CAAC,EAAE,OAAO;IAcnC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAwDpE,cAAc,CAAC,GAAG,GAAE,MAAe,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAOrE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAaxC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM;IAgB1E,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM;IAgCtF,CAAC,MAAM,CAAC,OAAO,CAAC;YAOF,KAAK;CAUtB"}
|
|
@@ -52,7 +52,9 @@ let TempFileService = class TempFileService {
|
|
|
52
52
|
fc = await db.fileContents.where({ id: fc }, (p) => (x) => x.fileContentID === p.id).first();
|
|
53
53
|
}
|
|
54
54
|
const localCache = await this.storage.downloadFile(fc);
|
|
55
|
-
|
|
55
|
+
const linkedFile = await this.diskCache.link(localCache, name, contentType);
|
|
56
|
+
this.files.push(linkedFile);
|
|
57
|
+
return linkedFile;
|
|
56
58
|
// return this.createLink(name, localCache, contentType);
|
|
57
59
|
// return new LocalFile(cachedPath, name, contentType, doNothing);
|
|
58
60
|
}
|
|
@@ -79,7 +81,9 @@ let TempFileService = class TempFileService {
|
|
|
79
81
|
// const { ext } = path.parse(fileName);
|
|
80
82
|
// const tf = await this.createLink(fileName, localFile, contentType);
|
|
81
83
|
// return tf;
|
|
82
|
-
|
|
84
|
+
const linkedFile = await this.diskCache.link(localFile, fileName, contentType);
|
|
85
|
+
this.files.push(linkedFile);
|
|
86
|
+
return linkedFile;
|
|
83
87
|
}
|
|
84
88
|
return localFile;
|
|
85
89
|
// const cachedPath = path.join(cachePath , cloudPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TempFileService.js","sourceRoot":"","sources":["../../../src/server/storage/TempFileService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,QAAQ,IAAI,GAAG,EAAE,MAAM,IAAI,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,GAAG,CAAC,kBAAkB,EAAE,CAAC;AAEzB,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAErG,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAE9B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;AAChC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEvC,SAAS,CAAC,OAAO,CAAC,CAAC;AAEnB,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AAE/B;;GAEG;AAEY,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;QAEH,UAAK,GAAgB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"TempFileService.js","sourceRoot":"","sources":["../../../src/server/storage/TempFileService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,QAAQ,IAAI,GAAG,EAAE,MAAM,IAAI,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,GAAG,CAAC,kBAAkB,EAAE,CAAC;AAEzB,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAErG,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAE9B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;AAChC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEvC,SAAS,CAAC,OAAO,CAAC,CAAC;AAEnB,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AAE/B;;GAEG;AAEY,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;QAEH,UAAK,GAAgB,EAAE,CAAC;IA8LpC,CAAC;IAtLG,KAAK,CAAC,eAAe,CAAC,OAAgB;QAClC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;QAC7B,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;YACjC,EAAE,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;iBACzG,KAAK,EAAE,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,EAA0C,EAC1C,EAAC,IAAI,EAAE,WAAW,EAAmB;QACrC,EAAE,KAAK,KAAK,CAAC,CAAC;QACd,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAC5D,EAAE,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAChG,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,OAAO,UAAU,CAAC;QAClB,yDAAyD;QACzD,kEAAkE;IACtE,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,CAAU;QACrC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,CAAC;QACvB,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAC5D,EAAE,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,aAAa,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7G,CAAC;QACD,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,EAAE,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC1B,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;QAChE,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAiB,EAAE,QAAgB,EAAE,WAAoB;QAC7E,IAAI,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC7F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAC5D,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC,CAAE,CAAC;YAEJ,IAAI,QAAQ,EAAE,CAAC;gBACX,wCAAwC;gBACxC,sEAAsE;gBACtE,aAAa;gBACb,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC/E,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC5B,OAAO,UAAU,CAAC;YACtB,CAAC;YACD,OAAO,SAAS,CAAC;YAEjB,uDAAuD;YACvD,0CAA0C;YAC1C,wCAAwC;YACxC,0BAA0B;YAC1B,2CAA2C;YAC3C,IAAI;YACJ,kBAAkB;YAClB,sBAAsB;YACtB,mDAAmD;YAEnD,oCAAoC;YACpC,iBAAiB;YACjB,QAAQ;YAER,mEAAmE;YAEnE,YAAY;YACZ,mDAAmD;YACnD,iBAAiB;YACjB,wBAAwB;YACxB,4DAA4D;YAC5D,6BAA6B;YAC7B,mBAAmB;YACnB,2BAA2B;YAC3B,wGAAwG;YACxG,YAAY;YACZ,QAAQ;YACR,IAAI;YACJ,uEAAuE;YACvE,8CAA8C;YAC9C,gBAAgB;YAChB,sEAAsE;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,SAAS,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;YACpF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAc,MAAM,EAAE,IAAa,EAAE,QAAiB;QAC9E,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3F,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,IAAa;QAEjD,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACzC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC;QACzB,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,CAAC,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,OAAwB,EAAE,WAAmB;QACnF,IAAI,QAAQ,EAAE,CAAC;YACX,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACJ,QAAQ,GAAG,UAAU,CAAC;QAC1B,CAAC;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAChB,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC1E,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,GAAuB,EAAE,WAAmB;QAClF,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAChB,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACX,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACJ,QAAQ,GAAG,UAAU,CAAC;QAC1B,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEtC,sDAAsD;QACtD,iEAAiE;QAEjE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC1E,IAAI,QAAQ,EAAE,KAAK,OAAO,EAAE,CAAC;YACzB,8BAA8B;YAC9B,oBAAoB;YACpB,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QACD,wEAAwE;QACxE,+BAA+B;QAC/B,uEAAuE;QACvE,kEAAkE;QAClE,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACtE,OAAO,EAAE,CAAC;IACd,CAAC;IAGD,CAAC,MAAM,CAAC,OAAO,CAAC;QACZ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAChC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,CAAC;IACL,CAAC;IAGO,KAAK,CAAC,KAAK,CAAC,QAAgB,EAAE,QAAgB;QAClD,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,EAAE,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACnB,WAAW;YACX,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,eAAe,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ,CAAA;AA3LW;IADP,MAAM;8BACU,WAAW;gDAAC;AAGrB;IADP,MAAM;8BACY,gBAAgB;kDAAC;AARnB,eAAe;IADnC,cAAc;GACM,eAAe,CAgMnC;eAhMoB,eAAe"}
|