@olares/lares-mobile 0.15.0 → 0.15.1

package/README.md

@@ -4,16 +4,20 @@ LarePass 只依赖这一个包。对话、Host、设置都在内部走 `@olares/
 
 ```vue
 <template>
-  <LaresApp :locale="locale" :env="env" />
+  <LaresApp :locale="locale" v-bind="ports" />
 </template>
 <script setup>
-import { LaresApp } from "@olares/lares-mobile";
+import { LaresApp, laresPortsFromAccount, findLaresEntrance } from "@olares/lares-mobile";
 </script>
 ```
 
 设置页同样只挂 `LaresAgentSettings`。
 
-`env` 由宿主注入（`PROTOCOL` / `LARES_SUB_DOMAIN` / `ACCOUNT_DOMAIN` / `IS_PC_TEST`）。PC 预览走 `/laresHost` 代理时设 `IS_PC_TEST`。需要自定义鉴权请求时再传 `request`。
+正式 App：把当前登录账号的 `myApps` 交给 `laresPortsFromAccount`（或自己调 `findLaresEntrance` 得到 `baseUrl`）。入口前缀是安装时随机的，不要拼 `lares.<用户>.olares.com`，也不要把 webpack `.env` 里的调试子域带进生产。
+
+PC 预览：`IS_PC_TEST` 时走 `/laresHost` 代理，`laresPortsFromAccount` 会继续用 `PROTOCOL` / `LARES_SUB_DOMAIN` / `ACCOUNT_DOMAIN`。自定义鉴权请求再传 `request`。
+
+切账号时更新 `baseUrl` / `env` 即可，客户端会丢掉上一台的 runtime 和设置缓存，改连新 Host。
 
 本地联调（包未上 registry 时）：
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olares/lares-mobile",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Lares chat component for LarePass",
   "type": "module",
   "repository": {
@@ -28,7 +28,7 @@
     "vue": "^3.2.0"
   },
   "dependencies": {
-    "@olares/lares-core": "0.15.0",
+    "@olares/lares-core": "0.15.1",
     "markdown-it": "^14.3.0"
   }
 }

package/src/App.vue

@@ -141,6 +141,7 @@ export default {
     return {
       sending: false,
       starting: false,
+      hostGen: 0,
       running: false,
       sessionId: "",
       draft: "",
@@ -183,6 +184,9 @@ export default {
     runtime() {
       return connectChat(this.ports);
     },
+    hostKey() {
+      return this.runtime.key;
+    },
     t() {
       return createT(this.locale);
     },
@@ -274,6 +278,9 @@ export default {
     sessionId(id) {
       this.bindIntake(id);
     },
+    hostKey() {
+      this.switchHost();
+    },
   },
   created() {
     this.intake = new FileIntake((file, sessionId, options) => this.runtime.upload(file, options, sessionId));
@@ -290,7 +297,7 @@ export default {
       },
     });
     this.bindIntake(this.sessionId);
-    this.unsub = this.runtime.subscribe((snap) => this.applySnap(snap));
+    this.bindRuntime();
     try {
       const raw = JSON.parse(localStorage.getItem("lares.mobile.effort") || "{}");
       if (raw && typeof raw === "object") this.effortByModel = raw;
@@ -404,17 +411,47 @@ export default {
       this.preview = { path: "", status: "idle", data: null, error: "" };
     },
     async retry() {
+      const gen = ++this.hostGen;
       this.starting = true;
       try {
         await this.runtime.start();
+        if (gen !== this.hostGen) return;
         await this.loadComposerMeta();
       } finally {
-        this.starting = false;
+        if (gen === this.hostGen) this.starting = false;
       }
     },
     modelKey(model) {
       return selectionKey({ provider: model.provider, model: model.id });
     },
+    bindRuntime() {
+      this.unsub?.();
+      this.unsub = this.runtime.subscribe((snap) => this.applySnap(snap));
+    },
+    switchHost() {
+      this.voiceCap?.stop?.(true);
+      this.intakeUnsub?.();
+      if (this.sessionId) this.intake?.cancelSession(this.sessionId);
+      this.sessionId = "";
+      this.items = [];
+      this.sessions = [];
+      this.sessionsReady = false;
+      this.previews = {};
+      this.preview = { path: "", status: "idle", data: null, error: "" };
+      this.pendingUser = "";
+      this.failed = "";
+      this.error = "";
+      this.models = null;
+      this.modelError = "";
+      this.modelPending = "";
+      this.modelSheet = false;
+      this.panel = "";
+      this.question = null;
+      this.questionBusy = false;
+      this.bindIntake("");
+      this.bindRuntime();
+      this.retry();
+    },
     bindIntake(sessionId) {
       this.intakeUnsub?.();
       this.intakeUnsub = null;

package/src/host.js

@@ -1,4 +1,4 @@
-import { hostConfigFromEnv, hostUrl, MODELS_PATH, probeHost } from "@olares/lares-core/larepass/host";
+import { hostTarget, hostUrl, MODELS_PATH, probeHost } from "@olares/lares-core/larepass/host";
 import { callRpc, consumeMux, ensureSession, loadTranscript, MUX_PATH, sendPrompt } from "@olares/lares-core/larepass/chat";
 import { muxWsUrl } from "@olares/lares-core/larepass/mux";
 import { RESPOND_PATH } from "@olares/lares-core/larepass/rpc";
@@ -92,9 +92,7 @@ export async function defaultRequest(url, init = {}) {
 }
 
 export function createHostClient(ports = {}) {
-  const fromEnv = hostConfigFromEnv(ports.env);
-  const baseUrl = ports.baseUrl ?? fromEnv.baseUrl;
-  const proxyPrefix = ports.proxyPrefix ?? fromEnv.proxyPrefix;
+  const { baseUrl, proxyPrefix } = hostTarget(ports);
   const send = ports.request ?? defaultRequest;
   const urlFor = (path) => hostUrl({ baseUrl, proxyPrefix, path });
   const request = (path, init) => send(urlFor(path), init);

package/src/index.d.ts

@@ -29,11 +29,24 @@ export type HostPorts = {
 
 export const PC_TEST_PROXY: string;
 
+export function findLaresEntrance(apps?: unknown[]): string;
+
 export function hostConfigFromEnv(env?: HostEnv): {
   baseUrl: string;
   proxyPrefix: string;
 };
 
+export function hostKey(ports?: HostPorts): string;
+
+export function laresPortsFromAccount(input?: {
+  env?: HostEnv;
+  apps?: unknown[];
+}): {
+  baseUrl?: string;
+  env?: HostEnv;
+  proxyPrefix?: string;
+};
+
 export function defaultRequest(url: string, init?: HostRequestInit): Promise<HostResponse>;
 
 export function createHostClient(ports?: HostPorts): {

package/src/index.js

@@ -1,4 +1,10 @@
 export { default as LaresApp } from "./App.vue";
 export { default as LaresAgentSettings } from "./settings/AgentSettings.vue";
 export { createHostClient, defaultRequest } from "./host.js";
-export { hostConfigFromEnv, PC_TEST_PROXY } from "@olares/lares-core/larepass/host";
+export {
+  findLaresEntrance,
+  hostConfigFromEnv,
+  hostKey,
+  laresPortsFromAccount,
+  PC_TEST_PROXY,
+} from "@olares/lares-core/larepass/host";

package/src/runtime.js

@@ -1,12 +1,32 @@
+import { hostKey } from "@olares/lares-core/larepass/host";
+import { resetHostSettingsCache } from "@olares/lares-core/larepass/settings";
 import { createChatRuntime } from "@olares/lares-core/larepass/runtime";
 import { createHostClient } from "./host.js";
 
 let current = null;
+let liveKey = "";
+
+export function adoptHost(ports) {
+  const key = hostKey(ports);
+  if (key === liveKey) return key;
+  liveKey = key;
+  current?.dispose?.();
+  current = null;
+  resetHostSettingsCache();
+  return key;
+}
 
 export function connectChat(ports) {
   const client = createHostClient(ports);
-  const key = client.urlFor("/api");
+  const key = adoptHost(ports);
   if (current?.key === key) return current;
   current = Object.assign(createChatRuntime(client), { key });
   return current;
 }
+
+export function resetChatHost() {
+  liveKey = "";
+  current?.dispose?.();
+  current = null;
+  resetHostSettingsCache();
+}

package/src/settings/AgentSettings.vue

@@ -94,7 +94,9 @@ import {
   searchValueFromMenu,
 } from "@olares/lares-core/search/menu";
 import { rememberedSettings } from "@olares/lares-core/larepass/settings";
+import { hostKey as hostSessionKey } from "@olares/lares-core/larepass/host";
 import { createHostClient } from "../host.js";
+import { adoptHost } from "../runtime.js";
 import { createT } from "../i18n.js";
 import LaresSettingRow from "./SettingRow.vue";
 import LaresSheet from "./Sheet.vue";
@@ -138,13 +140,19 @@ export default {
     t() {
       return createT(this.locale);
     },
-    settings() {
-      return createHostClient({
+    ports() {
+      return {
         baseUrl: this.baseUrl,
         proxyPrefix: this.proxyPrefix,
         request: this.request,
         env: this.env,
-      }).settings;
+      };
+    },
+    hostKey() {
+      return hostSessionKey(this.ports);
+    },
+    settings() {
+      return createHostClient(this.ports).settings;
     },
     busy() {
       return this.loading || Boolean(this.pending);
@@ -238,6 +246,19 @@ export default {
       return "";
     },
   },
+  watch: {
+    hostKey() {
+      adoptHost(this.ports);
+      this.panel = "";
+      this.models = null;
+      this.voice = null;
+      this.search = null;
+      this.modelError = "";
+      this.voiceError = "";
+      this.searchError = "";
+      this.load(true);
+    },
+  },
   mounted() {
     this.load(false);
   },