@lilaquadrat/studio 9.20.3 → 10.0.0-beta.10

package/lib/{cjs/src → src}/services/domains.service.js

@@ -1,21 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongodb_1 = require("mongodb");
-const dns_1 = __importDefault(require("dns"));
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const domain_model_1 = __importDefault(require("../models/domain.model"));
-const certificates_service_1 = __importDefault(require("./certificates.service"));
-const hosting_model_1 = __importDefault(require("../models/hosting.model"));
-const certificatesAction_service_1 = __importDefault(require("./certificatesAction.service"));
-const secret_service_1 = __importDefault(require("./secret.service"));
-const dns = dns_1.default.promises;
-class DomainsService extends Immutable_class_1.default {
+import { ObjectId } from 'mongodb';
+import DNS from 'dns';
+import Immutable from '../Immutable.class.js';
+import DomainModel from '../models/domain.model.js';
+// import certificatesService from './certificates.service.js';
+import HostingModel from '../models/hosting.model.js';
+// import certificatesActionService from './certificatesAction.service.js';
+import secretService from './secret.service.js';
+const dns = DNS.promises;
+class DomainsService extends Immutable {
     constructor() {
         super(...arguments);
-        this.model = domain_model_1.default;
+        this.model = DomainModel;
     }
     async single(internalId, options) {
         const projection = {};
@@ -114,43 +109,49 @@ class DomainsService extends Immutable_class_1.default {
      */
     async createWithSSL(data, user, app) {
         const newDomain = await this.create({ ...data, validated: false }, user, app);
-        const secret = await secret_service_1.default.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, user, app);
+        const secret = await secretService.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, user, app);
         /** set the dns validation secret */
         await this.immutable(newDomain._id, { secret: secret._id }, user, 'change', app, undefined, undefined, 'setSecret');
-        const certOrRequest = await certificates_service_1.default.getOrRequest(data.domain, data.company, data.project, user, app);
-        if (certOrRequest.type === 'certificate') {
-            await this.linkCertificate(new mongodb_1.ObjectId(certOrRequest.data?._id), data.domain, data.company, data.project, user, app);
-        }
+        // const certOrRequest = await certificatesService.getOrRequest(data.domain, data.company, data.project, user, app);
+        // if (certOrRequest.type === 'certificate') {
+        //   await this.linkCertificate(new ObjectId(certOrRequest.data?._id), data.domain, data.company, data.project, user, app);
+        // }
         return newDomain;
     }
     async createWithSecret(data, options) {
         const newDomain = await this.create({ ...data, validated: false }, options.user, options.app);
-        const secret = await secret_service_1.default.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, options.user, options.app);
+        const secret = await secretService.singleUpsert(data.company, data.project, undefined, undefined, data.domain, 10, options.user, options.app);
         /** set the dns validation secret */
         await this.immutable(newDomain._id, { secret: secret._id }, options.user, 'change', options.app, undefined, undefined, 'setSecret');
         return newDomain;
     }
     async createWithWildcard(data, options) {
         const newDomain = await this.create({ ...data, validated: true }, options.user, options.app);
-        const certOrRequest = await certificates_service_1.default.getOrRequestWildcard(data.domain, options);
-        if (certOrRequest.type === 'certificate') {
-            await this.linkCertificate(new mongodb_1.ObjectId(certOrRequest.data?._id), data.domain, undefined, undefined, options.user, options.app);
-        }
+        // const certOrRequest = await certificatesService.getOrRequestWildcard(data.domain, options);
+        // if (certOrRequest.type === 'certificate') {
+        //   await this.linkCertificate(new ObjectId(certOrRequest.data?._id), data.domain, undefined, undefined, options.user, options.app);
+        // }
         return newDomain;
     }
     /**
      * start a new certification action based upon the last failed for this domain
      */
     async retrySSL(data, user, app) {
-        const failedAction = await certificatesAction_service_1.default.latest(data.domain, data.company, data.project);
-        if (failedAction?.state === 'failed') {
-            return certificatesAction_service_1.default.request(failedAction.domains, failedAction.type, failedAction.contentType, failedAction.renew, {
-                company: failedAction.company,
-                project: failedAction.project,
-                user,
-                app,
-            });
-        }
+        // const failedAction = await certificatesActionService.latest(data.domain, data.company, data.project);
+        // if (failedAction?.state === 'failed') {
+        //   return certificatesActionService.request(
+        //     failedAction.domains,
+        //     failedAction.type as 'domain',
+        //     failedAction.contentType,
+        //     failedAction.renew,
+        //     {
+        //       company: failedAction.company as string,
+        //       project: failedAction.project as string,
+        //       user,
+        //       app,
+        //     },
+        //   );
+        // }
         return null;
     }
     async remove(_id, user, app) {
@@ -165,7 +166,7 @@ class DomainsService extends Immutable_class_1.default {
         return this.immutable({ domain, company, project }, { certificate: certificateInternalId }, user, 'change', app, undefined, undefined, 'setCertificate');
     }
     linkMultipleDomains(certificateInternalId, domains, company, project, user, app) {
-        const PROMISEARRAY = domains.map((domain) => this.linkCertificate(new mongodb_1.ObjectId(certificateInternalId), domain, company, project, user, app));
+        const PROMISEARRAY = domains.map((domain) => this.linkCertificate(new ObjectId(certificateInternalId), domain, company, project, user, app));
         return Promise.all(PROMISEARRAY);
     }
     /**
@@ -209,7 +210,7 @@ class DomainsService extends Immutable_class_1.default {
      * get all domains for specific project with ports and certificates
      */
     async getDomainsWithPorts(company, project) {
-        const hostingPorts = await hosting_model_1.default.db.findOne({ company, project, active: true });
+        const hostingPorts = await HostingModel.db.findOne({ company, project, active: true });
         if (!hostingPorts)
             return [];
         return this.model.db.aggregate([
@@ -287,7 +288,7 @@ class DomainsService extends Immutable_class_1.default {
      * get all domains from active hosting with ports and certificates
      */
     async getAllDomainsWithPorts() {
-        return hosting_model_1.default.db.aggregate([
+        return HostingModel.db.aggregate([
             {
                 $match: {
                     $and: [
@@ -367,8 +368,8 @@ class DomainsService extends Immutable_class_1.default {
         ]).toArray();
     }
     getCustomQuery(filter, options) {
-        let match = {};
-        let matchLate = {};
+        const match = {};
+        const matchLate = {};
         if (filter?.domain) {
             match.domain = filter.domain;
         }
@@ -591,45 +592,63 @@ class DomainsService extends Immutable_class_1.default {
         };
         return returnObject;
     }
-    async getOrRequestForProject(company, project, options) {
-        const domains = await this.model.db.find({
-            company,
-            project,
-            validated: true,
-            active: true,
-            isDefault: false,
-        }).toArray();
-        return domains.map((single) => certificates_service_1.default.getOrRequest(single.domain, company, project, options.user, options.app));
-    }
+    // async getOrRequestForProject(company: string, project: string, options: Required<UserApp>): Promise<Promise<{
+    //   type: 'certificate';
+    //   data: BasicData<Certificate>;
+    // } | {
+    //   type: 'request';
+    //   data: ObjectId | undefined;
+    // }>[]> {
+    //   const domains = await this.model.db.find({
+    //     company,
+    //     project,
+    //     validated: true,
+    //     active: true,
+    //     isDefault: false,
+    //   }).toArray();
+    //   return domains.map((single) => certificatesService.getOrRequest(
+    //     single.domain, company, project, options.user, options.app,
+    //   ));
+    // }
     async requestCertificateForDomain(internalId, options) {
         const domain = await this.model.db.findOne({ _id: internalId });
         if (!domain)
             return null;
-        if (await certificatesAction_service_1.default.actionExistsForDomain(domain.domain))
-            throw new Error('CERTIFICATEACTION_EXISTS');
+        // if (await certificatesActionService.actionExistsForDomain(domain.domain)) throw new Error('CERTIFICATEACTION_EXISTS');
         if (!domain?.active && domain.company && domain.project)
             throw new Error('DOMAIN_NOT_ACTIVE');
         if (!domain?.validated)
             throw new Error('DOMAIN_NOT_VALIDATED');
-        if (!domain.company && !domain.project) {
-            return certificatesAction_service_1.default.request([domain.domain], 'wildcard', 'pem', true, {
-                app: options.app,
-                user: options.user,
-                forceFile: true,
-                timeout: 120,
-            });
-        }
-        else if (domain.company && domain.project) {
-            return certificatesAction_service_1.default.request([domain.domain], 'domain', 'pem', true, {
-                ...options,
-                company: domain.company,
-                project: domain.project,
-                forceFile: true,
-                timeout: 120,
-            });
-        }
+        // if (!domain.company && !domain.project) {
+        //   return certificatesActionService.request(
+        //     [domain.domain],
+        //     'wildcard',
+        //     'pem',
+        //     true,
+        //     {
+        //       app: options.app,
+        //       user: options.user,
+        //       forceFile: true,
+        //       timeout: 120,
+        //     },
+        //   );
+        // } else if (domain.company && domain.project) {
+        //   return certificatesActionService.request(
+        //     [domain.domain],
+        //     'domain',
+        //     'pem',
+        //     true,
+        //     {
+        //       ...options,
+        //       company: domain.company,
+        //       project: domain.project,
+        //       forceFile: true,
+        //       timeout: 120,
+        //     },
+        //   );
+        // }
         return null;
     }
 }
-exports.default = new DomainsService();
+export default new DomainsService();
 //# sourceMappingURL=domains.service.js.map

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

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

package/lib/{cjs/src → src}/services/editor.service.d.ts

@@ -1,8 +1,8 @@
 import { ObjectId, UnorderedBulkOperation, WithId } from 'mongodb';
-import Immutable from '../Immutable.class';
+import Immutable from '../Immutable.class.js';
 import { BasicData, Content, GenericData, ContentOptions, Options, History, ObjectIdString } from '@lilaquadrat/interfaces';
 declare class EditorService extends Immutable<Content> {
-    model: import("../classes/modelv2.class").default<Content, string>;
+    model: import("../classes/modelv2.class.js").default<Content, string>;
     put(_id: BasicData<Content>['_id'], data: Content): Promise<WithId<Content> | null>;
     single(_id: string, isHistory?: boolean): Promise<WithId<Content> | null>;
     getById(id: string, options: ContentOptions): Promise<BasicData<Content>>;

package/lib/{cjs/src → src}/services/editor.service.js

@@ -1,21 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongodb_1 = require("mongodb");
-const childData_aggregation_1 = __importDefault(require("../aggegations/childData.aggregation"));
-const partial_aggregation_1 = __importDefault(require("../aggegations/partial.aggregation"));
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const logger_1 = __importDefault(require("../logger"));
-const models_1 = require("../../models");
-const genericData_aggregation_1 = __importDefault(require("../aggegations/genericData.aggregation"));
-const updateMappedId_1 = __importDefault(require("../helpers/updateMappedId"));
-const findObjetcsWithKeys_1 = __importDefault(require("../helpers/findObjetcsWithKeys"));
-class EditorService extends Immutable_class_1.default {
+import { ObjectId, } from 'mongodb';
+import childDataAggregation from '../aggegations/childData.aggregation.js';
+import partialAggregation from '../aggegations/partial.aggregation.js';
+import Immutable from '../Immutable.class.js';
+import logger from '../logger.js';
+import { EditorModel } from '../../models.js';
+import genericDataAggregation from '../aggegations/genericData.aggregation.js';
+import updateMappedId from '../helpers/updateMappedId.js';
+import findObjectsWithKeys from '../helpers/findObjetcsWithKeys.js';
+class EditorService extends Immutable {
     constructor() {
         super(...arguments);
-        this.model = models_1.EditorModel;
+        this.model = EditorModel;
     }
     put(_id, data) {
         return this.model.db.findOneAndUpdate({ _id }, data);
@@ -23,7 +18,7 @@ class EditorService extends Immutable_class_1.default {
     single(_id, isHistory) {
         const query = {};
         query._id = isHistory
-            ? new mongodb_1.ObjectId(_id)
+            ? new ObjectId(_id)
             : _id;
         return this.model.db.findOne(query);
     }
@@ -67,7 +62,7 @@ class EditorService extends Immutable_class_1.default {
         const aggregation = [];
         const query = {
             $match: {
-                _id: { $in: arrayOfInternalIds.map((single) => new mongodb_1.ObjectId(single)) },
+                _id: { $in: arrayOfInternalIds.map((single) => new ObjectId(single)) },
                 company: options.company,
                 project: options.project,
             },
@@ -114,36 +109,36 @@ class EditorService extends Immutable_class_1.default {
     execSingle(aggregation, options) {
         const extendedAggregation = [...aggregation];
         if (options.partials) {
-            extendedAggregation.push(...partial_aggregation_1.default);
+            extendedAggregation.push(...partialAggregation);
         }
         if (options.children) {
-            extendedAggregation.push(...childData_aggregation_1.default);
+            extendedAggregation.push(...childDataAggregation);
         }
         if (options.genericData) {
-            extendedAggregation.push(...genericData_aggregation_1.default);
+            extendedAggregation.push(...genericDataAggregation);
         }
         return this.model.db.aggregate(extendedAggregation).toArray()
             .then(async (data) => data.length > 0 ? data[0] : undefined)
             .catch((e) => {
-            logger_1.default.error(e);
+            logger.error(e);
             return e;
         });
     }
     execMulti(aggregation, options) {
         const extendedAggregation = [...aggregation];
         if (options.partials) {
-            extendedAggregation.push(...partial_aggregation_1.default);
+            extendedAggregation.push(...partialAggregation);
         }
         if (options.children) {
-            extendedAggregation.push(...childData_aggregation_1.default);
+            extendedAggregation.push(...childDataAggregation);
         }
         if (options.genericData) {
-            extendedAggregation.push(...genericData_aggregation_1.default);
+            extendedAggregation.push(...genericDataAggregation);
         }
         return this.model.db.aggregate(extendedAggregation).toArray()
             .then(async (data) => data.length > 0 ? data : undefined)
             .catch((e) => {
-            logger_1.default.error(e);
+            logger.error(e);
             return e;
         });
     }
@@ -245,11 +240,11 @@ class EditorService extends Immutable_class_1.default {
                 },
             });
         }
-        aggregation = [...aggregation, ...partial_aggregation_1.default, ...childData_aggregation_1.default];
+        aggregation = [...aggregation, ...partialAggregation, ...childDataAggregation];
         return this.model.db.aggregate(aggregation).toArray()
             .then((data) => (data.length > 0 ? data[0] : undefined))
             .catch((e) => {
-            logger_1.default.error(e);
+            logger.error(e);
             throw e;
         });
     }
@@ -366,7 +361,7 @@ class EditorService extends Immutable_class_1.default {
          */
         importData.map((single) => {
             const originalId = single._id?.toString();
-            const newId = new mongodb_1.ObjectId();
+            const newId = new ObjectId();
             single._id = newId;
             single.company = options.company;
             single.project = options.project;
@@ -446,7 +441,7 @@ class EditorService extends Immutable_class_1.default {
          */
         const filteredHistoryData = importHistoryData.filter((single) => {
             const newParentId = idMapping[single.history.parent?.toString()];
-            single._id = new mongodb_1.ObjectId();
+            single._id = new ObjectId();
             /**
              * update the parent id
              */
@@ -471,13 +466,13 @@ class EditorService extends Immutable_class_1.default {
             * update the layouts
             */
             if (single.settings?.useLayout) {
-                (0, updateMappedId_1.default)(single.settings, 'useLayout', idMapping);
+                updateMappedId(single.settings, 'useLayout', idMapping);
             }
             /**
             * only update media files if a cdn is given
             */
             if (options.cdn) {
-                const pictureAndVideo = (0, findObjetcsWithKeys_1.default)(single.modules, ['video', 'picture']);
+                const pictureAndVideo = findObjectsWithKeys(single.modules, ['video', 'picture']);
                 pictureAndVideo.forEach((singleModule) => {
                     if (singleModule.picture) {
                         this.updatePictureVideo(singleModule.picture, idMapping, { cdn: options.cdn, company: options.company, project: options.project });
@@ -528,5 +523,5 @@ class EditorService extends Immutable_class_1.default {
         return { filteredData, skippedData, bulk };
     }
 }
-exports.default = new EditorService();
+export default new EditorService();
 //# sourceMappingURL=editor.service.js.map

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

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

package/lib/{cjs/src → src}/services/editorBase.service.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
-import Immutable from '../Immutable.class';
+import Immutable from '../Immutable.class.js';
 import { EditorBase, ShareClientInterface } from '@lilaquadrat/interfaces';
 declare class EditorBaseService extends Immutable<EditorBase> {
-    model: import("../classes/modelv2.class").default<EditorBase, string>;
+    model: import("../classes/modelv2.class.js").default<EditorBase, string>;
     get shareClient(): ShareClientInterface;
     /**
      * creates basic CDN folders for this project

package/lib/{cjs/src → src}/services/editorBase.service.js

@@ -1,21 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const models_1 = require("../../models");
-const main_1 = require("../../main");
-const services_1 = require("../../services");
-class EditorBaseService extends Immutable_class_1.default {
+import Immutable from '../Immutable.class.js';
+import { EditorBaseModel } from '../../models.js';
+import { logger, ShareClientFactory } from '../../main.js';
+import { HandleFileService } from '../../services.js';
+class EditorBaseService extends Immutable {
     constructor() {
         super(...arguments);
-        this.model = models_1.EditorBaseModel;
+        this.model = EditorBaseModel;
     }
     get shareClient() {
-        const shareClient = (0, main_1.ShareClientFactory)('azureBlob', {
-            connectionString: process.env.STORAGE_HOSTED,
-            accountName: process.env.STORAGE_ACCOUNT,
+        const shareClient = ShareClientFactory(process.env.STORAGE_TYPE, {
+            endpoint: process.env.STORAGE_ENDPOINT,
+            accessKey: process.env.STORAGE_ACCESSKEY,
+            secretKey: process.env.STORAGE_SECRETKEY,
+            container: 'customers',
         });
         return shareClient;
     }
@@ -42,6 +39,7 @@ class EditorBaseService extends Immutable_class_1.default {
         const base = await this.single('lilaquadrat', 'base', type);
         if (!base)
             throw new Error('BASE_NOT_FOUND');
+        console.log('base', base);
         if (base.version === '3') {
             await this.copyEditorBasev3(company, project, type, path);
         }
@@ -55,27 +53,27 @@ class EditorBaseService extends Immutable_class_1.default {
         return this.shareClient
             .list(path, filter)
             .then((foundFiles) => {
-            main_1.logger.info(`projects.create.${company}.${project}.files.copy`);
-            main_1.logger.info(`projects.create.${company}.${project}.files.copy.${foundFiles.length}`);
-            main_1.logger.debug(path);
-            main_1.logger.debug(`${company}/${project}/editor`);
+            logger.info(`projects.create.${company}.${project}.files.copy`);
+            logger.info(`projects.create.${company}.${project}.files.copy.${foundFiles.length}`);
+            logger.debug(path);
+            logger.debug(`${company}/${project}/editor`);
             return this.shareClient.copy(foundFiles, path, `${company}/${project}/editor`);
         });
     }
     async copyEditorBasev3(company, project, type, path = 'lilaquadrat/base/editorBase') {
         let files;
         let assets;
-        let targetFolder = `${company}/${project}/editor`;
-        main_1.logger.info(`projects.create.${company}.${project}.files.copy`);
+        const targetFolder = `${company}/${project}/editor`;
+        logger.info(`projects.create.${company}.${project}.files.copy`);
         if (type === 'server') {
-            main_1.logger.info(`projects.create.v3.${company}.${project}.files.copy.server`);
+            logger.info(`projects.create.v3.${company}.${project}.files.copy.server`);
             await this.shareClient.copy(['index.server.html', 'index.mail.html', 'server-entry.js', 'ssr-manifest.json'], `${path}/server`, targetFolder);
         }
         if (type === 'app') {
             assets = await this.shareClient.list(`${path}/app`, /(.(js|css|woff|png|map|webmanifest))$/i);
-            main_1.logger.info(`projects.create.v3.${company}.${project}.files.copy.app.${assets.length}`);
+            logger.info(`projects.create.v3.${company}.${project}.files.copy.app.${assets.length}`);
             await this.shareClient.copy(assets, `${path}/app`, targetFolder);
-            main_1.logger.info(`projects.create.v3.${company}.${project}.files.copy.index`);
+            logger.info(`projects.create.v3.${company}.${project}.files.copy.index`);
             await this.shareClient.copy(['index.html'], `${path}/app`, targetFolder);
         }
         return true;
@@ -119,8 +117,8 @@ class EditorBaseService extends Immutable_class_1.default {
             }
         }
         if (type === 'app')
-            await services_1.HandleFileService.clean(options.company, options.project, cleanFolder);
-        return services_1.HandleFileService.add(options.company, options.project, file, targetFolder)
+            await HandleFileService.clean(options.company, options.project, cleanFolder);
+        return HandleFileService.add(options.company, options.project, file, targetFolder)
             .then(() => this.upsertType(options.company, options.project, type, version, !options.isBase, options.user, options.app));
     }
     syncFiles(company, project, user, app, isBase = false) {
@@ -140,7 +138,7 @@ class EditorBaseService extends Immutable_class_1.default {
         if (!base)
             throw new Error('BASE_NOT_FOUND');
         if (type === 'app')
-            await services_1.HandleFileService.clean(company, project, isBase ? 'editorBase' : 'editor');
+            await HandleFileService.clean(company, project, isBase ? 'editorBase' : 'editor');
         return this.copyBase(company, project, type, 'lilaquadrat/base/editorBase', user, app)
             .then(() => this.upsertType(company, project, type, base.version, false, user, app));
     }
@@ -159,5 +157,5 @@ class EditorBaseService extends Immutable_class_1.default {
         return false;
     }
 }
-exports.default = new EditorBaseService();
+export default new EditorBaseService();
 //# sourceMappingURL=editorBase.service.js.map

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

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

package/lib/{cjs/src → src}/services/handleFile.service.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ShareClientInterface } from '@lilaquadrat/interfaces';
 export declare class HandleFileService {
     client: ShareClientInterface;