@anycon/protocol 0.1.1 → 0.2.0

package/src/crypto.ts

@@ -124,6 +124,15 @@ export interface EnrollCrypto {
 /** `loadCrypto()` 的结果：配对 / 重连 / 传输 + 账号内接入。 */
 export type FullCrypto = Crypto & EnrollCrypto
 
+/** dev server 预览隧道（ADR-39）用到的部分。只有预览页的 service worker 用；`loadCrypto()` 的结果同时满足它。 */
+export interface PreviewCrypto {
+  /**
+   * 预览隧道握手 `Noise_NKpsk0` 的 initiator：没有静态密钥，钉住 daemon 静态公钥 `daemonPublic`（32 字节）。
+   * `psk` 是预览票据密钥（32 字节），`prologue` 用 `previewPrologue(label, ticketId)` 算。
+   */
+  previewInitiator(daemonPublic: Uint8Array, psk: Uint8Array, prologue: Uint8Array): Handshake
+}
+
 /** wasm 产物不存在或加载失败。 */
 export class CryptoUnavailableError extends Error {
   override readonly name = 'CryptoUnavailableError'
@@ -171,6 +180,7 @@ export interface WasmModule {
   WasmHandshake: {
     pairing(role: Role, local: RawKeypair, psk: Uint8Array): RawHandshake
     reconnect(role: Role, local: RawKeypair, remotePublic?: Uint8Array): RawHandshake
+    previewInitiator(daemonPublic: Uint8Array, psk: Uint8Array, prologue: Uint8Array): RawHandshake
   }
   derivePairSecrets(code: string): RawPairSecrets
   derivePsk(code: string): Uint8Array
@@ -262,7 +272,7 @@ function wrapCpace(raw: RawCpace): Cpace {
   }
 }
 
-function wrapModule(mod: WasmModule): FullCrypto {
+function wrapModule(mod: WasmModule): FullCrypto & PreviewCrypto {
   // 传给 wasm 的 Keypair 每次临时重建。握手对象建好后释放它：wasm 若按值消费了它，free 是空操作。
   const withKeypair = (kp: Keypair, build: (raw: RawKeypair) => RawHandshake): Handshake => {
     const raw = mod.WasmKeypair.fromSecret(kp.secret)
@@ -283,6 +293,8 @@ function wrapModule(mod: WasmModule): FullCrypto {
       withKeypair(local, (raw) => mod.WasmHandshake.pairing(role, raw, psk)),
     reconnect: (role, local, remotePublic) =>
       withKeypair(local, (raw) => mod.WasmHandshake.reconnect(role, raw, remotePublic)),
+    previewInitiator: (daemonPublic, psk, prologue) =>
+      wrapHandshake(mod.WasmHandshake.previewInitiator(daemonPublic, psk, prologue)),
     derivePairSecrets: (code) => {
       const raw = mod.derivePairSecrets(code)
       try {
@@ -346,7 +358,7 @@ async function nodeWasmBytes(): Promise<Uint8Array> {
   }
 }
 
-async function initialize(options: LoadCryptoOptions): Promise<FullCrypto> {
+async function initialize(options: LoadCryptoOptions): Promise<FullCrypto & PreviewCrypto> {
   const mod = await (options.module ?? importWasmModule())
   const input: unknown = options.wasm ?? (isNode() ? await nodeWasmBytes() : undefined)
   // wasm-bindgen ≥ 0.2.93 的对象形参；不给 input 时浏览器走胶水 js 里的 `new URL(…, import.meta.url)`。
@@ -354,13 +366,13 @@ async function initialize(options: LoadCryptoOptions): Promise<FullCrypto> {
   return wrapModule(mod)
 }
 
-let cached: Promise<FullCrypto> | undefined
+let cached: Promise<FullCrypto & PreviewCrypto> | undefined
 
 /**
  * 加载并初始化 wasm。进程内只初始化一次（第二次调用返回同一个 Promise；失败不缓存，可重试）。
  * wasm 产物不存在时抛 `CryptoUnavailableError`，消息里写明要跑 `just gen-wasm`。
  */
-export function loadCrypto(options: LoadCryptoOptions = {}): Promise<FullCrypto> {
+export function loadCrypto(options: LoadCryptoOptions = {}): Promise<FullCrypto & PreviewCrypto> {
   if (!cached) {
     cached = initialize(options).catch((err: unknown) => {
       cached = undefined

package/src/envelope.ts

@@ -99,7 +99,7 @@ type ControlType = Control['type']
 
 /** 每个变体的字段声明顺序（不含 `type`），对应 control.rs。 */
 const CONTROL_FIELD_ORDER: Readonly<Record<ControlType, readonly string[]>> = {
-  auth: ['device_token', 'protocol_version', 'client'],
+  auth: ['device_token', 'protocol_version', 'client', 'preview_token'],
   auth_ok: ['device_id', 'server_time_ms', 'peers_online', 'quota'],
   auth_fail: ['reason'],
   pair_begin: ['match_id'],
@@ -117,12 +117,13 @@ const CONTROL_FIELD_ORDER: Readonly<Record<ControlType, readonly string[]>> = {
   revoke: ['device'],
   peer_online: ['device'],
   peer_offline: ['device'],
+  preview_peer: ['peer', 'label'],
   undeliverable: ['to', 'seq'],
   queue_overflow: ['to', 'dropped_seqs'],
   queue_drop: ['seq'],
   backpressure: ['to', 'seq'],
   dropped: ['seq', 'reason'],
-  rate_limited: ['retry_after_ms'],
+  rate_limited: ['retry_after_ms', 'to'],
   quota_update: ['quota'],
   rotate_token: [],
   token_rotated: ['device_token'],
@@ -130,10 +131,11 @@ const CONTROL_FIELD_ORDER: Readonly<Record<ControlType, readonly string[]>> = {
 
 /** Rust 侧 `#[serde(skip_serializing_if = "Option::is_none")]` 的字段：None 时整键省略，而不是编码为 nil。 */
 const CONTROL_SKIP_NONE: Readonly<Record<string, ReadonlySet<string>>> = {
-  auth: new Set(['device_token']),
+  auth: new Set(['device_token', 'preview_token']),
   auth_ok: new Set(['quota']),
   pair_done: new Set(['device_id', 'device_token']),
   enroll_failed: new Set(['enroll_id']),
+  rate_limited: new Set(['to']),
 }
 
 /** 全部控制消息的 `type`，对应 control.rs 的 `Control` 变体（snake_case）。 */