@lilaquadrat/studio 10.0.0-beta.22 → 10.0.0-beta.24
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/helpers.d.ts +2 -1
- package/lib/helpers.js +2 -1
- package/lib/helpers.js.map +1 -1
- package/lib/src/Immutable.class.d.ts +6 -1
- package/lib/src/Immutable.class.js +6 -5
- package/lib/src/Immutable.class.js.map +1 -1
- package/lib/src/helpers/storageSdkFactory.d.ts +2 -0
- package/lib/src/helpers/storageSdkFactory.js +11 -0
- package/lib/src/helpers/storageSdkFactory.js.map +1 -0
- package/lib/src/models/hosting.model.js +0 -2
- package/lib/src/models/hosting.model.js.map +1 -1
- package/lib/src/services/conf.service.d.ts +3 -31
- package/lib/src/services/conf.service.js +57 -167
- package/lib/src/services/conf.service.js.map +1 -1
- package/lib/src/services/customers.service.d.ts +4 -4
- package/lib/src/services/domains.service.d.ts +17 -80
- package/lib/src/services/domains.service.js +78 -579
- package/lib/src/services/domains.service.js.map +1 -1
- package/lib/src/services/hosting.service.d.ts +12 -24
- package/lib/src/services/hosting.service.js +28 -115
- package/lib/src/services/hosting.service.js.map +1 -1
- package/lib/src/services/import.service.d.ts +1 -1
- package/lib/src/services/jetstream.service.d.ts +3 -1
- package/lib/src/services/jetstream.service.js +2 -1
- package/lib/src/services/jetstream.service.js.map +1 -1
- package/lib/src/services/listParticipants.service.d.ts +2 -2
- package/lib/src/services/me.service.d.ts +1 -1
- package/lib/src/services/publish.service.d.ts +3 -3
- package/lib/src/services/storage.service.d.ts +4 -4
- package/lib/src/services/storage.service.js +5 -4
- package/lib/src/services/storage.service.js.map +1 -1
- package/lib/src/services/structures.service.d.ts +1 -1
- package/package.json +3 -2
package/lib/helpers.d.ts
CHANGED
|
@@ -14,4 +14,5 @@ import filenameHelper from './src/helpers/filenameHelper.js';
|
|
|
14
14
|
import batch from './src/helpers/batch.js';
|
|
15
15
|
import CacheHelper from './src/helpers/cacheHelper.js';
|
|
16
16
|
import ControllerHelper from './src/helpers/ControllerHelper.js';
|
|
17
|
-
|
|
17
|
+
import storageSdkFactory from './src/helpers/storageSdkFactory.js';
|
|
18
|
+
export { companyRights, hardCopy, createError, getSecrets, matchSortArray, isValidObjectId, convertCountryISO2, countries, HttpStatusCode, ProjectScope, CompanyScope, UniversalScope, CompanyScopeAdmin, safeObjectId, isDeepEmpty, filenameHelper, batch, CacheHelper, ControllerHelper, storageSdkFactory };
|
package/lib/helpers.js
CHANGED
|
@@ -15,9 +15,10 @@ import filenameHelper from './src/helpers/filenameHelper.js';
|
|
|
15
15
|
import batch from './src/helpers/batch.js';
|
|
16
16
|
import CacheHelper from './src/helpers/cacheHelper.js';
|
|
17
17
|
import ControllerHelper from './src/helpers/ControllerHelper.js';
|
|
18
|
+
import storageSdkFactory from './src/helpers/storageSdkFactory.js';
|
|
18
19
|
export { companyRights, hardCopy, createError, getSecrets, matchSortArray, isValidObjectId, convertCountryISO2, countries, HttpStatusCode, ProjectScope, CompanyScope, UniversalScope, CompanyScopeAdmin, safeObjectId, isDeepEmpty,
|
|
19
20
|
// createSasToken,
|
|
20
|
-
filenameHelper, batch, CacheHelper, ControllerHelper, };
|
|
21
|
+
filenameHelper, batch, CacheHelper, ControllerHelper, storageSdkFactory };
|
|
21
22
|
// Note: Fastify plugins (authPlugin, studioAppPlugin, queryAssertionPlugin) are not exported here
|
|
22
23
|
// to avoid loading fastify-plugin for non-Fastify apps.
|
|
23
24
|
// Import them directly if needed:
|
package/lib/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../helpers.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,UAAU,MAAM,6BAA6B,CAAC;AACrD,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,kBAAkB,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAClH,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,gEAAgE;AAChE,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,KAAK,MAAM,wBAAwB,CAAC;AAC3C,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,gBAAgB,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../helpers.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,UAAU,MAAM,6BAA6B,CAAC;AACrD,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,kBAAkB,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAClH,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,gEAAgE;AAChE,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,KAAK,MAAM,wBAAwB,CAAC;AAC3C,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,gBAAgB,MAAM,mCAAmC,CAAC;AACjE,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EACH,aAAa,EACb,QAAQ,EACR,WAAW,EACX,UAAU,EACV,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,SAAS,EACT,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,WAAW;AACX,kBAAkB;AAClB,cAAc,EACd,KAAK,EACL,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACpB,CAAA;AAED,kGAAkG;AAClG,wDAAwD;AACxD,kCAAkC;AAClC,yEAAyE;AACzE,mFAAmF;AACnF,6FAA6F"}
|
|
@@ -10,9 +10,14 @@ export default abstract class Immutable<T extends mongo.Document> {
|
|
|
10
10
|
* * adds a new entry in the history and updates the current one
|
|
11
11
|
* **IMPORTANT** dont query fields that would be changed on update, that will mess up the history
|
|
12
12
|
*/
|
|
13
|
+
immutable(_idOrFilterQuery: BasicData<T>['_id'] | Filter<BasicData<T>> | string, data: BasicData<T> | Partial<BasicData<T>>, user: string, reason: HistoryReason, app: string, additionalHistoryData: Record<string, string | number> | undefined, bulk: UnorderedBulkOperation | OrderedBulkOperation | undefined, partial: Model<BasicData<T>>['actions'] | undefined, options: {
|
|
14
|
+
validator?: ValidateFunction;
|
|
15
|
+
returnDocument: true;
|
|
16
|
+
}): Promise<BasicData<T>>;
|
|
13
17
|
immutable(_idOrFilterQuery: BasicData<T>['_id'] | Filter<BasicData<T>> | string, data: BasicData<T> | Partial<BasicData<T>>, user: string, reason: HistoryReason, app: string, additionalHistoryData?: Record<string, string | number>, bulk?: UnorderedBulkOperation | OrderedBulkOperation, partial?: Model<BasicData<T>>['actions'], options?: {
|
|
14
18
|
validator?: ValidateFunction;
|
|
15
|
-
|
|
19
|
+
returnDocument?: false;
|
|
20
|
+
}): Promise<UpdateResult>;
|
|
16
21
|
/**
|
|
17
22
|
* creates or updates data
|
|
18
23
|
*/
|
|
@@ -5,10 +5,6 @@ import historyService from './services/history.service.js';
|
|
|
5
5
|
import IdService from './services/id.service.js';
|
|
6
6
|
import isValidObjectId from './helpers/isValidObjectId.js';
|
|
7
7
|
export default class Immutable {
|
|
8
|
-
/**
|
|
9
|
-
* * adds a new entry in the history and updates the current one
|
|
10
|
-
* **IMPORTANT** dont query fields that would be changed on update, that will mess up the history
|
|
11
|
-
*/
|
|
12
8
|
async immutable(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk, partial, options) {
|
|
13
9
|
const validationType = partial || 'change';
|
|
14
10
|
const filterQuery = isValidObjectId(_idOrFilterQuery)
|
|
@@ -59,8 +55,13 @@ export default class Immutable {
|
|
|
59
55
|
}
|
|
60
56
|
return this.model.db.findOneAndUpdate(filterQuery, updateQuery, { returnDocument: 'after' })
|
|
61
57
|
.then(async (document) => {
|
|
58
|
+
if (!document)
|
|
59
|
+
throw new ImmutableError('DOCUMENT_FOR_UPDATE_MISSING');
|
|
60
|
+
const returnDocument = document;
|
|
62
61
|
await historyService.create(document, user, reason, app, this.model.name, undefined, undefined, bulk);
|
|
63
|
-
return
|
|
62
|
+
return !options?.returnDocument
|
|
63
|
+
? update
|
|
64
|
+
: returnDocument;
|
|
64
65
|
});
|
|
65
66
|
}
|
|
66
67
|
return update;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Immutable.class.js","sourceRoot":"","sources":["../../src/Immutable.class.ts"],"names":[],"mappings":"AAAA,OAAO,EACqB,QAAQ,GAGnC,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,cAAc,MAAM,qCAAqC,CAAC;AACjE,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAC3D,OAAO,SAAS,MAAM,0BAA0B,CAAC;AACjD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAO3D,MAAM,CAAC,OAAO,OAAgB,SAAS;
|
|
1
|
+
{"version":3,"file":"Immutable.class.js","sourceRoot":"","sources":["../../src/Immutable.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import authService from "../services/auth.service.js";
|
|
2
|
+
import StorageSDK from "@lilaquadrat/storage-sdk";
|
|
3
|
+
export default async function storageSdkFactory() {
|
|
4
|
+
const token = await authService.token(process.env.OAUTH_CLIENTID, process.env.OAUTH_CLIENTSECRET);
|
|
5
|
+
return new StorageSDK({
|
|
6
|
+
api: process.env.API_URL,
|
|
7
|
+
public: process.env.CDN_URL,
|
|
8
|
+
secure: process.env.SECURE_URL,
|
|
9
|
+
}, 5, 'debug', token);
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=storageSdkFactory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storageSdkFactory.js","sourceRoot":"","sources":["../../../src/helpers/storageSdkFactory.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAElD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB;IAE7C,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAe,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAmB,CAAC,CAAC;IACpG,OAAO,IAAI,UAAU,CACnB;QACE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,OAAQ;QACzB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAQ;QAC5B,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAW;KAChC,EACD,CAAC,EACD,OAAO,EACL,KAAM,CACT,CAAC;AAEJ,CAAC"}
|
|
@@ -15,7 +15,6 @@ model.setSchema({
|
|
|
15
15
|
company: { type: 'string' },
|
|
16
16
|
project: { type: 'string' },
|
|
17
17
|
active: { type: 'boolean' },
|
|
18
|
-
port: { type: 'number' },
|
|
19
18
|
},
|
|
20
19
|
required: ['port', 'company', 'project'],
|
|
21
20
|
additionalProperties: false,
|
|
@@ -30,7 +29,6 @@ model.setSchema({
|
|
|
30
29
|
model.setSchema({
|
|
31
30
|
type: 'object',
|
|
32
31
|
properties: {
|
|
33
|
-
redirectToMainDomain: { type: 'boolean' },
|
|
34
32
|
isApp: { type: 'boolean' },
|
|
35
33
|
},
|
|
36
34
|
additionalProperties: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting.model.js","sourceRoot":"","sources":["../../../src/models/hosting.model.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD,MAAM,KAAK,GAAG,IAAI,OAAO,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;
|
|
1
|
+
{"version":3,"file":"hosting.model.js","sourceRoot":"","sources":["../../../src/models/hosting.model.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD,MAAM,KAAK,GAAG,IAAI,OAAO,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;KAC5B;IACD,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;IACxC,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CAAC,CAAC;AAEV,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,EACD,cAAc,CAAC,CAAC;AAEhB,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC3B;IACD,oBAAoB,EAAE,KAAK;CAC5B,EACD,gBAAgB,EAChB,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC3B,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -1,35 +1,7 @@
|
|
|
1
|
-
import { ShareClientInterface, DomainConf, HostingWithSettings } from '@lilaquadrat/interfaces';
|
|
2
1
|
export declare class ConfService {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
* load the base nginx conf file for further rendering
|
|
7
|
-
*/
|
|
8
|
-
getBase(folder: string, name: string): Promise<Buffer<ArrayBufferLike>>;
|
|
9
|
-
constructor();
|
|
10
|
-
/**
|
|
11
|
-
* generates nginx config
|
|
12
|
-
*
|
|
13
|
-
*/
|
|
14
|
-
render(http: DomainConf | undefined, https: DomainConf[] | undefined, defaultDomain: DomainConf | undefined, redirectDomains: DomainConf[] | undefined, company: string, project: string, baseConf: string, hosting?: HostingWithSettings): string;
|
|
15
|
-
renderStreamConf(domains: DomainConf[], confString: string): string;
|
|
16
|
-
getComposeObject(domains: DomainConf[], baseFolder: string, image?: string): {
|
|
17
|
-
[key: string]: any;
|
|
18
|
-
};
|
|
19
|
-
getKey(company: string, project: string): string;
|
|
20
|
-
validateDomains(domains: string[]): string[];
|
|
21
|
-
/**
|
|
22
|
-
* validate domains and remove double entries
|
|
23
|
-
*/
|
|
24
|
-
validateStreamDomains(domains: DomainConf[]): DomainConf[];
|
|
25
|
-
/**
|
|
26
|
-
* docker: docker, stream: nginx main stream conf, proxy: nginx main proxy config, project: project nginx
|
|
27
|
-
*/
|
|
28
|
-
refresh(type: 'project', company: string, project: string): Promise<boolean>;
|
|
29
|
-
refresh(type: 'docker' | 'stream' | 'proxy'): Promise<boolean>;
|
|
30
|
-
refreshDockerCompose(base?: string): Promise<boolean>;
|
|
31
|
-
refreshNginx(type: 'stream' | 'proxy' | 'project', company: string | undefined, project: string | undefined): Promise<boolean>;
|
|
32
|
-
createFolderRecursive(base: string, path: string): Promise<boolean>;
|
|
2
|
+
refresh(company: string, project: string): Promise<void>;
|
|
3
|
+
generate(company: string, project: string): Promise<Buffer<ArrayBuffer> | undefined>;
|
|
4
|
+
remove(company: string, project: string): Promise<void>;
|
|
33
5
|
}
|
|
34
6
|
declare const _default: ConfService;
|
|
35
7
|
export default _default;
|
|
@@ -1,181 +1,71 @@
|
|
|
1
1
|
import handlebars from 'handlebars';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import domainsService from "./domains.service.js";
|
|
3
|
+
import storageSdkFactory from '../helpers/storageSdkFactory.js';
|
|
4
|
+
import StorageService from './storage.service.js';
|
|
4
5
|
import HostingService from './hosting.service.js';
|
|
5
6
|
export class ConfService {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
* generates nginx config
|
|
22
|
-
*
|
|
23
|
-
*/
|
|
24
|
-
render(http, https, defaultDomain, redirectDomains, company, project, baseConf, hosting) {
|
|
25
|
-
const template = handlebars.compile(baseConf);
|
|
26
|
-
const conf = template({
|
|
27
|
-
http, https, company, project, defaultDomain, hosting, redirectDomains,
|
|
28
|
-
}).trim();
|
|
29
|
-
if (conf.length === 0) {
|
|
30
|
-
return `#
|
|
31
|
-
#
|
|
32
|
-
# NO CONF CONTENT
|
|
33
|
-
#
|
|
34
|
-
#
|
|
35
|
-
`;
|
|
36
|
-
}
|
|
37
|
-
return conf;
|
|
38
|
-
}
|
|
39
|
-
renderStreamConf(domains, confString) {
|
|
40
|
-
const template = handlebars.compile(confString);
|
|
41
|
-
const conf = template({
|
|
42
|
-
domains,
|
|
43
|
-
}).trim();
|
|
44
|
-
if (conf.length === 0) {
|
|
45
|
-
return `#
|
|
46
|
-
#
|
|
47
|
-
# NO CONF CONTENT
|
|
48
|
-
#
|
|
49
|
-
#
|
|
50
|
-
`;
|
|
51
|
-
}
|
|
52
|
-
return conf;
|
|
53
|
-
}
|
|
54
|
-
getComposeObject(domains, baseFolder, image = 'nginx:alpine') {
|
|
55
|
-
const composeObject = {
|
|
56
|
-
version: '3',
|
|
57
|
-
services: {},
|
|
58
|
-
};
|
|
59
|
-
domains.map((domain) => {
|
|
60
|
-
const domainObject = {
|
|
61
|
-
image,
|
|
62
|
-
container_name: this.getKey(domain.company, domain.project),
|
|
63
|
-
ports: [
|
|
64
|
-
`${domain.ports?.http}:80`,
|
|
65
|
-
`${domain.ports?.https}:443`,
|
|
66
|
-
],
|
|
67
|
-
volumes: [
|
|
68
|
-
`${baseFolder}/${domain.company}/${domain.project}/hosting:/var/www/hosting:ro`,
|
|
69
|
-
`${baseFolder}/${domain.company}/${domain.project}/conf:/etc/nginx/conf.d/`,
|
|
70
|
-
`${baseFolder}/${domain.company}/${domain.project}/certs:/var/www/certs`,
|
|
71
|
-
'/base/data/certs:/var/www/base/certs',
|
|
72
|
-
],
|
|
73
|
-
};
|
|
74
|
-
composeObject.services[this.getKey(domain.company, domain.project)] = domainObject;
|
|
75
|
-
return domainObject;
|
|
7
|
+
async refresh(company, project) {
|
|
8
|
+
const storageSdk = await storageSdkFactory();
|
|
9
|
+
const confBuffer = await this.generate(company, project);
|
|
10
|
+
if (!confBuffer)
|
|
11
|
+
throw new Error('CONF_FAILED');
|
|
12
|
+
await storageSdk.upload({
|
|
13
|
+
pathOrBuffer: confBuffer,
|
|
14
|
+
filename: `caddy/customers/${company}-${project}.caddy`,
|
|
15
|
+
mimetype: 'text/plain',
|
|
16
|
+
size: confBuffer.length,
|
|
17
|
+
}, {
|
|
18
|
+
app: 'internal',
|
|
19
|
+
company: 'lilaquadrat',
|
|
20
|
+
project: 'studio',
|
|
21
|
+
overwrite: true
|
|
76
22
|
});
|
|
77
|
-
return composeObject;
|
|
78
23
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
return true;
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
/**
|
|
93
|
-
* validate domains and remove double entries
|
|
94
|
-
*/
|
|
95
|
-
validateStreamDomains(domains) {
|
|
96
|
-
const filteredDomains = [];
|
|
97
|
-
domains.map((domain) => {
|
|
98
|
-
/**
|
|
99
|
-
* skip all with missing values
|
|
100
|
-
*/
|
|
101
|
-
if (!domain)
|
|
102
|
-
return false;
|
|
103
|
-
if (!domain?.domains?.length)
|
|
104
|
-
return false;
|
|
105
|
-
if (!domain.company.length)
|
|
106
|
-
return false;
|
|
107
|
-
if (!domain.project.length)
|
|
108
|
-
return false;
|
|
109
|
-
if (!domain.ports?.http)
|
|
110
|
-
return false;
|
|
111
|
-
if (!domain.ports?.https)
|
|
112
|
-
return false;
|
|
113
|
-
/**
|
|
114
|
-
* skip double entries
|
|
115
|
-
*/
|
|
116
|
-
const unique = filteredDomains.filter((searchDomain) => {
|
|
117
|
-
// if (domain.domains.includes(searchDomain.domain)) return true;
|
|
118
|
-
if (searchDomain.company === domain.company && searchDomain.project === domain.project)
|
|
119
|
-
return true;
|
|
120
|
-
if (searchDomain.port === domain.port)
|
|
121
|
-
return true;
|
|
122
|
-
return false;
|
|
24
|
+
async generate(company, project) {
|
|
25
|
+
const storageSdk = await storageSdkFactory();
|
|
26
|
+
let template;
|
|
27
|
+
try {
|
|
28
|
+
template = await storageSdk.download({
|
|
29
|
+
company: 'lilaquadrat',
|
|
30
|
+
project: 'studio',
|
|
31
|
+
app: 'internal',
|
|
32
|
+
filename: 'customers.caddy.hbs',
|
|
33
|
+
prefix: 'caddy'
|
|
123
34
|
});
|
|
124
|
-
if (unique.length)
|
|
125
|
-
return false;
|
|
126
|
-
return filteredDomains.push(domain);
|
|
127
|
-
});
|
|
128
|
-
return filteredDomains;
|
|
129
|
-
}
|
|
130
|
-
refresh(type, company, project) {
|
|
131
|
-
if (type === 'docker') {
|
|
132
|
-
return this.refreshDockerCompose();
|
|
133
35
|
}
|
|
134
|
-
|
|
135
|
-
|
|
36
|
+
catch (error) {
|
|
37
|
+
console.error(error);
|
|
38
|
+
return;
|
|
136
39
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
targetFolder = 'conf';
|
|
153
|
-
}
|
|
154
|
-
if (type === 'proxy') {
|
|
155
|
-
template = 'proxy_http.conf';
|
|
156
|
-
targetFile = 'proxy_http.conf';
|
|
157
|
-
targetFolder = 'conf';
|
|
158
|
-
}
|
|
159
|
-
if (type === 'project') {
|
|
160
|
-
template = '.conf';
|
|
161
|
-
targetFile = 'nginx.conf';
|
|
162
|
-
targetFolder = `user/${company}/${project}/conf`;
|
|
163
|
-
}
|
|
164
|
-
const confBase = (await this.getBase('base', template)).toString();
|
|
165
|
-
if (type === 'stream' || type === 'proxy') {
|
|
166
|
-
const domains = await DomainsService.getAllDomainsWithPorts();
|
|
167
|
-
renderedConf = this.renderStreamConf(DomainsService.mapPortToRealPorts(domains, { http: 8000, https: 9000 }), confBase);
|
|
40
|
+
const hosting = await HostingService.single(company, project);
|
|
41
|
+
const domains = await domainsService.getDomainsWithMain(company, project);
|
|
42
|
+
const templateVars = {
|
|
43
|
+
company,
|
|
44
|
+
project,
|
|
45
|
+
domains: domains.domains,
|
|
46
|
+
isApp: hosting?.isApp
|
|
47
|
+
};
|
|
48
|
+
if (!domains.domains?.length && !domains.main)
|
|
49
|
+
throw new Error('NO_DOMAINS');
|
|
50
|
+
/**
|
|
51
|
+
* only add the redirect block if we have a main domain and domain to redirect
|
|
52
|
+
*/
|
|
53
|
+
if (domains.main && domains.domains.length) {
|
|
54
|
+
templateVars.mainDomain = domains.main;
|
|
168
55
|
}
|
|
169
|
-
if (
|
|
170
|
-
|
|
171
|
-
const domains = await DomainsService.getDomainsWithPorts(company, project);
|
|
172
|
-
const mappedDomains = DomainsService.mapDomainsProject(domains, { http: 8000, https: 9000, redirectToMainDomain: hosting?.redirectToMainDomain });
|
|
173
|
-
renderedConf = this.render(mappedDomains?.http, mappedDomains?.https, mappedDomains?.defaultDomain, mappedDomains?.redirectDomains, company, project, confBase);
|
|
56
|
+
else if (domains.main && !domains.domains.length) {
|
|
57
|
+
templateVars.domains.push(domains.main);
|
|
174
58
|
}
|
|
175
|
-
|
|
59
|
+
const compiledTemplate = handlebars.compile(template.toString());
|
|
60
|
+
const conf = compiledTemplate(templateVars).trim();
|
|
61
|
+
return Buffer.from(conf);
|
|
176
62
|
}
|
|
177
|
-
|
|
178
|
-
|
|
63
|
+
async remove(company, project) {
|
|
64
|
+
const conf = await StorageService.getByFilename(`${company}-${project}.caddy`, 'caddy/customers', 'internal', { company: 'lilaquadrat', project: 'studio' });
|
|
65
|
+
if (!conf || !conf._id)
|
|
66
|
+
return;
|
|
67
|
+
const storageSdk = await storageSdkFactory();
|
|
68
|
+
await storageSdk.remove(conf._id.toString(), { company: 'lilaquadrat', project: 'studio', app: 'internal' });
|
|
179
69
|
}
|
|
180
70
|
}
|
|
181
71
|
export default new ConfService();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conf.service.js","sourceRoot":"","sources":["../../../src/services/conf.service.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"conf.service.js","sourceRoot":"","sources":["../../../src/services/conf.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,16 +49,16 @@ export declare class CustomersService extends Immutable<CustomerPerson | Custome
|
|
|
49
49
|
/**
|
|
50
50
|
* connects a auth0 account with a customer
|
|
51
51
|
*/
|
|
52
|
-
connectToAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<
|
|
52
|
+
connectToAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
|
|
53
53
|
/**
|
|
54
54
|
* connects a auth0 account with a customer
|
|
55
55
|
*/
|
|
56
|
-
confirmEmail(account: string, emailConfirmationCode: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<
|
|
57
|
-
disconnectFromAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<
|
|
56
|
+
confirmEmail(account: string, emailConfirmationCode: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
|
|
57
|
+
disconnectFromAccount(internalId: ObjectId, account: string, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
|
|
58
58
|
/**
|
|
59
59
|
* sets a new email confirmation code
|
|
60
60
|
*/
|
|
61
|
-
setEmailConfirmationCode(internalId: ObjectId, options: Required<UserAppWithOptions>): Promise<UpdateResult<
|
|
61
|
+
setEmailConfirmationCode(internalId: ObjectId, options: Required<UserAppWithOptions>): Promise<UpdateResult<import("bson").Document>>;
|
|
62
62
|
createEmailConfirmationCode(length: number): string;
|
|
63
63
|
getStructure(type: 'person' | 'company'): string[];
|
|
64
64
|
importManual(importData: BasicData<Customers>[], options: Required<UserAppWithOptions>): Promise<CustomerImportResult>;
|
|
@@ -1,42 +1,10 @@
|
|
|
1
1
|
import { ObjectId, WithId } from 'mongodb';
|
|
2
2
|
import Immutable from '../Immutable.class.js';
|
|
3
|
-
import { Domain, ProjectDomain,
|
|
3
|
+
import { Domain, ProjectDomain, ProjectDomainWithSecret, UserApp, Options, BasicData } from '@lilaquadrat/interfaces';
|
|
4
4
|
declare class DomainsService extends Immutable<Domain> {
|
|
5
5
|
model: import("../classes/modelv2.class.js").default<Domain, string>;
|
|
6
|
-
single(internalId: ObjectId, options: {
|
|
7
|
-
includeSecret: true;
|
|
8
|
-
}): Promise<WithId<Omit<ProjectDomain, 'secret'> & {
|
|
9
|
-
secret: Secret;
|
|
10
|
-
}>>;
|
|
11
|
-
single(internalId: ObjectId, options: {
|
|
12
|
-
certificate: true;
|
|
13
|
-
}): Promise<WithId<Omit<ProjectDomain, 'certificate'> & {
|
|
14
|
-
certificate: Certificate;
|
|
15
|
-
}>>;
|
|
16
|
-
single(internalId: ObjectId, options: {
|
|
17
|
-
includeSecret: true;
|
|
18
|
-
certificate: true;
|
|
19
|
-
}): Promise<WithId<Omit<ProjectDomain, 'secret' | 'certificate'> & {
|
|
20
|
-
secret: Secret;
|
|
21
|
-
certificate: Certificate;
|
|
22
|
-
}>>;
|
|
23
|
-
single(internalId: ObjectId): Promise<WithId<Omit<Domain, 'secret' | 'certificate'> | SystemDomain>>;
|
|
24
|
-
/**
|
|
25
|
-
* @deprecated
|
|
26
|
-
*/
|
|
27
|
-
createWithSSL(data: ProjectDomain, user: string, app: string): Promise<import("@lilaquadrat/interfaces").CreateResult<BasicData<Domain>>>;
|
|
28
6
|
createWithSecret(data: ProjectDomain, options: Required<UserApp>): Promise<import("@lilaquadrat/interfaces").CreateResult<BasicData<Domain>>>;
|
|
29
|
-
createWithWildcard(data: SystemDomain, options: Required<UserApp> & {
|
|
30
|
-
forceFile?: boolean;
|
|
31
|
-
saveInVault?: boolean;
|
|
32
|
-
}): Promise<import("@lilaquadrat/interfaces").CreateResult<BasicData<Domain>>>;
|
|
33
|
-
/**
|
|
34
|
-
* start a new certification action based upon the last failed for this domain
|
|
35
|
-
*/
|
|
36
|
-
retrySSL(data: ProjectDomain, user: string, app: string): Promise<null>;
|
|
37
7
|
remove(_id: ObjectId, user: string, app: string): Promise<import("mongodb").DeleteResult>;
|
|
38
|
-
linkCertificate(certificateInternalId: ObjectId, domain: string, company: string | undefined, project: string | undefined, user: string, app: string): Promise<import("mongodb").UpdateResult<BasicData<Domain>>>;
|
|
39
|
-
linkMultipleDomains(certificateInternalId: ObjectId, domains: string[], company: string, project: string, user: string, app: string): Promise<import("mongodb").UpdateResult<BasicData<Domain>>[]>;
|
|
40
8
|
/**
|
|
41
9
|
* In order to bind a domain to lilaquadrat STUDIO, the ownership of the domains needs to be validated.
|
|
42
10
|
* a TXT entry with ``lila-studio-SECRET`` needs to be added to the DNS
|
|
@@ -49,60 +17,29 @@ declare class DomainsService extends Immutable<Domain> {
|
|
|
49
17
|
validateDnsARecord(domain: string, ip: string): Promise<boolean>;
|
|
50
18
|
getDefaultDomain(company: string, project: string, hostingDomain: string): string;
|
|
51
19
|
getAllDomains(): Promise<WithId<Domain>[]>;
|
|
20
|
+
/**
|
|
21
|
+
* returns a string of domains and if a domain is set as "main" it will be not in the last
|
|
22
|
+
* @param company
|
|
23
|
+
* @param project
|
|
24
|
+
* @returns
|
|
25
|
+
*/
|
|
26
|
+
getDomainsWithMain(company: string, project: string): Promise<{
|
|
27
|
+
domains: string[];
|
|
28
|
+
main?: string;
|
|
29
|
+
}>;
|
|
52
30
|
createDefaultDomain(company: string, project: string, options: Required<UserApp & {
|
|
53
31
|
baseDomain: string;
|
|
54
32
|
}>): Promise<import("@lilaquadrat/interfaces").CreateResult<BasicData<Domain>> | (import("mongodb").UpdateResult<import("bson").Document> & {
|
|
55
33
|
_id: ObjectId;
|
|
56
34
|
})>;
|
|
35
|
+
single(internalId: ObjectId, options: Options): Promise<BasicData<ProjectDomain>>;
|
|
36
|
+
single(internalId: ObjectId, options: Options & {
|
|
37
|
+
includeSecret: true;
|
|
38
|
+
}): Promise<BasicData<ProjectDomainWithSecret>>;
|
|
57
39
|
/**
|
|
58
|
-
* get all domains for specific project
|
|
59
|
-
*/
|
|
60
|
-
getDomainsWithPorts(company: string, project: string): Promise<(ProjectDomain & {
|
|
61
|
-
port: number;
|
|
62
|
-
})[]>;
|
|
63
|
-
/**
|
|
64
|
-
* get all domains from active hosting with ports and certificates
|
|
65
|
-
*/
|
|
66
|
-
getAllDomainsWithPorts(): Promise<(Hosting & {
|
|
67
|
-
port: number;
|
|
68
|
-
domains: ProjectDomain[];
|
|
69
|
-
})[]>;
|
|
70
|
-
getCustomQuery(filter: {
|
|
71
|
-
domain?: string;
|
|
72
|
-
filterState: string[];
|
|
73
|
-
}, options: UserAppWithOptions & SkipLimitSort): ListCustomQueries<DomainsList>;
|
|
74
|
-
/**
|
|
75
|
-
* add the ports to the domains
|
|
76
|
-
*/
|
|
77
|
-
mapPortToRealPorts<T>(domains: (T & {
|
|
78
|
-
ports?: Record<string, number>;
|
|
79
|
-
port?: number;
|
|
80
|
-
})[], port: HostingPorts): (T & {
|
|
81
|
-
ports?: Record<string, number>;
|
|
82
|
-
port?: number;
|
|
83
|
-
})[];
|
|
84
|
-
/**
|
|
85
|
-
*
|
|
86
|
-
* map the database format to the working format
|
|
87
|
-
*/
|
|
88
|
-
mapDomains(domains: (Domain & {
|
|
89
|
-
port: number;
|
|
90
|
-
})[]): DomainConf[];
|
|
91
|
-
/**
|
|
92
|
-
*
|
|
93
|
-
* map the database format to the working format
|
|
40
|
+
* get all active and validated domains for specific project
|
|
94
41
|
*/
|
|
95
|
-
|
|
96
|
-
port: number;
|
|
97
|
-
})[], options: HostingPorts & {
|
|
98
|
-
redirectToMainDomain?: boolean;
|
|
99
|
-
}): {
|
|
100
|
-
http: DomainConf;
|
|
101
|
-
https: DomainConf[];
|
|
102
|
-
defaultDomain?: DomainConf;
|
|
103
|
-
redirectDomains?: DomainConf[];
|
|
104
|
-
} | null;
|
|
105
|
-
requestCertificateForDomain(internalId: ObjectId, options: Required<UserApp>): Promise<null>;
|
|
42
|
+
getDomains(company: string, project: string): Promise<WithId<Domain>[]>;
|
|
106
43
|
}
|
|
107
44
|
declare const _default: DomainsService;
|
|
108
45
|
export default _default;
|