@social-mail/social-mail-web-server 1.7.195 → 1.7.199

package/dist/common/BaseDiskCache.d.ts

@@ -0,0 +1,20 @@
+import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
+export default class BaseDiskCache {
+    protected readonly root: string;
+    protected readonly keepTTLSeconds: number;
+    protected readonly minSize: number;
+    protected readonly updateAccessTime: boolean;
+    constructor({ root, keepTTLSeconds, minSize, updateAccessTime }: {
+        root: string;
+        keepTTLSeconds?: number;
+        minSize?: number;
+        updateAccessTime?: boolean;
+    });
+    get(path: string): Promise<LocalFile>;
+    getOrCreateAsync(path: string, factory: (fx: LocalFile) => Promise<void>, ext?: string): Promise<LocalFile>;
+    createTempFileDeleteOnExit(pathFragments: string[], name: string, contentType: string): LocalFile;
+    protected deleteFile(path: string): Promise<void>;
+    protected clean(): Promise<void>;
+    private getFilesToDelete;
+}
+//# sourceMappingURL=BaseDiskCache.d.ts.map

package/dist/common/BaseDiskCache.d.ts.map

@@ -0,0 +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;gBAEzC,EACI,IAAI,EACJ,cAAqB,EACrB,OAAiC,EACjC,gBAAuB,EAC1B,EAAE;QACC,IAAI,EAAE,MAAM,CAAC;QACb,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC9B;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"}

package/dist/common/BaseDiskCache.js

@@ -0,0 +1,222 @@
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        function next() {
+            while (env.stack.length) {
+                var rec = env.stack.pop();
+                try {
+                    var result = rec.dispose && rec.dispose.call(rec.value);
+                    if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
+/* eslint-disable no-console */
+import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
+import ensureDir from "./FileApi.js";
+import LockFile from "../server/storage/LockFile.js";
+import fsp, { rmdir, stat, unlink } from "node:fs/promises";
+import sleep from "./sleep.js";
+import { existsSync } from "node:fs";
+import { join, parse } from "node:path";
+import { randomUUID } from "node:crypto";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import { toKMBString } from "./NumberFormats.js";
+const doNothing = () => void 0;
+export default class BaseDiskCache {
+    constructor({ root, keepTTLSeconds = 3600, minSize = Number.MAX_SAFE_INTEGER, updateAccessTime = true }) {
+        this.root = root;
+        this.keepTTLSeconds = keepTTLSeconds;
+        this.minSize = minSize;
+        this.updateAccessTime = updateAccessTime;
+        ensureDir(root);
+        // eslint-disable-next-line no-console
+        setTimeout(() => this.clean().catch(console.error), 1000);
+    }
+    async get(path) {
+        path = join(this.root, path);
+        if (existsSync(path)) {
+            if (this.updateAccessTime) {
+                const now = new Date();
+                await fsp.utimes(path, now, now);
+            }
+            return new LocalFile(path, void 0, void 0, doNothing);
+        }
+    }
+    async getOrCreateAsync(path, factory, ext = ".dat") {
+        path = join(this.root, path);
+        const parsedPath = parse(path);
+        ensureDir(parsedPath.dir);
+        let error;
+        for (let index = 0; index < 10; index++) {
+            const env_1 = { stack: [], error: void 0, hasError: false };
+            try {
+                const lock = __addDisposableResource(env_1, await LockFile.lock(path), false);
+                if (existsSync(path)) {
+                    if (this.updateAccessTime) {
+                        const now = new Date();
+                        await fsp.utimes(path, now, now);
+                    }
+                    return new LocalFile(path, void 0, void 0, doNothing);
+                }
+                const tmpPath = join(this.root, randomUUID() + (parsedPath.ext || ext));
+                // console.log(`Downloading for ${path}`);
+                await factory(new LocalFile(tmpPath, void 0, void 0, doNothing));
+                try {
+                    await fsp.rename(tmpPath, path);
+                }
+                catch (e) {
+                    if (existsSync(tmpPath)) {
+                        unlink(tmpPath).catch(doNothing);
+                    }
+                    error = e;
+                    await sleep(3000);
+                    continue;
+                }
+                return new LocalFile(path, void 0, void 0, doNothing);
+            }
+            catch (e_1) {
+                env_1.error = e_1;
+                env_1.hasError = true;
+            }
+            finally {
+                __disposeResources(env_1);
+            }
+        }
+        throw new EntityAccessError(`Failed to write file due to error ${error.stack ?? error}`);
+    }
+    createTempFileDeleteOnExit(pathFragments, name, contentType) {
+        const fileName = pathFragments.pop();
+        if (pathFragments.length) {
+            const folder = join(this.root, ...pathFragments);
+            ensureDir(folder);
+        }
+        const path = join(this.root, ...pathFragments, fileName);
+        return new LocalFile(path, name, contentType, () => this.deleteFile(path).catch(console.error));
+    }
+    async deleteFile(path) {
+        if (!path.startsWith(this.root)) {
+            return;
+        }
+        // console.log(`Deleting ${path}`);
+        await unlink(path);
+        for (;;) {
+            const parsed = parse(path);
+            if (parsed.dir === this.root) {
+                break;
+            }
+            path = parsed.dir;
+            try {
+                // console.log(`Deleting folder ${path}`);
+                await rmdir(path);
+            }
+            catch (error) {
+                // do nothing
+                console.error(error);
+                break;
+            }
+        }
+    }
+    async clean() {
+        const env_2 = { stack: [], error: void 0, hasError: false };
+        try {
+            const l = __addDisposableResource(env_2, await LockFile.lock("clean-" + this.root, void 0, 10000), false);
+            let total = 0;
+            for (let i = 7; i > 0; i--) {
+                const s = await fsp.statfs(this.root);
+                const freeSize = s.bavail * s.bsize;
+                if (freeSize < this.minSize) {
+                    try {
+                        const keep = Date.now() - this.keepTTLSeconds * i;
+                        const files = await this.getFilesToDelete(keep);
+                        for (const file of files) {
+                            await this.deleteFile(file.path);
+                            total += file.statInfo.size;
+                        }
+                    }
+                    catch (error) {
+                        console.error(error);
+                    }
+                }
+            }
+            if (total) {
+                console.log(`${this.root} cleaned, ${toKMBString(total)} freed.`);
+            }
+            await sleep(30000);
+            setTimeout(() => this.clean().catch(console.error), 30000);
+        }
+        catch (e_2) {
+            env_2.error = e_2;
+            env_2.hasError = true;
+        }
+        finally {
+            __disposeResources(env_2);
+        }
+    }
+    async getFilesToDelete(oldest) {
+        const dir = await fsp.opendir(this.root, { recursive: true });
+        const filesToDelete = [];
+        try {
+            for await (const entry of dir) {
+                if (!entry.isFile()) {
+                    continue;
+                }
+                const path = join(entry.parentPath, entry.name);
+                const statInfo = await stat(path);
+                if (statInfo.ctimeMs < oldest) {
+                    filesToDelete.push({ path, statInfo });
+                    if (filesToDelete.length === 1000) {
+                        break;
+                    }
+                }
+            }
+        }
+        catch (error) {
+            console.error(error);
+        }
+        finally {
+            try {
+                await dir.close();
+            }
+            catch {
+                // do nothing
+            }
+        }
+        return filesToDelete;
+    }
+}
+//# sourceMappingURL=BaseDiskCache.js.map

package/dist/common/BaseDiskCache.js.map

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

package/dist/server/seed/ui/seed-ui.js

@@ -1,7 +1,7 @@
 import { UIPackageConfig } from "../../services/DBConfig.js";
 import semver from "semver";
 export default async function seedUI(config) {
-    const version = "1.4.140";
+    const version = "1.4.152";
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {
         if (semver.gte(existing.version, version)) {

package/dist/server/services/cache/DiskCacheService.d.ts

@@ -1,7 +1,8 @@
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
-export default class DiskCacheService {
+import BaseDiskCache from "../../../common/BaseDiskCache.js";
+export default class DiskCacheService extends BaseDiskCache {
+    private tmp;
     constructor();
-    getOrCreate(path: string, factory: (filePath: any) => Promise<void>, ext?: string): Promise<LocalFile>;
-    clear(): Promise<void>;
+    link(localFile: LocalFile, fileName: string, contentType: string): Promise<LocalFile>;
 }
 //# sourceMappingURL=DiskCacheService.d.ts.map

package/dist/server/services/cache/DiskCacheService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiskCacheService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/cache/DiskCacheService.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAqB/E,MAAM,CAAC,OAAO,OAAO,gBAAgB;;IAQ3B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,QAAQ,KAAA,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,SAAS;IAyC5E,KAAK;CAiFd"}
+{"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;;IAerB,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAQzE"}

package/dist/server/services/cache/DiskCacheService.js

@@ -7,197 +7,40 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
-    if (value !== null && value !== void 0) {
-        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-        var dispose, inner;
-        if (async) {
-            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
-            dispose = value[Symbol.asyncDispose];
-        }
-        if (dispose === void 0) {
-            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
-            dispose = value[Symbol.dispose];
-            if (async) inner = dispose;
-        }
-        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
-        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
-        env.stack.push({ value: value, dispose: dispose, async: async });
-    }
-    else if (async) {
-        env.stack.push({ async: true });
-    }
-    return value;
-};
-var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
-    return function (env) {
-        function fail(e) {
-            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
-            env.hasError = true;
-        }
-        function next() {
-            while (env.stack.length) {
-                var rec = env.stack.pop();
-                try {
-                    var result = rec.dispose && rec.dispose.call(rec.value);
-                    if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
-                }
-                catch (e) {
-                    fail(e);
-                }
-            }
-            if (env.hasError) throw env.error;
-        }
-        return next();
-    };
-})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-});
 /* eslint-disable no-console */
 import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
-import { join, parse } from "path";
+import { join } from "path";
 import { globalEnv } from "../../../common/globalEnv.js";
-import fsp from "node:fs/promises";
+import { link } from "node:fs/promises";
 import FileSize from "../../../common/FileSize.js";
 import ensureDir from "../../../common/FileApi.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
-import LockFile from "../../storage/LockFile.js";
-import { existsSync } from "fs";
 import { randomUUID } from "crypto";
-import sleep from "../../../common/sleep.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import { unlink } from "fs/promises";
+import BaseDiskCache from "../../../common/BaseDiskCache.js";
 const cacheRoot = globalEnv.cacheDir;
 const serverCache = globalEnv.cacheDir;
 ensureDir(serverCache);
 const tempSize = FileSize.parse(globalEnv.tmpSize);
 const minSize = tempSize / 2;
 const doNothing = () => void 0;
-let DiskCacheService = class DiskCacheService {
+let DiskCacheService = class DiskCacheService extends BaseDiskCache {
     constructor() {
-        // it is important to clean
-        // in the beginning to avoid no file space errors.
-        setTimeout(() => this.clear().catch(console.error), 1000);
-    }
-    async getOrCreate(path, factory, ext = ".dat") {
-        path = join(serverCache, path);
-        const parsedPath = parse(path);
-        ensureDir(parsedPath.dir);
-        let error;
-        for (let index = 0; index < 10; index++) {
-            const env_1 = { stack: [], error: void 0, hasError: false };
-            try {
-                const lock = __addDisposableResource(env_1, await LockFile.lock(path), false);
-                if (existsSync(path)) {
-                    // change
-                    return new LocalFile(path, void 0, void 0, doNothing);
-                }
-                const tmpPath = join(serverCache, randomUUID() + (parsedPath.ext || ext));
-                await factory(tmpPath);
-                try {
-                    await fsp.rename(tmpPath, path);
-                }
-                catch (e) {
-                    if (existsSync(tmpPath)) {
-                        unlink(tmpPath).catch(doNothing);
-                    }
-                    error = e;
-                    await sleep(3000);
-                    continue;
-                }
-                return new LocalFile(path, void 0, void 0, doNothing);
-            }
-            catch (e_1) {
-                env_1.error = e_1;
-                env_1.hasError = true;
-            }
-            finally {
-                __disposeResources(env_1);
-            }
-        }
-        throw new EntityAccessError(`Failed to write file due to error ${error.stack ?? error}`);
+        super({
+            root: join(cacheRoot),
+            keepTTLSeconds: 86400,
+            minSize
+        });
+        this.tmp = new BaseDiskCache({
+            root: join(cacheRoot, "tmp"),
+            keepTTLSeconds: 60 * 60
+        });
     }
-    async clear() {
-        try {
-            const env_2 = { stack: [], error: void 0, hasError: false };
-            try {
-                const l = __addDisposableResource(env_2, await LockFile.lock("clean-" + cacheRoot, void 0, 10000), false);
-                const s = await fsp.statfs(cacheRoot);
-                const freeSize = s.bavail * s.bsize;
-                if (freeSize < minSize) {
-                    let target = minSize - freeSize;
-                    const finalTarget = target;
-                    console.log(`Clearing temp files to delete ${target} bytes.`);
-                    let old = DateTime.now.addDays(-8);
-                    while (target > 0) {
-                        old = old.addDays(1);
-                        const dir = await fsp.opendir(cacheRoot, { recursive: true });
-                        const filesToDelete = [];
-                        try {
-                            for await (const entry of dir) {
-                                if (!entry.isFile()) {
-                                    continue;
-                                }
-                                try {
-                                    const filePath = join(entry.path, entry.name);
-                                    const st = await fsp.stat(filePath);
-                                    if (st.mtimeMs < old.msSinceEpoch) {
-                                        target -= st.size;
-                                        if (filesToDelete.length < 100) {
-                                            filesToDelete.push(filePath);
-                                        }
-                                        else {
-                                            break;
-                                        }
-                                        // console.log(`${filePath} deleted.`);
-                                        // await fsp.unlink(filePath);
-                                        if (target < 0) {
-                                            break;
-                                        }
-                                    }
-                                }
-                                catch {
-                                    // we will ignore the error...
-                                }
-                            }
-                        }
-                        finally {
-                            try {
-                                await dir.close();
-                            }
-                            catch {
-                                // ignore error..
-                            }
-                        }
-                        for (const element of filesToDelete) {
-                            console.log(`${element} deleted.`);
-                            try {
-                                await fsp.unlink(element);
-                            }
-                            catch {
-                                // ignore this error as someone else might have deleted
-                                // it
-                            }
-                        }
-                    }
-                    console.log(`Temp folder cleared, ${finalTarget - target} bytes freed.`);
-                }
-            }
-            catch (e_2) {
-                env_2.error = e_2;
-                env_2.hasError = true;
-            }
-            finally {
-                __disposeResources(env_2);
-            }
-        }
-        catch (error) {
-            console.error(error);
-        }
-        await sleep(30000);
-        setTimeout(() => this.clear().catch(console.error), 60000);
+    async link(localFile, fileName, contentType) {
+        const file = this.tmp.createTempFileDeleteOnExit([
+            randomUUID(),
+            fileName
+        ], fileName, contentType);
+        await link(localFile.path, file.path);
+        return file;
     }
 };
 DiskCacheService = __decorate([
@@ -205,4 +48,108 @@ DiskCacheService = __decorate([
     __metadata("design:paramtypes", [])
 ], DiskCacheService);
 export default DiskCacheService;
+// constructor() {
+//     // it is important to clean
+//     // in the beginning to avoid no file space errors.
+//     setTimeout(() => this.clear().catch(console.error), 1000);
+// }
+//     async getOrCreate(path: string, factory: (filePath) => Promise<void>, ext = ".dat" ) {
+//         path = join(serverCache, path);
+//         const parsedPath = parse(path);
+//         ensureDir(parsedPath.dir);
+//         let error: Error;
+//         for (let index = 0; index < 10; index++) {
+//             using lock = await LockFile.lock(path);
+//             if (existsSync(path)) {
+//                 // change
+//                 return new LocalFile(path, void 0, void 0, doNothing);
+//             }
+//             const tmpPath = join(serverCache, randomUUID() + (parsedPath.ext || ext));
+//             await factory(tmpPath);
+//             try {
+//                 await fsp.rename(tmpPath, path);
+//             } catch (e) {
+//                 if (existsSync(tmpPath)) {
+//                     unlink(tmpPath).catch(doNothing);
+//                 }
+//                 error = e;
+//                 await sleep(3000);
+//                 continue;
+//             }
+//             return new LocalFile(path, void 0, void 0, doNothing);
+//         }
+//         throw new EntityAccessError(`Failed to write file due to error ${error.stack ?? error}`);
+//     }
+//     async clear() {
+//         try {
+//             using l = await LockFile.lock("clean-" + cacheRoot, void 0, 10000);
+//             const s = await fsp.statfs(cacheRoot);
+//             const freeSize = s.bavail * s.bsize;
+//             if (freeSize < minSize) {
+//                 let target = minSize - freeSize;
+//                 const finalTarget = target;
+//                 console.log(`Clearing temp files to delete ${target} bytes.`);
+//                 let old = DateTime.now.addDays(-8);
+//                 while(target > 0) {
+//                     old = old.addDays(1);
+//                     const dir = await fsp.opendir(cacheRoot, { recursive: true });
+//                     const filesToDelete = [];
+//                     try {
+//                         for await (const entry of dir) {
+//                             if (!entry.isFile()) {
+//                                 continue;
+//                             }
+//                             try {
+//                                 const filePath = join(entry.parentPath, entry.name);
+//                                 const st = await fsp.stat(filePath);
+//                                 if (st.mtimeMs < old.msSinceEpoch) {
+//                                     target -= st.size;
+//                                     if (filesToDelete.length < 100) {
+//                                         filesToDelete.push(filePath);
+//                                     } else {
+//                                         break;
+//                                     }
+//                                     // console.log(`${filePath} deleted.`);
+//                                     // await fsp.unlink(filePath);
+//                                     if (target < 0) {
+//                                         break;
+//                                     }
+//                                 }
+//                             } catch {
+//                                 // we will ignore the error...
+//                             }
+//                         }
+//                     } finally {
+//                         try {
+//                             await dir.close();
+//                         } catch {
+//                             // ignore error..
+//                         }
+//                     }
+//                     for (const element of filesToDelete) {
+//                         console.log(`${element} deleted.`);
+//                         try {
+//                             await fsp.unlink(element);
+//                         } catch {
+//                             // ignore this error as someone else might have deleted
+//                             // it
+//                         }
+//                     }
+//                 }
+//                 console.log(`Temp folder cleared, ${finalTarget-target} bytes freed.`);
+//             }
+//         } catch (error) {
+//             console.error(error);
+//         }
+//         await sleep(30000);
+//         setTimeout(() => this.clear().catch(console.error), 60000);
+//     }
+//     async link(localFile: LocalFile, fileName: string, contentType: string) {
+//         const dir = join(serverCache, "tmp", randomUUID());
+//         ensureDir(dir);
+//         const path = join(dir, fileName);
+//         await link(localFile.path, path);
+//         return new LocalFile(path, fileName, contentType, () => unlinkSync(path));
+//     }
+// }
 //# sourceMappingURL=DiskCacheService.js.map

package/dist/server/services/cache/DiskCacheService.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiskCacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/DiskCacheService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DiskCacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/DiskCacheService.ts"],"names":[],"mappings":"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"}

package/dist/server/services/captcha/CaptchaService.js

@@ -59,7 +59,7 @@ let CaptchaService = class CaptchaService {
         return { id: v.verificationID, accessCode };
     }
     async getVideo(code) {
-        return this.diskCache.getOrCreate("captcha/" + code + ".gif", (filePath) => this.prepareVideo(code, filePath));
+        return this.diskCache.getOrCreateAsync("captcha/" + code + ".gif", (cf) => this.prepareVideo(code, cf.path));
     }
     async prepareVideo(code, saveAs) {
         const tf = await this.tfs.createTempFile(".webm", "code", "video/webm");