proteum 2.1.8 → 2.1.9-2

package/cli/scaffold/templates.ts

@@ -2,6 +2,18 @@ import type { TScaffoldInitConfig, TScaffoldResult } from './types';
 
 const renderJson = (value: unknown) => JSON.stringify(value, null, 4);
 
+export type TTsconfigTemplatePaths = {
+    frameworkTsconfig: string;
+    frameworkClient: string;
+    frameworkCommon: string;
+    frameworkServer: string;
+    frameworkTypesGlobal: string;
+    preactCompat: string;
+    preactCompatClient: string;
+    preactTestUtils: string;
+    preactJsxRuntime: string;
+};
+
 export const createPageTemplate = ({
     routePath,
     heading,
@@ -162,8 +174,8 @@ export default class ${appIdentifier} extends Application {
 }
 `;
 
-export const createClientTsconfigTemplate = () => `{
-    "extends": "../node_modules/proteum/tsconfig.common.json",
+export const createClientTsconfigTemplate = (paths: TTsconfigTemplatePaths) => `{
+    "extends": ${JSON.stringify(paths.frameworkTsconfig)},
     "compilerOptions": {
         "rootDir": "..",
         "baseUrl": "..",
@@ -172,9 +184,9 @@ export const createClientTsconfigTemplate = () => `{
         "strictBindCallApply": true,
         "useUnknownInCatchVariables": true,
         "paths": {
-            "@client/*": ["./node_modules/proteum/client/*"],
-            "@common/*": ["./node_modules/proteum/common/*"],
-            "@server/*": ["./node_modules/proteum/server/*"],
+            "@client/*": [${JSON.stringify(paths.frameworkClient)}],
+            "@common/*": [${JSON.stringify(paths.frameworkCommon)}],
+            "@server/*": [${JSON.stringify(paths.frameworkServer)}],
 
             "@/client/context": ["./.proteum/client/context.ts"],
             "@generated/client/*": ["./.proteum/client/*"],
@@ -182,24 +194,25 @@ export const createClientTsconfigTemplate = () => `{
             "@generated/server/*": ["./.proteum/server/*"],
             "@/*": ["./*"],
 
-            "react": ["./node_modules/preact/compat"],
-            "react-dom/test-utils": ["./node_modules/preact/test-utils"],
-            "react-dom": ["./node_modules/preact/compat"],
-            "react/jsx-runtime": ["./node_modules/preact/jsx-runtime"]
+            "react": [${JSON.stringify(paths.preactCompat)}],
+            "react-dom/client": [${JSON.stringify(paths.preactCompatClient)}],
+            "react-dom/test-utils": [${JSON.stringify(paths.preactTestUtils)}],
+            "react-dom": [${JSON.stringify(paths.preactCompat)}],
+            "react/jsx-runtime": [${JSON.stringify(paths.preactJsxRuntime)}]
         }
     },
     "include": [
         ".",
         "../var/typings",
-        "../node_modules/proteum/types/global",
+        ${JSON.stringify(paths.frameworkTypesGlobal)},
         "../.proteum/client/services.d.ts",
         "../server/index.ts"
     ]
 }
 `;
 
-export const createServerTsconfigTemplate = () => `{
-    "extends": "../node_modules/proteum/tsconfig.common.json",
+export const createServerTsconfigTemplate = (paths: TTsconfigTemplatePaths) => `{
+    "extends": ${JSON.stringify(paths.frameworkTsconfig)},
     "compilerOptions": {
         "rootDir": "..",
         "baseUrl": "..",
@@ -209,9 +222,9 @@ export const createServerTsconfigTemplate = () => `{
         "useUnknownInCatchVariables": true,
         "moduleSuffixes": [".ssr", ""],
         "paths": {
-            "@client/*": ["./node_modules/proteum/client/*"],
-            "@common/*": ["./node_modules/proteum/common/*"],
-            "@server/*": ["./node_modules/proteum/server/*"],
+            "@client/*": [${JSON.stringify(paths.frameworkClient)}],
+            "@common/*": [${JSON.stringify(paths.frameworkCommon)}],
+            "@server/*": [${JSON.stringify(paths.frameworkServer)}],
 
             "@/client/context": ["./.proteum/client/context.ts"],
             "@generated/client/*": ["./.proteum/client/*"],
@@ -219,10 +232,11 @@ export const createServerTsconfigTemplate = () => `{
             "@generated/server/*": ["./.proteum/server/*"],
             "@/*": ["./*"],
 
-            "react": ["./node_modules/preact/compat"],
-            "react-dom/test-utils": ["./node_modules/preact/test-utils"],
-            "react-dom": ["./node_modules/preact/compat"],
-            "react/jsx-runtime": ["./node_modules/preact/jsx-runtime"]
+            "react": [${JSON.stringify(paths.preactCompat)}],
+            "react-dom/client": [${JSON.stringify(paths.preactCompatClient)}],
+            "react-dom/test-utils": [${JSON.stringify(paths.preactTestUtils)}],
+            "react-dom": [${JSON.stringify(paths.preactCompat)}],
+            "react/jsx-runtime": [${JSON.stringify(paths.preactJsxRuntime)}]
         }
     },
     "include": [
@@ -230,7 +244,7 @@ export const createServerTsconfigTemplate = () => `{
         "../identity.config.ts",
         "../proteum.config.ts",
         "../var/typings",
-        "../node_modules/proteum/types/global",
+        ${JSON.stringify(paths.frameworkTypesGlobal)},
         "../.proteum/server/services.d.ts",
         "../server/index.ts"
     ]

package/cli/utils/check.ts

@@ -8,13 +8,7 @@ import { runProcess } from './runProcess';
 const tsconfigPaths = ['client/tsconfig.json', 'server/tsconfig.json', 'commands/tsconfig.json'];
 const eslintConfigPaths = ['eslint.config.mjs', 'eslint.config.js', 'eslint.config.cjs'];
 
-const resolveInstalledBinary = (name: string) => {
-    const binary = path.join(cli.paths.core.root, 'node_modules', '.bin', name);
-
-    if (!fs.existsSync(binary)) throw new Error(`Missing required binary "${name}" in Proteum dependencies.`);
-
-    return binary;
-};
+const resolveInstalledBinary = (packageName: string, binName: string) => cli.paths.resolveBinary(packageName, binName);
 
 const resolveExistingAppPaths = (paths: string[]) =>
     paths
@@ -43,10 +37,10 @@ export const runAppTypecheck = async () => {
     if (existingProjects.length === 0)
         throw new Error(`No TypeScript app projects found. Expected one of: ${tsconfigPaths.join(', ')}.`);
 
-    const tsc = resolveInstalledBinary('tsc');
+    const tsc = resolveInstalledBinary('typescript', 'tsc');
 
     for (const { relativePath } of existingProjects)
-        await runProcess(tsc, ['-p', relativePath, '--noEmit', '--pretty', 'false'], {
+        await runProcess(tsc.command, [...tsc.args, '-p', relativePath, '--noEmit', '--pretty', 'false'], {
             cwd: cli.paths.appRoot,
             env: getTypecheckEnv(),
         });
@@ -62,10 +56,10 @@ export const runAppLint = async ({ fix = false } = {}) => {
                 .join(', ')}.`,
         );
 
-    const eslint = resolveInstalledBinary('eslint');
+    const eslint = resolveInstalledBinary('eslint', 'eslint');
     const args = ['.', '--config', config.absolutePath, '--no-config-lookup'];
 
     if (fix) args.push('--fix');
 
-    await runProcess(eslint, args, { cwd: cli.paths.appRoot });
+    await runProcess(eslint.command, [...eslint.args, ...args], { cwd: cli.paths.appRoot });
 };

package/client/app/index.ts

@@ -41,6 +41,18 @@ type Prettify<T> = { [K in keyof T]: T[K] } & {};
 
 export type ApplicationProperties = Prettify<keyof Application>;
 
+const normalizeBrowserErrorMessage = (value: unknown): string => {
+    if (typeof value === 'string') return value;
+    if (value && typeof value === 'object' && 'message' in value && typeof value.message === 'string')
+        return value.message;
+
+    return '';
+};
+
+const isIgnorableBrowserErrorMessage = (message: string) =>
+    message === 'ResizeObserver loop completed with undelivered notifications.' ||
+    message === 'ResizeObserver loop limit exceeded';
+
 /*----------------------------------
 - CLASS
 ----------------------------------*/
@@ -81,8 +93,11 @@ export default abstract class Application {
         });
 
         window.onerror = (message, file, line, col, stacktrace) => {
-            console.error(`Exception catched by method B`, message);
-            this.reportBug({ stacktrace: stacktrace?.stack || JSON.stringify({ message, file, line, col }) }).then(
+            const normalizedMessage = normalizeBrowserErrorMessage(message);
+            if (isIgnorableBrowserErrorMessage(normalizedMessage)) return true;
+
+            console.error(`Exception catched by method B`, normalizedMessage || message);
+            this.reportBug({ stacktrace: stacktrace?.stack || JSON.stringify({ message: normalizedMessage || message, file, line, col }) }).then(
                 () => {
                     // TODO in toas service: app.on('bug', () => toast.warning( ... ))
                     /*context?.toast.warning("Bug detected", 

package/client/app.tsconfig.json

@@ -1,28 +1,29 @@
 {
-    "extends": "../../node_modules/proteum/tsconfig.common.json",
+    "extends": "../tsconfig.common.json",
     "compilerOptions": {
         "rootDir": "..",
         "baseUrl": "..",
         "paths": {
             
-            "@client/*": ["../node_modules/proteum/client/*"],
-            "@common/*": ["../node_modules/proteum/common/*"],
+            "@client/*": ["./client/*"],
+            "@common/*": ["./common/*"],
 
             // Only used for typings (ex: ServerResponse)
             // Removed before bundling
-            "@server/*": ["../node_modules/proteum/server/*"],
+            "@server/*": ["./server/*"],
             "@/*": ["./*"],
 
             // ATTENTION: Les références à preact doivent toujours pointer vers la même instance
-            "react": ["preact/compat"],
-            "react-dom/test-utils": ["preact/test-utils"],
-            "react-dom": ["preact/compat"], // Must be below test-utils
-            "react/jsx-runtime": ["preact/jsx-runtime"],
-            "preact/jsx-runtime": ["preact/jsx-runtime"]
+            "react": ["../preact/compat"],
+            "react-dom/client": ["../preact/compat/client"],
+            "react-dom/test-utils": ["../preact/test-utils"],
+            "react-dom": ["../preact/compat"], // Must be below client + test-utils
+            "react/jsx-runtime": ["../preact/jsx-runtime"],
+            "preact/jsx-runtime": ["../preact/jsx-runtime"]
         }
     },
     "include": [
         ".",
-        "../../node_modules/proteum/types/global"
+        "../types/global"
     ]
 }

package/common/connectedProjects.ts

@@ -44,6 +44,13 @@ export type TConnectedProjectEnvConfig = {
     urlInternal: string;
 };
 
+export type TConnectedProjectHealthResponse = {
+    connectedProjects: string[];
+    identifier: string;
+    name: string;
+    ok: true;
+};
+
 export type TConnectedFetcherTarget = {
     namespace: string;
     controllerAccessor: string;

package/common/dev/serverHotReload.ts

@@ -13,9 +13,18 @@ export type TServerHotReloadResult = {
     error?: string;
 };
 
+export type TServerReadyConnectedProject = {
+    namespace: string;
+    identifier: string;
+    name: string;
+    urlInternal: string;
+    healthUrl: string;
+};
+
 export type TServerReadyMessage = {
     type: typeof serverHotReloadMessageType.ready;
     publicUrl: string;
+    connectedProjects?: TServerReadyConnectedProject[];
 };
 
 export const isServerHotReloadRequest = (value: unknown): value is TServerHotReloadRequest =>
@@ -31,8 +40,20 @@ export const isServerHotReloadResult = (value: unknown): value is TServerHotRelo
         (value as TServerHotReloadResult).type === serverHotReloadMessageType.failed) &&
     Array.isArray((value as TServerHotReloadResult).changedFiles);
 
+const isServerReadyConnectedProject = (value: unknown): value is TServerReadyConnectedProject =>
+    typeof value === 'object' &&
+    value !== null &&
+    typeof (value as TServerReadyConnectedProject).namespace === 'string' &&
+    typeof (value as TServerReadyConnectedProject).identifier === 'string' &&
+    typeof (value as TServerReadyConnectedProject).name === 'string' &&
+    typeof (value as TServerReadyConnectedProject).urlInternal === 'string' &&
+    typeof (value as TServerReadyConnectedProject).healthUrl === 'string';
+
 export const isServerReadyMessage = (value: unknown): value is TServerReadyMessage =>
     typeof value === 'object' &&
     value !== null &&
     (value as TServerReadyMessage).type === serverHotReloadMessageType.ready &&
-    typeof (value as TServerReadyMessage).publicUrl === 'string';
+    typeof (value as TServerReadyMessage).publicUrl === 'string' &&
+    ((value as TServerReadyMessage).connectedProjects === undefined ||
+        (Array.isArray((value as TServerReadyMessage).connectedProjects) &&
+            (value as TServerReadyMessage).connectedProjects.every(isServerReadyConnectedProject)));

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "proteum",
 	"description": "LLM-first Opinionated Typescript Framework for web applications.",
-	"version": "2.1.8",
+	"version": "2.1.9-2",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/proteum.git",
 	"license": "MIT",
@@ -69,6 +69,7 @@
 		"preact": "^10.27.1",
 		"preact-render-to-string": "^6.6.1",
 		"prompts": "^2.4.2",
+		"react": "^19.2.0",
 		"react-apexcharts": "^2.1.0",
 		"replace-once": "^1.0.0",
 		"responsive-loader": "^3.1.2",

package/server/app.tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../../node_modules/proteum/tsconfig.common.json",
+    "extends": "../tsconfig.common.json",
     "compilerOptions": {
         "rootDir": "..",
         "baseUrl": "..",
@@ -14,22 +14,23 @@
             "@/common/.generated/*": ["./.proteum/common/*"],
             "@/server/.generated/*": ["./.proteum/server/*"],
 
-            "@client/*": ["../node_modules/proteum/client/*"],
-            "@common/*": ["../node_modules/proteum/common/*"],
-            "@server/*": ["../node_modules/proteum/server/*"],
+            "@client/*": ["./client/*"],
+            "@common/*": ["./common/*"],
+            "@server/*": ["./server/*"],
 
             "@/*": ["./*"],
 
             // ATTENTION: Les références à preact doivent toujours pointer vers la même instance
-            "react": ["preact/compat"],
-            "react-dom/test-utils": ["preact/test-utils"],
-            "react-dom": ["preact/compat"], // Must be below test-utils
-            "react/jsx-runtime": ["preact/jsx-runtime"]
+            "react": ["../preact/compat"],
+            "react-dom/client": ["../preact/compat/client"],
+            "react-dom/test-utils": ["../preact/test-utils"],
+            "react-dom": ["../preact/compat"], // Must be below client + test-utils
+            "react/jsx-runtime": ["../preact/jsx-runtime"]
         }
     },
     
     "include": [
         ".",
-        "../../node_modules/proteum/types/global"
+        "../types/global"
     ]
 }

package/server/services/auth/index.ts

@@ -853,6 +853,9 @@ export default abstract class AuthService<
         return user as TUser;
     }
 
+    /**
+     * @deprecated Use `check(request, null, tracking)` to make the authenticated-user requirement explicit.
+     */
     public check(request: TRequest): TUser;
 
     public check(request: TRequest, conditions: null, tracking?: TAuthTrackingContext): TUser;
@@ -861,8 +864,14 @@ export default abstract class AuthService<
 
     public check(request: TRequest, conditions: false, tracking?: TAuthTrackingContext): null;
 
+    /**
+     * @deprecated Use `check(request, { role }, tracking)` or another explicit conditions object instead.
+     */
     public check(request: TRequest, role?: TUserRole | boolean): TUser | null;
 
+    /**
+     * @deprecated Use `check(request, { role, ...rules }, tracking)` with app-defined auth rules instead of legacy feature/action arguments.
+     */
     public check(request: TRequest, role: TUserRole | boolean, feature: FeatureKeys, action?: string): TUser | null;
 
     public check(

package/server/services/router/http/index.ts

@@ -26,10 +26,12 @@ import type { TBasicUser } from '@server/services/auth';
 import type { TServerRouter } from '..';
 import type { TDevConsoleLogLevel } from '@common/dev/console';
 import type { TPerfGroupBy } from '@common/dev/performance';
+import type { TServerReadyConnectedProject } from '@common/dev/serverHotReload';
 import type { TDevSessionStartResponse, TDevSessionUserSummary } from '@common/dev/session';
 import { serverHotReloadMessageType } from '@common/dev/serverHotReload';
 import { explainSectionNames } from '@common/dev/diagnostics';
 import {
+    type TConnectedProjectHealthResponse,
     connectedProjectHealthPath,
     connectedProjectProxyPathPrefix,
     parseConnectedProjectProxyPath,
@@ -93,25 +95,48 @@ const createContentSecurityPolicy = (config: Config['csp']): TContentSecurityPol
 };
 
 const immutablePublicAssetCacheControl = 'public, max-age=31536000, immutable';
+const devPublicAssetCacheControl = 'no-store';
 const revalidatedPublicAssetCacheControl = 'public, max-age=0, must-revalidate';
 const hashedPublicAssetPattern = /(^|[-_.])[a-f0-9]{6,}(?=(\.[^.]+)+$)/i;
 const connectedProjectBootRetryCount = 10;
 const connectedProjectBootRetryDelayMs = 5_000;
 
-const isVersionedPublicAssetRequest = (res: express.Response, filePath: string) => {
-    const requestUrl = res.req?.originalUrl || res.req?.url || '';
+const isVersionedPublicAssetRequest = (res: undefined | express.Response | http.ServerResponse, filePath: string) => {
+    const request =
+        res && typeof res === 'object' && 'req' in res
+            ? ((res as express.Response | (http.ServerResponse & { req?: express.Request })).req ?? undefined)
+            : undefined;
+    const requestUrl = request?.originalUrl || request?.url || '';
     const searchParams = new URL(requestUrl, 'http://proteum.local').searchParams;
     if (searchParams.has('v')) return true;
 
     return hashedPublicAssetPattern.test(path.basename(filePath));
 };
 
-const resolvePublicAssetCacheControl = (res: express.Response, filePath: string) =>
-    isVersionedPublicAssetRequest(res, filePath) ? immutablePublicAssetCacheControl : revalidatedPublicAssetCacheControl;
+const resolvePublicAssetCacheControl = ({
+    res,
+    filePath,
+    profile,
+}: {
+    res: undefined | express.Response | http.ServerResponse;
+    filePath: string;
+    profile: string;
+}) => {
+    if (profile === 'dev') return devPublicAssetCacheControl;
+    return isVersionedPublicAssetRequest(res, filePath) ? immutablePublicAssetCacheControl : revalidatedPublicAssetCacheControl;
+};
 const wait = async (durationMs: number) =>
     await new Promise<void>((resolve) => {
         setTimeout(resolve, durationMs);
     });
+const isNonEmptyString = (value: unknown): value is string => typeof value === 'string' && value.trim() !== '';
+const isConnectedProjectHealthResponse = (value: unknown): value is TConnectedProjectHealthResponse =>
+    typeof value === 'object' &&
+    value !== null &&
+    (value as TConnectedProjectHealthResponse).ok === true &&
+    isNonEmptyString((value as TConnectedProjectHealthResponse).identifier) &&
+    isNonEmptyString((value as TConnectedProjectHealthResponse).name) &&
+    Array.isArray((value as TConnectedProjectHealthResponse).connectedProjects);
 
 /*----------------------------------
 - FUNCTION
@@ -167,7 +192,9 @@ export default class HttpServer<TRouter extends TServerRouter = TServerRouter> {
         };
     }
 
-    private async verifyConnectedProjectsBeforeStart() {
+    private async verifyConnectedProjectsBeforeStart(): Promise<TServerReadyConnectedProject[]> {
+        const verifiedConnectedProjects: TServerReadyConnectedProject[] = [];
+
         for (const connectedProject of Object.values(this.app.connectedProjects || {})) {
             const healthUrl = new URL(connectedProjectHealthPath, connectedProject.urlInternal).toString();
             let lastError: Error | undefined;
@@ -184,7 +211,21 @@ export default class HttpServer<TRouter extends TServerRouter = TServerRouter> {
                         );
                     }
 
+                    const payload = (await response.json()) as unknown;
+                    if (!isConnectedProjectHealthResponse(payload)) {
+                        throw new Error(
+                            `Connected project "${connectedProject.namespace}" health check returned an invalid payload at ${healthUrl}.`,
+                        );
+                    }
+
                     lastError = undefined;
+                    verifiedConnectedProjects.push({
+                        namespace: connectedProject.namespace,
+                        identifier: payload.identifier.trim(),
+                        name: payload.name.trim(),
+                        urlInternal: connectedProject.urlInternal,
+                        healthUrl,
+                    });
                     break;
                 } catch (error) {
                     lastError =
@@ -204,15 +245,20 @@ export default class HttpServer<TRouter extends TServerRouter = TServerRouter> {
                 await wait(connectedProjectBootRetryDelayMs);
             }
         }
+
+        return verifiedConnectedProjects;
     }
 
     private registerConnectedProjectRoutes(routes: express.Express) {
         routes.get(connectedProjectHealthPath, (_req, res) => {
-            res.json({
+            const response: TConnectedProjectHealthResponse = {
                 connectedProjects: Object.keys(this.app.connectedProjects || {}),
                 identifier: this.app.identity.identifier,
+                name: this.app.identity.name,
                 ok: true,
-            });
+            };
+
+            res.json(response);
         });
 
         routes.all(`${connectedProjectHealthPath}/*`, (_req, res) => {
@@ -360,14 +406,29 @@ export default class HttpServer<TRouter extends TServerRouter = TServerRouter> {
         // Normalement, seulement utile pour le mode production,
         // Quand mode debug, les ressources client semblent servies par le dev middlewae
         // Sauf que les ressources serveur ne semblent pas trouvées par le dev-middleware
+        const disablePublicAssetCaching = this.app.env.profile === 'dev';
         routes.use(compression());
         routes.use('/public', cors());
         routes.use(
             '/public',
             express.static(path.join(Container.path.root, APP_OUTPUT_DIR, 'public'), {
                 dotfiles: 'deny',
-                setHeaders: function setCustomCacheControl(res, filePath) {
-                    res.setHeader('Cache-Control', resolvePublicAssetCacheControl(res, filePath));
+                etag: !disablePublicAssetCaching,
+                lastModified: !disablePublicAssetCaching,
+                setHeaders: (res, filePath) => {
+                    if (disablePublicAssetCaching) {
+                        res.removeHeader('ETag');
+                        res.removeHeader('Last-Modified');
+                    }
+
+                    res.setHeader(
+                        'Cache-Control',
+                        resolvePublicAssetCacheControl({
+                            res,
+                            filePath,
+                            profile: this.app.env.profile,
+                        }),
+                    );
                 },
             }),
             (req, res) => {
@@ -426,12 +487,13 @@ export default class HttpServer<TRouter extends TServerRouter = TServerRouter> {
         /*----------------------------------
         - BOOT SERVICES
         ----------------------------------*/
-        await this.verifyConnectedProjectsBeforeStart();
+        const verifiedConnectedProjects = await this.verifyConnectedProjectsBeforeStart();
 
         this.http.listen(this.config.port, () => {
             if (__DEV__ && typeof process.send === 'function') {
                 process.send({
                     type: serverHotReloadMessageType.ready,
+                    connectedProjects: verifiedConnectedProjects,
                     publicUrl: this.publicUrl,
                 });
                 return;