@zlooks.cn/tools-server 1.0.3 → 1.1.1

package/dist/transfer/rooms.js

@@ -0,0 +1,110 @@
+import { createHash, randomBytes } from 'node:crypto';
+import { TransferError, transferPolicy as policy, roomCodeSchema, signalSchema, } from './contracts.js';
+// Shared Redis CAS keeps pairing correct across replicas; content never enters this service.
+export class TransferRooms {
+    redis;
+    constructor(redis) {
+        this.redis = redis;
+    }
+    key(code) {
+        roomCodeSchema.parse(code);
+        return `transfer:room:${createHash('sha256').update(code).digest('hex')}`;
+    }
+    async create(signal) {
+        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 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
+      redis.call('ZADD', KEYS[1], ARGV[3], KEYS[2])
+      redis.call('SET', KEYS[2], ARGV[4], 'PX', ARGV[5])
+      redis.call('PEXPIRE', KEYS[1], ARGV[5])
+      return 1
+    `, 2, 'transfer:rooms', key, Date.now(), policy.maxRooms, Date.now() + policy.roomIdleTimeoutMs, JSON.stringify(room), policy.roomIdleTimeoutMs);
+        if (!accepted)
+            throw new TransferError('当前房间已满，请稍后重试');
+        return { code, expiresAt };
+    }
+    async load(code) {
+        const key = this.key(code);
+        const raw = await this.redis.get(key);
+        if (!raw)
+            return;
+        const room = JSON.parse(raw);
+        if (room.expiresAt <= Date.now())
+            return;
+        return { key, raw, room };
+    }
+    async change(code, signal, edit, missing) {
+        for (let attempt = 0; attempt < policy.conflictRetries; attempt++) {
+            signal.throwIfAborted();
+            const loaded = await this.load(code);
+            signal.throwIfAborted();
+            if (!loaded) {
+                if (missing !== undefined)
+                    return missing;
+                throw new TransferError('房间不存在或已过期，请重新创建');
+            }
+            const { key, raw, room } = loaded;
+            room.peers = room.peers.filter((peer) => Date.now() - peer.seen < policy.peerTimeoutMs);
+            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 saved = await this.redis.eval(`
+        if redis.call('GET', KEYS[1]) ~= ARGV[1] then return 0 end
+        if tonumber(ARGV[3]) <= 0 then
+          redis.call('DEL', KEYS[1])
+          redis.call('ZREM', KEYS[2], KEYS[1])
+        else
+          redis.call('SET', KEYS[1], ARGV[2], 'PX', ARGV[3])
+          redis.call('ZADD', KEYS[2], ARGV[4], KEYS[1])
+          redis.call('PEXPIRE', KEYS[2], ARGV[5])
+        end
+        return 1
+      `, 2, key, 'transfer:rooms', raw, JSON.stringify(room), idleExpiry - Date.now(), idleExpiry, policy.roomIdleTimeoutMs);
+            if (saved)
+                return result;
+        }
+        throw new TransferError('房间操作繁忙，请重试');
+    }
+    read(code, peer, signal) {
+        return this.change(code, signal, (room) => {
+            room.peers = room.peers.filter((item) => item.id !== peer.id);
+            if (room.peers.length >= policy.maxPeers)
+                throw new TransferError('房间连接设备已达上限');
+            room.peers.push({ ...peer, seen: Date.now() });
+            return {
+                expiresAt: room.expiresAt,
+                peers: room.peers.map(({ id }) => ({ id })),
+                signals: room.signals.filter((item) => item.to === peer.id
+                    && room.peers.some(({ id }) => id === item.from)),
+            };
+        });
+    }
+    leave(code, peer, signal) {
+        return this.change(code, signal, (room) => {
+            room.peers = room.peers.filter(({ id }) => id !== peer.id);
+            return null;
+        }, null);
+    }
+    signal(code, value, cancellation) {
+        const signal = signalSchema.parse(value);
+        return this.change(code, cancellation, (room) => {
+            if (!room.peers.some((peer) => peer.id === signal.to)
+                || !room.peers.some((peer) => peer.id === signal.from)) {
+                throw new TransferError('对方设备已离开房间');
+            }
+            if (!room.signals.some((item) => item.id === signal.id))
+                room.signals.push(signal);
+            room.signals = room.signals.slice(-policy.maxSignals);
+            while (Buffer.byteLength(JSON.stringify(room.signals)) > policy.maxSignalHistoryBytes) {
+                room.signals.shift();
+            }
+        });
+    }
+}
+//# sourceMappingURL=rooms.js.map

package/dist/transfer/rooms.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlooks.cn/tools-server",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "type": "module",
   "private": false,
   "engines": {
@@ -17,7 +17,7 @@
   ],
   "zlooks": {
     "kind": "service",
-    "description": "84 个浏览器本地计算工具",
+    "description": "84 个本地计算工具与浏览器直连跨设备互传",
     "dependsOn": [],
     "nodeConditions": [
       "react-server"
@@ -47,8 +47,14 @@
     "@codemirror/legacy-modes": "6.5.4",
     "@codemirror/state": "6.7.2",
     "@codemirror/view": "6.43.10",
+    "@hile/context": "4.0.3",
     "@hile/core": "4.0.2",
+    "@hile/http-over-micro": "1.0.4",
+    "@hile/ioredis": "4.0.3",
+    "@hile/message-loader": "4.0.9",
     "@hile/micro": "4.0.9",
+    "@hile/micro-contract": "1.0.1",
+    "@hile/model": "4.0.5",
     "@hile/rsc": "1.0.28",
     "@hile/rsc-discovery-hile": "1.0.25",
     "@it-tools/oggen": "1.3.0",
@@ -56,6 +62,8 @@
     "@regexper/render": "1.0.0",
     "@scure/bip39": "2.4.0",
     "@sindresorhus/slugify": "3.0.1",
+    "@zlooks.cn/browser-api": "1.0.2",
+    "@zlooks.cn/infrastructure": "1.0.0",
     "@zlooks.cn/registry-config": "1.0.1",
     "@zlooks.cn/service-command": "1.0.4",
     "@zlooks.cn/ui": "1.1.9",
@@ -73,6 +81,7 @@
     "email-normalizer": "1.0.0",
     "figlet": "1.12.0",
     "ibantools": "4.5.4",
+    "ioredis": "5.11.1",
     "json5": "2.2.3",
     "jwt-decode": "3.1.2",
     "libphonenumber-js": "1.13.15",
@@ -97,7 +106,10 @@
     "uuid": "14.0.3",
     "xml-formatter": "3.7.0",
     "xml-js": "1.6.11",
+    "y-codemirror.next": "0.3.5",
+    "y-protocols": "1.0.7",
     "yaml": "2.9.1",
+    "yjs": "13.6.33",
     "zod": "4.4.3"
   },
   "devDependencies": {
@@ -119,7 +131,7 @@
     "typescript": "7.0.2",
     "vitest": "4.1.11"
   },
-  "description": "84 个浏览器本地工具的 Hile RSC 页面服务",
+  "description": "本地工具与跨设备互传的 Hile RSC 页面服务",
   "license": "GPL-3.0-only",
-  "gitHead": "4f8ccf0934560a6f370bdf3f823ad591a8777fa8"
+  "gitHead": "14b8f0f7d4d6d2cbc433fe195236fecd5035c5bb"
 }