@olares/lares-core 0.15.2 → 0.15.5

package/brand/manifest.js

@@ -1,5 +1,5 @@
 import { PRODUCT_NAME, THEME_COLOR } from "./identity.js";
-import { MARK_PATH } from "../icons/mark.js";
+import { MARK_PATH, MARK_TYPE } from "../icons/mark.js";
 
 export const MANIFEST_PATH = "/lares/manifest.webmanifest";
 
@@ -11,5 +11,5 @@ export const MANIFEST = {
   scope: "/",
   display: "fullscreen",
   theme_color: THEME_COLOR,
-  icons: [{ src: MARK_PATH, sizes: "any", type: "image/svg+xml", purpose: "any" }],
+  icons: [{ src: MARK_PATH, sizes: "any", type: MARK_TYPE, purpose: "any" }],
 };

package/files/upload-client.js

@@ -7,6 +7,31 @@ function errorCode(payload) {
     : "file_upload_failed";
 }
 
+/**
+ * `fetch` can only authenticate with the Olares cookie, and a host whose page is
+ * cross-origin to the Host — a packaged LarePass desktop build is a `file://`
+ * page — has none, so the upload answers 401 while every RPC call succeeds.
+ * When the host injects a `request` port the upload rides the same auth as the
+ * rest of the client; without one this stays the plain cookie fetch.
+ */
+async function postUpload(options, url, headers, body, signal) {
+  if (typeof options.request === "function") {
+    const res = await options.request(url, { method: "POST", headers, body, signal });
+    return {
+      ok: Boolean(res?.ok),
+      status: Number(res?.status) || 0,
+      // The port already parsed the body; an empty one arrives as undefined.
+      payload: res?.body ?? null,
+    };
+  }
+  const res = await fetch(url, { method: "POST", headers, body, signal });
+  return {
+    ok: res.ok,
+    status: res.status,
+    payload: await res.json().catch(() => null),
+  };
+}
+
 export async function uploadFile(file, sessionId, options = {}) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), UPLOAD_TIMEOUT_MS);
@@ -14,21 +39,21 @@ export async function uploadFile(file, sessionId, options = {}) {
   if (options.signal?.aborted) controller.abort(options.signal.reason);
   else options.signal?.addEventListener("abort", onAbort, { once: true });
   try {
-    const response = await fetch(options.url ?? FILES_UPLOAD_PATH, {
-      method: "POST",
-      headers: {
+    const { ok, status, payload } = await postUpload(
+      options,
+      options.url ?? FILES_UPLOAD_PATH,
+      {
         "content-type": file.type || "application/octet-stream",
         "x-lares-file-name": encodeURIComponent(file.name || "file"),
         "x-lares-session-id": sessionId,
         "x-lares-upload-request-id": options.requestId ?? crypto.randomUUID(),
       },
-      body: file,
-      signal: controller.signal,
-    });
-    const payload = await response.json().catch(() => null);
-    if (!response.ok) {
+      file,
+      controller.signal,
+    );
+    if (!ok) {
       const error = new Error(errorCode(payload));
-      error.status = response.status;
+      error.status = status;
       throw error;
     }
     if (!payload || typeof payload.path !== "string") throw new Error("file_upload_failed");

package/icons/mark.js

@@ -1,21 +1,38 @@
 import { PRODUCT_NAME } from "../brand/identity.js";
 
 /**
- * Product mark: favicon, PWA icon, CSS splash, and slot occupants.
- * An eave over a resident orb — two strokes, readable at 20px collapsed rail.
+ * Product mark: favicon, PWA icon, CSS splash, and slot occupants. Consumers
+ * cache this URL, so the path and the SVG encoding are fixed — publishing the
+ * artwork at a new path leaves stale favicons behind.
+ * Geometry is the design delivery verbatim (ids renamed, aria-label injected).
+ * Keep it a vector — favicon rasterizers drop <image> data URIs.
  */
+export const MARKET_ICON_URL = "https://app.cdn.olares.com/appstore/lares/icon_new.png";
+
 export const MARK_PATH = "/lares/mark.svg";
+export const MARK_TYPE = "image/svg+xml";
 
-export const MARK_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" role="img" aria-label="${PRODUCT_NAME}">
+export const MARK_SVG = `<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256" fill="none" role="img" aria-label="${PRODUCT_NAME}">
   <defs>
-    <linearGradient id="lares-mark" x1="0" y1="0" x2="32" y2="32" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#6366F1"/>
-      <stop offset="1" stop-color="#22D3EE"/>
+    <filter id="lares-mark-shadow" x="0" y="0" width="256" height="257.829" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1.82857"/>
+      <feGaussianBlur stdDeviation="0.914286"/>
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+      <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow"/>
+    </filter>
+    <linearGradient id="lares-mark" x1="128" y1="0" x2="128" y2="256" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFED52"/>
+      <stop offset="1" stop-color="#EBD304"/>
     </linearGradient>
   </defs>
-  <rect width="32" height="32" rx="8" fill="url(#lares-mark)"/>
-  <path fill="none" stroke="#fff" stroke-width="3.2" stroke-linecap="round" stroke-linejoin="round" d="M6.8 17.4 16 9.2l9.2 8.2"/>
-  <circle cx="16" cy="22" r="3.2" fill="#fff"/>
+  <g filter="url(#lares-mark-shadow)">
+    <rect width="256" height="256" fill="url(#lares-mark)"/>
+    <path fill="#252121" d="M83.5926 125.858C85.7382 144.539 100.433 157.223 120.829 157.998L128.063 158.273H142.829C170.407 158.273 186.978 179.868 179.84 206.507H115.676C86.0222 206.506 68.2049 183.286 75.8798 154.643L83.5926 125.858ZM104.576 47.5429C133.193 47.5429 150.386 69.9505 142.98 97.5918L128.319 152.309C99.7025 152.309 82.5086 129.9 89.915 102.259L100.338 63.3618C102.534 55.1648 97.833 48.3464 89.5437 47.7079L87.3945 47.5429H104.576Z"/>
+  </g>
 </svg>`;
 
 /** Inline form for CSS `background-image`, which cannot reference a route that may 404 mid-boot. */

package/larepass/host.js

@@ -45,6 +45,23 @@ export function hostConfigFromEnv(env = {}) {
   };
 }
 
+/**
+ * Every key the host may hand down. The list is canonical: a host spreads these
+ * onto the components as props and `createHostClient` reads them back off the
+ * object, so a key that exists in one place and not the other is dropped in
+ * silence — which is how `socketProtocol` shipped inert once already.
+ */
+export const HOST_PORT_KEYS = ["baseUrl", "proxyPrefix", "env", "request", "socketProtocol"];
+
+/** Collect the port keys off any carrier (a component instance included). */
+export function pickHostPorts(source = {}) {
+  const ports = {};
+  for (const key of HOST_PORT_KEYS) {
+    ports[key] = source[key];
+  }
+  return ports;
+}
+
 /** Resolve the live Host origin. Explicit baseUrl/proxyPrefix win over env. */
 export function hostTarget(ports = {}) {
   const fromEnv = hostConfigFromEnv(ports.env);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olares/lares-core",
-  "version": "0.15.2",
+  "version": "0.15.5",
   "description": "Lares 共享业务核心：Router、workspace、文件/媒体、Olares 身份（无 UI、无平台壳）",
   "type": "module",
   "repository": {

package/router/shim.js

@@ -43,7 +43,9 @@ export function shimBudget(suffix) {
   };
 }
 
+/** @returns {Record<string, string>} */
 export function shimRequestHeaders(incoming, env = process.env) {
+  /** @type {Record<string, string>} */
   const headers = {};
   for (const [key, value] of Object.entries(incoming)) {
     if (value == null || DROPPED_REQ.has(key.toLowerCase())) continue;
@@ -107,6 +109,36 @@ function serveCachedModels(req, res) {
   );
 }
 
+function downstreamCancellation(req, res) {
+  const controller = new AbortController();
+  let finished = false;
+
+  const cleanup = () => {
+    req.off("aborted", cancel);
+    res.off("finish", finish);
+    res.off("close", close);
+  };
+  const cancel = () => {
+    if (!controller.signal.aborted) {
+      controller.abort(new Error("LLM downstream disconnected"));
+    }
+    cleanup();
+  };
+  const finish = () => {
+    finished = true;
+    cleanup();
+  };
+  const close = () => {
+    if (!finished) cancel();
+    else cleanup();
+  };
+
+  req.once("aborted", cancel);
+  res.once("finish", finish);
+  res.once("close", close);
+  return controller;
+}
+
 export function proxyToRouter(req, res, env = process.env) {
   if (isModelsGet(req)) {
     serveCachedModels(req, res);
@@ -121,6 +153,7 @@ export function proxyToRouter(req, res, env = process.env) {
   const headers = shimRequestHeaders(req.headers, env);
   const transport = target.protocol === "https:" ? httpsRequest : httpRequest;
   const method = (req.method ?? "GET").toUpperCase();
+  const cancellation = downstreamCancellation(req, res);
 
   const run = async () => {
     let body;
@@ -132,16 +165,22 @@ export function proxyToRouter(req, res, env = process.env) {
       if (!budget.audio && carriesWebpImage(body)) body = await transcodeWebpImages(body);
       headers["content-length"] = String(body.length);
     }
+    if (cancellation.signal.aborted) return;
 
     const upstream = transport(
       target,
-      { method, headers, timeout: budget.timeoutMs },
+      { method, headers, timeout: budget.timeoutMs, signal: cancellation.signal },
       (up) => {
+        if (cancellation.signal.aborted) {
+          up.destroy();
+          return;
+        }
         res.writeHead(up.statusCode ?? 502, shimResponseHeaders(up.headers));
         up.pipe(res);
       },
     );
     upstream.on("error", (err) => {
+      if (cancellation.signal.aborted) return;
       if (res.headersSent) {
         res.destroy();
         return;
@@ -161,6 +200,7 @@ export function proxyToRouter(req, res, env = process.env) {
   };
 
   void run().catch((err) => {
+    if (cancellation.signal.aborted) return;
     if (res.headersSent) {
       res.destroy();
       return;

package/voice/client.js

@@ -62,23 +62,39 @@ export function mergeTranscript(draft, transcript) {
   return `${base} ${text}`;
 }
 
+function transcribeErrorCode(payload) {
+  const code = payload && typeof payload === "object" ? payload.error?.code : undefined;
+  return typeof code === "string" ? code : "voice_failed";
+}
+
+/**
+ * The only voice call that carries a body, and so the only one that cannot go
+ * through `createHostSettings`. Like the upload it must accept the host's
+ * `request` port: a cross-origin host page sends no Olares cookie, so a plain
+ * `fetch` here answers 401 even though `/config`, `/status` and `/models` — which
+ * do ride the port — all succeed.
+ */
 export async function postTranscribe(blob, language, signal, options = {}) {
   const query = language ? `?language=${encodeURIComponent(language)}` : "";
   const base = String(options.baseUrl ?? API).replace(/\/$/, "");
-  const res = await fetch(`${base}/transcribe${query}`, {
-    method: "POST",
-    headers: { "content-type": blob.type || "audio/webm" },
-    body: blob,
-    signal,
-  });
+  const url = `${base}/transcribe${query}`;
+  const headers = { "content-type": blob.type || "audio/webm" };
+
+  if (typeof options.request === "function") {
+    const res = await options.request(url, { method: "POST", headers, body: blob, signal });
+    if (!res?.ok) throw new Error(transcribeErrorCode(res?.body));
+    return String(res?.body?.text ?? "").trim();
+  }
+
+  const res = await fetch(url, { method: "POST", headers, body: blob, signal });
   if (!res.ok) {
-    let code = "voice_failed";
+    let payload = null;
     try {
-      code = (await res.json())?.error?.code ?? code;
+      payload = await res.json();
     } catch {
-      /* keep default */
+      /* fall back to the generic code */
     }
-    throw new Error(code);
+    throw new Error(transcribeErrorCode(payload));
   }
   return String((await res.json())?.text ?? "").trim();
 }