@walkhi/code-relax 0.1.0-beta.40 → 0.1.0-beta.41

package/dist/build-platform.json

@@ -1 +1 @@
-{"layout":"npm-platform-packages","version":"0.1.0-beta.40"}
+{"layout":"npm-platform-packages","version":"0.1.0-beta.41"}

package/dist/shared/p2p-diagnostics.cjs

@@ -23,6 +23,6 @@
       `;gathering=${known(this.gathering, ['new', 'in-progress', 'gathering', 'complete'])}` +
       `;local=${counts(this.local)};remote=${counts(this.remote)}` +
       `;open=${Number(this.open)};ping=${Number(this.ping)};pong=${Number(this.pong)}` +
-      `;error=${known(this.error, ['none', 'stun', 'description', 'candidate', 'channel', 'frame', 'peer', 'initialization', 'signal'])}`;
+      `;error=${known(this.error, ['none', 'stun', 'description', 'candidate', 'channel', 'frame', 'peer', 'initialization', 'signal', 'ice-policy'])}`;
   }
 });

package/dist/shared/p2p-file-channel.cjs

@@ -29,10 +29,13 @@
       const data = binary ? (value instanceof Uint8Array ? value : new Uint8Array(value)) : value;
       const size = binary ? data.byteLength : new TextEncoder().encode(data).length;
       if (!size || size > (binary ? MAX : PART) || this.bufferedAmount + size > LIMIT) throw new Error('文件直连分片或队列超限');
+      const negotiated = this.io.maxMessageSize?.();
+      const frameBytes = Number.isFinite(negotiated) && negotiated > 0 ? Math.min(PART, Math.max(1, Math.floor(negotiated))) : PART;
       const frames = binary ? [JSON.stringify({ type: 'rtc-file-bytes', length: size })] : [];
-      if (binary) for (let i = 0; i < size; i += PART) frames.push(data.slice(i, i + PART));
+      if (binary) for (let i = 0; i < size; i += frameBytes) frames.push(data.slice(i, i + frameBytes));
       else frames.push(data);
       const sizes = frames.map(frame => typeof frame === 'string' ? new TextEncoder().encode(frame).length : frame.byteLength);
+      if (sizes.some(length => length > frameBytes)) throw new Error('文件传输消息超过协商上限');
       const framedSize = sizes.reduce((total, length) => total + length, 0);
       if (this.bufferedAmount + framedSize > LIMIT) throw new Error('文件直连队列超限');
       this.outbound.push({ frames, sizes, index: 0 }); this.queued += framedSize; this.pump();
@@ -66,7 +69,7 @@
           this.waitForPartial(); return;
         }
         const bytes = value instanceof Uint8Array ? value : new Uint8Array(value), part = this.partial;
-        if (!part || bytes.length !== Math.min(PART, part.data.length - part.offset)) throw new Error();
+        if (!part || bytes.length < 1 || bytes.length > Math.min(PART, part.data.length - part.offset)) throw new Error();
         this.waitForPartial(); this.io.received?.(); part.data.set(bytes, part.offset); part.offset += bytes.length;
         if (part.offset === part.data.length) {
           this.partial = null; clearTimeout(this.timer); this.timer = null;

package/dist/shared/p2p-ice-policy.cjs

@@ -0,0 +1,22 @@
+(function (root, factory) {
+  if (typeof module === 'object' && module.exports) module.exports = factory();
+  else root.CodeRelaxIcePolicy = factory();
+})(globalThis, () => {
+  const directType = type => ['host', 'srflx', 'prflx'].includes(type);
+  const candidate = value => {
+    if (typeof value !== 'string' || value.length > 2048 || /[\r\n]/.test(value)) return false;
+    const fields = value.trim().split(/\s+/);
+    return /^(?:a=)?candidate:/.test(fields[0]) && fields[6] === 'typ' && directType(fields[7]);
+  };
+  return {
+    directType, candidate,
+    servers: values => Array.isArray(values) && values.length <= 4 && values.every(value => {
+      if (typeof value !== 'string' || !/^stun:[a-zA-Z0-9.-]+:[0-9]{1,5}$/.test(value)) return false;
+      const port = Number(value.split(':').at(-1));
+      return port > 0 && port <= 65535;
+    }),
+    sdp: value => typeof value === 'string' && value.length <= 65536 &&
+      value.split(/\r?\n/).filter(line => line.startsWith('a=candidate:')).every(candidate),
+    pair: (localType, remoteType) => directType(localType) && directType(remoteType),
+  };
+});

package/dist/src/self-relay/p2p-probe.mjs

@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto';
 import P2pDiagnostics from '../../shared/p2p-diagnostics.cjs';
 import P2pDataFramer from '../../shared/p2p-data-channel.cjs';
 import FileChannel from '../../shared/p2p-file-channel.cjs';
+import IcePolicy from '../../shared/p2p-ice-policy.cjs';
 
 const PROBE_UDP_PORT_RANGE = Object.freeze({ begin: 42000, end: 42031 });
 const HIGH_WATER = 1024 * 1024;
@@ -26,7 +27,7 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
   const files = new Map();
   const nonce = randomUUID();
   const idle = new P2pDataFramer.IdleWatch(message => {
-    if (!channel.sendMessage(JSON.stringify(message))) throw new Error('Idle probe send failed');
+    channel.sendMessage(JSON.stringify(message));
   }, () => finish('idle-timeout'));
   const timer = setTimeout(() => finish(verified ? 'closed' : 'timeout'), 15000);
   function finish(state) {
@@ -40,6 +41,8 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
   }
   function verify() {
     if (verified || !pingReceived || !pongReceived) return;
+    const pair = peer.getSelectedCandidatePair();
+    if (!pair || !IcePolicy.pair(pair.local.type, pair.remote.type)) { diagnostic.error = 'ice-policy'; finish('failed'); return; }
     verified = true; clearTimeout(timer);
     if (remoteDirect) idle.received();
     report(remoteDirect ? 'direct' : 'verified', diagnostic.snapshot('verified'));
@@ -54,7 +57,7 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
   }
   peer.onDataChannel(raw => {
     if (closed || purpose !== 'file' || !onFileChannel || raw.getLabel() !== 'code-relax-file-v1' || files.size >= 4) { raw.close(); return; }
-    const socket = new FileChannel({ buffered: () => raw.bufferedAmount(),
+    const socket = new FileChannel({ buffered: () => raw.bufferedAmount(), maxMessageSize: () => peer.maxMessageSize(),
       send: value => typeof value === 'string' ? raw.sendMessage(value) : raw.sendMessageBinary(value), close: () => raw.close(), received: () => idle.received() });
     files.set(raw, socket);
     socket.addEventListener('close', () => files.delete(raw));
@@ -75,7 +78,8 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
     try {
       while (outbound.length && channel.bufferedAmount() < HIGH_WATER) {
         const item = outbound[0], frame = framer.frame(item);
-        if (!channel.sendMessage(frame)) return;
+        // false means accepted into libdatachannel's buffer, not rejected. Never replay it.
+        channel.sendMessage(frame);
         if (framer.commit(item)) { outbound.shift(); queuedBytes -= item.bytes; }
       }
     } catch { diagnostic.error = 'channel'; finish('failed'); }
@@ -92,7 +96,11 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
   peer.onGatheringStateChange(state => { if (!closed) diagnostic.gathering = state; });
   peer.onStateChange(state => { if (!closed && (state === 'failed' || state === 'closed')) { diagnostic.error = 'peer'; finish('failed'); } });
   peer.onLocalDescription((sdp, type) => { if (!closed) { diagnostic.offer = type === 'offer'; signal({ kind: type, sdp, iceServers, direct: 1 }); } });
-  peer.onLocalCandidate((candidate, mid) => { if (!closed) { diagnostic.candidate('local', candidate); signal({ kind: 'candidate', candidate, mid }); } });
+  peer.onLocalCandidate((candidate, mid) => {
+    if (closed) return;
+    if (!IcePolicy.candidate(candidate)) { diagnostic.error = 'ice-policy'; finish('failed'); return; }
+    diagnostic.candidate('local', candidate); signal({ kind: 'candidate', candidate, mid });
+  });
   channel = peer.createDataChannel('code-relax-probe-v1');
   channel.setBufferedAmountLowThreshold(LOW_WATER);
   channel.onBufferedAmountLow(pump);
@@ -124,12 +132,14 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
     receive(message) {
       if (closed) return;
       if (message.kind === 'answer' && !answered) {
+        if (!IcePolicy.sdp(message.sdp)) { diagnostic.error = 'ice-policy'; finish('failed'); return; }
         try { peer.setRemoteDescription(message.sdp, 'answer'); }
         catch { diagnostic.error = 'description'; finish('failed'); return; }
         answered = true; remoteDirect = message.direct === 1; diagnostic.answer = true;
         for (const item of candidates) peer.addRemoteCandidate(item.candidate, item.mid);
         candidates = [];
       } else if (message.kind === 'candidate') {
+        if (!IcePolicy.candidate(message.candidate)) { diagnostic.error = 'ice-policy'; finish('failed'); return; }
         diagnostic.candidate('remote', message.candidate);
         if (answered) peer.addRemoteCandidate(message.candidate, message.mid);
         else if (candidates.length < 64) candidates.push(message);
@@ -145,15 +155,14 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
 export function validProbeSignal(value) {
   if (!value || value.version !== 1 || !/^[\w-]{16,128}$/.test(value.probeId || '')) return false;
   if (['start', 'close'].includes(value.kind)) return true;
-  if (['offer', 'answer'].includes(value.kind)) return typeof value.sdp === 'string' && value.sdp.length <= 65536 &&
+  if (['offer', 'answer'].includes(value.kind)) return IcePolicy.sdp(value.sdp) &&
     (value.direct === undefined || value.direct === 0 || value.direct === 1) &&
     (value.iceServers === undefined || validProbeIceServers(value.iceServers));
-  if (value.kind === 'candidate') return typeof value.candidate === 'string' && value.candidate.length <= 2048 &&
+  if (value.kind === 'candidate') return IcePolicy.candidate(value.candidate) &&
     typeof value.mid === 'string' && value.mid.length <= 64;
   return false;
 }
 
 export function validProbeIceServers(value) {
-  return Array.isArray(value) && value.length <= 4 && value.every(item =>
-    typeof item === 'string' && /^stun:[a-zA-Z0-9.-]+:[0-9]{1,5}$/.test(item) && Number(item.split(':').at(-1)) <= 65535);
+  return IcePolicy.servers(value);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.40",
+  "version": "0.1.0-beta.41",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",
@@ -41,8 +41,8 @@
     "tag": "beta"
   },
   "optionalDependencies": {
-    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.40",
-    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.40",
-    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.40"
+    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.41",
+    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.41",
+    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.41"
   }
 }