@futdevpro/ccap 1.1.5 → 1.1.7
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/cli/build/_collections/config.util.d.ts +11 -2
- package/cli/build/_collections/config.util.d.ts.map +1 -1
- package/cli/build/_collections/config.util.js +10 -2
- package/cli/build/_collections/config.util.js.map +1 -1
- package/cli/build/_collections/config.util.spec.js +6 -1
- package/cli/build/_collections/config.util.spec.js.map +1 -1
- package/cli/build/_collections/process-control.util.js +1 -1
- package/cli/build/_collections/process-control.util.js.map +1 -1
- package/package.json +2 -2
- package/server/build/src/_routes/client-static/client-static.controller.js +7 -1
- package/server/build/src/_routes/client-static/client-static.controller.js.map +1 -1
|
@@ -6,8 +6,17 @@ export declare function getServerPort(): number;
|
|
|
6
6
|
* Server base URL: CCAP_SERVER_URL env, vagy localhost + getServerPort().
|
|
7
7
|
*/
|
|
8
8
|
export declare function getServerBaseUrl(): string;
|
|
9
|
+
/** Kliens app útvonal, ha a szerverről szolgáljuk (client-dist). */
|
|
10
|
+
export declare const CLIENT_APP_PATH: string;
|
|
11
|
+
/** Paraméterek getClientBaseUrl híváshoz. */
|
|
12
|
+
export interface GetClientBaseUrlParams_Interface {
|
|
13
|
+
/** Ha true, a szerverről kiszolgált kliens URL-jét adja (server base + CLIENT_APP_PATH). */
|
|
14
|
+
fromServer?: boolean;
|
|
15
|
+
}
|
|
9
16
|
/**
|
|
10
|
-
* Kliens oldal URL (
|
|
17
|
+
* Kliens oldal base URL (egy forrás – dev serve vagy szerverről kiszolgált app).
|
|
18
|
+
* fromServer nélkül: dev kliens (localhost:DEFAULT_CLIENT_PORT).
|
|
19
|
+
* fromServer: true esetén: getServerBaseUrl() + CLIENT_APP_PATH.
|
|
11
20
|
*/
|
|
12
|
-
export declare function getClientBaseUrl(): string;
|
|
21
|
+
export declare function getClientBaseUrl(params?: GetClientBaseUrlParams_Interface): string;
|
|
13
22
|
//# sourceMappingURL=config.util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.util.d.ts","sourceRoot":"","sources":["../../src/_collections/config.util.ts"],"names":[],"mappings":"AAuCA;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAoBtC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAQzC;AAKD
|
|
1
|
+
{"version":3,"file":"config.util.d.ts","sourceRoot":"","sources":["../../src/_collections/config.util.ts"],"names":[],"mappings":"AAuCA;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAoBtC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAQzC;AAKD,oEAAoE;AACpE,eAAO,MAAM,eAAe,EAAE,MAAmB,CAAC;AAElD,6CAA6C;AAC7C,MAAM,WAAW,gCAAgC;IAC/C,4FAA4F;IAC5F,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,gCAAgC,GAAG,MAAM,CAMlF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CLIENT_APP_PATH = void 0;
|
|
3
4
|
exports.getServerPort = getServerPort;
|
|
4
5
|
exports.getServerBaseUrl = getServerBaseUrl;
|
|
5
6
|
exports.getClientBaseUrl = getClientBaseUrl;
|
|
@@ -62,10 +63,17 @@ function getServerBaseUrl() {
|
|
|
62
63
|
}
|
|
63
64
|
/** Kliens (Angular) alapértelmezett port (serve). */
|
|
64
65
|
const DEFAULT_CLIENT_PORT = 4205;
|
|
66
|
+
/** Kliens app útvonal, ha a szerverről szolgáljuk (client-dist). */
|
|
67
|
+
exports.CLIENT_APP_PATH = '/api/app';
|
|
65
68
|
/**
|
|
66
|
-
* Kliens oldal URL (
|
|
69
|
+
* Kliens oldal base URL (egy forrás – dev serve vagy szerverről kiszolgált app).
|
|
70
|
+
* fromServer nélkül: dev kliens (localhost:DEFAULT_CLIENT_PORT).
|
|
71
|
+
* fromServer: true esetén: getServerBaseUrl() + CLIENT_APP_PATH.
|
|
67
72
|
*/
|
|
68
|
-
function getClientBaseUrl() {
|
|
73
|
+
function getClientBaseUrl(params) {
|
|
74
|
+
if (params?.fromServer) {
|
|
75
|
+
return `${getServerBaseUrl()}${exports.CLIENT_APP_PATH}`;
|
|
76
|
+
}
|
|
69
77
|
return `http://localhost:${DEFAULT_CLIENT_PORT}`;
|
|
70
78
|
}
|
|
71
79
|
//# sourceMappingURL=config.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.util.js","sourceRoot":"","sources":["../../src/_collections/config.util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.util.js","sourceRoot":"","sources":["../../src/_collections/config.util.ts"],"names":[],"mappings":";;;AA0CA,sCAoBC;AAKD,4CAQC;AAmBD,4CAMC;;AApGD,+CAAyB;AACzB,mDAA6B;AAE7B,mCAAmC;AACnC,MAAM,mBAAmB,GAAW,KAAK,CAAC;AAE1C,6DAA6D;AAC7D,MAAM,gBAAgB,GAAW,IAAI,CAAC,IAAI,CACxC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,EAClD,mBAAmB,CACpB,CAAC;AAOF;;GAEG;AACH,SAAS,uBAAuB;IAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrC,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,GAAW,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAkC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9D,IAAI,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;YACnE,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa;IAC3B,MAAM,MAAM,GAAuB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;IAE/D,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,GAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;YAEjC,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACb,MAAM,IAAI,GAAW,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAE5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,WAAW;QACb,CAAC;IACH,CAAC;IAED,OAAO,uBAAuB,EAAE,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,MAAM,MAAM,GAAuB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;IAE/D,IAAI,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAED,OAAO,oBAAoB,aAAa,EAAE,EAAE,CAAC;AAC/C,CAAC;AAED,qDAAqD;AACrD,MAAM,mBAAmB,GAAW,IAAI,CAAC;AAEzC,oEAAoE;AACvD,QAAA,eAAe,GAAW,UAAU,CAAC;AAQlD;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,MAAyC;IACxE,IAAI,MAAM,EAAE,UAAU,EAAE,CAAC;QACvB,OAAO,GAAG,gBAAgB,EAAE,GAAG,uBAAe,EAAE,CAAC;IACnD,CAAC;IAED,OAAO,oBAAoB,mBAAmB,EAAE,CAAC;AACnD,CAAC"}
|
|
@@ -36,10 +36,15 @@ describe('config.util', () => {
|
|
|
36
36
|
});
|
|
37
37
|
});
|
|
38
38
|
describe('getClientBaseUrl', () => {
|
|
39
|
-
it('returns client
|
|
39
|
+
it('returns dev client URL when called without params', () => {
|
|
40
40
|
const url = (0, config_util_1.getClientBaseUrl)();
|
|
41
41
|
expect(url).toBe('http://localhost:4205');
|
|
42
42
|
});
|
|
43
|
+
it('returns server-served client URL when fromServer is true', () => {
|
|
44
|
+
process.env.CCAP_SERVER_URL = 'http://localhost:39050';
|
|
45
|
+
const url = (0, config_util_1.getClientBaseUrl)({ fromServer: true });
|
|
46
|
+
expect(url).toBe('http://localhost:39050/api/app');
|
|
47
|
+
});
|
|
43
48
|
});
|
|
44
49
|
});
|
|
45
50
|
//# sourceMappingURL=config.util.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.util.spec.js","sourceRoot":"","sources":["../../src/_collections/config.util.spec.ts"],"names":[],"mappings":";;AAAA,+CAAkF;AAElF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,MAAM,WAAW,GAAsB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1D,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,uBAAuB,CAAC;YAEtD,MAAM,IAAI,GAAW,IAAA,2BAAa,GAAE,CAAC;YAErC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC1D,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,kBAAkB,CAAC;YAEjD,MAAM,IAAI,GAAW,IAAA,2BAAa,GAAE,CAAC;YAErC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,WAAW,CAAC;YAE1C,MAAM,IAAI,GAAW,IAAA,2BAAa,GAAE,CAAC;YAErC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,6BAA6B,CAAC;YAE5D,MAAM,GAAG,GAAW,IAAA,8BAAgB,GAAE,CAAC;YAEvC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAEnC,MAAM,GAAG,GAAW,IAAA,8BAAgB,GAAE,CAAC;YAEvC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"config.util.spec.js","sourceRoot":"","sources":["../../src/_collections/config.util.spec.ts"],"names":[],"mappings":";;AAAA,+CAAkF;AAElF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,MAAM,WAAW,GAAsB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1D,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,uBAAuB,CAAC;YAEtD,MAAM,IAAI,GAAW,IAAA,2BAAa,GAAE,CAAC;YAErC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC1D,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,kBAAkB,CAAC;YAEjD,MAAM,IAAI,GAAW,IAAA,2BAAa,GAAE,CAAC;YAErC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,WAAW,CAAC;YAE1C,MAAM,IAAI,GAAW,IAAA,2BAAa,GAAE,CAAC;YAErC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,6BAA6B,CAAC;YAE5D,MAAM,GAAG,GAAW,IAAA,8BAAgB,GAAE,CAAC;YAEvC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAEnC,MAAM,GAAG,GAAW,IAAA,8BAAgB,GAAE,CAAC;YAEvC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,GAAG,GAAW,IAAA,8BAAgB,GAAE,CAAC;YAEvC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,wBAAwB,CAAC;YAEvD,MAAM,GAAG,GAAW,IAAA,8BAAgB,EAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YAE3D,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -109,7 +109,7 @@ async function startServerAndClient() {
|
|
|
109
109
|
const clientPackagePath = path.join(clientDir, 'package.json');
|
|
110
110
|
if (!fs.existsSync(clientPackagePath)) {
|
|
111
111
|
fsm_dynamo_1.DyFM_Log.info(`Kliens mappa nincs (pl. globális install) – a kliens UI a serverről érhető el.`);
|
|
112
|
-
fsm_dynamo_1.DyFM_Log.info(`Nyisd meg a böngészőben: ${(0, config_util_1.
|
|
112
|
+
fsm_dynamo_1.DyFM_Log.info(`Nyisd meg a böngészőben: ${(0, config_util_1.getClientBaseUrl)({ fromServer: true })}`);
|
|
113
113
|
return;
|
|
114
114
|
}
|
|
115
115
|
const clientRunning = ensurePidFileValid(exports.CLIENT_PID_FILE_PATH, 'client');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-control.util.js","sourceRoot":"","sources":["../../src/_collections/process-control.util.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAkGH,oDAkEC;AAKD,kDAWC;AAKD,wDASC;AAMD,0DASC;;AA/MD,iDAA0D;AAC1D,+CAAyB;AACzB,mDAA6B;AAE7B,sDAAiD;AAEjD,+
|
|
1
|
+
{"version":3,"file":"process-control.util.js","sourceRoot":"","sources":["../../src/_collections/process-control.util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/ccap",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.7",
|
|
4
4
|
"description": "CCAP Revisioned – Agent architektúra; CLI, server, client, e2e alprojektek.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"ccap": "./bin/ccap.js"
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"start": "concurrently \"pnpm run start-client\" \"pnpm run start-server\"",
|
|
41
41
|
"start-client": "cd client && pnpm run serve",
|
|
42
42
|
"start-server": "cd server && pnpm start",
|
|
43
|
-
"build": "cd cli && pnpm run build-base ; cd ../server && pnpm run build-base ;
|
|
43
|
+
"build": "cd cli && pnpm run build-base ; cd ../server && pnpm run build-base ; pnpm run build-ui-for-server",
|
|
44
44
|
"build-cli": "cd cli && pnpm run build-base",
|
|
45
45
|
"build-server": "cd server && pnpm run build-base",
|
|
46
46
|
"build-client": "cd client && pnpm run build-base",
|
|
@@ -42,6 +42,7 @@ const FALLBACK_HTML = `<!DOCTYPE html>
|
|
|
42
42
|
/**
|
|
43
43
|
* Statikus kliens (Angular build) kiszolgálása, ha a client-dist mappa létezik.
|
|
44
44
|
* GET *: először static file, ha nincs találat akkor index.html (SPA fallback).
|
|
45
|
+
* Az index.html base href-jét mindig /api/app/-re írjuk, hogy az assetok a mount útvonal alatt kérődjenek.
|
|
45
46
|
* Ha client-dist nincs: GET * a FALLBACK_HTML-t adja vissza (404 elkerülés).
|
|
46
47
|
*/
|
|
47
48
|
class ClientStatic_Controller extends nts_dynamo_1.DyNTS_Controller {
|
|
@@ -73,6 +74,8 @@ class ClientStatic_Controller extends nts_dynamo_1.DyNTS_Controller {
|
|
|
73
74
|
* express.static a client-dist gyökeréhez viszonyít, ezért az /api/app prefixet le kell venni.
|
|
74
75
|
*/
|
|
75
76
|
const API_APP_MOUNT_PATH = '/api/app';
|
|
77
|
+
/** Base href, amit az index.html-be írunk – az assetok így /api/app/ alatt kérődnek. */
|
|
78
|
+
const BASE_HREF_FOR_APP = '/api/app/';
|
|
76
79
|
fsm_dynamo_1.DyFM_Log.info(`CCAP kliens UI kiszolgálása: ${CLIENT_DIST_PATH} (statikus + SPA fallback)`);
|
|
77
80
|
this.endpoints = [
|
|
78
81
|
new nts_dynamo_1.DyNTS_Endpoint_Params({
|
|
@@ -83,7 +86,10 @@ class ClientStatic_Controller extends nts_dynamo_1.DyNTS_Controller {
|
|
|
83
86
|
async (req, res, _issuer) => {
|
|
84
87
|
const next = () => {
|
|
85
88
|
if (fs.existsSync(indexPath)) {
|
|
86
|
-
|
|
89
|
+
const raw = fs.readFileSync(indexPath, 'utf-8');
|
|
90
|
+
const withBase = raw.replace(/<base\s+href="[^"]*"\s*\/?>/i, `<base href="${BASE_HREF_FOR_APP}">`);
|
|
91
|
+
res.setHeader('Content-Type', 'text/html; charset=utf-8');
|
|
92
|
+
res.status(200).send(withBase);
|
|
87
93
|
}
|
|
88
94
|
else {
|
|
89
95
|
res.status(404).send('Not found');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-static.controller.js","sourceRoot":"","sources":["../../../../src/_routes/client-static/client-static.controller.ts"],"names":[],"mappings":";;;;AAAA;;;;GAIG;AACH,+CAAyB;AACzB,mDAA6B;AAG7B,8DAA8B;AAE9B,sDAAoE;AACpE,sDAAgF;AAEhF;;;GAGG;AACH,MAAM,sBAAsB,GAAa;IACvC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC;IAC9D,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC;CACrE,CAAC;AAEF,MAAM,gBAAgB,GACpB,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAE5F,mEAAmE;AACnE,MAAM,aAAa,GAAW;;;;;;;;;;;;;;;;QAgBtB,CAAC;AAET
|
|
1
|
+
{"version":3,"file":"client-static.controller.js","sourceRoot":"","sources":["../../../../src/_routes/client-static/client-static.controller.ts"],"names":[],"mappings":";;;;AAAA;;;;GAIG;AACH,+CAAyB;AACzB,mDAA6B;AAG7B,8DAA8B;AAE9B,sDAAoE;AACpE,sDAAgF;AAEhF;;;GAGG;AACH,MAAM,sBAAsB,GAAa;IACvC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC;IAC9D,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC;CACrE,CAAC;AAEF,MAAM,gBAAgB,GACpB,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAE5F,mEAAmE;AACnE,MAAM,aAAa,GAAW;;;;;;;;;;;;;;;;QAgBtB,CAAC;AAET;;;;;GAKG;AACH,MAAa,uBAAwB,SAAQ,6BAAgB;IAC3D,MAAM,CAAC,WAAW;QAChB,OAAO,uBAAuB,CAAC,oBAAoB,EAAE,CAAC;IACxD,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,qBAAQ,CAAC,IAAI,CACX,mFAAmF,CACpF,CAAC;YACF,IAAI,CAAC,SAAS,GAAG;gBACf,IAAI,kCAAqB,CAAC;oBACxB,IAAI,EAAE,eAAe;oBACrB,IAAI,EAAE,8BAAiB,CAAC,GAAG;oBAC3B,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE;wBACL,KAAK,EAAE,IAAa,EAAE,GAAa,EAAE,OAAe,EAAiB,EAAE;4BACrE,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;4BAC1D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBACtC,CAAC;qBACF;iBACF,CAAC;aACH,CAAC;YAEF,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAoB,iBAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC3E,MAAM,SAAS,GAAW,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAEvE;;;WAGG;QACH,MAAM,kBAAkB,GAAW,UAAU,CAAC;QAE9C,wFAAwF;QACxF,MAAM,iBAAiB,GAAW,WAAW,CAAC;QAE9C,qBAAQ,CAAC,IAAI,CACX,gCAAgC,gBAAgB,4BAA4B,CAC7E,CAAC;QAEF,IAAI,CAAC,SAAS,GAAG;YACf,IAAI,kCAAqB,CAAC;gBACxB,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,8BAAiB,CAAC,GAAG;gBAC3B,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE;oBACL,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,OAAe,EAAiB,EAAE;wBACpE,MAAM,IAAI,GAAG,GAAS,EAAE;4BACtB,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gCAC7B,MAAM,GAAG,GAAW,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gCACxD,MAAM,QAAQ,GAAW,GAAG,CAAC,OAAO,CAClC,8BAA8B,EAC9B,eAAe,iBAAiB,IAAI,CACrC,CAAC;gCACF,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;gCAC1D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BACjC,CAAC;iCAAM,CAAC;gCACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;4BACpC,CAAC;wBACH,CAAC,CAAC;wBACF,MAAM,WAAW,GAAW,GAAG,CAAC,GAAG,CAAC;wBACpC,MAAM,cAAc,GAAW,WAAW,CAAC,OAAO,CAChD,IAAI,MAAM,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,IAAI,CAAC,EAC7E,GAAG,CACJ,CAAC;wBACF,GAAG,CAAC,GAAG,GAAG,cAAc,IAAI,GAAG,CAAC;wBAChC,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAS,EAAE;4BACpC,GAAG,CAAC,GAAG,GAAG,WAAW,CAAC;4BACtB,IAAI,EAAE,CAAC;wBACT,CAAC,CAAC,CAAC;oBACL,CAAC;iBACF;aACF,CAAC;SACH,CAAC;IACJ,CAAC;CACF;AA9ED,0DA8EC"}
|