cabloy 5.1.240 → 5.1.242

package/zova/src/suite/a-commerce/modules/commerce-siteadmin/src/page/dashboard/controller.tsx

@@ -19,12 +19,18 @@ export class ControllerPageDashboard extends BeanControllerPageBase {
 
   protected render() {
     const query = this.queryOperatorContext;
+    const operator = query.data!;
+    const user = this.$passport.user;
+    const displayName =
+      user && String(user.id) === String(operator.userId)
+        ? this.$passport.displayName
+        : operator.displayName || operator.userName;
     return (
       <div class="p-6">
         <h1 class="text-2xl font-semibold">{this.scope.locale.CommerceAdministration()}</h1>
         <dl class="mt-4 grid max-w-xl grid-cols-[auto_1fr] gap-x-4 gap-y-2">
           <dt>{this.scope.locale.Operator()}</dt>
-          <dd>{query.data!.userName}</dd>
+          <dd>{displayName}</dd>
           <dt>{this.scope.locale.Instance()}</dt>
           <dd>{query.data!.instanceName || 'default'}</dd>
         </dl>

package/zova/src/suite/a-home/modules/home-api/src/api/openapi/types.ts

@@ -2596,6 +2596,7 @@ export interface components {
       | undefined;
     'home-user.dto.accountCurrent': {
       name: string;
+      displayName?: string | undefined;
       avatar?: string | undefined;
       locale?: unknown;
       tz?: string | undefined;
@@ -2605,7 +2606,7 @@ export interface components {
     };
     'home-user.dto.accountProfileUpdate': {
       /** @description Display name */
-      name: string;
+      displayName?: string | undefined;
       /**
        * Avatar
        * @description Absolute HTTPS avatar URL or API delivery URL
@@ -2673,6 +2674,7 @@ export interface components {
     'home-user.dto.passportUser': {
       id: number | string;
       name: string;
+      displayName?: string | undefined;
       avatar?: string | undefined;
       email?: string | undefined;
       mobile?: string | undefined;
@@ -2783,6 +2785,7 @@ export interface components {
       instanceName: string;
       userId: string;
       userName: string;
+      displayName?: string | undefined;
     };
     'commerce-promotion.dto.couponMineItem': {
       id: number | string;
@@ -3215,7 +3218,9 @@ export interface components {
       shippedAt: Date;
     };
     'commerce-trade.dto.orderShip': {
+      /** @description Carrier */
       carrier: string;
+      /** @description Tracking number */
       trackingNumber: string;
     };
     'commerce-trade.dto.orderSelectRes': {

package/zova/src/suite/a-home/modules/home-base/src/config/locale/en-us.ts

@@ -5,6 +5,7 @@ export default {
   LanguageEnglish: 'English',
   LanguageChinese: 'Chinese',
   LanguageJapanese: 'Japanese',
+  LanguageTraditionalChinese: 'Traditional Chinese',
   VonaIntegratedSsr: 'Vona integrated SSR',
   ZovaStandaloneSsr: 'Zova standalone SSR',
   SsrSite: 'SSR Site',

package/zova/src/suite/a-home/modules/home-base/src/config/locale/zh-cn.ts

@@ -5,6 +5,7 @@ export default {
   LanguageEnglish: '英语',
   LanguageChinese: '简体中文',
   LanguageJapanese: '日语',
+  LanguageTraditionalChinese: '繁体中文',
   VonaIntegratedSsr: 'Vona 集成式 SSR',
   ZovaStandaloneSsr: 'Zova 独立式 SSR',
   SsrSite: 'SSR 站点',

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.user.tsx

@@ -18,7 +18,7 @@ export class RenderUser extends BeanRenderBase {
                 this.$scopeBase.config.avatar.empty
               }
             />
-            {this.$passport.user?.name}
+            {this.$passport.displayName}
           </summary>
           <ul class="bg-base-100 rounded-t-none p-2 w-32">
             <li>

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.user.tsx

@@ -21,7 +21,9 @@ export class RenderUser extends BeanRenderBase {
                   ) || this.$scopeBase.config.avatar.empty
                 }
               />
-              {this.$passport.user?.name || this.scope.locale.NotLoggedIn()}
+              {this.$passport.isAuthenticated
+                ? this.$passport.displayName
+                : this.scope.locale.NotLoggedIn()}
             </summary>
             <ul class="bg-base-100 rounded-t-none p-2 w-40">
               {this.$passport.isAuthenticated ? (

package/zova/src/suite/a-home/modules/home-passport/src/model/passport.ts

@@ -187,6 +187,10 @@ export class ModelPassport extends BeanModelBase {
     return this.passport?.user;
   }
 
+  get displayName(): string | undefined {
+    return this.user?.displayName || this.user?.name;
+  }
+
   get roles() {
     return this.passport?.roles;
   }

package/zova/src/suite/a-home/modules/home-user/src/config/locale/en-us.ts

@@ -2,6 +2,7 @@ export default {
   AccountSettings: 'Account Settings',
   AccountProfile: 'Profile',
   AccountSecurity: 'Account Security',
+  AccountUserName: 'User name',
   AccountDisplayName: 'Display name',
   AccountLocale: 'Locale',
   AccountTimezone: 'Time zone',

package/zova/src/suite/a-home/modules/home-user/src/config/locale/zh-cn.ts

@@ -2,6 +2,7 @@ export default {
   AccountSettings: '账户设置',
   AccountProfile: '个人资料',
   AccountSecurity: '账户安全',
+  AccountUserName: '用户名',
   AccountDisplayName: '显示名称',
   AccountLocale: '语言区域',
   AccountTimezone: '时区',

package/zova/src/suite/a-home/modules/home-user/src/model/account.ts

@@ -21,8 +21,9 @@ export interface IModelOptionsAccount extends IDecoratorModelOptions {}
 
 export type AccountProfileUpdateCommand = Omit<
   ApiApiHomeUserAccountupdateProfileRequestBody,
-  'avatar' | 'locale' | 'tz'
+  'displayName' | 'avatar' | 'locale' | 'tz'
 > & {
+  displayName?: string | null;
   avatar?: string | null;
   locale?: string | null;
   tz?: string | null;

package/zova/src/suite/a-home/modules/home-user/src/page/account/controller.tsx

@@ -81,7 +81,11 @@ export class ControllerPageAccount extends BeanControllerPageBase {
   }
 
   async submitProfile(data: TypeFormOnSubmitData<ProfileDraft>) {
-    const current = await this.$$modelAccount.updateProfile().mutateAsync(data.value);
+    const displayName = data.value.displayName;
+    const current = await this.$$modelAccount.updateProfile().mutateAsync({
+      ...data.value,
+      displayName: displayName === undefined ? undefined : displayName?.trim() || null,
+    });
     this._resetProfileDraft(current);
     this.profileMessage = this.scope.locale.AccountProfileSaved();
   }
@@ -119,7 +123,7 @@ export class ControllerPageAccount extends BeanControllerPageBase {
   private _resetProfileDraft(current = this.queryCurrent?.data) {
     if (!current) return;
     this.profileDraft = {
-      name: current.name,
+      displayName: current.displayName ?? '',
       avatar: current.avatar ?? undefined,
       locale: typeof current.locale === 'string' ? current.locale : undefined,
       tz: current.tz ?? undefined,
@@ -254,8 +258,18 @@ export class ControllerPageAccount extends BeanControllerPageBase {
             );
           }}
         />
+        <label class="form-control gap-2">
+          <span class="label-text">{this.scope.locale.AccountUserName()}</span>
+          <input
+            class="input"
+            type="text"
+            readonly
+            autocomplete="username"
+            value={this.queryCurrent?.data?.name}
+          />
+        </label>
         <ZFormFieldPreset
-          name="name"
+          name="displayName"
           render="basic-input:formFieldInput"
           options={{ type: 'text' }}
         />

package/vona/src/suite-vendor/a-vona/modules/a-ratelimit/test/aggregate.test.ts

@@ -1,247 +0,0 @@
-import type { IMiddlewareSystemOptionsAggregate, RateLimitMode } from 'vona-module-a-ratelimit';
-
-import assert from 'node:assert/strict';
-import { randomUUID } from 'node:crypto';
-import { once } from 'node:events';
-import { createServer } from 'node:http';
-import { describe, it } from 'node:test';
-import { setTimeout } from 'node:timers/promises';
-import { cast, compose } from 'vona';
-import { app } from 'vona-mock';
-import { MiddlewareSystemAggregate, ServiceRateLimit } from 'vona-module-a-ratelimit';
-
-const exemptPath = '/api/test/vona/performAction/rateLimitExempt';
-const limitedPath = '/api/test/vona/performAction/rateLimit';
-
-type AdmitCommand = (key: string, windowMs: string) => Promise<[number, number]>;
-
-function createService(command: AdmitCommand) {
-  const service = app.bean._newBean(ServiceRateLimit);
-  Object.defineProperty(service, 'bean', {
-    value: { redis: { get: () => ({ rateLimitAdmit: command }) } },
-  });
-  return service;
-}
-
-type Request = (path: string, options?: RequestInit) => Promise<Response>;
-
-async function withGate(
-  mode: RateLimitMode,
-  limit: number,
-  command: AdmitCommand,
-  fn: (request: Request) => Promise<void>,
-) {
-  await app.bean.executor.mockCtx(async () => {
-    const middleware = app.bean._newBean(MiddlewareSystemAggregate);
-    Object.defineProperty(middleware, 'scope', {
-      value: { service: { rateLimit: createService(command) } },
-    });
-    const policyName = `test-aggregate-${randomUUID()}`;
-    // Keep admission and its listener local; never patch the shared application chain.
-    const chain = compose([
-      (_ctx, next) => middleware.execute({ rateLimit: { mode, limit } }, next),
-      ...app.middleware,
-    ]);
-    const server = createServer((req, res) => {
-      void app.bean.executor
-        .newCtx(
-          () => {
-            app.ctx.onionsDynamic = {
-              interceptor: { 'a-ratelimit:rateLimit': { rateLimit: { name: policyName } } },
-            };
-            return cast(app).handleRequest(app.ctx, chain);
-          },
-          { dbInfo: { level: 0 }, innerAccess: false, req, res },
-        )
-        .catch(error => res.destroy(error));
-    });
-    try {
-      server.listen(0, '127.0.0.1');
-      await once(server, 'listening');
-      const address = server.address();
-      assert.ok(address && typeof address !== 'string');
-      await fn((path, options) =>
-        fetch(`http://127.0.0.1:${address.port}${path}`, {
-          ...options,
-          headers: { accept: 'application/json', ...options?.headers },
-          signal: AbortSignal.timeout(10_000),
-        }),
-      );
-    } finally {
-      await new Promise<void>((resolve, reject) => {
-        server.close(error => (error ? reject(error) : resolve()));
-        server.closeAllConnections();
-      });
-      const redis = app.bean.redis.get('limiter');
-      const prefix = redis.options.keyPrefix ?? '';
-      const keys = await redis.keys(`${prefix}rate-limit:v1:*:${encodeURIComponent(policyName)}:*`);
-      if (keys.length) await redis.del(...keys.map(key => key.slice(prefix.length)));
-    }
-  });
-}
-
-function counter(): AdmitCommand {
-  let current = 0;
-  return async () => [++current, 1_000];
-}
-
-describe('aggregate.test.ts', { concurrency: false }, () => {
-  it('shares an atomic Redis budget across request contexts and expires its counter', async () => {
-    const key = `test:aggregate:${randomUUID()}`;
-    const redis = cast(app.bean.redis.get('limiter'));
-    const keys: string[] = [];
-    // Isolate this test's bucket without changing the production key dimensions or TTL.
-    const service = createService((actualKey, windowMs) => {
-      keys.push(actualKey);
-      return redis.rateLimitAdmit(key, windowMs);
-    });
-    try {
-      const results = await Promise.all(
-        [0, 1, 2, 3].map(index =>
-          app.bean.executor.mockCtx(async () => {
-            app.ctx.req.url = `/aggregate-${index}`;
-            return service.admitAggregate({
-              mode: 'enforce',
-              limit: 2,
-            });
-          }),
-        ),
-      );
-      assert.equal(results.filter(result => result.allowed).length, 2);
-      assert.ok(keys.every(actualKey => /^rate-limit:aggregate:v1:\d+$/.test(actualKey)));
-      assert.equal(await redis.get(key), '4');
-      const ttl = await redis.pttl(key);
-      assert.ok(ttl > 0 && ttl <= 1_000);
-      await setTimeout(ttl + 20);
-      assert.equal(await redis.get(key), null);
-      await app.bean.executor.mockCtx(async () => {
-        const result = await service.admitAggregate({
-          mode: 'enforce',
-          limit: 2,
-        });
-        assert.equal(result.allowed, true);
-        assert.equal(result.remaining, 1);
-      });
-    } finally {
-      await redis.del(key);
-    }
-  });
-
-  it('counts health, preflight, unknown paths and identity-exempt actions in one HTTP budget', async () => {
-    await withGate('enforce', 3, counter(), async request => {
-      const health = await request('/health/live');
-      assert.equal(health.status, 200);
-      await health.text();
-      const preflight = await request('/aggregate-unknown', {
-        method: 'OPTIONS',
-        headers: { 'origin': 'https://example.test', 'access-control-request-method': 'GET' },
-      });
-      assert.notEqual(preflight.status, 429);
-      await preflight.text();
-      const unknown = await request(`/aggregate-unknown-${randomUUID()}`);
-      assert.equal(unknown.status, 404);
-      await unknown.text();
-      const rejected = await request(exemptPath);
-      assert.equal(rejected.status, 429);
-      assert.equal(rejected.headers.get('retry-after'), '1');
-      assert.equal(rejected.headers.get('ratelimit-limit'), null);
-      assert.deepEqual(await rejected.json(), { code: 429, message: 'Too Many Requests' });
-    });
-  });
-
-  it('observes excess requests without rejecting or replacing identity headers', async () => {
-    await withGate('observe', 1, counter(), async request => {
-      for (let index = 0; index < 2; index++) {
-        const response = await request(exemptPath);
-        assert.equal(response.status, 200);
-        assert.equal(response.headers.get('ratelimit-limit'), null);
-        assert.equal(response.headers.get('retry-after'), null);
-        await response.text();
-      }
-    });
-    await withGate('enforce', 100, counter(), async request => {
-      for (let index = 0; index < 2; index++) {
-        const response = await request(limitedPath);
-        assert.equal(response.status, 200);
-        assert.equal(response.headers.get('ratelimit-limit'), '2');
-        await response.text();
-      }
-      const response = await request(limitedPath);
-      assert.equal(response.status, 429);
-      assert.equal(response.headers.get('ratelimit-limit'), '2');
-      await response.text();
-    });
-  });
-
-  it('fails open only in observe mode and preserves HTTP 503 for HTML callers', async () => {
-    const unavailable: AdmitCommand = async () => {
-      throw new Error('redis unavailable');
-    };
-    await withGate('observe', 1, unavailable, async request => {
-      const response = await request('/health/live');
-      assert.equal(response.status, 200);
-      await response.text();
-    });
-    await withGate('enforce', 1, unavailable, async request => {
-      const response = await request(exemptPath, { headers: { accept: 'text/html' } });
-      assert.equal(response.status, 503);
-      assert.match(response.headers.get('content-type')!, /application\/json/);
-      assert.equal(response.headers.get('retry-after'), null);
-      assert.deepEqual(await response.json(), { code: 503, message: 'Service Unavailable' });
-    });
-  });
-
-  it('keeps competing gates and the shared application listener independent', async () => {
-    await Promise.all([
-      withGate(
-        'enforce',
-        1,
-        async () => [2, 1_000],
-        async request => {
-          const response = await request('/health/live');
-          assert.equal(response.status, 429);
-          await response.text();
-          const address = app.server.address();
-          assert.ok(address && typeof address !== 'string');
-          const shared = await fetch(`http://127.0.0.1:${address.port}/health/live`, {
-            signal: AbortSignal.timeout(10_000),
-          });
-          assert.equal(shared.status, 200);
-          await shared.text();
-        },
-      ),
-      withGate(
-        'enforce',
-        1,
-        async () => [1, 1_000],
-        async request => {
-          const response = await request('/health/live');
-          assert.equal(response.status, 200);
-          await response.text();
-        },
-      ),
-    ]);
-  });
-
-  it('requires valid explicit configuration even in observe mode', async () => {
-    await app.bean.executor.mockCtx(async () => {
-      const middleware = app.bean._newBean(MiddlewareSystemAggregate);
-      let downstream = false;
-      const next = async () => {
-        downstream = true;
-      };
-      for (const options of [
-        {},
-        { rateLimit: { mode: 'observe', limit: 0 } },
-        { rateLimit: { mode: 'observe', limit: 1.5 } },
-        { rateLimit: { mode: 'invalid', limit: 1 } },
-      ]) {
-        await assert.rejects(
-          middleware.execute(options as IMiddlewareSystemOptionsAggregate, next),
-          /rate-limit aggregate/,
-        );
-      }
-      assert.equal(downstream, false);
-    });
-  });
-});