@lilaquadrat/studio 8.2.0 → 8.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/src/models/hosting.model.js +9 -0
- package/lib/cjs/src/models/hosting.model.js.map +1 -1
- package/lib/cjs/src/services/conf.service.d.ts +2 -2
- package/lib/cjs/src/services/conf.service.js +5 -4
- package/lib/cjs/src/services/conf.service.js.map +1 -1
- package/lib/cjs/src/services/domains.service.d.ts +4 -1
- package/lib/cjs/src/services/domains.service.js +16 -7
- package/lib/cjs/src/services/domains.service.js.map +1 -1
- package/lib/cjs/src/services/hosting.service.d.ts +1 -1
- package/lib/cjs/src/services/hosting.service.js +5 -4
- package/lib/cjs/src/services/hosting.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const modelv2_class_1 = __importDefault(require("../classes/modelv2.class"));
|
|
7
7
|
const model = new modelv2_class_1.default('hosting', 'hosting');
|
|
8
|
+
model.removeWhenEmpty = ['redirectToMainDomain', 'isApp'];
|
|
8
9
|
model.addIndex({
|
|
9
10
|
key: {
|
|
10
11
|
company: 1,
|
|
@@ -31,5 +32,13 @@ model.setSchema({
|
|
|
31
32
|
},
|
|
32
33
|
additionalProperties: false,
|
|
33
34
|
}, 'changeActive');
|
|
35
|
+
model.setSchema({
|
|
36
|
+
type: 'object',
|
|
37
|
+
properties: {
|
|
38
|
+
redirectToMainDomain: { type: 'boolean' },
|
|
39
|
+
isApp: { type: 'boolean' },
|
|
40
|
+
},
|
|
41
|
+
additionalProperties: false,
|
|
42
|
+
}, 'changeSettings', { unsetWithinPartial: true });
|
|
34
43
|
exports.default = model;
|
|
35
44
|
//# sourceMappingURL=hosting.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting.model.js","sourceRoot":"","sources":["../../../../src/models/hosting.model.ts"],"names":[],"mappings":";;;;;AACA,6EAA+C;AAE/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAU,SAAS,EAAE,SAAS,CAAC,CAAC;AAEzD,KAAK,CAAC,QAAQ,CACZ;IACE,GAAG,EAAE;QACH,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;KACX;IACD,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,iBAAiB;CACxB,EACD,CAAC,CACF,CAAC;AAEF,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;IACxC,oBAAoB,EAAE,KAAK;CAC5B,
|
|
1
|
+
{"version":3,"file":"hosting.model.js","sourceRoot":"","sources":["../../../../src/models/hosting.model.ts"],"names":[],"mappings":";;;;;AACA,6EAA+C;AAE/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAU,SAAS,EAAE,SAAS,CAAC,CAAC;AAEzD,KAAK,CAAC,eAAe,GAAG,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;AAE1D,KAAK,CAAC,QAAQ,CACZ;IACE,GAAG,EAAE;QACH,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;KACX;IACD,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,iBAAiB;CACxB,EACD,CAAC,CACF,CAAC;AAEF,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;IACxC,oBAAoB,EAAE,KAAK;CAC5B,EACC,QAAQ,CAAC,CAAC;AAEZ,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC5B;IACD,oBAAoB,EAAE,KAAK;CAC5B,EACC,cAAc,CAAC,CAAC;AAElB,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,oBAAoB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACzC,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC3B;IACD,oBAAoB,EAAE,KAAK;CAC5B,EACC,gBAAgB,EAChB,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC7B,CAAC;AAEF,kBAAe,KAAK,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { ShareClientInterface, DomainConf } from '@lilaquadrat/interfaces';
|
|
2
|
+
import { ShareClientInterface, DomainConf, HostingWithSettings } from '@lilaquadrat/interfaces';
|
|
3
3
|
export declare class ConfService {
|
|
4
4
|
shareClient: ShareClientInterface;
|
|
5
5
|
/**
|
|
@@ -12,7 +12,7 @@ export declare class ConfService {
|
|
|
12
12
|
* generates nginx config
|
|
13
13
|
*
|
|
14
14
|
*/
|
|
15
|
-
render(http: DomainConf | undefined, https: DomainConf[] | undefined, defaultDomain: DomainConf | undefined, company: string, project: string, baseConf: string): string;
|
|
15
|
+
render(http: DomainConf | undefined, https: DomainConf[] | undefined, defaultDomain: DomainConf | undefined, redirectDomains: DomainConf[] | undefined, company: string, project: string, baseConf: string, hosting?: HostingWithSettings): string;
|
|
16
16
|
renderStreamConf(domains: DomainConf[], confString: string): string;
|
|
17
17
|
getComposeObject(domains: DomainConf[], baseFolder: string, image?: string): {
|
|
18
18
|
[key: string]: any;
|
|
@@ -26,10 +26,10 @@ class ConfService {
|
|
|
26
26
|
* generates nginx config
|
|
27
27
|
*
|
|
28
28
|
*/
|
|
29
|
-
render(http, https, defaultDomain, company, project, baseConf) {
|
|
29
|
+
render(http, https, defaultDomain, redirectDomains, company, project, baseConf, hosting) {
|
|
30
30
|
const template = handlebars_1.default.compile(baseConf);
|
|
31
31
|
const conf = template({
|
|
32
|
-
http, https, company, project, defaultDomain,
|
|
32
|
+
http, https, company, project, defaultDomain, hosting, redirectDomains
|
|
33
33
|
}).trim();
|
|
34
34
|
if (conf.length === 0) {
|
|
35
35
|
return `#
|
|
@@ -172,9 +172,10 @@ class ConfService {
|
|
|
172
172
|
renderedConf = this.renderStreamConf(domains_service_1.default.mapPortToRealPorts(domains, { http: 8000, https: 9000 }), confBase);
|
|
173
173
|
}
|
|
174
174
|
if (type === 'project' && company && project) {
|
|
175
|
+
const hosting = await hosting_service_1.default.single(company, project);
|
|
175
176
|
const domains = await domains_service_1.default.getDomainsWithPorts(company, project);
|
|
176
|
-
const mappedDomains = domains_service_1.default.mapDomainsProject(domains, { http: 8000, https: 9000 });
|
|
177
|
-
renderedConf = this.render(mappedDomains?.http, mappedDomains?.https, mappedDomains?.defaultDomain, company, project, confBase);
|
|
177
|
+
const mappedDomains = domains_service_1.default.mapDomainsProject(domains, { http: 8000, https: 9000, redirectToMainDomain: hosting?.redirectToMainDomain });
|
|
178
|
+
renderedConf = this.render(mappedDomains?.http, mappedDomains?.https, mappedDomains?.defaultDomain, mappedDomains?.redirectDomains, company, project, confBase);
|
|
178
179
|
}
|
|
179
180
|
return this.shareClient.create(targetFolder, targetFile, renderedConf);
|
|
180
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conf.service.js","sourceRoot":"","sources":["../../../../src/services/conf.service.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AACpC,2FAA6D;AAC7D,wEAA+C;AAC/C,wEAA+C;AAG/C,MAAa,WAAW;IAItB;;;OAGG;IACH,OAAO,CAAC,MAAc,EAAE,IAAY;QAElC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE5C,CAAC;IAED;QAEE,IAAI,CAAC,WAAW,GAAG,IAAA,kCAAkB,EACnC,OAAO,CAAC,GAAG,CAAC,oBAA8B,EAC1C;YACE,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAAoC;YAClE,SAAS,EAAE,eAAe;SAC3B,CACF,CAAC;IAEJ,CAAC;IAED;;;SAGK;IACL,MAAM,CACJ,IAA4B,EAC5B,KAA+B,EAC/B,aAAqC,EACrC,OAAe,EACf,OAAe,EACf,QAAgB;
|
|
1
|
+
{"version":3,"file":"conf.service.js","sourceRoot":"","sources":["../../../../src/services/conf.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,10 +94,13 @@ declare class DomainsService extends Immutable<Domain> {
|
|
|
94
94
|
*/
|
|
95
95
|
mapDomainsProject(domains: (ProjectDomain & {
|
|
96
96
|
port: number;
|
|
97
|
-
})[],
|
|
97
|
+
})[], options: HostingPorts & {
|
|
98
|
+
redirectToMainDomain?: boolean;
|
|
99
|
+
}): {
|
|
98
100
|
http: DomainConf;
|
|
99
101
|
https: DomainConf[];
|
|
100
102
|
defaultDomain?: DomainConf | undefined;
|
|
103
|
+
redirectDomains?: DomainConf[] | undefined;
|
|
101
104
|
} | null;
|
|
102
105
|
getOrRequestForProject(company: string, project: string, options: Required<UserApp>): Promise<Promise<{
|
|
103
106
|
type: 'certificate';
|
|
@@ -534,7 +534,7 @@ class DomainsService extends Immutable_class_1.default {
|
|
|
534
534
|
*
|
|
535
535
|
* map the database format to the working format
|
|
536
536
|
*/
|
|
537
|
-
mapDomainsProject(domains,
|
|
537
|
+
mapDomainsProject(domains, options) {
|
|
538
538
|
if (!domains.length)
|
|
539
539
|
return null;
|
|
540
540
|
let defaultDomain;
|
|
@@ -542,18 +542,20 @@ class DomainsService extends Immutable_class_1.default {
|
|
|
542
542
|
domains: [],
|
|
543
543
|
company: domains[0]?.company,
|
|
544
544
|
project: domains[0]?.project,
|
|
545
|
-
port:
|
|
545
|
+
port: options.http + domains[0]?.port,
|
|
546
546
|
};
|
|
547
547
|
const mappedHttps = [];
|
|
548
|
+
const redirectDomains = [];
|
|
548
549
|
domains.forEach((single) => {
|
|
549
550
|
if (single.isDefault) {
|
|
550
551
|
defaultDomain = {
|
|
551
552
|
domains: [{ domain: single.domain, company: domains[0]?.company, project: domains[0]?.project }],
|
|
552
553
|
company: domains[0]?.company,
|
|
553
554
|
project: domains[0]?.project,
|
|
555
|
+
isMain: single.isMain,
|
|
554
556
|
ports: {
|
|
555
|
-
http:
|
|
556
|
-
https:
|
|
557
|
+
http: options.http + single.port,
|
|
558
|
+
https: options.https + single.port,
|
|
557
559
|
},
|
|
558
560
|
};
|
|
559
561
|
return;
|
|
@@ -564,10 +566,16 @@ class DomainsService extends Immutable_class_1.default {
|
|
|
564
566
|
domains: [{ domain: single.domain, company: domains[0]?.company, project: domains[0]?.project }],
|
|
565
567
|
company: single.company,
|
|
566
568
|
project: single.project,
|
|
567
|
-
|
|
569
|
+
isMain: single.isMain,
|
|
570
|
+
port: options.https + single.port,
|
|
568
571
|
certificate: certificate.filename,
|
|
569
572
|
};
|
|
570
|
-
|
|
573
|
+
if (options.redirectToMainDomain && !single.isMain) {
|
|
574
|
+
redirectDomains.push(httpsMapping);
|
|
575
|
+
}
|
|
576
|
+
else {
|
|
577
|
+
mappedHttps.push(httpsMapping);
|
|
578
|
+
}
|
|
571
579
|
// if the certificate is created through the http challenge, the domain must always be reachable through http
|
|
572
580
|
if (certificate.type === 'domain') {
|
|
573
581
|
mappedHttp.domains.push({ domain: single.domain, company: domains[0]?.company, project: domains[0]?.project });
|
|
@@ -581,6 +589,7 @@ class DomainsService extends Immutable_class_1.default {
|
|
|
581
589
|
http: mappedHttp,
|
|
582
590
|
https: mappedHttps,
|
|
583
591
|
defaultDomain,
|
|
592
|
+
redirectDomains
|
|
584
593
|
};
|
|
585
594
|
return returnObject;
|
|
586
595
|
}
|
|
@@ -599,7 +608,7 @@ class DomainsService extends Immutable_class_1.default {
|
|
|
599
608
|
return null;
|
|
600
609
|
if (await certificatesAction_service_1.default.actionExistsForDomain(domain.domain))
|
|
601
610
|
throw new Error('CERTIFICATEACTION_EXISTS');
|
|
602
|
-
if (!domain?.active)
|
|
611
|
+
if (!domain?.active && domain.company && domain.project)
|
|
603
612
|
throw new Error('DOMAIN_NOT_ACTIVE');
|
|
604
613
|
if (!domain?.validated)
|
|
605
614
|
throw new Error('DOMAIN_NOT_VALIDATED');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domains.service.js","sourceRoot":"","sources":["../../../../src/services/domains.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"domains.service.js","sourceRoot":"","sources":["../../../../src/services/domains.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ declare class HostingService extends Immutable<Hosting> {
|
|
|
4
4
|
model: import("../classes/modelv2.class").default<Hosting, string>;
|
|
5
5
|
shareClient: ShareClientInterface;
|
|
6
6
|
constructor();
|
|
7
|
-
single(company: string, project: string): Promise<HostingWithSettings |
|
|
7
|
+
single(company: string, project: string): Promise<HostingWithSettings | undefined>;
|
|
8
8
|
activate(company: string, project: string, user: string, app: string): Promise<import("mongodb").UpdateResult<import("@lilaquadrat/interfaces").BasicData<Hosting>> | import("@lilaquadrat/interfaces").CreateResult<import("@lilaquadrat/interfaces").BasicData<Hosting>>>;
|
|
9
9
|
deactivate(company: string, project: string, user: string, app: string): Promise<import("mongodb").UpdateResult<import("@lilaquadrat/interfaces").BasicData<Hosting>>>;
|
|
10
10
|
/**
|
|
@@ -67,7 +67,7 @@ class HostingService extends Immutable_class_1.default {
|
|
|
67
67
|
];
|
|
68
68
|
return hosting_model_1.default.db.aggregate(aggregationArray)
|
|
69
69
|
.toArray()
|
|
70
|
-
.then((data) => (data.length ? data[0] :
|
|
70
|
+
.then((data) => (data.length ? data[0] : undefined));
|
|
71
71
|
}
|
|
72
72
|
async activate(company, project, user, app) {
|
|
73
73
|
const hosting = await hosting_model_1.default.db.findOne({ company, project });
|
|
@@ -156,10 +156,11 @@ class HostingService extends Immutable_class_1.default {
|
|
|
156
156
|
return await this.model.db.countDocuments({ company, project, active: true }) === 1;
|
|
157
157
|
}
|
|
158
158
|
async refreshNginx(company, project) {
|
|
159
|
-
const confBase = (await conf_service_1.default.getBase('base', '.
|
|
159
|
+
const confBase = (await conf_service_1.default.getBase('base', '.conf1')).toString();
|
|
160
|
+
const hosting = await this.single(company, project);
|
|
160
161
|
const domains = await domains_service_1.default.getDomainsWithPorts(company, project);
|
|
161
|
-
const mappedDomains = domains_service_1.default.mapDomainsProject(domains, { http: 8000, https: 9000 });
|
|
162
|
-
const renderedConf = conf_service_1.default.render(mappedDomains?.http?.domains.length ? mappedDomains?.http : undefined, mappedDomains?.https.length ? mappedDomains?.https : undefined, mappedDomains?.defaultDomain, company, project, confBase);
|
|
162
|
+
const mappedDomains = domains_service_1.default.mapDomainsProject(domains, { http: 8000, https: 9000, redirectToMainDomain: hosting?.redirectToMainDomain });
|
|
163
|
+
const renderedConf = conf_service_1.default.render(mappedDomains?.http?.domains.length ? mappedDomains?.http : undefined, mappedDomains?.https.length ? mappedDomains?.https : undefined, mappedDomains?.defaultDomain, mappedDomains?.redirectDomains, company, project, confBase, hosting);
|
|
163
164
|
await conf_service_1.default.shareClient.create(`user/${company}/${project}/conf`, 'nginx.conf', renderedConf);
|
|
164
165
|
return renderedConf;
|
|
165
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting.service.js","sourceRoot":"","sources":["../../../../src/services/hosting.service.ts"],"names":[],"mappings":";;;;;AAAA,wFAA+D;AAC/D,yEAA2C;AAC3C,2FAA6D;AAC7D,wEAA+C;AAC/C,4EAAmD;AACnD,uDAA+B;AAC/B,kEAAyC;AACzC,kFAAyD;AAGzD,MAAM,cAAe,SAAQ,yBAAkB;IAM7C;QAEE,KAAK,EAAE,CAAC;QANV,UAAK,GAAG,uBAAY,CAAC;QAQnB,IAAI,CAAC,WAAW,GAAG,IAAA,kCAAkB,EACnC,OAAO,CAAC,GAAG,CAAC,oBAA8B,EAC1C;YACE,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAAoC;YAClE,SAAS,EAAE,eAAe;SAC3B,CACF,CAAC;IAEJ,CAAC;IAED,MAAM,CAAC,OAAe,EAAE,OAAe;QAErC,MAAM,gBAAgB,GAAG;YACvB;gBACE,MAAM,EAAE;oBACN,OAAO;oBACP,OAAO;iBACR;aACF;YACD;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB;oBACvB,EAAE,EAAE,IAAI;oBACR,QAAQ,EAAE;wBACR;4BACE,QAAQ,EAAE;gCACR,UAAU,EAAE,CAAC;gCACb,GAAG,EAAE,CAAC;6BACP;yBACF;wBACD;4BACE,OAAO,EAAE;gCACP,IAAI,EAAE,aAAa;6BACpB;yBACF;qBACF;iBACF;aACF;YACD;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,KAAK;iBACZ;aACF;YACD;gBACE,UAAU,EAAE;oBACV,QAAQ,EAAE;wBACR,EAAE,EAAE,gBAAgB;qBACrB;iBACF;aACF;YACD;gBACE,QAAQ,EAAE;oBACR,EAAE,EAAE,CAAC;iBACN;aACF;SACF,CAAC;QAEF,OAAO,uBAAY,CAAC,EAAE,CAAC,SAAS,CAAsB,gBAAgB,CAAC;aACpE,OAAO,EAAE;aACT,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"hosting.service.js","sourceRoot":"","sources":["../../../../src/services/hosting.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lilaquadrat/studio",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.3.1",
|
|
4
4
|
"description": "classes and tools for STUDIO",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://lilaquadrat.de",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"@azure/storage-blob": "^12.17.0",
|
|
69
69
|
"@azure/storage-file-share": "^12.17.0",
|
|
70
70
|
"@azure/storage-queue": "^12.16.0",
|
|
71
|
-
"@lilaquadrat/interfaces": "^1.
|
|
71
|
+
"@lilaquadrat/interfaces": "^1.5.0",
|
|
72
72
|
"@root/acme": "^3.1.0",
|
|
73
73
|
"@root/csr": "^0.8.1",
|
|
74
74
|
"@root/keypairs": "^0.10.0",
|