@dev-anywhere/relay 0.4.71 → 0.4.73

package/dist/{chunk-H7OL7UK7.js → chunk-UV7DNQUI.js}

@@ -513,6 +513,11 @@ var RelayClientInfoSchema = z8.object({
   connectedAt: z8.number().int().nonnegative(),
   current: z8.boolean().optional(),
   userAgent: z8.string().optional(),
+  platform: z8.string().optional(),
+  maxTouchPoints: z8.number().int().nonnegative().optional(),
+  browserName: z8.string().min(1),
+  osName: z8.string().min(1),
+  deviceKind: z8.enum(["desktop", "tablet", "phone", "unknown"]),
   remoteAddress: z8.string().optional()
 });
 var AgentCliAvailabilitySchema = z8.object({
@@ -675,7 +680,13 @@ var relayControlDefinitions = [
   control("latency_web_proxy_pong", { ...RequiredRequestIdShape, proxyNow: z8.number().optional() }, "proxy_to_client"),
   // 客户端注册协议
   control("client_register", {
-    clientId: IdSchema
+    clientId: IdSchema,
+    userAgent: z8.string().optional(),
+    platform: z8.string().optional(),
+    maxTouchPoints: z8.number().int().nonnegative().optional(),
+    browserName: z8.string().min(1),
+    osName: z8.string().min(1),
+    deviceKind: z8.enum(["desktop", "tablet", "phone", "unknown"])
   }),
   control("client_register_response", {
     status: z8.enum(["restored", "proxy_offline", "new"]),
@@ -964,7 +975,8 @@ function isClientToProxyRelayControlType(type) {
 
 // ../../packages/shared/dist/constants/relay-close-codes.js
 var RelayCloseCode = {
-  CLIENT_KICKED: 4401
+  CLIENT_KICKED: 4401,
+  CLIENT_PROTOCOL_REJECTED: 4402
 };
 
 // ../../packages/shared/dist/binary-frame.js
@@ -1173,6 +1185,11 @@ var RelayRegistry = class {
       connectedAt: metadata.connectedAt ?? Date.now(),
       ...metadata.clientId !== void 0 ? { clientId: metadata.clientId } : {},
       ...metadata.userAgent !== void 0 ? { userAgent: metadata.userAgent } : {},
+      ...metadata.platform !== void 0 ? { platform: metadata.platform } : {},
+      ...metadata.maxTouchPoints !== void 0 ? { maxTouchPoints: metadata.maxTouchPoints } : {},
+      ...metadata.browserName !== void 0 ? { browserName: metadata.browserName } : {},
+      ...metadata.osName !== void 0 ? { osName: metadata.osName } : {},
+      ...metadata.deviceKind !== void 0 ? { deviceKind: metadata.deviceKind } : {},
       ...metadata.remoteAddress !== void 0 ? { remoteAddress: metadata.remoteAddress } : {}
     });
   }
@@ -1184,6 +1201,21 @@ var RelayRegistry = class {
     }
     this.addClientWs(ws, { clientId });
   }
+  updateConnectedClientMetadata(ws, metadata) {
+    const current = this.connectedClients.get(ws);
+    if (!current) {
+      this.addClientWs(ws, metadata);
+      return;
+    }
+    if (metadata.clientId !== void 0) current.clientId = metadata.clientId;
+    if (metadata.userAgent !== void 0) current.userAgent = metadata.userAgent;
+    if (metadata.platform !== void 0) current.platform = metadata.platform;
+    if (metadata.maxTouchPoints !== void 0) current.maxTouchPoints = metadata.maxTouchPoints;
+    if (metadata.browserName !== void 0) current.browserName = metadata.browserName;
+    if (metadata.osName !== void 0) current.osName = metadata.osName;
+    if (metadata.deviceKind !== void 0) current.deviceKind = metadata.deviceKind;
+    if (metadata.remoteAddress !== void 0) current.remoteAddress = metadata.remoteAddress;
+  }
   removeClientWs(ws) {
     this.connectedClients.delete(ws);
   }
@@ -1235,6 +1267,7 @@ var RelayRegistry = class {
     const details = [];
     for (const [ws, metadata] of this.connectedClients) {
       if (ws.readyState !== WebSocket.OPEN || !metadata.clientId) continue;
+      if (!metadata.browserName || !metadata.osName || !metadata.deviceKind) continue;
       const binding = this.clientBindings.get(metadata.clientId);
       details.push({
         clientId: metadata.clientId,
@@ -1242,6 +1275,11 @@ var RelayRegistry = class {
         connectedAt: metadata.connectedAt,
         ...metadata.clientId === currentClientId ? { current: true } : {},
         ...metadata.userAgent !== void 0 ? { userAgent: metadata.userAgent } : {},
+        ...metadata.platform !== void 0 ? { platform: metadata.platform } : {},
+        ...metadata.maxTouchPoints !== void 0 ? { maxTouchPoints: metadata.maxTouchPoints } : {},
+        browserName: metadata.browserName,
+        osName: metadata.osName,
+        deviceKind: metadata.deviceKind,
         ...metadata.remoteAddress !== void 0 ? { remoteAddress: metadata.remoteAddress } : {}
       });
     }
@@ -1754,7 +1792,6 @@ function handleProxyConnection(ws, registry, logger, chaos) {
 
 // src/handlers/client.ts
 import { WebSocket as WebSocket7 } from "ws";
-import { nanoid as nanoid3 } from "nanoid";
 
 // src/voice/bailian-asr.ts
 import { EventEmitter } from "events";
@@ -2404,9 +2441,26 @@ function handleVoiceConfigControl(msg, ws, store, logger, providers) {
 
 // src/handlers/client.ts
 var MAX_JSON_MESSAGE_SIZE2 = 1 * 1024 * 1024;
-function handleClientRegister(clientId, clientWs, registry, logger) {
+function isMalformedClientRegister(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    return parsed !== null && typeof parsed === "object" && parsed.type === "client_register";
+  } catch {
+    return false;
+  }
+}
+function handleClientRegister(registration, clientWs, registry, logger) {
+  const { clientId } = registration;
   clientWs.clientId = clientId;
-  registry.updateConnectedClientId(clientWs, clientId);
+  registry.updateConnectedClientMetadata(clientWs, {
+    clientId,
+    ...registration.userAgent !== void 0 ? { userAgent: registration.userAgent } : {},
+    ...registration.platform !== void 0 ? { platform: registration.platform } : {},
+    ...registration.maxTouchPoints !== void 0 ? { maxTouchPoints: registration.maxTouchPoints } : {},
+    browserName: registration.browserName,
+    osName: registration.osName,
+    deviceKind: registration.deviceKind
+  });
   const binding = registry.getClientBinding(clientId);
   if (!binding) {
     clientWs.send(
@@ -2516,6 +2570,19 @@ function rejectNotBound(ws) {
     })
   );
 }
+function rejectNotRegistered2(ws, requestId) {
+  ws.send(
+    JSON.stringify({
+      type: "relay_error",
+      requestId,
+      code: RelayErrorCode.NOT_REGISTERED,
+      message: "Client must register before selecting a proxy"
+    })
+  );
+}
+function closeRejectedClientProtocol(ws) {
+  ws.close(RelayCloseCode.CLIENT_PROTOCOL_REJECTED, "client protocol rejected");
+}
 function rejectProxySelect(ws, requestId, proxyId) {
   ws.send(
     JSON.stringify({
@@ -2570,7 +2637,7 @@ function handleClientConnection(ws, registry, logger, chaos, voiceConfigStore, v
         "Client message received"
       );
       if (msg.type === "client_register") {
-        handleClientRegister(msg.clientId, clientWs, registry, logger);
+        handleClientRegister(msg, clientWs, registry, logger);
         return;
       }
       if (msg.type === "relay_client_list_request") {
@@ -2668,13 +2735,15 @@ function handleClientConnection(ws, registry, logger, chaos, voiceConfigStore, v
         return;
       }
       if (msg.type === "proxy_select") {
+        if (!clientWs.clientId) {
+          rejectNotRegistered2(clientWs, msg.requestId);
+          closeRejectedClientProtocol(clientWs);
+          return;
+        }
         if (!registry.isProxyOnline(msg.proxyId)) {
           rejectProxySelect(clientWs, msg.requestId, msg.proxyId);
           return;
         }
-        if (!clientWs.clientId) {
-          clientWs.clientId = `anon-${nanoid3(10)}`;
-        }
         const bound = registry.bindClientById(clientWs.clientId, msg.proxyId, clientWs);
         if (!bound) {
           rejectProxySelect(clientWs, msg.requestId, msg.proxyId);
@@ -2723,6 +2792,9 @@ function handleClientConnection(ws, registry, logger, chaos, voiceConfigStore, v
         message: `${result.error} | raw: ${raw.slice(0, 200)}`
       })
     );
+    if (isMalformedClientRegister(raw)) {
+      closeRejectedClientProtocol(clientWs);
+    }
   });
   clientWs.on("close", () => {
     registry.removeClientWs(clientWs);
@@ -3526,4 +3598,4 @@ export {
   parseRelayChaosFromEnv,
   createRelayServer
 };
-//# sourceMappingURL=chunk-H7OL7UK7.js.map
+//# sourceMappingURL=chunk-UV7DNQUI.js.map