cabloy 5.1.232 → 5.1.234

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-socket",
-  "version": "5.1.17",
+  "version": "5.1.18",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-socket/src/service/socket.ts

@@ -75,8 +75,13 @@ export class ServiceSocket extends BeanBase {
           this.bean.socket.addClient(ws);
           // compose
           await this._getComposeSocketConnections(ws.namespace)({ method: 'enter', ws });
+          if (ws.readyState !== WebSocket.OPEN) {
+            this.bean.socket.removeClient(ws);
+            return;
+          }
         } catch (err: any) {
           this.app.handleError(err);
+          this.bean.socket.removeClient(ws);
           // terminate
           ws.terminate();
           return;

package/vona/src/suite-vendor/a-cabloy/modules/a-socket/test/socket.test.ts

@@ -0,0 +1,122 @@
+import type { IncomingMessage } from 'node:http';
+
+import assert from 'node:assert/strict';
+import { once } from 'node:events';
+import { after, before, describe, it } from 'node:test';
+import { setTimeout } from 'node:timers/promises';
+import { acquireTestLock, app } from 'vona-mock';
+import { WebSocket } from 'ws';
+
+import { socketEventRecord } from '../src/types/socketEvent.ts';
+
+describe('socket.test.ts', { concurrency: false, timeout: 15000 }, () => {
+  let release: () => void;
+
+  before(async () => {
+    release = await acquireTestLock('a-security');
+  });
+
+  after(() => {
+    release();
+  });
+
+  it('rejects a disallowed origin before event initialization without retaining the client', async () => {
+    await withConnection(
+      'https://socket-rejected.invalid',
+      undefined,
+      async (client, server, messages) => {
+        await once(client, 'close');
+        assert.equal(typeof server.sendEvent, 'undefined');
+        assert.deepEqual(messages, []);
+        await assertClientRemoved(server);
+      },
+    );
+  });
+
+  it('sends one ready event for an accepted connection and removes it on close', async () => {
+    await withConnection(undefined, undefined, async (client, server, messages) => {
+      if (!messages.length) await once(client, 'message');
+      await app.bean.executor.mockCtx(async () => {
+        const scope = app.scope('a-socket');
+        assert.deepEqual(messages, [
+          `${scope.config.eventPrefix}${JSON.stringify([socketEventRecord.sysReady, null])}`,
+        ]);
+        assert.equal(app.bean.socket.getClient(server.id), server);
+        assert.ok(app.bean.socket.clientsNamespace[server.namespace]?.includes(server.id));
+      });
+      const closed = once(client, 'close');
+      client.close();
+      await closed;
+      await assertClientRemoved(server);
+      assert.equal(messages.length, 1);
+    });
+  });
+
+  it('removes a client when passport initialization throws after event initialization', async () => {
+    await withConnection(
+      undefined,
+      'invalid-socket-test-token',
+      async (client, server, messages) => {
+        await once(client, 'close');
+        assert.equal(typeof server.sendEvent, 'function');
+        assert.deepEqual(messages, []);
+        await assertClientRemoved(server);
+      },
+    );
+  });
+});
+
+async function withConnection(
+  origin: string | undefined,
+  passportCode: string | undefined,
+  fn: (client: WebSocket, server: WebSocket, messages: string[]) => Promise<void>,
+) {
+  const address = app.server.address();
+  assert.ok(address && typeof address !== 'string');
+  const scope = app.scope('a-socket');
+  const url = new URL(`http://127.0.0.1:${address.port}${scope.config.globalPrefix}/`);
+  url.searchParams.set(scope.config.queryKey.instanceName, '');
+  url.searchParams.set('socketTest', crypto.randomUUID());
+  if (passportCode) url.searchParams.set(scope.config.queryKey.passportCode, passportCode);
+  const requestUrl = `${url.pathname}${url.search}`;
+  url.protocol = 'ws:';
+
+  const connected = Promise.withResolvers<WebSocket>();
+  let server: WebSocket | undefined;
+  const onConnection = (ws: WebSocket, req: IncomingMessage) => {
+    if (req.url !== requestUrl) return;
+    server = ws;
+    connected.resolve(ws);
+  };
+  app.wss.on('connection', onConnection);
+  const client = new WebSocket(url, { origin, handshakeTimeout: 5000 });
+  client.on('error', connected.reject);
+  const messages: string[] = [];
+  client.on('message', data => messages.push(data.toString()));
+  try {
+    await fn(client, await connected.promise, messages);
+  } finally {
+    app.wss.off('connection', onConnection);
+    if (client.readyState !== WebSocket.CLOSED) {
+      const closed = once(client, 'close');
+      client.terminate();
+      await closed;
+    }
+    if (server) {
+      await app.bean.executor.mockCtx(async () => {
+        app.bean.socket.removeClient(server!);
+      });
+    }
+  }
+}
+
+async function assertClientRemoved(server: WebSocket) {
+  await app.bean.executor.mockCtx(async () => {
+    // The peer close event can arrive before asynchronous server-side exit hooks finish.
+    for (let attempt = 0; attempt < 100 && app.bean.socket.getClient(server.id); attempt++) {
+      await setTimeout(10);
+    }
+    assert.equal(app.bean.socket.getClient(server.id), undefined);
+    assert.equal(app.bean.socket.clientsNamespace[server.namespace]?.includes(server.id), false);
+  });
+}

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

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

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

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

package/zova/package.original.json

@@ -81,6 +81,7 @@
     "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.10",
     "@types/node": "^22.19.17",
     "@vitejs/plugin-vue": "^6.0.7",
+    "code-inspector-plugin": "2.0.9",
     "concurrently": "^10.0.4",
     "quasar-app-extension-zova": "^1.3.2",
     "sass": "^1.101.0",

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

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

package/zova/packages-cli/cli-set-front/cli/templates/create/page/snippets/routes.ts

@@ -1,6 +1,6 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
 
-const __snippet_declare = "import { ZPage<%=argv.nameMeta.fullCapitalize%> } from './.metadata/page/<%=argv.pageName%>.js';\n";
+const __snippet_declare = "import { ZPage<%=argv.nameMeta.fullCapitalize%> } from './.metadata/page/<%=argv.pageName%>.ts';\n";
 const __snippet_body = '{ path: \'<%=argv.moduleInfo.name!==argv.pageName?argv.pageName:""%>\', component: ZPage<%=argv.nameMeta.fullCapitalize%> },';
 
 export default metadataCustomSnippet({

package/zova/packages-cli/cli-set-front/cli/templates/refactor/anotherRender/snippets/render.ts

@@ -19,7 +19,7 @@ export default metadataCustomSnippet({
       ast = ast.replace(" } from 'zova';", ", Use } from 'zova';");
     }
     ast = ast
-      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.renderClassName} } from './render.${argv.renderName}.jsx';`)
+      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.renderClassName} } from './render.${argv.renderName}.tsx';`)
       .replace(
         'extends BeanRenderBase {',
         `extends BeanRenderBase {\n  @Use()\n  $$$$render${argv.renderNameCapitalize}: ${argv.renderClassName};\n`,

package/zova/packages-cli/cli-set-front/cli/templates/refactor/anotherStyle/snippets/style.ts

@@ -19,7 +19,7 @@ export default metadataCustomSnippet({
       ast = ast.replace(" } from 'zova';", ", Use } from 'zova';");
     }
     ast = ast
-      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.styleClassName} } from './style.${argv.styleName}.js';`)
+      .replace("from 'zova-module-a-bean';", `from 'zova-module-a-bean';\nimport { ${argv.styleClassName} } from './style.${argv.styleName}.ts';`)
       .replace('extends BeanStyleBase {', `extends BeanStyleBase {\n  @Use()\n  $$$$style${argv.styleNameCapitalize}: ${argv.styleClassName};\n`);
     // ok
     return ast;

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.119",
+  "version": "1.2.120",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [
@@ -70,7 +70,7 @@
     "vite": "^8.3.4",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.50"
+    "zova-vite": "^1.1.51"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.openapi.generate.ts

@@ -192,7 +192,7 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     const indexFile = path.join(module.root, 'src/api/openapi/index.ts');
     await fse.outputFile(
       indexFile,
-      "export * from './baseURL.js';\nexport * from './schemas.js';\nexport * from './types.js';",
+      "export * from './baseURL.ts';\nexport * from './schemas.ts';\nexport * from './types.ts';",
     );
     await this.helper.formatFile({ fileName: indexFile });
     return cache;
@@ -218,7 +218,7 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     }
     let contentSchemas = typeSchemas.join('\n');
     if (contentSchemas.includes('components["schemas"]')) {
-      contentSchemas = `import type { components } from './types.js';\n${contentSchemas}`;
+      contentSchemas = `import type { components } from './types.ts';\n${contentSchemas}`;
     }
     contentSchemas = `// eslint-disable\n${contentSchemas}`;
     return contentSchemas;
@@ -419,11 +419,11 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     if (contentTypes2.includes('paths[')) importsOpenapiType.push('paths');
     const contentImportsOpenapiValue =
       importsOpenapiValue.length > 0
-        ? `import { ${importsOpenapiValue.join(', ')} } from './openapi/index.js';`
+        ? `import { ${importsOpenapiValue.join(', ')} } from './openapi/index.ts';`
         : '';
     const contentImportsOpenapiType =
       importsOpenapiType.length > 0
-        ? `import type { ${importsOpenapiType.join(', ')} } from './openapi/index.js';`
+        ? `import type { ${importsOpenapiType.join(', ')} } from './openapi/index.ts';`
         : '';
     const contentImportsOpenapi = [contentImportsOpenapiValue, contentImportsOpenapiType]
       .filter(item => !!item)
@@ -457,7 +457,7 @@ export class Api${apiName} extends BeanApiBase {
     }
     const contentImportsApiPath =
       importsApiPath.length > 0
-        ? `import { ${importsApiPath.join(', ')} } from '../api/${apiNameLower}.js';`
+        ? `import { ${importsApiPath.join(', ')} } from '../api/${apiNameLower}.ts';`
         : '';
     const apiMetaContent = `import { BeanBase } from 'zova';
 import { ApiMeta } from 'zova-module-a-api';

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.refactor.renameComponent.ts

@@ -79,8 +79,8 @@ export class CliRefactorRenameComponent extends BeanCliBase {
     let content = (await fse.readFile(routesFile)).toString();
     //
     content = content.replace(
-      `import { ZPage${argv.nameMeta.shortCapitalize} } from './.metadata/page/${argv.nameMeta.short}.js';`,
-      `import { ZPage${argv.componentNameNewCapitalize} } from './.metadata/page/${argv.componentNameNew}.js';`,
+      `import { ZPage${argv.nameMeta.shortCapitalize} } from './.metadata/page/${argv.nameMeta.short}.ts';`,
+      `import { ZPage${argv.componentNameNewCapitalize} } from './.metadata/page/${argv.componentNameNew}.ts';`,
     );
     //
     const ast = gogocode(content);

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

@@ -26,7 +26,7 @@ import { generateOptionsPackage } from './toolsMetadata/generateOptionsPackage.t
 import { generateScope } from './toolsMetadata/generateScope.ts';
 import { generateScopeResources } from './toolsMetadata/generateScopeResources.ts';
 import { generateScopeResourcesMeta } from './toolsMetadata/generateScopeResourcesMeta.ts';
-import { globAllTsFiles } from './toolsMetadata/utils.ts';
+import { escapeRegExp, globAllTsFiles } from './toolsMetadata/utils.ts';
 
 declare module '@cabloy/cli' {
   interface ICommandArgv {
@@ -215,20 +215,42 @@ export class CliToolsMetadata extends BeanCliBase {
 
   async _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string) {
     const thisDest = path.join(modulePath, 'src/.metadata/this.ts');
-    if (await fse.pathExists(thisDest)) return;
+    const exportLine = `export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts';`;
+    if (await fse.pathExists(thisDest)) {
+      const content = await fse.readFile(thisDest, 'utf8');
+      const migrated = this._migrateOwnedExport(content, exportLine);
+      if (migrated !== content) await fse.writeFile(thisDest, migrated);
+      return;
+    }
     const content = `export const __ThisModule__ = '${moduleName}';
-export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.js';
+${exportLine}
 `;
     // save
     await fse.writeFile(thisDest, content);
   }
 
+  _migrateOwnedExport(content: string, exportLine: string) {
+    const pattern = escapeRegExp(exportLine)
+      .replace('\\.ts', '\\.(?:js|ts)')
+      .replaceAll("'", '[\'"]');
+    let seen = false;
+    return content.replace(
+      new RegExp(`^([ \\t]*)${pattern}([ \\t]*)(\\r?)(\\n|$)`, 'gm'),
+      (_line, indent, trailing, carriageReturn, newline) => {
+        if (seen) return '';
+        seen = true;
+        return `${indent}${exportLine}${trailing}${carriageReturn}${newline}`;
+      },
+    );
+  }
+
   async _prependExportIfNeeded(
     jsContent: string,
     exportLine: string,
     sourceFile: string,
     modulePath: string,
   ) {
+    jsContent = this._migrateOwnedExport(jsContent, exportLine);
     const sourcePath = path.join(modulePath, sourceFile);
     if ((await fse.pathExists(sourcePath)) && !jsContent.includes(exportLine)) {
       return `${exportLine}\n${jsContent}`;
@@ -244,25 +266,25 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.js'
     }
     jsContent = await this._prependExportIfNeeded(
       jsContent,
-      "export * from './types/index.js';",
+      "export * from './types/index.ts';",
       'src/types/index.ts',
       modulePath,
     );
     jsContent = await this._prependExportIfNeeded(
       jsContent,
-      "export * from './lib/index.js';",
+      "export * from './lib/index.ts';",
       'src/lib/index.ts',
       modulePath,
     );
     jsContent = await this._prependExportIfNeeded(
       jsContent,
-      "export * from './.metadata/locales.js';",
+      "export * from './.metadata/locales.ts';",
       'src/.metadata/locales.ts',
       modulePath,
     );
     jsContent = await this._prependExportIfNeeded(
       jsContent,
-      "export * from './.metadata/index.js';",
+      "export * from './.metadata/index.ts';",
       'src/.metadata/index.ts',
       modulePath,
     );

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

@@ -7,8 +7,8 @@ export async function generateConfig(modulePath: string) {
   if (!(await fse.pathExists(configFile))) return '';
   // combine
   const content = `/** config: begin */
-export * from '../config/config.js';
-import { config } from '../config/config.js';
+export * from '../config/config.ts';
+import { config } from '../config/config.ts';
 /** config: end */
 `;
   return content;
@@ -19,8 +19,8 @@ export async function generateConstant(modulePath: string) {
   if (!(await fse.pathExists(constantFile))) return '';
   // combine
   const content = `/** constant: begin */
-export * from '../config/constants.js';
-import { constants } from '../config/constants.js';
+export * from '../config/constants.ts';
+import { constants } from '../config/constants.ts';
 /** constant: end */
 `;
   return content;
@@ -35,7 +35,7 @@ export async function generateLocale1(modulePath: string) {
   for (const file of files) {
     const localeName = path.basename(file, '.ts');
     const className = `locale_${localeName.replace('-', '_')}`;
-    contentImports.push(`import ${className} from '../config/locale/${localeName}.js';`);
+    contentImports.push(`import ${className} from '../config/locale/${localeName}.ts';`);
     contentLocales.push(`  '${localeName}': ${className},`);
   }
   // combine
@@ -52,7 +52,7 @@ export async function generateLocale2(contentLocales: string) {
   if (!contentLocales) return '';
   // combine
   const content = `/** locale: begin */
-import { locales } from './locales.js';
+import { locales } from './locales.ts';
 /** locale: end */
 `;
   return content;
@@ -63,8 +63,8 @@ export async function generateError(modulePath: string) {
   if (!(await fse.pathExists(errorFile))) return '';
   // combine
   const content = `/** error: begin */
-export * from '../config/errors.js';
-import { errors } from '../config/errors.js';
+export * from '../config/errors.ts';
+import { errors } from '../config/errors.ts';
 /** error: end */
 `;
   return content;

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

@@ -22,7 +22,7 @@ async function generateMonkey_common(modulePath: string, commandName: string) {
   if (!(await fse.pathExists(monkeyFile))) return '';
   // combine
   const content = `/** ${commandName}: begin */
-export * from '../${commandName}.js';
+export * from '../${commandName}.ts';
 /** ${commandName}: end */
 `;
   return content;
@@ -33,7 +33,7 @@ async function generateMain_common(modulePath: string, commandName: string) {
   if (!(await fse.pathExists(monkeyFile))) return '';
   // combine
   const content = `/** ${commandName}: begin */
-export * from '../${commandName}.js';
+export * from '../${commandName}.ts';
 /** ${commandName}: end */
 `;
   return content;

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

@@ -42,7 +42,7 @@ export async function generateScope(
   // combine
   const content = `/** scope: begin */
 import { ${contentImports.join(', ')} } from 'zova';
-import { Scope } from '${moduleName === 'a-bean' ? '../lib/scope.js' : 'zova-module-a-bean'}';
+import { Scope } from '${moduleName === 'a-bean' ? '../lib/scope.ts' : 'zova-module-a-bean'}';
 
 @Scope()
 export class ScopeModule${relativeNameCapitalize} extends BeanScopeBase {}

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

@@ -14,7 +14,7 @@ export async function generateScopeResourcesMeta(
   if (globFiles.length === 0) return '';
   // combine
   const content = `/** meta ${metaName}: begin */
-import { Meta${toUpperCaseFirstChar(metaName)} } from '../bean/meta.${metaName}.js';
+import { Meta${toUpperCaseFirstChar(metaName)} } from '../bean/meta.${metaName}.ts';
 /** meta ${metaName}: end */
 `;
   return content;

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

@@ -42,12 +42,8 @@ export async function globAllTsFiles(
     if (fileName.startsWith('_')) continue;
     const parts = fileName.split('.').slice(0, -1);
     const isIgnore = checkIgnoreOfParts(parts);
-    const fileNameJS = fileName.replace('.ts', '.js').replace('.tsx', '.jsx');
-    const fileNameJSRelative = path
-      .relative(pathMetadata, filePath)
-      .replace(/\\/g, '/')
-      .replace('.ts', '.js')
-      .replace('.tsx', '.jsx');
+    const fileNameJS = fileName;
+    const fileNameJSRelative = path.relative(pathMetadata, filePath).replace(/\\/g, '/');
     const fileContent = fse.readFileSync(filePath).toString();
     const isVirtual = fileContent.includes('@Virtual()');
     const isPreload = fileContent.includes('@Preload()');