itube-specs 0.0.1025 → 0.0.1027

package/components/player/channel.vue

@@ -32,7 +32,7 @@
       {{ $t('subscribe') }}
     </button>
     <span
-      v-if="subscribersCount"
+      v-if="subscribersCount && featureFlags.FeatureFollowEnabled"
       class="player-channel__count"
     >{{ $n(subscribersCount, 'compact') }}</span>
   </div>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.1025",
+  "version": "0.0.1027",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {

package/server/middleware/locale-redirect.ts

@@ -18,6 +18,7 @@ export default defineEventHandler((event) => {
     subdomains,
     codes,
     defaultCode,
+    protocol: getRequestProtocol(event, { xForwardedProto: true }),
   });
 
   if (vary) setResponseHeader(event, 'Vary', 'Accept-Language, Cookie');

package/server/utils/__tests__/locale-redirect.test.ts

@@ -25,12 +25,18 @@ describe('resolveLocaleRedirect', () => {
     subdomains: { ru: 'ru', ja: 'jp', de: 'de' },
     codes: CODES,
     defaultCode: 'en',
+    protocol: 'https',
   };
 
   it('уводит с базового домена на поддомен языка браузера', () => {
     expect(resolveLocaleRedirect(base)).toEqual({ vary: true, location: 'https://jp.a.com/videos?page=2' });
   });
 
+  it('протокол — как у запроса: локально без прокси остаётся http', () => {
+    expect(resolveLocaleRedirect({ ...base, headers: { ...base.headers, host: 'localhost:3200' }, protocol: 'http' }).location)
+      .toBe('http://jp.localhost:3200/videos?page=2');
+  });
+
   it('язык браузера — дефолтный: без редиректа, но с Vary', () => {
     expect(resolveLocaleRedirect({ ...base, headers: { ...base.headers, 'accept-language': 'en-US' } })).toEqual({ vary: true });
   });

package/server/utils/locale-redirect.ts

@@ -52,6 +52,8 @@ export interface ILocaleRedirectInput {
   subdomains: LocaleSubdomains
   codes: readonly string[]
   defaultCode: string
+  /** Протокол запроса (`getRequestProtocol` с учётом x-forwarded-proto): без прокси локально — http. */
+  protocol: string
 }
 
 export interface ILocaleRedirectDecision {
@@ -69,7 +71,7 @@ export interface ILocaleRedirectDecision {
  * переключателем, а cookie могла не доехать: на localhost она живёт только на своём поддомене.
  */
 export function resolveLocaleRedirect(input: ILocaleRedirectInput): ILocaleRedirectDecision {
-  const { method, path, headers, langCookie, subdomains, codes, defaultCode } = input;
+  const { method, path, headers, langCookie, subdomains, codes, defaultCode, protocol } = input;
   const skip = { vary: false };
 
   if (method !== 'GET') return skip;
@@ -97,7 +99,6 @@ export function resolveLocaleRedirect(input: ILocaleRedirectInput): ILocaleRedir
   const target = localeDomain(detected, baseDomainFromHost(host, subdomains), subdomains);
   if (target === host) return { vary: true };
 
-  const protocol = headers['x-forwarded-proto'] || 'https';
 
   return { vary: true, location: `${protocol}://${target}${path}` };
 }