cabloy 5.1.51 → 5.1.53

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.14",
+  "version": "5.1.15",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/.metadata/index.ts

@@ -1,4 +1,5 @@
 // eslint-disable
+import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** interceptor: begin */
 export * from '../bean/interceptor.ssrRedirect.ts';
 export * from '../bean/interceptor.ssrRender.ts';
@@ -83,13 +84,60 @@ declare module 'vona-module-a-ssr' {
 /** bean: end */
 /** bean: begin */
 import type { BeanSsr } from '../bean/bean.ssr.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'ssr': BeanSsr;
   }
 }
 /** bean: end */
+/** controller: begin */
+export * from '../controller/memoryDiag.ts';
+import type { IControllerOptionsMemoryDiag } from '../controller/memoryDiag.ts';
+import 'vona-module-a-web';
+declare module 'vona-module-a-web' {
+
+    export interface IControllerRecord {
+      'a-ssr:memoryDiag': IControllerOptionsMemoryDiag;
+    }
+
+
+}
+declare module 'vona-module-a-ssr' {
+
+        export interface ControllerMemoryDiag {
+          /** @internal */
+          get scope(): ScopeModuleASsr;
+        }
+
+          export interface ControllerMemoryDiag {
+            get $beanFullName(): 'a-ssr.controller.memoryDiag';
+            get $onionName(): 'a-ssr:memoryDiag';
+            get $onionOptions(): IControllerOptionsMemoryDiag;
+          }
+}
+/** controller: end */
+/** controller: begin */
+// @ts-ignore ignore
+import type { ControllerMemoryDiag } from '../controller/memoryDiag.ts';
+declare module 'vona-module-a-ssr' {
+
+    export interface IControllerOptionsMemoryDiag {
+      actions?: TypeControllerOptionsActions<ControllerMemoryDiag>;
+    }
+}
+declare module 'vona-module-a-web' {
+  export interface IApiPathGetRecord{
+        '/ssr/memoryDiag/stats': undefined;
+    }
+export interface IApiPathPostRecord{
+        '/ssr/memoryDiag/gc': undefined;
+'/ssr/memoryDiag/heapSnapshot': undefined;
+    }
+
+}
+
+/** controller: end */
 /** service: begin */
 export * from '../service/devProxy.ts';
 export * from '../service/ssr.ts';

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/controller/memoryDiag.ts

@@ -0,0 +1,97 @@
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
+import inspector from 'node:inspector';
+import v8 from 'node:v8';
+import { BeanBase } from 'vona';
+import { Passport } from 'vona-module-a-user';
+import { Controller, Web } from 'vona-module-a-web';
+
+const HEADER_MEMORY_DIAG_TOKEN = 'x-ssr-memory-diag-token';
+const ENV_MEMORY_DIAG_TOKEN = 'SSR_MEMORY_DIAG_TOKEN';
+
+export interface IControllerOptionsMemoryDiag extends IDecoratorControllerOptions {}
+
+@Controller<IControllerOptionsMemoryDiag>('memoryDiag', {
+  exclude: true,
+})
+export class ControllerMemoryDiag extends BeanBase {
+  @Web.get('stats')
+  @Passport.public()
+  async stats() {
+    this._checkAccess();
+    const mem = process.memoryUsage();
+    const heap = v8.getHeapStatistics();
+    return {
+      pid: process.pid,
+      timestamp: Date.now(),
+      memoryUsage: {
+        rss: mem.rss,
+        heapTotal: mem.heapTotal,
+        heapUsed: mem.heapUsed,
+        external: mem.external,
+        arrayBuffers: mem.arrayBuffers,
+      },
+      heapStatistics: {
+        used_heap_size: heap.used_heap_size,
+        total_heap_size: heap.total_heap_size,
+        total_available_size: heap.total_available_size,
+        heap_size_limit: heap.heap_size_limit,
+        malloced_memory: heap.malloced_memory,
+        number_of_native_contexts: heap.number_of_native_contexts,
+        number_of_detached_contexts: heap.number_of_detached_contexts,
+      },
+    };
+  }
+
+  @Web.post('gc')
+  @Passport.public()
+  async forceGc() {
+    this._checkAccess();
+    const session = new inspector.Session();
+    session.connect();
+    try {
+      await this._postHeapProfiler(session, 'HeapProfiler.enable');
+      await this._postHeapProfiler(session, 'HeapProfiler.collectGarbage');
+    } finally {
+      session.disconnect();
+    }
+    return await this.stats();
+  }
+
+  @Web.post('heapSnapshot')
+  @Passport.public()
+  async heapSnapshot() {
+    this._checkAccess();
+    const fileName = v8.writeHeapSnapshot(
+      `/tmp/heapdump-${process.pid}-${Date.now()}.heapsnapshot`,
+    );
+    return { pid: process.pid, file: fileName };
+  }
+
+  private _postHeapProfiler(session: inspector.Session, method: string): Promise<void> {
+    return new Promise<void>(function postHeapProfiler(resolve, reject) {
+      session.post(method, function onPost(err) {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+
+  private _checkAccess() {
+    const token = process.env[ENV_MEMORY_DIAG_TOKEN];
+    if (!token) {
+      if (!this.app.meta.isDev && !this.app.meta.isTest) {
+        this.app.throw(403);
+      }
+      return;
+    }
+
+    const tokenHeader = this.ctx.get(HEADER_MEMORY_DIAG_TOKEN);
+    if (tokenHeader !== token) {
+      this.app.throw(403);
+    }
+  }
+}

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.29",
+  "version": "5.1.30",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/README.md

@@ -1,4 +1,4 @@
-English | [简体中文](./README.zh-CN.md)
+English | [Simplified Chinese](./README.zh-CN.md)
 
 # Zova
 

package/zova/package.original.json

@@ -67,11 +67,11 @@
   "devDependencies": {
     "@cabloy/lint": "^5.1.27",
     "@cabloy/openapi-typescript": "^7.9.2",
-    "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.9",
+    "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.10",
     "@types/node": "^22.19.17",
     "@vitejs/plugin-vue": "^6.0.7",
     "concurrently": "^8.2.2",
-    "quasar-app-extension-zova": "^1.3.0",
+    "quasar-app-extension-zova": "^1.3.1",
     "sass": "^1.99.0",
     "typescript": "^5.9.3",
     "vite": "^8.0.14",
@@ -91,10 +91,10 @@
   },
   "pnpm": {
     "overrides": {
-      "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.9",
+      "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.10",
       "@vue/babel-plugin-jsx": "npm:@cabloy/vue-babel-plugin-jsx@^2.0.1",
       "@vue/compiler-sfc": "npm:@cabloy/vue-compiler-sfc@^3.5.14",
-      "@vue/runtime-core": "npm:@cabloy/vue-runtime-core@^3.5.53",
+      "@vue/runtime-core": "npm:@cabloy/vue-runtime-core@^3.5.57",
       "@vue/runtime-dom": "npm:@cabloy/vue-runtime-dom@^3.5.13",
       "@vue/reactivity": "npm:@cabloy/vue-reactivity@^3.5.16",
       "@vue/server-renderer": "npm:@cabloy/vue-server-renderer@^3.5.18",

package/zova/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.73",
+  "version": "1.2.75",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.0.0",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.71"
+    "zova-cli-set-front": "^1.2.73"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.71",
+  "version": "1.2.73",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -70,7 +70,7 @@
     "vite": "^8.0.14",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.14",
-    "zova-vite": "^1.1.33"
+    "zova-vite": "^1.1.35"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.tools.metadata.ts

@@ -168,7 +168,7 @@ export class CliToolsMetadata extends BeanCliBase {
     const contentConstants = await generateConstant(modulePath);
     content += contentConstants;
     // locale
-    const contentLocales1 = await generateLocale1(modulePath, moduleName);
+    const contentLocales1 = await generateLocale1(modulePath);
     const contentLocales2 = await generateLocale2(contentLocales1);
     content += contentLocales2;
     // error

package/zova/packages-cli/cli-set-front/src/lib/bean/toolsMetadata/generateConfig.ts

@@ -26,7 +26,7 @@ import { constants } from '../config/constants.js';
   return content;
 }
 
-export async function generateLocale1(modulePath: string, moduleName: string) {
+export async function generateLocale1(modulePath: string) {
   const files = await globby('src/config/locale/*.ts', { cwd: modulePath });
   if (files.length === 0) return '';
   files.sort();
@@ -39,21 +39,11 @@ export async function generateLocale1(modulePath: string, moduleName: string) {
     contentLocales.push(`  '${localeName}': ${className},`);
   }
   // combine
-  const content = `import type { TypeLocaleBase } from 'zova';
-import { useApp, useComputed } from 'zova';
-${contentImports.join('\n')}
+  const content = `${contentImports.join('\n')}
 
 export const locales = {
 ${contentLocales.join('\n')}
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K, ...args: any[]) {
-  const app = useApp();
-  const str = \`${moduleName}::\${key}\`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}
 `;
   return content;
 }

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.54",
+  "version": "1.1.56",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.32",
-    "zova-core": "^5.1.48"
+    "zova-core": "^5.1.50"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-utils/zova-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-vite",
-  "version": "1.1.33",
+  "version": "1.1.35",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "zova vite",
   "keywords": [
@@ -49,7 +49,7 @@
     "@cabloy/vue-compiler-sfc": "^3.5.14",
     "@cabloy/vue-reactivity": "^3.5.16",
     "@cabloy/vue-router": "^4.4.16",
-    "@cabloy/vue-runtime-core": "^3.5.53",
+    "@cabloy/vue-runtime-core": "^3.5.57",
     "@cabloy/vue-runtime-dom": "^3.5.13",
     "@cabloy/vue-server-renderer": "^3.5.18",
     "@faker-js/faker": "^8.4.1",

package/zova/packages-utils/zova-vite/templates/app/controller.tsx_

@@ -7,11 +7,11 @@ export class ControllerPageApp extends BeanControllerPageBase {
     // app
     const instance = getCurrentInstance();
     const app = instance!.appContext.app!;
-    if (!app.zova) {
-      await this.initApp(app);
-    } else {
+    if (app.zova) {
       await this.updateApp(app.zova);
+      return;
     }
+    await this.initApp(app);
   }
 
   protected render() {

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.93",
+  "version": "5.1.95",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.48",
-    "zova-suite-a-zova": "^5.1.92"
+    "zova-core": "^5.1.50",
+    "zova-suite-a-zova": "^5.1.94"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.48",
+  "version": "5.1.50",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -56,7 +56,7 @@
     "@cabloy/vue-compiler-sfc": "^3.5.14",
     "@cabloy/vue-reactivity": "^3.5.16",
     "@cabloy/vue-router": "^4.4.16",
-    "@cabloy/vue-runtime-core": "^3.5.53",
+    "@cabloy/vue-runtime-core": "^3.5.57",
     "@cabloy/vue-runtime-dom": "^3.5.13",
     "@cabloy/vue-server-renderer": "^3.5.18",
     "@cabloy/word-utils": "^2.1.14",

package/zova/packages-zova/zova-core/src/bean/beanContainer.ts

@@ -103,7 +103,7 @@ export class BeanContainer {
             beanInstance,
           );
           this.runWithInstanceScopeOrAppContext(() => {
-            beanInstance.__dispose__();
+            return beanInstance.__dispose__();
           });
           this.app.meta.module._monkeyModuleSync(
             false,
@@ -630,8 +630,8 @@ export class BeanContainer {
       await this.app?.meta.module._monkeyModule(true, 'beanInit', undefined, this, beanInstance);
     }
     if (!(beanInstance instanceof BeanAopBase) && beanInstance.__init__) {
-      await this.runWithInstanceScopeOrAppContext(async () => {
-        await beanInstance.__init__(...args);
+      await this.runWithInstanceScopeOrAppContext(() => {
+        return beanInstance.__init__(...args);
       });
     }
     if (this.containerType === 'sys') {

package/zova/packages-zova/zova-core/src/bean/beanControllerPageBase.ts

@@ -21,6 +21,7 @@ export class BeanControllerPageBase extends BeanBase {
 
   /** @internal */
   public __updateControllerData() {
+    if (!this.app) return;
     this.app.meta.module._monkeyModuleSync(true, 'controllerDataUpdate', undefined, this);
   }
 }

package/zova/packages-zova/zova-core/src/core/component/module.ts

@@ -186,8 +186,8 @@ export class AppModule extends BeanSimple {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
       if (mainInstance && mainInstance[monkeyName]) {
         // @ts-ignore ignore
-        await this.app.vue.runWithContext(async () => {
-          await mainInstance[monkeyName](...monkeyData);
+        await this.app.vue.runWithContext(() => {
+          return mainInstance[monkeyName](...monkeyData);
         });
       }
     }
@@ -197,13 +197,13 @@ export class AppModule extends BeanSimple {
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {
-          await this.app.vue.runWithContext(async () => {
+          await this.app.vue.runWithContext(() => {
             if (moduleTarget === undefined) {
               // @ts-ignore ignore
-              await monkeyInstance[monkeyName](...monkeyData);
+              return monkeyInstance[monkeyName](...monkeyData);
             } else {
               // @ts-ignore ignore
-              await monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
+              return monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
             }
           });
         }
@@ -212,13 +212,13 @@ export class AppModule extends BeanSimple {
     // app monkey
     const appMonkey = this.app.meta.appMonkey;
     if (appMonkey && appMonkey[monkeyName]) {
-      await this.app.vue.runWithContext(async () => {
+      await this.app.vue.runWithContext(() => {
         if (moduleTarget === undefined) {
           // @ts-ignore ignore
-          await appMonkey[monkeyName](...monkeyData);
+          return appMonkey[monkeyName](...monkeyData);
         } else {
           // @ts-ignore ignore
-          await appMonkey[monkeyName](moduleTarget, ...monkeyData);
+          return appMonkey[monkeyName](moduleTarget, ...monkeyData);
         }
       });
     }
@@ -238,8 +238,8 @@ export class AppModule extends BeanSimple {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
       if (mainInstance && mainInstance[monkeyName]) {
         // @ts-ignore ignore
-        this.app.vue.runWithContext(async () => {
-          mainInstance[monkeyName](...monkeyData);
+        this.app.vue.runWithContext(() => {
+          return mainInstance[monkeyName](...monkeyData);
         });
       }
     }
@@ -249,13 +249,13 @@ export class AppModule extends BeanSimple {
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {
-          this.app.vue.runWithContext(async () => {
+          this.app.vue.runWithContext(() => {
             if (moduleTarget === undefined) {
               // @ts-ignore ignore
-              monkeyInstance[monkeyName](...monkeyData);
+              return monkeyInstance[monkeyName](...monkeyData);
             } else {
               // @ts-ignore ignore
-              monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
+              return monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
             }
           });
         }
@@ -264,13 +264,13 @@ export class AppModule extends BeanSimple {
     // app monkey
     const appMonkey = this.app.meta.appMonkey;
     if (appMonkey && appMonkey[monkeyName]) {
-      this.app.vue.runWithContext(async () => {
+      this.app.vue.runWithContext(() => {
         if (moduleTarget === undefined) {
           // @ts-ignore ignore
-          appMonkey[monkeyName](...monkeyData);
+          return appMonkey[monkeyName](...monkeyData);
         } else {
           // @ts-ignore ignore
-          appMonkey[monkeyName](moduleTarget, ...monkeyData);
+          return appMonkey[monkeyName](moduleTarget, ...monkeyData);
         }
       });
     }

package/zova/packages-zova/zova-core/src/core/context/component.ts

@@ -4,15 +4,21 @@ import { BeanSimple } from '../../bean/beanSimple.ts';
 import { BeanControllerIdentifier, BeanRenderIdentifier } from '../../bean/type.ts';
 import { cast } from '../../types/utils/cast.ts';
 
+const SymbolTypeSSRRenderOriginal = Symbol('SymbolTypeSSRRenderOriginal');
+const SymbolTypeSSRRenderResetCount = Symbol('SymbolTypeSSRRenderResetCount');
+
 export class CtxComponent extends BeanSimple {
   private _bean_render_original: any;
+  private _instance_ssrRender_original: any;
+  private _renderPatched = false;
+  private _ssrRenderReset = false;
 
   activate() {
     if (this.ctx.disposed) return;
     const renderMethod = 'render';
-    const self = this;
     const instance = cast(this.ctx.instance);
     this._bean_render_original = instance[renderMethod];
+    const self = this;
     instance[renderMethod] = function (this, ...args) {
       if (instance.isUnmounted) return;
       if (!self.ctx.meta.state.inited.state) {
@@ -33,16 +39,42 @@ export class CtxComponent extends BeanSimple {
       //   return render.render();
       // }
     };
-    instance.type.ssrRender = null;
+    this._renderPatched = true;
+    const componentType = cast(instance.type);
+    const ssrRenderResetCount = componentType[SymbolTypeSSRRenderResetCount] ?? 0;
+    if (ssrRenderResetCount === 0) {
+      componentType[SymbolTypeSSRRenderOriginal] = componentType.ssrRender;
+      componentType.ssrRender = null;
+    }
+    componentType[SymbolTypeSSRRenderResetCount] = ssrRenderResetCount + 1;
+    this._instance_ssrRender_original = instance.ssrRender;
     instance.ssrRender = null;
+    this._ssrRenderReset = true;
   }
 
   /** @internal */
   public dispose() {
     const renderMethod = 'render';
     const instance = cast(this.ctx.instance);
-    instance[renderMethod] = this._bean_render_original;
+    if (this._renderPatched) {
+      instance[renderMethod] = this._bean_render_original;
+    }
+    if (this._ssrRenderReset) {
+      instance.ssrRender = this._instance_ssrRender_original;
+      const componentType = cast(instance.type);
+      const ssrRenderResetCount = componentType[SymbolTypeSSRRenderResetCount] ?? 0;
+      if (ssrRenderResetCount <= 1) {
+        componentType.ssrRender = componentType[SymbolTypeSSRRenderOriginal];
+        componentType[SymbolTypeSSRRenderOriginal] = undefined;
+        componentType[SymbolTypeSSRRenderResetCount] = 0;
+      } else {
+        componentType[SymbolTypeSSRRenderResetCount] = ssrRenderResetCount - 1;
+      }
+    }
     this._bean_render_original = null;
+    this._instance_ssrRender_original = null;
+    this._renderPatched = false;
+    this._ssrRenderReset = false;
   }
 
   private _getRender(): any {

package/zova/packages-zova/zova-core/src/core/context/util.ts

@@ -1,4 +1,4 @@
-import { setCurrentInstance } from '@cabloy/vue-runtime-core';
+import { withCurrentInstanceScope, withCurrentInstanceScopeSSR } from '@cabloy/vue-runtime-core';
 import { pauseTracking, resetTracking } from '@vue/reactivity';
 
 import { BeanSimple } from '../../bean/beanSimple.ts';
@@ -9,17 +9,21 @@ export class CtxUtil extends BeanSimple {
     if (this.ctx.disposed) {
       throwErrorComponentUnmounted();
     }
-    const reset = setCurrentInstance(this.ctx.instance as any);
-    if (!tracking) {
-      pauseTracking();
-    }
-    try {
-      return fn();
-    } finally {
+    const instance = this.ctx.instance as any;
+    const runner = process.env.SERVER ? withCurrentInstanceScopeSSR : withCurrentInstanceScope;
+    const result = runner(instance, () => {
       if (!tracking) {
-        resetTracking();
+        pauseTracking();
       }
-      reset();
-    }
+      try {
+        const result = fn();
+        return result;
+      } finally {
+        if (!tracking) {
+          resetTracking();
+        }
+      }
+    });
+    return result;
   }
 }

package/zova/packages-zova/zova-core/src/core/sys/config.ts

@@ -39,7 +39,7 @@ export interface ZovaConfig {
   ssr: {
     cookie: boolean;
     withVona: boolean;
-    ignoreCookieOnServer: boolean;
+    cookieDisabledOnServer: boolean;
     hmr: boolean;
   };
   ws: {