@social-mail/social-mail-web-server 1.8.364 → 1.8.367

package/src/server/model/events/StoreJournalEvents.ts

@@ -9,7 +9,6 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import SalesInvoiceService from "../../services/accounts/sales/SalesInvoiceService.js";
 import JournalService from "../../services/accounts/JournalService.js";
 import { StoreJournal } from "../entities/StoreJournal.js";
-import CouponService from "../../services/coupons/CouponService.js";
 import { Symbols } from "../../../common/Symbols.js";
 import { Decimal } from "decimal.js";
 
@@ -119,8 +118,6 @@ export default class StoreJournalEvents extends AuthenticatedEvents<StoreJournal
         let credits = Decimal(0);
         let debits = Decimal(0);
 
-        const log = [];
-
         for (const iterator of entity.entries) {
             iterator.credit ??= 0;
             iterator.debit ??= 0;
@@ -135,6 +132,7 @@ export default class StoreJournalEvents extends AuthenticatedEvents<StoreJournal
             debits = debits.add(Decimal(iterator.debit));
         }
         if (!credits.equals(debits)) {
+            // eslint-disable-next-line no-console
             console.log(entity.entries);
             throw new EntityAccessError(`Journal is not balanced, sum of all credits ${credits} and debits ${debits} must be equal.`);
         }

package/src/server/model/events/StoreMediaFileEvents.ts

@@ -3,18 +3,11 @@ import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { StoreMediaFile } from "../entities/StoreMediaFile.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import AppFile from "../entities/AppFile.js";
 import SocialMailContext from "../SocialMailContext.js";
-import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-import EncryptionService from "../../services/encryption/EncryptionService.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 
-const till = new DateTime(DateTime.today.year + 2, 1, 1);
-
 export default class StoreMediaFileEvents extends AuthenticatedEvents<StoreMediaFile> {
 
     @Inject

package/src/server/model/events/VerificationTokenEvents.ts

@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
-import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import VerificationToken, { verificationType } from "../entities/VerificationToken.js";
+import VerificationToken from "../entities/VerificationToken.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../SocialMailContext.js";
@@ -14,10 +13,7 @@ import { randomUUID } from "crypto";
 import CaptchaService from "../../services/captcha/CaptchaService.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import ExternalInvoke from "@entity-access/server-pages/dist/decorators/ExternalInvoke.js";
-import { globalEnv } from "../../../common/globalEnv.js";
-import MailService from "../../services/emails/MailService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-import EmailAddressService from "../../services/EmailAddressService.js";
 import WebSiteContentService from "../../services/files/WebSiteContentService.js";
 import OtpToUserService from "../../services/user/otp-to-user/OtpToUserService.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
@@ -130,8 +126,6 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
     async verifyCode(entity: VerificationToken, code: string) {
         const db = ServiceProvider.resolve(this, SocialMailContext);
 
-        const id = entity.verificationID;
-
         switch(entity.type) {
             case "captcha":
                 if(entity.code !== code) {
@@ -362,7 +356,6 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
 
     preJson(entity: VerificationToken): VerificationToken {
         entity.externalID = void 0;
-        const { code, verificationID } = entity;
         entity.code = void 0;
         entity.webSiteFolderID = void 0;
         entity.ipAddress = void 0;

package/src/server/model/events/WebSiteEvents.ts

@@ -16,7 +16,6 @@ import WebSiteVersionService from "../../services/files/WebSiteVersionService.js
 import { hash } from "crypto";
 import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
 import { globalEnv } from "../../../common/globalEnv.js";
-import WebSiteContentService from "../../services/files/WebSiteContentService.js";
 import MessagingService from "../../services/message-events/MessagingService.js";
 
 export default class WebSiteEvents extends AuthenticatedEvents<WebSite> {

package/src/server/model/events/WebSiteHostEvents.ts

@@ -1,4 +1,4 @@
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
@@ -7,7 +7,6 @@ import EmailAddressService from "../../services/EmailAddressService.js";
 import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWorkflow.js";
 import { WebSiteHost } from "../entities/WebSiteHost.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
-import SocialMailContext from "../SocialMailContext.js";
 import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
 import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
 

package/src/server/seed/seed.ts

@@ -9,7 +9,6 @@ import DbLockContext from "../services/db-lock/DbLockContext.js";
 import LockFile from "../storage/LockFile.js";
 import { globalEnv } from "../../common/globalEnv.js";
 import BaseStorage from "../storage/BaseStorage.js";
-import EncryptionService from "../services/encryption/EncryptionService.js";
 import ReportDbContext from "../../reports/model/ReportDbContext.js";
 import Logger from "@entity-access/entity-access/dist/common/Logger.js";
 

package/src/server/services/AppKeyProvider.ts

@@ -5,7 +5,6 @@ import { BaseDriver } from "@entity-access/entity-access/dist/drivers/base/BaseD
 import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import KeyProvider, { IAuthKey } from "@entity-access/server-pages/dist/services/KeyProvider.js";
-import { generateKeyPair } from "node:crypto";
 
 @RegisterSingleton
 export default class AppKeyProvider extends KeyProvider {

package/src/server/services/CryptoService.ts

@@ -1,7 +1,6 @@
 import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { IAuthKey } from "@entity-access/server-pages/dist/services/TokenService.js";
-import crypto, { KeyFormat, generateKeyPair } from "node:crypto";
+import crypto, { generateKeyPair } from "node:crypto";
 import { Stream } from "node:stream";
 
 @RegisterSingleton

package/src/server/services/MailboxThreadService.ts

@@ -1,13 +1,10 @@
 /* eslint-disable no-console */
-import Inject, { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import MailboxContact from "../model/entities/MailboxContact.js";
 import { globalServices } from "../../globalServices.js";
 import SocialMailContext from "../model/SocialMailContext.js";
-import { IBaseQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
-let compiledQuery: IBaseQuery<MailboxContact>;
-
 @RegisterSingleton
 export default class MailboxThreadService {
 

package/src/server/services/UserInfoProvider.ts

@@ -1,5 +1,4 @@
-import Inject, { RegisterScoped, RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
+import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import { IAuthCookie } from "@entity-access/server-pages/dist/services/TokenService.js";
 import USP from "@entity-access/server-pages/dist/services/UserSessionProvider.js";
 import SocialMailContext from "../model/SocialMailContext.js";

package/src/server/services/accounts/chart-of-accounts/ChartOfAccounts.ts

@@ -1,9 +1,6 @@
 import Inject, { RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../../model/SocialMailContext.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import { randomUUID } from "node:crypto";
 import CryptoService from "../../CryptoService.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
 @RegisterTransient
 export default class ChartOfAccounts {

package/src/server/services/auth-factors/MultiAuthFactorService.ts

@@ -8,8 +8,6 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 
-const host =  globalEnv.host;
-
 @RegisterScoped
 export default class MultiAuthFactorService {
 

package/src/server/services/cache/CacheService.ts

@@ -1,4 +1,4 @@
-import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import TempFileService from "../../storage/TempFileService.js";
 import BaseStorage from "../../storage/BaseStorage.js";
 import { globalServices } from "../../../globalServices.js";
@@ -9,9 +9,6 @@ import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
 import { unlinkSync } from "fs";
 import { parse } from "path";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-import { randomUUID } from "crypto";
-import sleep from "../../../common/sleep.js";
 import CachedItem from "../../model/entities/CachedItem.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { appendFile } from "fs/promises";
@@ -144,8 +141,6 @@ export default class CacheService {
         const keys = { key, keyHash };
         const { base: fileName } = parse(key);
 
-        let added = false;
-
         let file: LocalFile;
         let cloudPath: string;
 
@@ -192,7 +187,6 @@ export default class CacheService {
                 slide: true,
                 expiry,
             } , keys);
-            added = true;
         }
 
         cloudPath = `cache/${cachedItem.itemID}`;

package/src/server/services/captcha/CaptchaService.ts

@@ -4,7 +4,6 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import ensureDir from "../../../common/FileApi.js";
 import { spawnPromise } from "../../../common/spawnPromise.js";
 import TempFileService from "../../storage/TempFileService.js";
-import { IVerification } from "./IVerification.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import { randomUUID } from "crypto";
 import BaseDiskCache from "../../../common/BaseDiskCache.js";

package/src/server/services/cert/SocialSecureContextService.ts

@@ -1,4 +1,3 @@
-import { IAcmeOptions } from "@entity-access/server-pages/dist/ssl/AcmeCertificateService.js";
 import SecureContextService from "@entity-access/server-pages/dist/ssl/SecureContextService.js";
 import { cacheFor, ICacheContainer, ObjectCache } from "../../../common/cacheFor.js";
 import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";

package/src/server/services/channels/ChannelPageService.tsx

@@ -173,9 +173,6 @@ export default class ChannelPageService {
             emailID = Base36.encode(e.emailID);
         }
 
-        const eBlogID = blogID;
-        const eEmailID = emailID;
-
         blogID = Base36.decode(blogID);
         emailID = Base36.decode(emailID);
 

package/src/server/services/channels/ChannelUrlService.ts

@@ -1,4 +1,4 @@
-import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import EncryptionService from "../encryption/EncryptionService.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import AppFile from "../../model/entities/AppFile.js";

package/src/server/services/convert/FileConversionService.ts

@@ -8,7 +8,6 @@ import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
 import CacheService from "../cache/CacheService.js";
 import ImageConverterService from "../image-converter/ImageConverterService.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
 import StringFormat from "../../../common/StringFormat.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import PdfDoc from "../extract/pdf/PdfDoc.js";
@@ -52,7 +51,7 @@ export default class FileConversionService {
                 factory: async () => {
 
                     file = await this.downloadFileContent(appFile, fileContentID);
-                    await using fl = await LockFile.lock(`${globalEnv.serverID}-${process.pid}-img`);
+                    using _fl = await LockFile.lock(`${globalEnv.serverID}-${process.pid}-img`);
                     // resize...
                     const ics = ServiceProvider.resolve(this, ImageConverterService);
                     return await ics.transform(type, file, fileName );
@@ -64,7 +63,7 @@ export default class FileConversionService {
             return await this.cacheService.get({ key, ttl,
                 factory: async () => {
                     file = await this.downloadFileContent(appFile, fileContentID);
-                    await using _fl = await LockFile.lock(`${globalEnv.serverID}-video`);
+                    using _fl = await LockFile.lock(`${globalEnv.serverID}-video`);
                     const ics = this;
                     return await ics.webmBranded(file, senderDomain );
                 }
@@ -75,7 +74,7 @@ export default class FileConversionService {
             return await this.cacheService.get({ key, ttl,
                 factory: async () => {
                     file = await this.downloadFileContent(appFile, fileContentID);
-                    await using _fl = await LockFile.lock(`${globalEnv.serverID}-video`);
+                    using _fl = await LockFile.lock(`${globalEnv.serverID}-video`);
                     const ics = this;
                     return await ics.webm(file );
                 }
@@ -86,7 +85,7 @@ export default class FileConversionService {
             return await this.cacheService.get({ key, ttl,
                 factory: async () => {
                     file = await this.downloadFileContent(appFile, fileContentID);
-                    await using fl = await LockFile.lock(`${globalEnv.serverID}-doc`);
+                    using _fl = await LockFile.lock(`${globalEnv.serverID}-doc`);
                     const ics = this;
                     return await ics[StringFormat.toCamelCase(type)](file, fileName );
                 }

package/src/server/services/coupons/CouponService.ts

@@ -1,10 +1,8 @@
 import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import { StoreJournal } from "../../model/entities/StoreJournal.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import StoreJournalCoupon from "../../model/entities/StoreJournalCoupon.js";
 import { StoreJournalLineItem } from "../../model/entities/StoreJournalLineItem.js";
-import StoreCoupon from "../../model/entities/StoreCoupon.js";
 
 @RegisterScoped
 export default class CouponService {

package/src/server/services/dom/BlogContentTransformer.tsx

@@ -4,7 +4,6 @@ import HtmlTransform, { TransformContext } from "./HtmlTransform.js";
 import { RegExpExtra } from "../../../protocols/core/RegExpExtra.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import AppFile from "../../model/entities/AppFile.js";
-import { globalEnv } from "../../../common/globalEnv.js";
 import EncryptionService from "../encryption/EncryptionService.js";
 import ChannelUrlService from "../channels/ChannelUrlService.js";
 import XNode from "@entity-access/server-pages/dist/html/XNode.js";

package/src/server/services/dom/HtmlSanitizer.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import { JSDOM } from 'jsdom';
-import DOMPurify from 'dompurify';
+import DOMPurify, { WindowLike } from 'dompurify';
 import SmtpError from "../../smtp/services/SmtpError.js";
 import { SmtpStatusCodes } from "../../smtp/client/SmtpStatusCodes.js";
 import { globalEnv } from "../../../common/globalEnv.js";
@@ -10,9 +10,8 @@ import { URLSearchParams } from "url";
 import BaseTransform from "./transforms/BaseTransform.js";
 import Button3x from "./transforms/Button3x.js";
 import type AppFile from "../../model/entities/AppFile.js";
-import { tokenizeCssUrl, tokenizeRegex } from "../../../protocols/core/tokenizer.js";
+import { tokenizeCssUrl } from "../../../protocols/core/tokenizer.js";
 import XNode from "@entity-access/server-pages/dist/html/XNode.js";
-import { RegExpExtra } from "../../../protocols/core/RegExpExtra.js";
 import { descendentIterator } from "../../../common/html/Html.js";
 
 const maxAttachmentSize = 25*1024*1024;
@@ -41,7 +40,7 @@ const transformerSymbol = Symbol("transformerSymbol");
 export default class HtmlSanitizer {
 
     prepareForPreview(html: string) {
-        const window = new JSDOM('', { url }).window;
+        const window = new JSDOM('', { url }).window as WindowLike;
         const purify = DOMPurify(window);
         const clean = purify.sanitize( `<div>
                 <style>
@@ -100,7 +99,7 @@ export default class HtmlSanitizer {
 
     sanitizeExternalResources({ html, text, prefix, blog }: { html: string, text: string, prefix, blog?: string }) {
 
-        const window = new JSDOM('', { url }).window;
+        const window = new JSDOM('', { url }).window as WindowLike;
         const purify = DOMPurify(window);
         const clean = purify.sanitize(html, { RETURN_DOM: true }) as HTMLElement;
 
@@ -177,7 +176,7 @@ export default class HtmlSanitizer {
 
     sanitize(html: string, text: string, replace?: ISanitizeParameters) {
 
-        const window = new JSDOM('', { url }).window;
+        const window = new JSDOM('', { url }).window as WindowLike;
         const purify = DOMPurify(window);
         const clean = purify.sanitize(html, { RETURN_DOM: true }) as HTMLElement;
 
@@ -301,7 +300,7 @@ export default class HtmlSanitizer {
         if (!html) {
             throw new SmtpError("Invalid email format, only html expected", SmtpStatusCodes.DeliveryNotPermitted);
         }
-        const window = new JSDOM('').window;
+        const window = new JSDOM('').window as WindowLike;
         const purify = DOMPurify(window);
         const clean = purify.sanitize(html, { RETURN_DOM: true}) as HTMLElement;
 
@@ -414,16 +413,16 @@ export default class HtmlSanitizer {
 
     }
 
-    private swapBackground(e: HTMLElement, src: string) {
-        e.style.backgroundImage = `url("${src}")`;
-        e.style.backgroundSize = "cover";
-        e.style.backgroundPosition = "center";
-
-        for (const iterator of e.children) {
-            const ie = iterator as HTMLElement;
-            ie.style.color = "transparent";
-            ie.style.backgroundColor = "transparent";
-        }
-    }
+    // private swapBackground(e: HTMLElement, src: string) {
+    //     e.style.backgroundImage = `url("${src}")`;
+    //     e.style.backgroundSize = "cover";
+    //     e.style.backgroundPosition = "center";
+
+    //     for (const iterator of e.children) {
+    //         const ie = iterator as HTMLElement;
+    //         ie.style.color = "transparent";
+    //         ie.style.backgroundColor = "transparent";
+    //     }
+    // }
 
 }

package/src/server/services/dom/HtmlTransform.tsx

@@ -1,6 +1,5 @@
-import { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import { JSDOM } from 'jsdom';
-import DOMPurify from 'dompurify';
+import DOMPurify, { WindowLike } from 'dompurify';
 import { globalEnv } from "../../../common/globalEnv.js";
 import { descendentIterator } from "../../../common/html/Html.js";
 
@@ -142,7 +141,7 @@ export default class HtmlTransform {
     }
 
     constructor(html: string, public readonly url = defaultUrl) {
-        const window = new JSDOM('', { url }).window;
+        const window = new JSDOM('', { url }).window as WindowLike;
         const purify = DOMPurify(window);
         this.root = purify.sanitize(html, {
             ADD_ATTR: ["hash-tag"],

package/src/server/services/email-logs/EmailLogService.ts

@@ -1,4 +1,4 @@
-import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import BaseStorage from "../../storage/BaseStorage.js";

package/src/server/services/emails/MailService.ts

@@ -1,4 +1,4 @@
-import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import { Email } from "../../model/entities/Email.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import EmailAddressService from "../EmailAddressService.js";

package/src/server/services/extract/Extract.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { FileType } from "../../../common/FileType.js";
-import { copyFile, readFile } from "fs/promises";
+import { copyFile } from "fs/promises";
 import { Convert } from "../convert/Convert.js";
 import LockFile from "../../storage/LockFile.js";
 import PdfDoc from "./pdf/PdfDoc.js";

package/src/server/services/files/AtomicFolderService.ts

@@ -1,10 +1,7 @@
 /* eslint-disable no-console */
 import Inject, { RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import AppFile from "../../model/entities/AppFile.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import FileAccessService from "./FileAccessService.js";
 
 @RegisterTransient

package/src/server/services/files/FileAccessService.ts

@@ -1,9 +1,8 @@
 
-import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
-import AppFile, { AppFileAccess, ExternalUser } from "../../model/entities/AppFile.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
+import { ExternalUser } from "../../model/entities/AppFile.js";
 import { globalServices } from "../../../globalServices.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import {ICacheContainer, ObjectCache, cacheFor } from "../../../common/cacheFor.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import CryptoService from "../CryptoService.js";
 import { randomUUID } from "crypto";

package/src/server/services/files/FileDeleteService.ts

@@ -12,8 +12,8 @@ export default class FileDeleteService {
     async delete(root: AppFile) {
         const path = root.path + "%";
 
-        // get all files...
-        const snapshotFiles = await this.db.appFiles.where({ path}, (p) => (x) => Sql.text.like(x.path, p.path))
+        // load all child files...
+        await this.db.appFiles.where({ path}, (p) => (x) => Sql.text.like(x.path, p.path))
             .toArray();
 
         await this.deleteFile(root);

package/src/server/services/files/FileVersionService.ts

@@ -5,6 +5,7 @@ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
 import DeleteFileHistoryWorkflow from "../../workflows/files/DeleteFileHistoryWorkflow.js";
 import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 @RegisterScoped
 export default class FileVersionService {
@@ -39,8 +40,8 @@ export default class FileVersionService {
         }
 
         if ( /text\//i.test(file.contentType)) {
-            const rootFolder = /\d+/.exec(file.path)[0] as any;
-            await db.websiteFolders.where({ rootFolder }, (p) => (x) => x.folderID === p.rootFolder)
+            const rootFolders = file.path.split("/").filter((x) => x && x !== file.fileContentID.toString()) as any[];
+            await db.websiteFolders.where({ rootFolders }, (p) => (x) => Sql.in(x.folderID, p.rootFolders))
                 .update(void 0, (p) => (x) => ({ isModified: true }));
         }
 

package/src/server/services/files/WebSiteContentService.ts

@@ -126,7 +126,7 @@ export default class WebSiteContentService
      * @returns
      */
     async getSnapshotFile(siteFolder: ISiteFolder, path: string[]) {
-        const { snapshotFolderID, folderID } = siteFolder;
+        const { snapshotFolderID } = siteFolder;
         const src = await this.getFile(snapshotFolderID, ... path);
         if (!src) {
             return;

package/src/server/services/files/WebSiteVersionService.ts

@@ -1,7 +1,6 @@
 import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import * as semver from "semver";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import { WebSiteVersion } from "../../model/entities/WebSiteVersion.js";
 import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import WebSite from "../../model/entities/WebSite.js";

package/src/server/services/files/web-content/WebContentTranspileService.ts

@@ -315,7 +315,7 @@ export default class WebContentTranspileService
     }
 
     private async rewriteCss(css: string, siteFolder: ISiteFolder, currentPath: string) {
-        for (const [match, group] of tokenizeRegex(css, /url\(((\"[^\"]+\")|([^\)]+))\)/gmi)) {
+        for (const [_match, group] of tokenizeRegex(css, /url\(((\"[^\"]+\")|([^\)]+))\)/gmi)) {
             if (group) {
                 let link = group;
                 const first = link[0];

package/src/server/services/html/PreviewDraftService.ts

@@ -2,7 +2,6 @@ import Inject, { RegisterScoped, ServiceObject } from "@entity-access/entity-acc
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { JSDOM } from 'jsdom';
 import { join } from "path";
-import TempFileService from "../../storage/TempFileService.js";
 import WebSite from "../../model/entities/WebSite.js";
 import { descendentElementIterator } from "../../../common/html/Html.js";
 import WebSiteContentService from "../files/WebSiteContentService.js";
@@ -22,9 +21,6 @@ export default class PreviewDraftService extends ServiceObject implements ICache
     @Inject
     private websiteService: WebSiteContentService;
 
-    @Inject
-    private tfs: TempFileService;
-
     @Inject
     private siteCache: SiteDiskContentCache;
 

package/src/server/services/message-events/PgEvents.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import pg from "pg";
 import sleep from "../../../common/sleep.js";
 import { globalEnv } from "../../../common/globalEnv.js";
@@ -71,7 +71,7 @@ export default class PgEvents {
             for(let i=0;i<10;i++) {
 
                 // locking queue messages
-                using fx = await LockFile.lock(`pg-events-msg${message}`);
+                using _fx = await LockFile.lock(`pg-events-msg${message}`);
 
                 const id = "social_" + message.replace(/[^a-zA-Z0-9]/g, "_");
                 const c = new pg.Client(globalEnv.pgEvents);

package/src/server/services/name-tokens/NameTokenService.ts

@@ -1,6 +1,5 @@
 import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import { tokenizeRegexAll } from "../../../protocols/core/tokenizer.js";
 import { RegExpExtra } from "../../../protocols/core/RegExpExtra.js";
 
 @RegisterSingleton

package/src/server/services/puppeteer/PuppeteerService.ts

@@ -1,7 +1,6 @@
 /* eslint-disable no-console */
 import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
-import { Agent, fetch } from "undici";
-import { connect } from "net";
+import { fetch } from "undici";
 import { hash } from "crypto";
 import { globalEnv } from "../../../common/globalEnv.js";
 import LockFile from "../../storage/LockFile.js";

package/src/server/services/push-notifications/PushNotificationService.ts

@@ -4,7 +4,6 @@ import WebPushService from "./web-push/WebPushService.js";
 import ApnPushService from "./apn/ApnPushService.js";
 import FcmPushService from "./fcm/FcmPushService.js";
 import { devicePushType } from "../../model/entities/LoginSession.js";
-import ForwardPushService from "./forward/ForwardPushService.js";
 
 @RegisterSingleton
 export default class PushNotificationService {

package/src/server/services/rate-limiter/RateLimiterService.ts

@@ -1,9 +1,7 @@
 import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../../model/SocialMailContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import sleep from "../../../common/sleep.js";
 import DbLockContext from "../db-lock/DbLockContext.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
 
 @RegisterScoped

package/src/server/services/root-certs/RootCertificates.ts

@@ -47,7 +47,7 @@ export default class RootCertificates {
             ensureDir(rootCertDir);
             if(!this.isCertValid()) {
                 // create a lock...
-                using lf = await LockFile.lock(rootCertPath);
+                using _lf = await LockFile.lock(rootCertPath);
 
                 this.index = 0;
 

package/src/server/services/scrapper/FaviconScrapperService.ts

@@ -1,6 +1,5 @@
-import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import { JSDOM } from "jsdom";
-import { HeapInfo } from "v8";
 import TempFileService from "../../storage/TempFileService.js";
 import { parse } from "path";