akanjs 3.1.0 → 3.1.1-rc.0

package/base/primitiveRegistry.ts

@@ -1,3 +1,6 @@
+
+
+import "dayjs/locale/ko";
 import dayjsLib, { type Dayjs } from "dayjs";
 import { CLIENT_VALUE, DEFAULT_VALUE, EXAMPLE_VALUE, PURIFIED_VALUE, SERVER_VALUE } from "./symbols";
 import type { Cls } from "./types";

package/client/dictionaryAsset.ts

@@ -0,0 +1,32 @@
+import { type Dictionary, TranslatorState } from "./translatorState";
+
+interface DictionaryModule {
+  lang: string;
+  default: Dictionary;
+}
+
+export class DictionaryAsset {
+  static readonly #loads = new Map<string, Promise<DictionaryModule>>();
+  static #retrySeq = 0;
+
+  static async load(url: string | null | undefined): Promise<void> {
+    if (!url) return;
+    const loading = DictionaryAsset.#loads.get(url) ?? DictionaryAsset.#import(url);
+    DictionaryAsset.#loads.set(url, loading);
+    const { lang, default: dictionary } = await loading;
+    TranslatorState.replace(lang, dictionary);
+  }
+
+  static async #import(url: string): Promise<DictionaryModule> {
+    try {
+      return (await import(url)) as DictionaryModule;
+    } catch {
+      try {
+        return (await import(`${url}?retry=${++DictionaryAsset.#retrySeq}`)) as DictionaryModule;
+      } catch (error) {
+        DictionaryAsset.#loads.delete(url);
+        throw error;
+      }
+    }
+  }
+}

package/client/index.ts

@@ -11,6 +11,7 @@ export * from "./href";
 export * from "./locale";
 export * from "./makePageProto";
 export * from "./mcpView";
+export * from "./nativeHost";
 export * from "./resolveServerUrl";
 export * from "./route";
 export * from "./router";

package/client/makePageProto.tsx

@@ -1,5 +1,5 @@
 import { getEnv } from "akanjs/base";
-import { parseAkanI18nEnv } from "akanjs/common";
+import { parseAkanI18nEnv, RequestLocale } from "akanjs/common";
 import { untrackedHeaders, untrackedRequest } from "akanjs/fetch";
 import type { ReactNode } from "react";
 import { csrLocation } from "./csrLocation";
@@ -36,21 +36,15 @@ const getPageInfo = (): { locale: string; path: string } => {
     return { locale, path: hasLocalePrefix ? `/${rest.join("/")}` : pathname };
   }
   const h = untrackedHeaders();
-  
-  const localeHeader = h.get("x-locale");
-  const pathHeader = h.get("x-path");
-  if (localeHeader && pathHeader) return { locale: localeHeader, path: pathHeader };
   const req = untrackedRequest();
-  if (req) {
-    const urlPath = new URL(req.url).pathname;
-    const [, firstSegment = "", ...rest] = urlPath.split("/");
-    if (!localeHeader && !localeSet.has(firstSegment)) return { locale: defaultLocale, path: pathHeader ?? urlPath };
-    return {
-      locale: localeHeader ?? (firstSegment || defaultLocale),
-      path: pathHeader ?? `/${rest.join("/")}`,
-    };
-  }
-  return { locale: localeHeader ?? defaultLocale, path: pathHeader ?? "/" };
+  return RequestLocale.resolve(
+    {
+      localeHeader: h.get("x-locale"),
+      pathHeader: h.get("x-path"),
+      pathname: req ? new URL(req.url).pathname : undefined,
+    },
+    { defaultLocale, locales },
+  );
 };
 
 export interface TransMessageOption {

package/client/native.ts

@@ -1,4 +1,3 @@
-import { isNative, platform } from "../vendor/@akanjs/native/packages/core/src/index.ts";
 import { browser } from "../vendor/@akanjs/native/plugins/browser/src/index.ts";
 import { opener } from "../vendor/@akanjs/native/plugins/opener/src/index.ts";
 
@@ -50,30 +49,10 @@ export { markReady, updates, useUpdateState } from "../vendor/@akanjs/native/plu
 export type { VolumeState } from "../vendor/@akanjs/native/plugins/volume/src/index.ts";
 export { volume } from "../vendor/@akanjs/native/plugins/volume/src/index.ts";
 export { useLiveValue, usePluginEvent } from "../vendor/@akanjs/native/packages/react/src/index.ts";
+export { desktopPlatform, isNativeApp, isNativeShell, nativePlatform, openExternalUrl } from "./nativeHost";
 export { browser, opener };
 
 export const loadCamera = () => import("../vendor/@akanjs/native/plugins/camera/src/index.ts");
 export const loadContacts = () => import("../vendor/@akanjs/native/plugins/contacts/src/index.ts");
 export const loadGeolocation = () => import("../vendor/@akanjs/native/plugins/geolocation/src/index.ts");
 export const loadIap = () => import("../vendor/@akanjs/native/plugins/iap/src/index.ts");
-
-/** Inside an iOS or Android shell of the native runtime; a mobile target opened in a browser is not. */
-export const isNativeApp = () => isNative && (platform === "ios" || platform === "android");
-
-/** Inside any shell of the native runtime, desktop included. */
-export const isNativeShell = () => isNative;
-
-export const nativePlatform = () => (isNativeApp() ? (platform as "ios" | "android") : null);
-
-export const desktopPlatform = () =>
-  isNative && (platform === "macos" || platform === "windows" || platform === "linux") ? platform : null;
-
-/** http(s) in the in-app browser, anything else (mailto:, tel:) in the app the system picks. */
-export const openExternalUrl = async (url: string) => {
-  if (!isNativeApp()) {
-    window.open(url, "_blank", "noopener,noreferrer");
-    return;
-  }
-  if (/^https?:/i.test(url)) await browser.open({ url });
-  else await opener.openUrl({ url });
-};

package/client/nativeHost.ts

@@ -0,0 +1,22 @@
+import { isNative, platform } from "../vendor/@akanjs/native/packages/core/src/index.ts";
+
+/** Inside an iOS or Android shell of the native runtime; a mobile target opened in a browser is not. */
+export const isNativeApp = () => isNative && (platform === "ios" || platform === "android");
+
+/** Inside any shell of the native runtime, desktop included. */
+export const isNativeShell = () => isNative;
+
+export const nativePlatform = () => (isNativeApp() ? (platform as "ios" | "android") : null);
+
+export const desktopPlatform = () =>
+  isNative && (platform === "macos" || platform === "windows" || platform === "linux") ? platform : null;
+
+/** http(s) in the in-app browser, anything else (mailto:, tel:) in the app the system picks. */
+export const openExternalUrl = async (url: string) => {
+  if (!isNativeApp()) {
+    window.open(url, "_blank", "noopener,noreferrer");
+    return;
+  }
+  if (/^https?:/i.test(url)) await (await import("../vendor/@akanjs/native/plugins/browser/src/index.ts")).browser.open({ url });
+  else await (await import("../vendor/@akanjs/native/plugins/opener/src/index.ts")).opener.openUrl({ url });
+};

package/client/translator.ts

@@ -1,67 +1,38 @@
 import { interpolateTranslation, parseAkanI18nEnv, pathGetLoose } from "akanjs/common";
 
-export interface Dictionary {
-  [key: string]: {
-    [key: string]: unknown;
-  };
-}
-export interface AllDictionary {
-  [key: string]: Dictionary;
-}
+import { type AllDictionary, type Dictionary, TranslatorState } from "./translatorState";
 
-interface TranslatorState {
-  langDictionaryMap: Map<string, Dictionary>;
-  
-  seededDicts: WeakSet<object>;
-  replacedDicts: WeakSet<object>;
-  
-  activeLocale?: string;
-  
-  activePath?: string;
-  
-  renderPath?: string;
-}
-
-const TRANSLATOR_STATE_KEY = "__AKAN_TRANSLATOR_STATE__";
-const getTranslatorState = (): TranslatorState => {
-  const globalScope = globalThis as typeof globalThis & {
-    [TRANSLATOR_STATE_KEY]?: TranslatorState;
-  };
-  globalScope[TRANSLATOR_STATE_KEY] ??= {
-    langDictionaryMap: new Map<string, Dictionary>(),
-    seededDicts: new WeakSet<object>(),
-    replacedDicts: new WeakSet<object>(),
-  };
-  return globalScope[TRANSLATOR_STATE_KEY];
-};
+export type { AllDictionary, Dictionary } from "./translatorState";
 
 export class Translator {
-  static readonly #filledDicts = new WeakMap<AllDictionary, Map<string, Dictionary>>();
   constructor(dictionary: Record<string, Record<string, Record<string, unknown>>>) {
     Object.entries(dictionary).forEach(([lang, dict]) => {
       Translator.seed(lang, dict as Dictionary);
     });
   }
   hasDictionary(lang: string) {
-    return getTranslatorState().langDictionaryMap.has(lang);
+    return Translator.hasLocale(lang);
+  }
+  static hasLocale(lang: string) {
+    return TranslatorState.get().langDictionaryMap.has(lang);
   }
   static setActiveLocale(lang: string | undefined) {
-    if (lang) getTranslatorState().activeLocale = lang;
+    if (lang) TranslatorState.get().activeLocale = lang;
   }
   static getActiveLocale(): string | undefined {
-    return getTranslatorState().activeLocale;
+    return TranslatorState.get().activeLocale;
   }
   static setActivePath(path: string | undefined) {
-    const state = getTranslatorState();
+    const state = TranslatorState.get();
     if (path) state.activePath = path;
     else delete state.activePath;
   }
   static getActivePath(): string | undefined {
-    return getTranslatorState().activePath;
+    return TranslatorState.get().activePath;
   }
   static renderAt<T>(path: string | undefined, render: () => T): T {
     if (!path) return render();
-    const state = getTranslatorState();
+    const state = TranslatorState.get();
     const outer = state.renderPath;
     state.renderPath = path;
     try {
@@ -71,17 +42,17 @@ export class Translator {
     }
   }
   static getRenderPath(): string | undefined {
-    return getTranslatorState().renderPath;
+    return TranslatorState.get().renderPath;
   }
   static markHydrated() {
-    delete getTranslatorState().activePath;
+    delete TranslatorState.get().activePath;
   }
   static translateByLocale(lang: string, key: string, param?: Record<string, string | number>): string {
     const msg = Translator.#lookup(lang, key) ?? Translator.#lookupDefault(lang, key) ?? key;
     return interpolateTranslation(msg, param);
   }
   static #lookup(lang: string, key: string) {
-    const dictionary = getTranslatorState().langDictionaryMap.get(lang);
+    const dictionary = TranslatorState.get().langDictionaryMap.get(lang);
     if (!dictionary) return undefined;
     const node = pathGetLoose(key, dictionary, ".") as { t?: unknown } | null;
     return typeof node?.t === "string" ? node.t : undefined;
@@ -92,16 +63,10 @@ export class Translator {
     return defaultLocale === lang ? undefined : Translator.#lookup(defaultLocale, key);
   }
   
-  static withDefaultLocale(allDictionary: AllDictionary, lang: string): Dictionary | undefined {
-    const { defaultLocale } = parseAkanI18nEnv();
+  static fillFromDefault(allDictionary: AllDictionary, lang: string, defaultLocale: string): Dictionary {
     const fallback = allDictionary[defaultLocale];
-    if (lang === defaultLocale || !fallback) return allDictionary[lang];
-    const filledByLocale = Translator.#filledDicts.get(allDictionary) ?? new Map<string, Dictionary>();
-    Translator.#filledDicts.set(allDictionary, filledByLocale);
-    const filled =
-      filledByLocale.get(lang) ?? (Translator.#fillGaps(allDictionary[lang] ?? {}, fallback) as Dictionary);
-    filledByLocale.set(lang, filled);
-    return filled;
+    if (lang === defaultLocale || !fallback) return allDictionary[lang] ?? {};
+    return Translator.#fillGaps(allDictionary[lang] ?? {}, fallback) as Dictionary;
   }
   static #fillGaps(own: Record<string, unknown>, fallback: Record<string, unknown>): Record<string, unknown> {
     const filled = { ...own };
@@ -119,7 +84,7 @@ export class Translator {
   
   static seed(lang: string, dict: Dictionary | undefined) {
     if (!dict) return;
-    const state = getTranslatorState();
+    const state = TranslatorState.get();
     if (state.seededDicts.has(dict)) return;
     state.seededDicts.add(dict);
     const existingDictionary = state.langDictionaryMap.get(lang) ?? {};
@@ -130,18 +95,13 @@ export class Translator {
     state.langDictionaryMap.set(lang, existingDictionary);
   }
   static replace(lang: string, dict: Dictionary | undefined) {
-    if (!dict) return;
-    const state = getTranslatorState();
-    if (state.replacedDicts.has(dict)) return;
-    state.seededDicts.add(dict);
-    state.replacedDicts.add(dict);
-    state.langDictionaryMap.set(lang, { ...dict });
+    TranslatorState.replace(lang, dict);
   }
   translate(lang: string, key: string, param?: Record<string, string | number>): string {
     return Translator.translateByLocale(lang, key, param);
   }
   async getDictionary(lang: string) {
-    const dictionary = getTranslatorState().langDictionaryMap.get(lang);
+    const dictionary = TranslatorState.get().langDictionaryMap.get(lang);
     if (!dictionary) throw new Error(`Dictionary for language ${lang} not found`);
     return dictionary;
   }

package/client/translatorState.ts

@@ -0,0 +1,44 @@
+export interface Dictionary {
+  [key: string]: {
+    [key: string]: unknown;
+  };
+}
+export interface AllDictionary {
+  [key: string]: Dictionary;
+}
+
+interface TranslatorStateValue {
+  langDictionaryMap: Map<string, Dictionary>;
+  
+  seededDicts: WeakSet<object>;
+  
+  replacedByLang: Map<string, object>;
+  
+  activeLocale?: string;
+  
+  activePath?: string;
+  
+  renderPath?: string;
+}
+
+const translatorStateKey = "__AKAN_TRANSLATOR_STATE__";
+
+export class TranslatorState {
+  static get(): TranslatorStateValue {
+    const globalScope = globalThis as typeof globalThis & { [translatorStateKey]?: TranslatorStateValue };
+    globalScope[translatorStateKey] ??= {
+      langDictionaryMap: new Map<string, Dictionary>(),
+      seededDicts: new WeakSet<object>(),
+      replacedByLang: new Map<string, object>(),
+    };
+    return globalScope[translatorStateKey];
+  }
+  static replace(lang: string, dict: Dictionary | undefined) {
+    if (!dict) return;
+    const state = TranslatorState.get();
+    if (state.replacedByLang.get(lang) === dict) return;
+    state.seededDicts.add(dict);
+    state.replacedByLang.set(lang, dict);
+    state.langDictionaryMap.set(lang, { ...dict });
+  }
+}

package/client/types.ts

@@ -16,6 +16,7 @@ export interface ReactFontPath {
   src: string;
   weight: number | string;
   style?: ReactFontStyle;
+  preload?: boolean;
   declarations?: ReactFontDeclaration[];
 }
 

package/common/index.ts

@@ -163,6 +163,7 @@ export {
 } from "./pipelinePlan";
 export { type RouteLayer, RouteLayering } from "./RouteLayering";
 export { randomPick, randomPicks } from "./randomPick";
+export { RequestLocale, type RequestLocaleInput } from "./requestLocale";
 export { hostFromRequest, isJsonContentType, originFromRequest } from "./requestOrigin";
 export { RestClient, type RestClientOptions, type RestRequestOptions } from "./restClient";
 export { round } from "./round";

package/common/requestLocale.ts

@@ -0,0 +1,28 @@
+import type { AkanI18nConfig } from "./localeConfig";
+
+export interface RequestLocaleInput {
+  localeHeader?: string | null;
+  pathHeader?: string | null;
+  /** The request URL's pathname; absent outside a request. */
+  pathname?: string;
+}
+
+export class RequestLocale {
+  static resolve(
+    { localeHeader: rawLocaleHeader, pathHeader, pathname }: RequestLocaleInput,
+    { defaultLocale, locales }: AkanI18nConfig,
+  ): { locale: string; path: string } {
+    
+    const localeHeader = rawLocaleHeader && locales.includes(rawLocaleHeader) ? rawLocaleHeader : null;
+    
+    if (localeHeader && pathHeader) return { locale: localeHeader, path: pathHeader };
+    if (pathname === undefined) return { locale: localeHeader ?? defaultLocale, path: pathHeader ?? "/" };
+    const [, firstSegment = "", ...rest] = pathname.split("/");
+    if (!localeHeader && !locales.includes(firstSegment))
+      return { locale: defaultLocale, path: pathHeader ?? pathname };
+    return {
+      locale: localeHeader ?? (firstSegment || defaultLocale),
+      path: pathHeader ?? `/${rest.join("/")}`,
+    };
+  }
+}

package/dictionary/base.dictionary.ts

@@ -99,6 +99,7 @@ export const baseDictionary = serviceDictionary(["en", "ko"])
     ok: ["OK", "확인"],
     cancel: ["Cancel", "취소"],
     retry: ["Try again", "다시 시도"],
+    copy: ["Copy", "복사"],
     pageLoadFailed: ["This page could not be loaded.", "이 화면을 불러오지 못했습니다."],
     pageNotFound: ["This page does not exist.", "없는 화면입니다."],
     goBack: ["Go back", "돌아가기"],

package/fetch/client/fetchClient.ts

@@ -302,6 +302,10 @@ export class FetchClient {
     if (FetchClient.bridged) return;
     this.ws.connect();
   }
+  connectOnUse() {
+    if (FetchClient.bridged) return;
+    this.ws.connectOnUse();
+  }
   disconnect() {
     this.ws.destroy();
     for (const ws of this.#originWs.values()) ws.destroy();

package/fetch/client/wsClient.ts

@@ -85,6 +85,7 @@ export class WsClient {
   #listenerMap = new Map<string, Set<Listener>>();
   #destroyed = false;
   #connectRequested = false;
+  #connectOnUse = false;
   /** Whether this client has been connected before, so the first open is a start rather than a recovery. */
   #hadConnection = false;
   #outbox: string[] = [];
@@ -137,6 +138,12 @@ export class WsClient {
     this.#ws?.send(JSON.stringify(websocketAuthContract.makeRequest(this.#jwt)));
   }
 
+  /** Opens the socket at the first emit or subscribe, so a page that never uses it never opens one. */
+  connectOnUse() {
+    this.#connectOnUse = true;
+    if (this.#outbox.length > 0 || this.#roomSubscribeMap.size > 0) this.connect();
+  }
+
   connect() {
     this.#connectRequested = true;
     if (this.#ws && this.#ws.readyState !== WebSocket.CLOSED) return;
@@ -182,6 +189,7 @@ export class WsClient {
       const queued = this.#outbox;
       this.#outbox = [];
       for (const frame of queued) this.#ws?.send(frame);
+      this.#handleMessage("connect", undefined);
     };
     this.#ws.onmessage = (e) => {
       this.#lastInboundAt = Date.now();
@@ -259,7 +267,10 @@ export class WsClient {
       this.#stopHeartbeat();
       
       if (openedAt && Date.now() - openedAt >= WsClient.stableMs) this.#reconnectAttempts = 0;
-      if (!this.#destroyed) this.#closed();
+      if (this.#destroyed) return;
+      this.#closed();
+      
+      this.#handleMessage("disconnect", { code: event.code, reason: event.reason });
     };
   }
 
@@ -401,6 +412,7 @@ export class WsClient {
     this.logger.debug(`WebSocket destroying`);
     this.#destroyed = true;
     this.#connectRequested = false;
+    this.#connectOnUse = false;
     this.#stopHeartbeat();
     this.#cancelReconnect();
     for (const timer of this.#unconnectedWarnTimers.values()) clearTimeout(timer);
@@ -444,6 +456,11 @@ export class WsClient {
   hasListeners(key: string) {
     return (this.#listenerMap.get(key)?.size ?? 0) > 0 || (this.#roomSubscribeMap.get(key)?.listener.size ?? 0) > 0;
   }
+  #requireConnection(action: "emit" | "subscribe", key: string) {
+    if (this.#connectRequested) return;
+    if (this.#connectOnUse) this.connect();
+    else this.#warnUnconnected(action, key);
+  }
   #warnUnconnected(action: "emit" | "subscribe", key: string) {
     const timerKey = `${action}:${key}`;
     if (this.#connectRequested || this.#unconnectedWarnTimers.has(timerKey)) return;
@@ -451,7 +468,7 @@ export class WsClient {
       this.#unconnectedWarnTimers.delete(timerKey);
       if (this.#connectRequested || this.#destroyed) return;
       console.warn(
-        `[akanjs] WebSocket is not connected. Call fetch.instance.connect(), or drop the root layout "wsConnect = false", before ${action} "${key}".`,
+        `[akanjs] WebSocket is not connected. Call fetch.instance.connect(), or drop the root layout's .wsConnect(false), before ${action} "${key}".`,
       );
     }, 0);
     this.#unconnectedWarnTimers.set(timerKey, timer);
@@ -462,7 +479,7 @@ export class WsClient {
     
     if (this.#ws?.readyState !== WebSocket.OPEN) {
       this.#outbox.push(frame);
-      this.#warnUnconnected("emit", key);
+      this.#requireConnection("emit", key);
       return this;
     }
     this.#ws.send(frame);
@@ -470,7 +487,6 @@ export class WsClient {
   }
   subscribe(option: RoomSubscription) {
     const roomId = WsClient.makeRoomId(option.key, option.data);
-    if (!this.#ws) this.#warnUnconnected("subscribe", option.key);
     let roomSubscribe = this.#roomSubscribeMap.get(roomId);
     if (!roomSubscribe) {
       roomSubscribe = {
@@ -487,6 +503,7 @@ export class WsClient {
     }
     roomSubscribe.listener.add(option.handleEvent);
     if (option.handleResync) roomSubscribe.resync.add(option.handleResync);
+    if (!this.#ws) this.#requireConnection("subscribe", option.key);
     this.logger.verbose(`Websocket subscribe pubsub for ${roomId} - ${roomSubscribe.listener.size} listeners added`);
     return this;
   }

package/native/api.ts

@@ -0,0 +1 @@
+export * from "../vendor/@akanjs/native/packages/cli/src/api.ts";

package/native/config.ts

@@ -0,0 +1 @@
+export * from "../vendor/@akanjs/native/packages/cli/src/config.ts";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.1.0",
+  "version": "3.1.1-rc.0",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -100,6 +100,16 @@
       "import": "./client/native/*.ts",
       "default": "./client/native/*.ts"
     },
+    "./native/api": {
+      "types": "./types/native/api.d.ts",
+      "import": "./native/api.ts",
+      "default": "./native/api.ts"
+    },
+    "./native/config": {
+      "types": "./types/native/config.d.ts",
+      "import": "./native/config.ts",
+      "default": "./native/config.ts"
+    },
     "./native/desktop": {
       "types": "./types/native/desktop.d.ts",
       "import": "./native/desktop.ts",

package/server/akanApp.ts

@@ -9,7 +9,7 @@ import { isTraceEnabled } from "../signal/trace";
 import { AKAN_CHILD_HOST, makeAkanChildProxyHeaders } from "./akanAppHeaders";
 import type { BuilderCsrReq, BuilderCsrRes, BuilderMessage, BuilderReq, BuilderRes } from "./artifact";
 import { type AssetHeaderOptions, assetHeaders } from "./assetHeaders";
-import { compressResponse, encodedFileResponse } from "./contentEncoding";
+import { compressResponse, compressStreamResponse, encodedFileResponse } from "./contentEncoding";
 import { isPortInUseError } from "./lifecycle/portInUse";
 import { resolveRuntimeDir } from "./lifecycle/runtimeDir";
 import { ChildOutputReader } from "./logging/childOutputReader";
@@ -636,8 +636,9 @@ export class AkanApp {
 
   static readonly #immutableArtifacts = [
     { prefix: "/_akan/client/", root: "client", strip: "/_akan/client/".length, type: "application/javascript" },
-    { prefix: "/_akan/styles/", root: "", strip: "/_akan/".length, type: "text/css; charset=utf-8" },
-    { prefix: "/_akan/fonts/", root: "", strip: "/_akan/".length, type: "font/woff2", anyOrigin: true },
+    { prefix: "/_akan/styles/", root: "styles", strip: "/_akan/styles/".length, type: "text/css; charset=utf-8" },
+    { prefix: "/_akan/fonts/", root: "fonts", strip: "/_akan/fonts/".length, type: "font/woff2", anyOrigin: true },
+    { prefix: "/_akan/dict/", root: "dict", strip: "/_akan/dict/".length, type: "text/javascript; charset=utf-8" },
   ] as const;
 
   async #serveImmutableArtifact(req: Request, url: URL): Promise<Response | null> {
@@ -787,6 +788,7 @@ export class AkanApp {
         body: req.method === "GET" || req.method === "HEAD" ? undefined : req.body,
         signal: req.signal,
         redirect: "manual",
+        decompress: false,
       });
       return await this.#proxyResponse(req, upstreamRes);
     } catch (error) {
@@ -957,11 +959,6 @@ export class AkanApp {
 
   async #proxyResponse(req: Request, upstreamRes: Response): Promise<Response> {
     const headers = new Headers(upstreamRes.headers);
-    
-    if (headers.has("content-encoding")) {
-      headers.delete("content-encoding");
-      headers.delete("content-length");
-    }
     this.#rewriteInternalLocation(headers);
     const proxied = new Response(upstreamRes.body, {
       status: upstreamRes.status,
@@ -969,7 +966,9 @@ export class AkanApp {
       headers,
     });
     
-    return AkanApp.#isProxiedJson(headers) ? await compressResponse(req, proxied) : proxied;
+    return AkanApp.#isProxiedJson(headers)
+      ? await compressResponse(req, proxied)
+      : compressStreamResponse(req, proxied);
   }
 
   static #isProxiedJson(headers: Headers): boolean {

package/server/akanAppHeaders.ts

@@ -43,7 +43,7 @@ export function makeAkanChildProxyHeaders(req: Request, childIdx: number, peer?:
   );
   headers.set("x-akan-child-idx", String(childIdx));
   
-  headers.set("accept-encoding", "identity");
+  if (!headers.get("accept-encoding")) headers.set("accept-encoding", "identity");
   if (!headers.has("x-request-id") && process.env.AKAN_BENCH_SKIP_REQUEST_ID !== "1") {
     headers.set("x-request-id", crypto.randomUUID());
   }