@lilaquadrat/studio 10.0.0-beta.5 → 10.0.0-beta.51

package/lib/src/services/ai.service.js

@@ -1,19 +1,18 @@
-import OpenAI from 'openai';
 import textGeneration from '../prompts/textGeneration.js';
 import textGenerationMulti from '../prompts/textGenerationMulti.js';
 import ProjectModel from '../models/project.model.js';
 import LoggingService from './logging.service.js';
 import LoggingModel from '../models/logging.model.js';
 import dayjs from 'dayjs';
+import { GoogleGenAI, ThinkingLevel } from '@google/genai';
 export class Ai {
-    constructor(provider, key) {
+    constructor(key, model) {
         if (key) {
-            if (provider === 'openai') {
-                this.provider = new OpenAI({
-                    apiKey: key,
-                });
-            }
+            this.provider = new GoogleGenAI({
+                apiKey: key,
+            });
         }
+        this.model = model;
     }
     async tokenUsage(date, options) {
         if (date) {
@@ -65,36 +64,30 @@ export class Ai {
         return { input: 0, output: 0, calls: 0 };
     }
     async generateTextForProject(input, instructions, element, context, options) {
-        const projectContext = await ProjectModel.db.findOne({ id: options.project }, { projection: { aiDescription: 1, aiTone: 1 } });
+        const projectContext = await ProjectModel.db.findOne({ company: options.company, id: options.project }, { projection: { aiDescription: 1, aiTone: 1 } });
         return this.generateText(input, instructions, element, { ...context, project: projectContext?.aiDescription, tone: projectContext?.aiTone }, options);
     }
     async generateText(input, instructions, element, context, options) {
         const content = options.type === 'single' ? textGeneration(input, element, context) : textGenerationMulti(input, context);
-        const response = await this.provider.chat.completions.create({
-            model: 'gpt-4.1-mini',
-            response_format: { type: 'json_object' },
-            store: true,
-            messages: [
-                {
-                    role: 'system',
-                    content,
+        const response = await this.provider.models.generateContent({
+            model: this.model,
+            config: {
+                systemInstruction: content,
+                thinkingConfig: {
+                    thinkingLevel: ThinkingLevel.LOW,
                 },
-                {
-                    role: 'user',
-                    content: JSON.stringify({
-                        input,
-                        instructions,
-                        context,
-                    }),
-                },
-            ],
-        }, {
-            timeout: 30000,
+                responseMimeType: 'application/json'
+            },
+            contents: JSON.stringify({
+                input,
+                instructions,
+                context,
+            }),
         });
         await LoggingService.add({ input: { input, instructions, context }, response }, { type: 'ai', company: options.company, project: options.project, app: options.app, user: options.user });
-        const responseData = JSON.parse(response.choices[0].message?.content);
+        const responseData = JSON.parse(response.text);
         return { output: responseData.input };
     }
 }
-export default new Ai('openai', process.env.OPENAI_API_KEY);
+export default new Ai(process.env.GOOGLE_API_KEY, process.env.AI_MODEL);
 //# sourceMappingURL=ai.service.js.map

package/lib/src/services/ai.service.js.map

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

package/lib/src/services/auth.service.d.ts

@@ -0,0 +1,10 @@
+declare class AuthService {
+    private tokenCache;
+    url: string;
+    constructor(url: string);
+    token(clientId: string, clientSecret: string): Promise<string>;
+    getToken(clientId: string, clientSecret: string): Promise<string>;
+    private buildTokenUrl;
+}
+declare const _default: AuthService;
+export default _default;

package/lib/src/services/auth.service.js

@@ -0,0 +1,63 @@
+import logger from "../logger.js";
+import querystring from 'querystring';
+class AuthService {
+    constructor(url) {
+        this.tokenCache = null;
+        this.url = url;
+    }
+    async token(clientId, clientSecret) {
+        // Check if we have a valid cached token
+        if (this.tokenCache && Date.now() < this.tokenCache.expiresAt) {
+            logger.debug('authservice.token.cached');
+            return this.tokenCache.accessToken;
+        }
+        // No valid token, fetch a new one and return it directly
+        logger.debug('authservice.token.fetching');
+        return await this.getToken(clientId, clientSecret);
+    }
+    async getToken(clientId, clientSecret) {
+        if (!this.url)
+            throw new Error('OAUTH_URL is not configured');
+        const tokenUrl = this.buildTokenUrl();
+        const body = querystring.stringify({
+            client_id: clientId,
+            client_secret: clientSecret,
+            audience: 'https://editor.lilaquadrat.de/api',
+            grant_type: 'client_credentials',
+        });
+        const response = await fetch(tokenUrl, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            body,
+        });
+        if (!response.ok) {
+            const errorData = await response.json().catch(() => ({}));
+            logger.error({ message: 'Token request failed', status: response.status, errorData });
+            throw new Error(`Token request failed with status ${response.status}`);
+        }
+        const token = await response.json();
+        if (!token.access_token || !token.expires_in) {
+            logger.error({ message: 'Invalid token response', token });
+            throw new Error('Invalid token response from OAuth server');
+        }
+        this.tokenCache = {
+            accessToken: token.access_token,
+            expiresAt: Date.now() + (token.expires_in - 60) * 1000,
+        };
+        logger.debug('authservice.token.get.success');
+        return token.access_token;
+    }
+    buildTokenUrl() {
+        try {
+            const url = new URL(`https://${this.url}/oauth/token`);
+            logger.debug(`authservice.token.url: ${url.toString()}`);
+            return url.toString();
+        }
+        catch (error) {
+            logger.error({ message: 'Invalid OAUTH_URL', url: this.url, error });
+            throw new Error(`Invalid OAUTH_URL: ${this.url}`);
+        }
+    }
+}
+export default new AuthService(process.env.OAUTH_URL);
+//# sourceMappingURL=auth.service.js.map

package/lib/src/services/auth.service.js.map

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

package/lib/src/services/conf.service.d.ts

@@ -1,35 +1,7 @@
-import { ShareClientInterface, DomainConf, HostingWithSettings } from '@lilaquadrat/interfaces';
 export declare class ConfService {
-    shareClient: ShareClientInterface;
-    /**
-     *
-     * load the base nginx conf file for further rendering
-     */
-    getBase(folder: string, name: string): Promise<Buffer<ArrayBufferLike>>;
-    constructor();
-    /**
-       * generates nginx config
-       *
-       */
-    render(http: DomainConf | undefined, https: DomainConf[] | undefined, defaultDomain: DomainConf | undefined, redirectDomains: DomainConf[] | undefined, company: string, project: string, baseConf: string, hosting?: HostingWithSettings): string;
-    renderStreamConf(domains: DomainConf[], confString: string): string;
-    getComposeObject(domains: DomainConf[], baseFolder: string, image?: string): {
-        [key: string]: any;
-    };
-    getKey(company: string, project: string): string;
-    validateDomains(domains: string[]): string[];
-    /**
-     * validate domains and remove double entries
-     */
-    validateStreamDomains(domains: DomainConf[]): DomainConf[];
-    /**
-     * docker: docker, stream: nginx main stream conf, proxy: nginx main proxy config, project: project nginx
-     */
-    refresh(type: 'project', company: string, project: string): Promise<boolean>;
-    refresh(type: 'docker' | 'stream' | 'proxy'): Promise<boolean>;
-    refreshDockerCompose(base?: string): Promise<boolean>;
-    refreshNginx(type: 'stream' | 'proxy' | 'project', company: string | undefined, project: string | undefined): Promise<boolean>;
-    createFolderRecursive(base: string, path: string): Promise<boolean>;
+    refresh(company: string, project: string): Promise<void>;
+    generate(company: string, project: string): Promise<Buffer<ArrayBuffer> | undefined>;
+    remove(company: string, project: string): Promise<void>;
 }
 declare const _default: ConfService;
 export default _default;

package/lib/src/services/conf.service.js

@@ -1,181 +1,72 @@
 import handlebars from 'handlebars';
-import ShareClientFactory from '../ShareClientFactory.class.js';
-import DomainsService from './domains.service.js';
+import domainsService from "./domains.service.js";
+import storageSdkFactory from '../helpers/storageSdkFactory.js';
+import StorageService from './storage.service.js';
 import HostingService from './hosting.service.js';
 export class ConfService {
-    /**
-     *
-     * load the base nginx conf file for further rendering
-     */
-    getBase(folder, name) {
-        return this.shareClient.get(folder, name);
-    }
-    constructor() {
-        this.shareClient = ShareClientFactory('azureStorage', {
-            connectionString: process.env.HOSTING_STORAGE_CONNECTION,
-            shareName: 'customer-apps',
-            accountName: process.env.STORAGE_ACCOUNT,
-        });
-    }
-    /**
-       * generates nginx config
-       *
-       */
-    render(http, https, defaultDomain, redirectDomains, company, project, baseConf, hosting) {
-        const template = handlebars.compile(baseConf);
-        const conf = template({
-            http, https, company, project, defaultDomain, hosting, redirectDomains,
-        }).trim();
-        if (conf.length === 0) {
-            return `# 
-#
-# NO CONF CONTENT
-#
-#
-`;
-        }
-        return conf;
-    }
-    renderStreamConf(domains, confString) {
-        const template = handlebars.compile(confString);
-        const conf = template({
-            domains,
-        }).trim();
-        if (conf.length === 0) {
-            return `# 
-#
-# NO CONF CONTENT
-#
-#
-`;
-        }
-        return conf;
-    }
-    getComposeObject(domains, baseFolder, image = 'nginx:alpine') {
-        const composeObject = {
-            version: '3',
-            services: {},
-        };
-        domains.map((domain) => {
-            const domainObject = {
-                image,
-                container_name: this.getKey(domain.company, domain.project),
-                ports: [
-                    `${domain.ports?.http}:80`,
-                    `${domain.ports?.https}:443`,
-                ],
-                volumes: [
-                    `${baseFolder}/${domain.company}/${domain.project}/hosting:/var/www/hosting:ro`,
-                    `${baseFolder}/${domain.company}/${domain.project}/conf:/etc/nginx/conf.d/`,
-                    `${baseFolder}/${domain.company}/${domain.project}/certs:/var/www/certs`,
-                    '/base/data/certs:/var/www/base/certs',
-                ],
-            };
-            composeObject.services[this.getKey(domain.company, domain.project)] = domainObject;
-            return domainObject;
+    async refresh(company, project) {
+        const storageSdk = await storageSdkFactory();
+        const confBuffer = await this.generate(company, project);
+        if (!confBuffer)
+            throw new Error('CONF_FAILED');
+        await storageSdk.upload({
+            pathOrBuffer: confBuffer,
+            filename: `{company}-${project}.caddy`,
+            relativePath: `caddy/customers/${company}-${project}.caddy`,
+            mimetype: 'text/plain',
+            size: confBuffer.length,
+        }, {
+            app: 'internal',
+            company: 'lilaquadrat',
+            project: 'studio',
+            overwrite: true
         });
-        return composeObject;
     }
-    getKey(company, project) {
-        return `${company}-${project}`;
-    }
-    validateDomains(domains) {
-        const fileredDomains = [...new Set(domains)];
-        return fileredDomains.filter((domain) => {
-            if (!domain)
-                return false;
-            if (!domain.length)
-                return false;
-            return true;
-        });
-    }
-    /**
-     * validate domains and remove double entries
-     */
-    validateStreamDomains(domains) {
-        const filteredDomains = [];
-        domains.map((domain) => {
-            /**
-             * skip all with missing values
-            */
-            if (!domain)
-                return false;
-            if (!domain?.domains?.length)
-                return false;
-            if (!domain.company.length)
-                return false;
-            if (!domain.project.length)
-                return false;
-            if (!domain.ports?.http)
-                return false;
-            if (!domain.ports?.https)
-                return false;
-            /**
-             * skip double entries
-            */
-            const unique = filteredDomains.filter((searchDomain) => {
-                // if (domain.domains.includes(searchDomain.domain)) return true;
-                if (searchDomain.company === domain.company && searchDomain.project === domain.project)
-                    return true;
-                if (searchDomain.port === domain.port)
-                    return true;
-                return false;
+    async generate(company, project) {
+        const storageSdk = await storageSdkFactory();
+        let template;
+        try {
+            template = await storageSdk.download({
+                company: 'lilaquadrat',
+                project: 'studio',
+                app: 'internal',
+                filename: 'customers.caddy.hbs',
+                prefix: 'caddy'
             });
-            if (unique.length)
-                return false;
-            return filteredDomains.push(domain);
-        });
-        return filteredDomains;
-    }
-    refresh(type, company, project) {
-        if (type === 'docker') {
-            return this.refreshDockerCompose();
         }
-        if (['stream', 'proxy', 'project'].includes(type)) {
-            return this.refreshNginx(type, company, project);
+        catch (error) {
+            console.error(error);
+            return;
         }
-        return null;
-    }
-    async refreshDockerCompose(base = '/base/data/user') {
-        const domains = await HostingService.getActive();
-        const mappedDomains = DomainsService.mapPortToRealPorts(domains, { http: 8000, https: 9000 });
-        return this.shareClient.create('', 'docker-compose.json', JSON.stringify(this.getComposeObject(mappedDomains, base)));
-    }
-    async refreshNginx(type, company, project) {
-        let template = '';
-        let targetFile = '';
-        let targetFolder = '';
-        let renderedConf = '';
-        if (type === 'stream') {
-            template = 'stream.conf';
-            targetFile = 'stream.conf';
-            targetFolder = 'conf';
-        }
-        if (type === 'proxy') {
-            template = 'proxy_http.conf';
-            targetFile = 'proxy_http.conf';
-            targetFolder = 'conf';
-        }
-        if (type === 'project') {
-            template = '.conf';
-            targetFile = 'nginx.conf';
-            targetFolder = `user/${company}/${project}/conf`;
-        }
-        const confBase = (await this.getBase('base', template)).toString();
-        if (type === 'stream' || type === 'proxy') {
-            const domains = await DomainsService.getAllDomainsWithPorts();
-            renderedConf = this.renderStreamConf(DomainsService.mapPortToRealPorts(domains, { http: 8000, https: 9000 }), confBase);
+        const hosting = await HostingService.single(company, project);
+        const domains = await domainsService.getDomainsWithMain(company, project);
+        const templateVars = {
+            company,
+            project,
+            domains: domains.domains,
+            isApp: hosting?.isApp
+        };
+        if (!domains.domains?.length && !domains.main)
+            throw new Error('NO_DOMAINS');
+        /**
+        * only add the redirect block if we have a main domain and domain to redirect
+        */
+        if (domains.main && domains.domains.length) {
+            templateVars.mainDomain = domains.main;
         }
-        if (type === 'project' && company && project) {
-            const hosting = await HostingService.single(company, project);
-            const domains = await DomainsService.getDomainsWithPorts(company, project);
-            const mappedDomains = DomainsService.mapDomainsProject(domains, { http: 8000, https: 9000, redirectToMainDomain: hosting?.redirectToMainDomain });
-            renderedConf = this.render(mappedDomains?.http, mappedDomains?.https, mappedDomains?.defaultDomain, mappedDomains?.redirectDomains, company, project, confBase);
+        else if (domains.main && !domains.domains.length) {
+            templateVars.domains.push(domains.main);
         }
-        return this.shareClient.create(targetFolder, targetFile, renderedConf);
+        const compiledTemplate = handlebars.compile(template.toString());
+        const conf = compiledTemplate(templateVars).trim();
+        return Buffer.from(conf);
     }
-    createFolderRecursive(base, path) {
-        return this.shareClient.createFolder(base, path);
+    async remove(company, project) {
+        const conf = await StorageService.getByFilename(`${company}-${project}.caddy`, 'caddy/customers', 'internal', { company: 'lilaquadrat', project: 'studio' });
+        if (!conf || !conf._id)
+            return;
+        const storageSdk = await storageSdkFactory();
+        await storageSdk.remove(conf._id.toString(), { company: 'lilaquadrat', project: 'studio', app: 'internal' });
     }
 }
 export default new ConfService();

package/lib/src/services/conf.service.js.map

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

package/lib/src/services/customers.service.d.ts

@@ -41,6 +41,8 @@ export declare class CustomersService extends Immutable<CustomerPerson | Custome
      * also sets an email confirmation code if none exists
      */
     getMe(account: string, company: string, options: Required<UserAppWithOptions>): Promise<BasicData<CustomerPerson>>;
+    resendConfirmationEmail(account: string, company: string, options: Required<UserAppWithOptions>): Promise<boolean>;
+    sendConfirmationEmail(customerId: ObjectId, options: Required<UserAppWithOptions>): Promise<void | CreateResult<BasicData<import("@lilaquadrat/interfaces").Publish>>>;
     isConnected(account: string, app: string): Promise<boolean>;
     emailConfirmed(account: string, app: string): Promise<boolean>;
     getCustomerByAccount(account: string, app: string, projection?: Record<string, number>): Promise<WithId<Customers> | null>;
@@ -49,18 +51,20 @@ export declare class CustomersService extends Immutable<CustomerPerson | Custome
     /**
      * connects a auth0 account with a customer
      */
-    connectToAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<BasicData<CustomerCompany | CustomerPerson>>>;
+    connectToAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
     /**
      * connects a auth0 account with a customer
      */
-    confirmEmail(account: string, emailConfirmationCode: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<BasicData<CustomerCompany | CustomerPerson>>>;
-    disconnectFromAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<BasicData<CustomerCompany | CustomerPerson>>>;
+    confirmEmail(account: string, emailConfirmationCode: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
+    setEmailToConfirmed(internalId: ObjectId, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
+    disconnectFromAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
     /**
      * sets a new email confirmation code
      */
-    setEmailConfirmationCode(internalId: ObjectId, options: Required<UserAppWithOptions>): Promise<UpdateResult<BasicData<CustomerCompany | CustomerPerson>>>;
+    setEmailConfirmationCode(internalId: ObjectId, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
     createEmailConfirmationCode(length: number): string;
     getStructure(type: 'person' | 'company'): string[];
+    getEmail(customerId: ObjectId): Promise<string | undefined>;
     importManual(importData: BasicData<Customers>[], options: Required<UserAppWithOptions>): Promise<CustomerImportResult>;
     updateImportIds(importData: BasicData<Customers>[], options: Required<Options>): Record<string, ObjectId>;
     export(options: Options): Promise<WithId<Customers>[]>;

package/lib/src/services/customers.service.js

@@ -13,6 +13,7 @@ import { structure as listParticipantsStructure } from '../models/listsParticipa
 import ListsModel from '../models/lists.model.js';
 import { MeService } from './me.service.js';
 import ForbiddenError from '../classes/errors/Forbidden.error.js';
+import EmailLimitService from './emailLimit.service.js';
 export class CustomersService extends Immutable {
     constructor() {
         super(...arguments);
@@ -28,10 +29,6 @@ export class CustomersService extends Immutable {
     }
     createPerson(data, modelAction, options) {
         data.company = options.company;
-        if (data.email) {
-            data.emailConfirmed = false;
-            data.emailConfirmationCode = this.createEmailConfirmationCode(6);
-        }
         return this.create(data, options.user, options.app, undefined, undefined, modelAction, options);
     }
     updateWithType(internalId, data, options) {
@@ -157,15 +154,38 @@ export class CustomersService extends Immutable {
         customer = await this.model.db.findOne({ 'accounts.account': account, company }, { projection });
         if (customer) {
             customer.emailConfirmed = customer?.emailConfirmed === true;
-            // if email is not confirmed and no confirmation code is set, set a new one
+            // if email is not confirmed and no confirmation code is set, set a new one and send the email
             if (!customer.emailConfirmed && !customer.emailConfirmationCode) {
                 await this.setEmailConfirmationCode(customer._id, options);
-                await publishService.emailViaId('email-confirmation-mail', customer._id, undefined, options);
+                await this.sendConfirmationEmail(customer._id, options);
             }
             delete customer.emailConfirmationCode;
         }
         return customer;
     }
+    async resendConfirmationEmail(account, company, options) {
+        const projection = {
+            email: 1,
+            emailConfirmed: 1,
+            emailConfirmationCode: 1,
+        };
+        const customer = await this.model.db.findOne({ 'accounts.account': account, company }, { projection });
+        if (customer && !customer.emailConfirmed) {
+            if (!customer.emailConfirmationCode) {
+                await this.setEmailConfirmationCode(customer._id, options);
+            }
+            await this.sendConfirmationEmail(customer._id, options);
+        }
+        return true;
+    }
+    async sendConfirmationEmail(customerId, options) {
+        if (await EmailLimitService.isLimitedViaCustomer(customerId, 'email-confirmation-mail')) {
+            throw new Error('EMAIL_LIMITED');
+        }
+        const publish = await publishService.emailViaId('email-confirmation-mail', customerId, undefined, options);
+        await EmailLimitService.createViaCustomer(customerId, 'email-confirmation-mail');
+        return publish;
+    }
     async isConnected(account, app) {
         return await this.model.db.countDocuments({ 'accounts.account': account, 'accounts.app': app }) > 0;
     }
@@ -203,9 +223,12 @@ export class CustomersService extends Immutable {
     async confirmEmail(account, emailConfirmationCode, options) {
         const user = await this.model.db.findOne({ 'accounts.account': account, 'accounts.app': options.app, company: options.company, emailConfirmationCode }, { projection: { emailConfirmationCode: 1 } });
         if (!user)
-            throw new Error('USER_NOT_FOUND');
+            throw new Error('EMAIL_CONFIRMATION_FAILED');
         return this.immutable({ _id: user._id }, { emailConfirmed: true }, options.user, 'change', options.app, undefined, undefined, 'confirmEmail');
     }
+    async setEmailToConfirmed(internalId, options) {
+        return this.immutable(internalId, { emailConfirmed: true }, options.user, 'change', options.app, undefined, undefined, 'confirmEmail');
+    }
     async disconnectFromAccount(internalId, account, options) {
         const user = await this.model.db.findOne({ _id: internalId, company: options.company }, { projection: { _id: 0, history: 0 } });
         const accounts = user?.accounts || [];
@@ -247,6 +270,10 @@ export class CustomersService extends Immutable {
         }
         return [];
     }
+    async getEmail(customerId) {
+        const customer = await this.model.db.findOne({ _id: customerId }, { projection: { email: 1 } });
+        return customer?.email;
+    }
     async importManual(importData, options) {
         const statistics = {
             success: 0,