@trokky/trokky 2.0.7 → 3.1.0
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/dist/core/core/engine.d.ts +1 -0
- package/dist/core/core/engine.d.ts.map +1 -1
- package/dist/core/core/engine.js +1 -0
- package/dist/core/core/engine.js.map +1 -1
- package/dist/core/security/oauth2/authorization-server.d.ts +2 -0
- package/dist/core/security/oauth2/authorization-server.d.ts.map +1 -1
- package/dist/core/security/oauth2/authorization-server.js +3 -1
- package/dist/core/security/oauth2/authorization-server.js.map +1 -1
- package/dist/integrations/express/config.d.ts +64 -25
- package/dist/integrations/express/config.d.ts.map +1 -1
- package/dist/integrations/express/config.js +51 -12
- package/dist/integrations/express/config.js.map +1 -1
- package/dist/integrations/express/integration.d.ts +2 -11
- package/dist/integrations/express/integration.d.ts.map +1 -1
- package/dist/integrations/express/integration.js +29 -134
- package/dist/integrations/express/integration.js.map +1 -1
- package/dist/integrations/express/server.d.ts +0 -2
- package/dist/integrations/express/server.d.ts.map +1 -1
- package/dist/integrations/express/server.js +7 -13
- package/dist/integrations/express/server.js.map +1 -1
- package/dist/integrations/express/types.d.ts +0 -15
- package/dist/integrations/express/types.d.ts.map +1 -1
- package/dist/routes/handlers/config.d.ts.map +1 -1
- package/dist/routes/handlers/config.js +0 -3
- package/dist/routes/handlers/config.js.map +1 -1
- package/dist/structure/validation/schemas.d.ts +12 -12
- package/package.json +1 -5
|
@@ -4,6 +4,55 @@
|
|
|
4
4
|
* This provides a clean, type-safe configuration interface that can be used
|
|
5
5
|
* both directly in TrokkyExpress.setup() and via trokky.config.ts files.
|
|
6
6
|
*/
|
|
7
|
+
/**
|
|
8
|
+
* Keys under `studio` that no longer do anything. They are accepted and reported
|
|
9
|
+
* at boot rather than refused: nothing depended on them, so a site carrying
|
|
10
|
+
* them keeps starting while its owner cleans them up.
|
|
11
|
+
*/
|
|
12
|
+
export const IGNORED_STUDIO_KEYS = {
|
|
13
|
+
fields: "'studio.fields' is ignored: custom field types are registered in the Studio build, never read from the server config.",
|
|
14
|
+
settings: "'studio.settings' is ignored: the Studio never read pageSize, enableDrafts, enableVersioning, autoSave or autosaveInterval from the server.",
|
|
15
|
+
};
|
|
16
|
+
/** Names the `studio` keys that are accepted but do nothing. */
|
|
17
|
+
export function ignoredStudioKeys(studio) {
|
|
18
|
+
if (!studio || typeof studio !== 'object')
|
|
19
|
+
return [];
|
|
20
|
+
return Object.keys(studio).filter(key => key in IGNORED_STUDIO_KEYS);
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* The Studio's public URL, from the config or the STUDIO_URL environment
|
|
24
|
+
* variable, without a trailing slash. Undefined when neither is set.
|
|
25
|
+
*/
|
|
26
|
+
export function resolveStudioUrl(config) {
|
|
27
|
+
const raw = config?.studio?.url ?? process.env.STUDIO_URL;
|
|
28
|
+
if (!raw)
|
|
29
|
+
return undefined;
|
|
30
|
+
return raw.replace(/\/+$/, '');
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Keys that used to live under `studio` and are refused since 3.0, with the
|
|
34
|
+
* message the server prints so the migration is obvious.
|
|
35
|
+
*/
|
|
36
|
+
export const REMOVED_STUDIO_KEYS = {
|
|
37
|
+
enabled: "'studio.enabled' is gone: the server no longer serves Studio. Mount it yourself with studioRouter() from '@trokky/studio/express', or simply do not mount it.",
|
|
38
|
+
path: "'studio.path' is gone: the mount path is wherever you app.use() the router from '@trokky/studio/express'.",
|
|
39
|
+
structure: "'studio.structure' has moved to the top-level 'structure' key: the navigation structure is read by the server for singleton enforcement, not only by Studio.",
|
|
40
|
+
requireAuth: "'studio.requireAuth' is gone: it was never enforced. Studio always requires a session.",
|
|
41
|
+
apiUrl: "'studio.apiUrl' is gone: pass apiPath or backendUrl to studioRouter() instead.",
|
|
42
|
+
};
|
|
43
|
+
/**
|
|
44
|
+
* Fail loudly on a pre-3.0 `studio` block instead of silently ignoring keys that used to
|
|
45
|
+
* decide whether and where Studio was served.
|
|
46
|
+
*/
|
|
47
|
+
export function assertStudioConfigShape(studio) {
|
|
48
|
+
if (!studio || typeof studio !== 'object')
|
|
49
|
+
return;
|
|
50
|
+
const offending = Object.keys(studio).filter(key => key in REMOVED_STUDIO_KEYS);
|
|
51
|
+
if (offending.length === 0)
|
|
52
|
+
return;
|
|
53
|
+
const lines = offending.map(key => ` - ${REMOVED_STUDIO_KEYS[key]}`);
|
|
54
|
+
throw new Error(`Unsupported 'studio' configuration (Trokky 3.0 moved Studio mounting out of the server):\n${lines.join('\n')}\n\nSee the 3.0 migration notes.`);
|
|
55
|
+
}
|
|
7
56
|
/**
|
|
8
57
|
* Apply environment-aware defaults to configuration
|
|
9
58
|
*/
|
|
@@ -83,23 +132,12 @@ export function withDefaults(config) {
|
|
|
83
132
|
},
|
|
84
133
|
...config.server
|
|
85
134
|
},
|
|
135
|
+
structure: config.structure,
|
|
86
136
|
studio: {
|
|
87
|
-
enabled: true,
|
|
88
|
-
path: '/studio',
|
|
89
|
-
requireAuth: true,
|
|
90
137
|
branding: {
|
|
91
138
|
title: 'Trokky CMS',
|
|
92
139
|
theme: 'system'
|
|
93
140
|
},
|
|
94
|
-
structure: undefined,
|
|
95
|
-
fields: [],
|
|
96
|
-
settings: {
|
|
97
|
-
pageSize: 20,
|
|
98
|
-
enableDrafts: true,
|
|
99
|
-
enableVersioning: false,
|
|
100
|
-
autoSave: true,
|
|
101
|
-
autosaveInterval: 30000 // 30 seconds
|
|
102
|
-
},
|
|
103
141
|
session: {
|
|
104
142
|
refreshBuffer: 5 * 60 * 1000, // 5 minutes
|
|
105
143
|
warningBuffer: 10 * 60 * 1000, // 10 minutes
|
|
@@ -144,6 +182,7 @@ export function defineConfig(config) {
|
|
|
144
182
|
if (env === 'production' && !config.security?.jwtSecret) {
|
|
145
183
|
throw new Error('JWT secret is required in production');
|
|
146
184
|
}
|
|
185
|
+
assertStudioConfigShape(config.studio);
|
|
147
186
|
return config;
|
|
148
187
|
}
|
|
149
188
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/integrations/express/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/integrations/express/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@ export declare class TrokkyExpress {
|
|
|
14
14
|
private config;
|
|
15
15
|
private logger;
|
|
16
16
|
private mountedApiPath;
|
|
17
|
-
private mountedStudioPath;
|
|
18
17
|
private studioConfig;
|
|
19
18
|
private i18nConfig;
|
|
20
19
|
private structureConfig;
|
|
@@ -31,10 +30,6 @@ export declare class TrokkyExpress {
|
|
|
31
30
|
* Create Express router with static routes only (excludes API routes)
|
|
32
31
|
*/
|
|
33
32
|
createStaticRouter(): Router;
|
|
34
|
-
/**
|
|
35
|
-
* Create Studio router if Studio integration is enabled
|
|
36
|
-
*/
|
|
37
|
-
createStudioRouter(): Promise<Router | undefined>;
|
|
38
33
|
/**
|
|
39
34
|
* Get just the middleware array
|
|
40
35
|
*/
|
|
@@ -48,15 +43,11 @@ export declare class TrokkyExpress {
|
|
|
48
43
|
*/
|
|
49
44
|
getMountedApiPath(): string;
|
|
50
45
|
/**
|
|
51
|
-
* Get the
|
|
52
|
-
|
|
53
|
-
getMountedStudioPath(): string;
|
|
54
|
-
/**
|
|
55
|
-
* Get both mounted paths for easy access
|
|
46
|
+
* Get the mounted paths. Since 3.0 only the API is mounted here; Studio's
|
|
47
|
+
* path is wherever the site mounted the router from '@trokky/studio/express'.
|
|
56
48
|
*/
|
|
57
49
|
getMountedPaths(): {
|
|
58
50
|
apiPath: string;
|
|
59
|
-
studioPath: string;
|
|
60
51
|
};
|
|
61
52
|
/**
|
|
62
53
|
* PROFESSIONAL SETUP - Clean, type-safe configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../../src/integrations/express/integration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAqB,MAAM,uBAAuB,CAAA;AAWvE,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC9E,OAAO,KAAK,EACV,YAAY,IAAI,eAAe,EAEhC,MAAM,aAAa,CAAA;AAIpB;;;;GAIG;AACH,qBAAa,aAAa;IACjB,MAAM,EAAE,YAAY,CAAA;IAC3B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,MAAM,CAA2C;IACzD,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../../src/integrations/express/integration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAqB,MAAM,uBAAuB,CAAA;AAWvE,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC9E,OAAO,KAAK,EACV,YAAY,IAAI,eAAe,EAEhC,MAAM,aAAa,CAAA;AAIpB;;;;GAIG;AACH,qBAAa,aAAa;IACjB,MAAM,EAAE,YAAY,CAAA;IAC3B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,MAAM,CAA2C;IACzD,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,eAAe,CAAY;gBAEvB,MAAM,EAAE,wBAAwB;IAwB5C;;OAEG;IACU,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAgE7D;;OAEG;IACI,YAAY,IAAI,MAAM;IAqD7B;;OAEG;IACI,kBAAkB,IAAI,MAAM;IAwBnC;;OAEG;IACI,aAAa;IAIpB;;OAEG;WACW,eAAe;IAI7B;;OAEG;IACI,iBAAiB,IAAI,MAAM;IAIlC;;;OAGG;IACI,eAAe,IAAI;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;IAI7C;;;;;;;;;;;;;;;;;;;;;;OAsBG;WACiB,MAAM,CACxB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,kBAAkB,CAAC;IAuP9B;;OAEG;IACI,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAIpD;;OAEG;IACI,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAIrE;;;OAGG;mBACkB,+BAA+B;IA0BpD;;OAEG;mBACkB,iBAAiB;IA6CtC;;OAEG;mBACkB,kBAAkB;IAkDvC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAUpC"}
|
|
@@ -4,7 +4,7 @@ import { TrokkyRoutes } from '../../routes/index.js';
|
|
|
4
4
|
import { ExpressAdapter } from './adapter.js';
|
|
5
5
|
import { TrokkyExpressMiddleware } from './middleware.js';
|
|
6
6
|
import { createLogger, TrokkyCore, } from '../../core/index.js';
|
|
7
|
-
import { withDefaults } from './config.js';
|
|
7
|
+
import { withDefaults, assertStudioConfigShape, ignoredStudioKeys, IGNORED_STUDIO_KEYS, resolveStudioUrl } from './config.js';
|
|
8
8
|
import { assertSingletonConsistency, checkSingletonStoredIds } from '../../core/schema/singleton.js';
|
|
9
9
|
/**
|
|
10
10
|
* Main Express integration class for Trokky CMS
|
|
@@ -18,7 +18,6 @@ export class TrokkyExpress {
|
|
|
18
18
|
config;
|
|
19
19
|
logger = createLogger('express', 'TrokkyExpress');
|
|
20
20
|
mountedApiPath = null;
|
|
21
|
-
mountedStudioPath = null;
|
|
22
21
|
studioConfig = null;
|
|
23
22
|
i18nConfig = null;
|
|
24
23
|
structureConfig = null;
|
|
@@ -46,20 +45,16 @@ export class TrokkyExpress {
|
|
|
46
45
|
const router = this.createRouter();
|
|
47
46
|
const staticRouter = this.createStaticRouter();
|
|
48
47
|
const middleware = this.middleware.getMiddleware();
|
|
49
|
-
// Create Studio router if enabled
|
|
50
|
-
let studioRouter;
|
|
51
|
-
if (this.config.studio?.enabled !== false) {
|
|
52
|
-
studioRouter = await this.createStudioRouter();
|
|
53
|
-
}
|
|
54
48
|
// Create auto-mount function
|
|
55
49
|
const mount = (app, options) => {
|
|
50
|
+
if (options && 'studioPath' in options) {
|
|
51
|
+
throw new Error("mount() no longer takes 'studioPath': since 3.0 the site mounts Studio itself with studioRouter() from '@trokky/studio/express'.");
|
|
52
|
+
}
|
|
56
53
|
const apiPath = options?.apiPath ?? '/api';
|
|
57
|
-
|
|
58
|
-
// Store the mounted paths for Studio config and external access
|
|
54
|
+
// Store the mounted path for Studio config and external access
|
|
59
55
|
this.mountedApiPath = apiPath;
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (this.config.studio?.enabled && this.studioConfig) {
|
|
56
|
+
// The API path is reported to Studio through GET /config/studio
|
|
57
|
+
if (this.studioConfig) {
|
|
63
58
|
this.studioConfig.apiBasePath = apiPath;
|
|
64
59
|
if (this.studioConfig.mediaUrlGenerator) {
|
|
65
60
|
this.studioConfig.mediaUrlGenerator.options.apiBasePath = apiPath;
|
|
@@ -79,30 +74,20 @@ export class TrokkyExpress {
|
|
|
79
74
|
});
|
|
80
75
|
app.use(cors(this.config.server.cors));
|
|
81
76
|
}
|
|
82
|
-
this.logger.info('
|
|
83
|
-
apiPath,
|
|
84
|
-
studioPath,
|
|
85
|
-
hasStudio: !!studioRouter,
|
|
86
|
-
});
|
|
77
|
+
this.logger.info('Mounting Trokky routers', { apiPath });
|
|
87
78
|
// Mount API routes
|
|
88
79
|
app.use(apiPath, router);
|
|
89
80
|
// Mount static routes at root level (no authentication)
|
|
90
81
|
app.use('/', staticRouter);
|
|
91
|
-
// Mount Studio if enabled
|
|
92
|
-
if (studioRouter) {
|
|
93
|
-
app.use(studioPath, studioRouter);
|
|
94
|
-
}
|
|
95
82
|
};
|
|
96
83
|
return {
|
|
97
84
|
router,
|
|
98
85
|
staticRouter,
|
|
99
|
-
studioRouter,
|
|
100
86
|
middleware,
|
|
101
87
|
config: this.config,
|
|
102
88
|
core: this.config.core, // Expose core for mail and other integrations
|
|
103
89
|
mount,
|
|
104
90
|
getMountedApiPath: () => this.getMountedApiPath(),
|
|
105
|
-
getMountedStudioPath: () => this.getMountedStudioPath(),
|
|
106
91
|
getMountedPaths: () => this.getMountedPaths(),
|
|
107
92
|
};
|
|
108
93
|
}
|
|
@@ -178,93 +163,6 @@ export class TrokkyExpress {
|
|
|
178
163
|
}
|
|
179
164
|
return router;
|
|
180
165
|
}
|
|
181
|
-
/**
|
|
182
|
-
* Create Studio router if Studio integration is enabled
|
|
183
|
-
*/
|
|
184
|
-
async createStudioRouter() {
|
|
185
|
-
if (!this.config.studio) {
|
|
186
|
-
return undefined;
|
|
187
|
-
}
|
|
188
|
-
this.logger.info('Creating Studio router with dynamic config injection');
|
|
189
|
-
const router = Router();
|
|
190
|
-
try {
|
|
191
|
-
// Import Studio assets utilities (separate @trokky/studio package)
|
|
192
|
-
const { getStudioHTML, getStudioAsset } = await import(
|
|
193
|
-
// @ts-ignore - @trokky/studio is an optional peer dependency resolved at runtime
|
|
194
|
-
'@trokky/studio/dist/server/assets.js');
|
|
195
|
-
// Serve Studio HTML with dynamic config injection
|
|
196
|
-
router.get('/', (req, res) => {
|
|
197
|
-
try {
|
|
198
|
-
const studioConfig = {
|
|
199
|
-
mode: 'production',
|
|
200
|
-
apiBasePath: this.getMountedApiPath(), // Use dynamic API path
|
|
201
|
-
basePath: this.getMountedStudioPath(), // Set the base path for routing
|
|
202
|
-
backendUrl: req.protocol + '://' + req.get('host') + this.getMountedApiPath(), // Full backend URL for integrated Studio
|
|
203
|
-
schemas: this.config.core?.getAllSchemas() || [],
|
|
204
|
-
branding: this.config.studio?.branding,
|
|
205
|
-
structure: this.config.studio?.structure,
|
|
206
|
-
config: this.config.studio?.config || {},
|
|
207
|
-
customFields: this.config.studio?.customFields || [],
|
|
208
|
-
mediaUrlGenerator: this.config.media?.mediaUrlGenerator,
|
|
209
|
-
i18n: this.i18nConfig || undefined,
|
|
210
|
-
};
|
|
211
|
-
const html = getStudioHTML(studioConfig, this.getMountedStudioPath());
|
|
212
|
-
res.setHeader('Content-Type', 'text/html');
|
|
213
|
-
res.send(html);
|
|
214
|
-
}
|
|
215
|
-
catch (error) {
|
|
216
|
-
this.logger.error('Failed to serve Studio HTML', error);
|
|
217
|
-
res.status(500).send('Studio temporarily unavailable');
|
|
218
|
-
}
|
|
219
|
-
});
|
|
220
|
-
// Serve Studio assets
|
|
221
|
-
router.get('/assets/:filename', (req, res) => {
|
|
222
|
-
try {
|
|
223
|
-
const asset = getStudioAsset(req.params.filename);
|
|
224
|
-
if (!asset) {
|
|
225
|
-
return res.status(404).send('Asset not found');
|
|
226
|
-
}
|
|
227
|
-
res.setHeader('Content-Type', asset.contentType);
|
|
228
|
-
res.send(asset.content);
|
|
229
|
-
}
|
|
230
|
-
catch (error) {
|
|
231
|
-
this.logger.error('Failed to serve Studio asset', error);
|
|
232
|
-
res.status(500).send('Asset unavailable');
|
|
233
|
-
}
|
|
234
|
-
});
|
|
235
|
-
// SPA catch-all route - serve Studio HTML for any unmatched Studio routes
|
|
236
|
-
// This enables client-side routing to work on page refresh
|
|
237
|
-
router.get('*', (req, res) => {
|
|
238
|
-
try {
|
|
239
|
-
const studioConfig = {
|
|
240
|
-
mode: 'production',
|
|
241
|
-
apiBasePath: this.getMountedApiPath(), // Use dynamic API path
|
|
242
|
-
basePath: this.getMountedStudioPath(), // Set the base path for routing
|
|
243
|
-
backendUrl: req.protocol + '://' + req.get('host') + this.getMountedApiPath(), // Full backend URL for integrated Studio
|
|
244
|
-
schemas: this.config.core?.getAllSchemas() || [],
|
|
245
|
-
branding: this.config.studio?.branding,
|
|
246
|
-
structure: this.config.studio?.structure,
|
|
247
|
-
config: this.config.studio?.config || {},
|
|
248
|
-
customFields: this.config.studio?.customFields || [],
|
|
249
|
-
mediaUrlGenerator: this.config.media?.mediaUrlGenerator,
|
|
250
|
-
i18n: this.i18nConfig || undefined,
|
|
251
|
-
};
|
|
252
|
-
const html = getStudioHTML(studioConfig, this.getMountedStudioPath());
|
|
253
|
-
res.setHeader('Content-Type', 'text/html');
|
|
254
|
-
res.send(html);
|
|
255
|
-
}
|
|
256
|
-
catch (error) {
|
|
257
|
-
this.logger.error('Failed to serve Studio HTML for SPA route', error);
|
|
258
|
-
res.status(500).send('Studio temporarily unavailable');
|
|
259
|
-
}
|
|
260
|
-
});
|
|
261
|
-
return router;
|
|
262
|
-
}
|
|
263
|
-
catch (error) {
|
|
264
|
-
this.logger.error('Failed to create Studio router - Studio assets not available', error);
|
|
265
|
-
return undefined;
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
166
|
/**
|
|
269
167
|
* Get just the middleware array
|
|
270
168
|
*/
|
|
@@ -284,19 +182,11 @@ export class TrokkyExpress {
|
|
|
284
182
|
return this.mountedApiPath || '/api';
|
|
285
183
|
}
|
|
286
184
|
/**
|
|
287
|
-
* Get the
|
|
288
|
-
|
|
289
|
-
getMountedStudioPath() {
|
|
290
|
-
return this.mountedStudioPath || '/studio';
|
|
291
|
-
}
|
|
292
|
-
/**
|
|
293
|
-
* Get both mounted paths for easy access
|
|
185
|
+
* Get the mounted paths. Since 3.0 only the API is mounted here; Studio's
|
|
186
|
+
* path is wherever the site mounted the router from '@trokky/studio/express'.
|
|
294
187
|
*/
|
|
295
188
|
getMountedPaths() {
|
|
296
|
-
return {
|
|
297
|
-
apiPath: this.getMountedApiPath(),
|
|
298
|
-
studioPath: this.getMountedStudioPath(),
|
|
299
|
-
};
|
|
189
|
+
return { apiPath: this.getMountedApiPath() };
|
|
300
190
|
}
|
|
301
191
|
/**
|
|
302
192
|
* PROFESSIONAL SETUP - Clean, type-safe configuration
|
|
@@ -361,8 +251,20 @@ export class TrokkyExpress {
|
|
|
361
251
|
enableSecurity: fullConfig.security.enabled,
|
|
362
252
|
jwtSecret: fullConfig.security.jwtSecret,
|
|
363
253
|
cryptoOptions: fullConfig.security.cryptoOptions,
|
|
364
|
-
|
|
254
|
+
// The device-flow approval page lives under the Studio; derive it from
|
|
255
|
+
// studio.url unless the site set oauth2.verificationUri explicitly.
|
|
256
|
+
oauth2: fullConfig.oauth2
|
|
257
|
+
? {
|
|
258
|
+
...fullConfig.oauth2,
|
|
259
|
+
verificationUri: fullConfig.oauth2.verificationUri ??
|
|
260
|
+
(resolveStudioUrl(fullConfig) ? `${resolveStudioUrl(fullConfig)}/auth/device` : undefined),
|
|
261
|
+
}
|
|
262
|
+
: fullConfig.oauth2,
|
|
365
263
|
};
|
|
264
|
+
assertStudioConfigShape(config.studio);
|
|
265
|
+
for (const key of ignoredStudioKeys(config.studio)) {
|
|
266
|
+
logger.warn(IGNORED_STUDIO_KEYS[key]);
|
|
267
|
+
}
|
|
366
268
|
const core = new TrokkyCore(coreConfig, storageAdapters, coreOptions);
|
|
367
269
|
await core.init();
|
|
368
270
|
logger.info('TrokkyCore initialized with professional config');
|
|
@@ -387,11 +289,11 @@ export class TrokkyExpress {
|
|
|
387
289
|
variants: fullConfig.media.variants || [],
|
|
388
290
|
},
|
|
389
291
|
};
|
|
390
|
-
if (fullConfig.studio.structure) {
|
|
391
|
-
resolvedStructureConfig = fullConfig.studio.structure;
|
|
392
|
-
}
|
|
393
292
|
logger.debug('Studio configuration resolved');
|
|
394
293
|
}
|
|
294
|
+
if (fullConfig.structure) {
|
|
295
|
+
resolvedStructureConfig = fullConfig.structure;
|
|
296
|
+
}
|
|
395
297
|
if (fullConfig.i18n) {
|
|
396
298
|
resolvedI18nConfig = fullConfig.i18n;
|
|
397
299
|
logger.debug('i18n configuration resolved', {
|
|
@@ -471,18 +373,11 @@ export class TrokkyExpress {
|
|
|
471
373
|
rateLimiting: fullConfig.security.rateLimit?.enabled
|
|
472
374
|
? fullConfig.security.rateLimit
|
|
473
375
|
: undefined,
|
|
474
|
-
studio: fullConfig.studio
|
|
376
|
+
studio: fullConfig.studio
|
|
475
377
|
? {
|
|
476
|
-
enabled: fullConfig.studio.enabled,
|
|
477
|
-
mount: fullConfig.studio.path,
|
|
478
|
-
auth: fullConfig.studio.requireAuth,
|
|
479
378
|
branding: fullConfig.studio.branding,
|
|
480
|
-
structure: fullConfig.
|
|
481
|
-
customFields: fullConfig.studio.fields,
|
|
379
|
+
structure: fullConfig.structure,
|
|
482
380
|
config: {
|
|
483
|
-
pageSize: fullConfig.studio.settings?.pageSize,
|
|
484
|
-
enableDrafts: fullConfig.studio.settings?.enableDrafts,
|
|
485
|
-
enableVersioning: fullConfig.studio.settings?.enableVersioning,
|
|
486
381
|
session: {
|
|
487
382
|
refreshBufferMs: fullConfig.studio.session?.refreshBuffer,
|
|
488
383
|
warningBufferMs: fullConfig.studio.session?.warningBuffer,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../src/integrations/express/integration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../src/integrations/express/integration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/integrations/express/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAgB,EAAE,OAAO,EAAU,MAAM,SAAS,CAAA;AAElD,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAA2B,MAAM,qBAAqB,CAAA;AAGnG,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EAOzB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,GAAG,EAAE,OAAO,CAAA;IACZ,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,qCAAqC;IACrC,WAAW,EAAE,kBAAkB,CAAA;IAC/B,4CAA4C;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,yDAAyD;IACzD,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;IACjD,iCAAiC;IACjC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,sBAAsB;IACtB,OAAO,EAAE,MAAM,UAAU,CAAA;CAC1B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/integrations/express/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAgB,EAAE,OAAO,EAAU,MAAM,SAAS,CAAA;AAElD,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAA2B,MAAM,qBAAqB,CAAA;AAGnG,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EAOzB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,GAAG,EAAE,OAAO,CAAA;IACZ,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,qCAAqC;IACrC,WAAW,EAAE,kBAAkB,CAAA;IAC/B,4CAA4C;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,yDAAyD;IACzD,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;IACjD,iCAAiC;IACjC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACzB,sBAAsB;IACtB,OAAO,EAAE,MAAM,UAAU,CAAA;CAC1B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,OAAO,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;CACnB;AAQD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,oBAAoB,CAAC,CA6G/B;AAyVD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,wBAAwB,EAChC,WAAW,EAAE,kBAAkB,EAC/B,WAAW,CAAC,EAAE,WAAW,GACxB,MAAM,OAAO,CAAC,IAAI,CAAC,CAiDrB;AAqFD;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;IAChE,GAAG,EAAE,OAAO,CAAA;IACZ,WAAW,EAAE,kBAAkB,CAAA;IAC/B,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAA;CACxD,CAAC,CAyDD"}
|
|
@@ -16,7 +16,7 @@ import express, { Router } from 'express';
|
|
|
16
16
|
import { createLogger } from '../../core/index.js';
|
|
17
17
|
import { MailService, MailNotificationService, BuiltInTemplateRenderer } from '../../mail/index.js';
|
|
18
18
|
import { TrokkyExpress } from './integration.js';
|
|
19
|
-
import { withDefaults } from './config.js';
|
|
19
|
+
import { withDefaults, resolveStudioUrl } from './config.js';
|
|
20
20
|
// =============================================================================
|
|
21
21
|
// MAIN SERVER FUNCTION
|
|
22
22
|
// =============================================================================
|
|
@@ -74,9 +74,8 @@ export async function startServer(config) {
|
|
|
74
74
|
const integration = await TrokkyExpress.create(fullConfig);
|
|
75
75
|
// Mount Trokky routes
|
|
76
76
|
const apiPath = fullConfig.server.basePath || '/api';
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
logger.info('Trokky routes mounted', { apiPath, studioPath });
|
|
77
|
+
integration.mount(app, { apiPath });
|
|
78
|
+
logger.info('Trokky routes mounted', { apiPath });
|
|
80
79
|
// Initialize mail service if configured
|
|
81
80
|
let mailService;
|
|
82
81
|
let mailNotificationService;
|
|
@@ -133,8 +132,6 @@ export async function startServer(config) {
|
|
|
133
132
|
port,
|
|
134
133
|
env: fullConfig.env,
|
|
135
134
|
apiPath,
|
|
136
|
-
studioPath,
|
|
137
|
-
studioEnabled: fullConfig.studio.enabled ?? true,
|
|
138
135
|
mailEnabled: !!mailService,
|
|
139
136
|
customRoutesCount: fullConfig.routes?.length ?? 0,
|
|
140
137
|
hooksCount: countHooks(fullConfig.hooks),
|
|
@@ -149,13 +146,16 @@ export async function startServer(config) {
|
|
|
149
146
|
// =============================================================================
|
|
150
147
|
async function initializeMailService(config, integration) {
|
|
151
148
|
logger.info('Initializing mail service...');
|
|
149
|
+
if (!resolveStudioUrl(config)) {
|
|
150
|
+
logger.warn('studio.url is not set (and STUDIO_URL is empty): links in system emails will point at localhost. Set studio.url to the public Studio URL.');
|
|
151
|
+
}
|
|
152
152
|
const mailConfig = config.mail;
|
|
153
153
|
// Use provided template renderer or create default BuiltInTemplateRenderer
|
|
154
154
|
const templateRenderer = mailConfig.templateRenderer ?? new BuiltInTemplateRenderer({
|
|
155
155
|
brandName: config.studio?.branding?.title || 'Trokky',
|
|
156
156
|
brandColor: '#3B82F6',
|
|
157
157
|
supportEmail: mailConfig.defaultFrom || 'noreply@localhost',
|
|
158
|
-
baseUrl:
|
|
158
|
+
baseUrl: resolveStudioUrl(config) || `http://localhost:${config.server.port || 3000}`,
|
|
159
159
|
});
|
|
160
160
|
// Create mail service
|
|
161
161
|
const mailService = new MailService({
|
|
@@ -522,9 +522,6 @@ function logStartupSummary(info) {
|
|
|
522
522
|
console.log(`║ Environment: ${info.env.padEnd(42)}║`);
|
|
523
523
|
console.log(`║ Port: ${String(info.port).padEnd(42)}║`);
|
|
524
524
|
console.log(`║ API: http://localhost:${info.port}${info.apiPath.padEnd(22)}║`);
|
|
525
|
-
if (info.studioEnabled) {
|
|
526
|
-
console.log(`║ Studio: http://localhost:${info.port}${info.studioPath.padEnd(22)}║`);
|
|
527
|
-
}
|
|
528
525
|
console.log(`║ Health: http://localhost:${info.port}/health${' '.repeat(17)}║`);
|
|
529
526
|
console.log('╠════════════════════════════════════════════════════════════╣');
|
|
530
527
|
console.log(`║ Mail: ${(info.mailEnabled ? 'Enabled' : 'Disabled').padEnd(42)}║`);
|
|
@@ -564,7 +561,6 @@ export async function createServer(config) {
|
|
|
564
561
|
// Mount routes
|
|
565
562
|
integration.mount(app, {
|
|
566
563
|
apiPath: fullConfig.server.basePath || '/api',
|
|
567
|
-
studioPath: fullConfig.studio.path || '/studio',
|
|
568
564
|
});
|
|
569
565
|
// Initialize mail, hooks, routes...
|
|
570
566
|
// (Similar to startServer but allows custom port)
|
|
@@ -584,8 +580,6 @@ export async function createServer(config) {
|
|
|
584
580
|
port: actualPort,
|
|
585
581
|
env: fullConfig.env,
|
|
586
582
|
apiPath: fullConfig.server.basePath || '/api',
|
|
587
|
-
studioPath: fullConfig.studio.path || '/studio',
|
|
588
|
-
studioEnabled: fullConfig.studio.enabled ?? true,
|
|
589
583
|
mailEnabled: false,
|
|
590
584
|
customRoutesCount: 0,
|
|
591
585
|
hooksCount: 0,
|