@zlooks.cn/tools-server 1.1.1 → 1.1.2

package/.hile-rsc/{build-mvf297qj-cc123793 → build-mvg67iq4-6af517c4}/server-rsc/index.js

@@ -15850,7 +15850,7 @@ var __hileRemoteClientBoundary = __hileRegisterClientReference(function() {
 function __hileDefault(props) {
   return React.createElement(__hileRemoteClientBoundary, {
     pluginId: "tools",
-    buildId: "build-mvf297qj-cc123793",
+    buildId: "build-mvg67iq4-6af517c4",
     referenceId: "tools/src/plugin/tools-app#default",
     exportName: "default",
     props

package/README.md

@@ -35,12 +35,18 @@ pnpm --filter @zlooks.cn/tools-server verify:rsc
 
 地址 `/tools/cross-device-transfer`，创建房间后在另一台设备打开分享链接或输入配对码。文本使用 Yjs 与 CodeMirror 协同编辑，剪贴板支持手动发送/复制及浏览器授权后的聚焦同步，文件须由对方确认接收并校验 SHA-256。全部内容经 WebRTC DataChannel 加密直传；服务器仅保存房间、在线状态与 SDP/ICE 连接信息，不接收内容或文件元数据。没有 TURN 或服务器中转回退，无法直连时明确提示失败。
 
-使用既有 Redis Registry 订阅，不新增或修改 Registry 配置。固定策略集中在 `src/transfer/contracts.ts`：房间最长 30 分钟、最多 8 台设备、本地文本输入 64,000 字符、剪贴板 8,000 字符、每次会话文件合计 20 MiB/5 个、16 KiB 分块。合法并发合并超过本地字符上限时保留双方修改，先删减后继续输入；本地序列化历史限制 256 KiB，合并状态限制 2 MiB。STUN 沿用 WebRTC 官方示例地址，STUN 仅协助发现网络地址，不传输内容。关闭页面会丢失本地会话内容，文件保存到设备后由用户保管。
+使用既有 Redis Registry 订阅，不新增或修改 Registry 配置。固定策略集中在 `src/transfer/contracts.ts`：房间在线期间持续有效、最多 8 台设备、本地文本输入 64,000 字符、剪贴板 8,000 字符、每次会话文件合计 20 MiB/5 个、16 KiB 分块。合法并发合并超过本地字符上限时保留双方修改，先删减后继续输入；本地序列化历史限制 256 KiB，合并状态限制 2 MiB。STUN 沿用 WebRTC 官方示例地址，STUN 仅协助发现网络地址，不传输内容。关闭页面会丢失本地会话内容，文件保存到设备后由用户保管。
 
-直连重试保留共享文本，重新建立已关闭或失败的通道；新 offer 替换旧连接，旧连接的排队任务不会写入新通道。文本更新用 Yjs 合并，文件和文本发送队列独立；接收积压受限。自动剪贴板仅在聚焦时读取，同一时间只保留一个读取，关闭或失焦后丢弃迟到结果。光标只接纳对应直连设备的状态，坐标经校验，颜色取本站主题。
+直连重试保留共享文本，先恢复房间心跳，再按最新成员列表重新建立未连通或失败的通道；新 offer 替换旧连接，旧连接的排队任务不会写入新通道。文本更新用 Yjs 合并，文件和文本发送队列独立；接收积压受限。自动剪贴板仅在聚焦时读取，同一时间只保留一个读取，关闭或失焦后丢弃迟到结果。光标只接纳对应直连设备的状态，坐标经校验，颜色取本站主题。
+
+“连接诊断”显示当前 ICE、数据通道及候选地址类型，不显示 IP、SDP 或共享内容。房间配对成功不代表网络直连成功；同一局域网仍可能被系统本地网络权限、防火墙或 Wi-Fi 设备隔离阻止。STUN 的单次 701 错误并不等于连接必然失败，应结合双方地址类型和最终 ICE 状态判断。
+
+设备默认显示系统与浏览器，并附短标记区分同类设备；本机名称可修改，作为浏览器本地偏好保存。网页无法读取系统设置中的电脑名称。设备列表、文件接收目标和协同光标使用同一名称；健康直连保留最近识别的设备身份，文件记录在对方离开后仍显示传输时的设备标记，关闭页面后清除。名称仅作为临时房间成员信息随心跳共享，不携带互传内容。标签页随机身份保存在 sessionStorage，刷新时增加连接代次并立即替换旧成员、清除旧信令及旧连接；旧页面迟到的心跳不能覆盖新连接。Yjs 文档始终使用新的客户端 ID，避免刷新后的编辑与旧历史发生身份冲突。
+
+局域网 HTTP 下不假设 `crypto.randomUUID()`、`crypto.subtle` 或系统剪贴板存在：UUID 使用已有 `uuid` 包的安全随机数兼容能力；文件 SHA-256 在缺少 SubtleCrypto 时使用可取消、有超时的本地模块 Worker，取消文件、设备断线或离开页面都会终止对应校验；无法读写系统剪贴板时显示 HTTPS 与手动粘贴提示，并停用自动同步。剪贴板权限拒绝后停止轮询，避免重复请求权限；共享文本与手动发送仍通过直连传输。
 
 Redis 在首次使用前应已就绪。首次初始化失败沿用 Hile 的失败缓存语义，恢复 Redis 后需重启工具服务；已成功初始化后的断开会自动重连。断开期间命令直接失败，不离线缓冲或在取消后重放。只影响房间/信令，既有浏览器计算和已建立的设备直连独立运行。
 
 Hile 已有 HOM、Micro、Model 和 Redis 生命周期能力；未提供浏览器 RTCDataChannel 文件协议，因此 `src/browser/peer-session.ts` 仅负责浏览器直连、分块背压与收发清理，不另建服务端传输协议。
 
-房间生命周期：创建后 1 分钟无人加入自动销毁；心跳只续空闲期限，不延长 30 分钟的绝对期限。主动离开移除该设备及其信令，最后一台设备离开时原子删除房间与容量索引；重复离开安全。关闭页面发送尽力而为的离开请求，断电、断网、浏览器崩溃等无法送达时，由 Redis 在最后一次心跳后 1 分钟回收。其他设备仍在发送心跳时不会销毁；后台冻结超过期限的页面需重新加入或创建房间。已建立的直连不依赖房间继续传输，房间过期后新设备不能加入。
+房间生命周期：创建后 1 分钟无人加入自动销毁；有设备持续发送心跳时一直有效，没有固定到期时间。接口中的 `expiresAt` 保留为当前空闲回收期限，每次心跳续期，兼容已打开的旧客户端。心跳临时失败自动重试，不并发堆积请求；恢复后自动清除房间连接提示，房间回收等永久加入失败则停止轮询，等待用户重试或创建房间。主动离开移除该设备及其信令，最后一台设备离开时原子删除房间与容量索引；重复离开安全。刷新或关闭页面只暂停心跳，不发送会立即销毁空房间的主动离开请求；刷新后以同一标签页身份替换旧成员。断电、断网、浏览器崩溃或关闭全部页面后，由 Redis 在最后一次心跳后 1 分钟回收。其他设备仍在发送心跳时不会销毁；后台冻结超过期限的页面需重新加入或创建房间。已建立的直连不依赖房间继续传输，房间过期后新设备不能加入。

package/dist/messages/rooms/leave.msg.d.ts

@@ -4,6 +4,11 @@ declare const _default: import("@hile/micro").MicroContractMessage<{
         code: import("zod").ZodString;
         peer: import("zod").ZodObject<{
             id: import("zod").ZodNumber;
+            session: import("zod").ZodOptional<import("zod").ZodObject<{
+                id: import("zod").ZodUUID;
+                revision: import("zod").ZodNumber;
+            }, import("zod/v4/core").$strict>>;
+            name: import("zod").ZodOptional<import("zod").ZodString>;
         }, import("zod/v4/core").$strict>;
     }, import("zod/v4/core").$strict>;
     readonly output: import("zod").ZodDiscriminatedUnion<[import("zod").ZodObject<{

package/dist/messages/rooms/read.msg.d.ts

@@ -4,6 +4,11 @@ declare const _default: import("@hile/micro").MicroContractMessage<{
         code: import("zod").ZodString;
         peer: import("zod").ZodObject<{
             id: import("zod").ZodNumber;
+            session: import("zod").ZodOptional<import("zod").ZodObject<{
+                id: import("zod").ZodUUID;
+                revision: import("zod").ZodNumber;
+            }, import("zod/v4/core").$strict>>;
+            name: import("zod").ZodOptional<import("zod").ZodString>;
         }, import("zod/v4/core").$strict>;
     }, import("zod/v4/core").$strict>;
     readonly output: import("zod").ZodDiscriminatedUnion<[import("zod").ZodObject<{
@@ -12,6 +17,11 @@ declare const _default: import("@hile/micro").MicroContractMessage<{
             expiresAt: import("zod").ZodNumber;
             peers: import("zod").ZodArray<import("zod").ZodObject<{
                 id: import("zod").ZodNumber;
+                session: import("zod").ZodOptional<import("zod").ZodObject<{
+                    id: import("zod").ZodUUID;
+                    revision: import("zod").ZodNumber;
+                }, import("zod/v4/core").$strict>>;
+                name: import("zod").ZodOptional<import("zod").ZodString>;
             }, import("zod/v4/core").$strict>>;
             signals: import("zod").ZodArray<import("zod").ZodObject<{
                 id: import("zod").ZodUUID;

package/dist/models/transfer/read-room.model.d.ts

@@ -6,6 +6,11 @@ declare const _default: import("@hile/model").ModelDefinition<{
     expiresAt: number;
     peers: {
         id: number;
+        session?: {
+            id: string;
+            revision: number;
+        } | undefined;
+        name?: string | undefined;
     }[];
     signals: {
         id: string;

package/dist/services/application.service.d.ts

@@ -25,6 +25,11 @@ declare const _default: import("@hile/core").ServiceRegisterProps<{
                         code: import("zod").ZodString;
                         peer: import("zod").ZodObject<{
                             id: import("zod").ZodNumber;
+                            session: import("zod").ZodOptional<import("zod").ZodObject<{
+                                id: import("zod").ZodUUID;
+                                revision: import("zod").ZodNumber;
+                            }, import("zod/v4/core").$strict>>;
+                            name: import("zod").ZodOptional<import("zod").ZodString>;
                         }, import("zod/v4/core").$strict>;
                     }, import("zod/v4/core").$strict>;
                     readonly output: import("zod").ZodDiscriminatedUnion<[import("zod").ZodObject<{
@@ -41,6 +46,11 @@ declare const _default: import("@hile/core").ServiceRegisterProps<{
                         code: import("zod").ZodString;
                         peer: import("zod").ZodObject<{
                             id: import("zod").ZodNumber;
+                            session: import("zod").ZodOptional<import("zod").ZodObject<{
+                                id: import("zod").ZodUUID;
+                                revision: import("zod").ZodNumber;
+                            }, import("zod/v4/core").$strict>>;
+                            name: import("zod").ZodOptional<import("zod").ZodString>;
                         }, import("zod/v4/core").$strict>;
                     }, import("zod/v4/core").$strict>;
                     readonly output: import("zod").ZodDiscriminatedUnion<[import("zod").ZodObject<{
@@ -49,6 +59,11 @@ declare const _default: import("@hile/core").ServiceRegisterProps<{
                             expiresAt: import("zod").ZodNumber;
                             peers: import("zod").ZodArray<import("zod").ZodObject<{
                                 id: import("zod").ZodNumber;
+                                session: import("zod").ZodOptional<import("zod").ZodObject<{
+                                    id: import("zod").ZodUUID;
+                                    revision: import("zod").ZodNumber;
+                                }, import("zod/v4/core").$strict>>;
+                                name: import("zod").ZodOptional<import("zod").ZodString>;
                             }, import("zod/v4/core").$strict>>;
                             signals: import("zod").ZodArray<import("zod").ZodObject<{
                                 id: import("zod").ZodUUID;

package/dist/transfer/contracts.d.ts

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 export declare const transferPolicy: Readonly<{
-    roomLifetimeMs: number;
     roomIdleTimeoutMs: 60000;
     maxRooms: 32;
     maxPeers: 8;
+    maxDeviceNameLength: 48;
     peerTimeoutMs: 15000;
     pollMs: 1000;
     requestTimeoutMs: 20000;
@@ -30,8 +30,18 @@ export declare const fileInputSchema: z.ZodObject<{
     size: z.ZodNumber;
     sha256: z.ZodString;
 }, z.core.$strict>;
+export declare const deviceNameSchema: z.ZodString;
+export declare const peerSessionSchema: z.ZodObject<{
+    id: z.ZodUUID;
+    revision: z.ZodNumber;
+}, z.core.$strict>;
 export declare const peerSchema: z.ZodObject<{
     id: z.ZodNumber;
+    session: z.ZodOptional<z.ZodObject<{
+        id: z.ZodUUID;
+        revision: z.ZodNumber;
+    }, z.core.$strict>>;
+    name: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 export declare const signalSchema: z.ZodObject<{
     id: z.ZodUUID;
@@ -55,12 +65,22 @@ export declare const readRoomSchema: z.ZodObject<{
     code: z.ZodString;
     peer: z.ZodObject<{
         id: z.ZodNumber;
+        session: z.ZodOptional<z.ZodObject<{
+            id: z.ZodUUID;
+            revision: z.ZodNumber;
+        }, z.core.$strict>>;
+        name: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>;
 }, z.core.$strict>;
 export declare const snapshotSchema: z.ZodObject<{
     expiresAt: z.ZodNumber;
     peers: z.ZodArray<z.ZodObject<{
         id: z.ZodNumber;
+        session: z.ZodOptional<z.ZodObject<{
+            id: z.ZodUUID;
+            revision: z.ZodNumber;
+        }, z.core.$strict>>;
+        name: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>>;
     signals: z.ZodArray<z.ZodObject<{
         id: z.ZodUUID;

package/dist/transfer/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/transfer/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;EAqBzB,CAAC;AAEH,eAAO,MAAM,cAAc,aAA0C,CAAC;AACtE,eAAO,MAAM,eAAe;;kBAA2C,CAAC;AACxE,eAAO,MAAM,eAAe;;;;kBAI1B,CAAC;AAEH,eAAO,MAAM,UAAU;;kBAAuC,CAAC;AAC/D,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;kBAKsC,CAAC;AAChE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAC1D,eAAO,MAAM,cAAc;;;;;kBAEzB,CAAC;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;kBAIzB,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAEtD,eAAO,MAAM,WAAW;;;;;EAKtB,CAAC;AAEH,qBAAa,aAAc,SAAQ,KAAK;CAAG"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/transfer/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;EAqBzB,CAAC;AAEH,eAAO,MAAM,cAAc,aAA0C,CAAC;AACtE,eAAO,MAAM,eAAe;;kBAA2C,CAAC;AACxE,eAAO,MAAM,eAAe;;;;kBAI1B,CAAC;AAEH,eAAO,MAAM,gBAAgB,aACQ,CAAC;AACtC,eAAO,MAAM,iBAAiB;;;kBAG5B,CAAC;AACH,eAAO,MAAM,UAAU;;;;;;;kBAIrB,CAAC;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;kBAKsC,CAAC;AAChE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAC1D,eAAO,MAAM,cAAc;;;;;;;;;;kBAEzB,CAAC;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAKzB,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAEtD,eAAO,MAAM,WAAW;;;;;EAKtB,CAAC;AAEH,qBAAa,aAAc,SAAQ,KAAK;CAAG"}

package/dist/transfer/contracts.js

@@ -4,10 +4,10 @@ import { TOOLS_SERVICE_NAMESPACE } from '../identity.js';
 const maxPeers = 8;
 const maxLocalDocumentBytes = 256 * 1_024;
 export const transferPolicy = Object.freeze({
-    roomLifetimeMs: 30 * 60 * 1_000,
     roomIdleTimeoutMs: 60_000,
     maxRooms: 32,
     maxPeers,
+    maxDeviceNameLength: 48,
     peerTimeoutMs: 15_000,
     pollMs: 1_000,
     requestTimeoutMs: 20_000,
@@ -33,7 +33,17 @@ export const fileInputSchema = z.strictObject({
     sha256: z.string().regex(/^[a-f0-9]{64}$/),
 });
 const peerIdSchema = z.number().int().min(0).max(0xffffffff);
-export const peerSchema = z.strictObject({ id: peerIdSchema });
+export const deviceNameSchema = z.string().trim().min(1).max(transferPolicy.maxDeviceNameLength)
+    .regex(/^[^\u0000-\u001f\u007f]+$/);
+export const peerSessionSchema = z.strictObject({
+    id: z.uuid(),
+    revision: z.number().int().min(1).max(Number.MAX_SAFE_INTEGER - 1),
+});
+export const peerSchema = z.strictObject({
+    id: peerIdSchema,
+    session: peerSessionSchema.optional(),
+    name: deviceNameSchema.optional(),
+});
 export const signalSchema = z.strictObject({
     id: z.uuid(), from: peerIdSchema, to: peerIdSchema,
     description: z.strictObject({ type: z.enum(['offer', 'answer']), sdp: z.string().min(1).max(16_000) }).optional(),
@@ -44,6 +54,7 @@ export const readRoomSchema = roomInputSchema.extend({
     peer: peerSchema,
 });
 export const snapshotSchema = z.strictObject({
+    // Keep the wire field for open clients; this is the renewable idle deadline.
     expiresAt: z.number().int(),
     peers: z.array(peerSchema).max(transferPolicy.maxPeers),
     signals: z.array(signalSchema).max(transferPolicy.maxSignals),

package/dist/transfer/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/transfer/contracts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/transfer/contracts.ts"],"names":[],"mappings":"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"}

package/dist/transfer/micro-contract.d.ts

@@ -22,6 +22,11 @@ export declare const transferContract: Readonly<{
                 code: z.ZodString;
                 peer: z.ZodObject<{
                     id: z.ZodNumber;
+                    session: z.ZodOptional<z.ZodObject<{
+                        id: z.ZodUUID;
+                        revision: z.ZodNumber;
+                    }, z.core.$strict>>;
+                    name: z.ZodOptional<z.ZodString>;
                 }, z.core.$strict>;
             }, z.core.$strict>;
             readonly output: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -38,6 +43,11 @@ export declare const transferContract: Readonly<{
                 code: z.ZodString;
                 peer: z.ZodObject<{
                     id: z.ZodNumber;
+                    session: z.ZodOptional<z.ZodObject<{
+                        id: z.ZodUUID;
+                        revision: z.ZodNumber;
+                    }, z.core.$strict>>;
+                    name: z.ZodOptional<z.ZodString>;
                 }, z.core.$strict>;
             }, z.core.$strict>;
             readonly output: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -46,6 +56,11 @@ export declare const transferContract: Readonly<{
                     expiresAt: z.ZodNumber;
                     peers: z.ZodArray<z.ZodObject<{
                         id: z.ZodNumber;
+                        session: z.ZodOptional<z.ZodObject<{
+                            id: z.ZodUUID;
+                            revision: z.ZodNumber;
+                        }, z.core.$strict>>;
+                        name: z.ZodOptional<z.ZodString>;
                     }, z.core.$strict>>;
                     signals: z.ZodArray<z.ZodObject<{
                         id: z.ZodUUID;

package/dist/transfer/micro-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"micro-contract.d.ts","sourceRoot":"","sources":["../../src/transfer/micro-contract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU3B,CAAC"}
+{"version":3,"file":"micro-contract.d.ts","sourceRoot":"","sources":["../../src/transfer/micro-contract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU3B,CAAC"}

package/dist/transfer/rooms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../src/transfer/rooms.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAEL,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAC9D,MAAM,gBAAgB,CAAC;AASxB,qBAAa,aAAa;IACL,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAzC,YAAoC,KAAK,EAAE,KAAK,EAAI;IAEpD,OAAO,CAAC,GAAG;IAKE,MAAM,CAAC,MAAM,EAAE,WAAW;;;OAiBtC;YAEa,IAAI;YASJ,MAAM;IAmCb,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAY5F;IAEM,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,iBAKjE;IAEM,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,iBAa3E;CACF"}
+{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../src/transfer/rooms.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAEL,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAC9D,MAAM,gBAAgB,CAAC;AAQxB,qBAAa,aAAa;IACL,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAzC,YAAoC,KAAK,EAAE,KAAK,EAAI;IAEpD,OAAO,CAAC,GAAG;IAKE,MAAM,CAAC,MAAM,EAAE,WAAW;;;OAiBtC;YAEa,IAAI;YAQJ,MAAM;IAkCb,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmB5F;IAEM,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,iBAKjE;IAEM,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,iBAa3E;CACF"}

package/dist/transfer/rooms.js

@@ -14,8 +14,8 @@ export class TransferRooms {
         signal.throwIfAborted();
         const code = randomBytes(18).toString('base64url');
         const key = this.key(code);
-        const expiresAt = Date.now() + policy.roomLifetimeMs;
-        const room = { expiresAt, signals: [], peers: [] };
+        const expiresAt = Date.now() + policy.roomIdleTimeoutMs;
+        const room = { signals: [], peers: [] };
         const accepted = await this.redis.eval(`
       redis.call('ZREMRANGEBYSCORE', KEYS[1], '-inf', ARGV[1])
       if redis.call('ZCARD', KEYS[1]) >= tonumber(ARGV[2]) then return 0 end
@@ -34,8 +34,6 @@ export class TransferRooms {
         if (!raw)
             return;
         const room = JSON.parse(raw);
-        if (room.expiresAt <= Date.now())
-            return;
         return { key, raw, room };
     }
     async change(code, signal, edit, missing) {
@@ -53,7 +51,7 @@ export class TransferRooms {
             const result = edit(room);
             const members = new Set(room.peers.map(({ id }) => id));
             room.signals = room.signals.filter(({ from, to }) => members.has(from) && members.has(to));
-            const idleExpiry = Math.min(room.expiresAt, Math.max(0, ...room.peers.map(({ seen }) => seen)) + policy.roomIdleTimeoutMs);
+            const idleExpiry = Math.max(0, ...room.peers.map(({ seen }) => seen)) + policy.roomIdleTimeoutMs;
             const saved = await this.redis.eval(`
         if redis.call('GET', KEYS[1]) ~= ARGV[1] then return 0 end
         if tonumber(ARGV[3]) <= 0 then
@@ -73,13 +71,20 @@ export class TransferRooms {
     }
     read(code, peer, signal) {
         return this.change(code, signal, (room) => {
-            room.peers = room.peers.filter((item) => item.id !== peer.id);
+            const current = peer.session && room.peers.find((item) => item.session?.id === peer.session.id);
+            if (current?.session && (current.session.revision > peer.session.revision
+                || (current.session.revision === peer.session.revision && current.id !== peer.id))) {
+                throw new TransferError('此页面的连接已被刷新后的页面替换，请刷新重试');
+            }
+            room.peers = room.peers.filter((item) => item.id !== peer.id
+                && (!peer.session || item.session?.id !== peer.session.id));
             if (room.peers.length >= policy.maxPeers)
                 throw new TransferError('房间连接设备已达上限');
-            room.peers.push({ ...peer, seen: Date.now() });
+            const seen = Date.now();
+            room.peers.push({ ...peer, seen });
             return {
-                expiresAt: room.expiresAt,
-                peers: room.peers.map(({ id }) => ({ id })),
+                expiresAt: seen + policy.roomIdleTimeoutMs,
+                peers: room.peers.map(({ seen: _seen, ...item }) => peer.session ? item : { id: item.id }),
                 signals: room.signals.filter((item) => item.to === peer.id
                     && room.peers.some(({ id }) => id === item.from)),
             };

package/dist/transfer/rooms.js.map

@@ -1 +1 @@
-{"version":3,"file":"rooms.js","sourceRoot":"","sources":["../../src/transfer/rooms.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rooms.js","sourceRoot":"","sources":["../../src/transfer/rooms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EACL,aAAa,EAAE,cAAc,IAAI,MAAM,EAAE,cAAc,EAAE,YAAY,GAEtE,MAAM,gBAAgB,CAAC;AAOxB,6FAA6F;AAC7F,MAAM,OAAO,aAAa;IACY,KAAK;IAAzC,YAAoC,KAAY;qBAAZ,KAAK;IAAU,CAAC;IAE5C,GAAG,CAAC,IAAY;QACtB,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,iBAAiB,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAmB;QACrC,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,iBAAiB,CAAC;QACxD,MAAM,IAAI,GAAS,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;;;;;;;KAOtC,EAAE,CAAC,EAAE,gBAAgB,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,iBAAiB,EAC/F,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,CAAC;QACvD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,IAAY;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAS,CAAC;QACrC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,MAAM,CAAI,IAAY,EAAE,MAAmB,EAAE,IAAuB,EAAE,OAAW;QAC7F,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,EAAE,CAAC;YAClE,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,IAAI,OAAO,KAAK,SAAS;oBAAE,OAAO,OAAO,CAAC;gBAC1C,MAAM,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAAC;YAC7C,CAAC;YACD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;YAClC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;YACxF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACxD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3F,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC;YAEjG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;;;;;;;;;;;OAWnC,EAAE,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,EAC/E,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,KAAK;gBAAE,OAAO,MAAM,CAAC;QAC3B,CAAC;QACD,MAAM,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAEM,IAAI,CAAC,IAAY,EAAE,IAAkB,EAAE,MAAmB;QAC/D,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,IAAI,CAAC,OAAQ,CAAC,EAAE,CAAC,CAAC;YACjG,IAAI,OAAO,EAAE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAQ,CAAC,QAAQ;mBACrE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,OAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBACtF,MAAM,IAAI,aAAa,CAAC,wBAAwB,CAAC,CAAC;YACpD,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;mBACvD,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ;gBAAE,MAAM,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;YAChF,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACnC,OAAO;gBACL,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC,iBAAiB;gBAC1C,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;gBAC1F,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;uBACrD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;aACpD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,IAAY,EAAE,IAAkB,EAAE,MAAmB;QAChE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IAEM,MAAM,CAAC,IAAY,EAAE,KAAqB,EAAE,YAAyB;QAC1E,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;mBAChD,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzD,MAAM,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;gBAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACtD,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;gBACtF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACvB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlooks.cn/tools-server",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "module",
   "private": false,
   "engines": {
@@ -133,5 +133,5 @@
   },
   "description": "本地工具与跨设备互传的 Hile RSC 页面服务",
   "license": "GPL-3.0-only",
-  "gitHead": "14b8f0f7d4d6d2cbc433fe195236fecd5035c5bb"
+  "gitHead": "4f330fb46e4c731c31f51a5b7c57907e3f7fd74f"
 }

package/.hile-rsc/build-mvf297qj-cc123793/client-browser/chunks/chunk-242VPVFX.js

@@ -1 +0,0 @@
-import{a,b}from"./chunk-FRMD2TGT.js";import"./chunk-RXCVXOY7.js";import"./chunk-LKWCVHM2.js";import"./chunk-VZS2AZSH.js";import"./chunk-ENX4REA6.js";import"./chunk-EPXOE4VI.js";export{b as runners,a as safeHtml};