Pull from main; maintain relevance

.github/FUNDING.yml

@@ -1 +1 @@
-buy_me_a_coffee: https://buymeacoffee.com/kingrt
+buy_me_a_coffee: kingrt

demo/video-chat/backend-king-php/run-dev.sh

@@ -118,9 +118,14 @@ start_backend() {
   local bind_port="$2"
   local worker_count
   worker_count="$(worker_count_for_mode "${mode}")"
+  local reuseport_value="${KING_HTTP1_ENABLE_REUSEPORT:-}"
+  if [[ -z "${reuseport_value}" && "${worker_count}" -gt 1 ]]; then
+    reuseport_value="1"
+  fi
 
   local worker_index=1
   while (( worker_index <= worker_count )); do
+    KING_HTTP1_ENABLE_REUSEPORT="${reuseport_value}" \
     VIDEOCHAT_KING_PORT="${bind_port}" \
     VIDEOCHAT_KING_SERVER_MODE="${mode}" \
     VIDEOCHAT_KING_WORKER_INDEX="${worker_index}" \
@@ -131,6 +136,9 @@ start_backend() {
   done
 
   echo "[video-chat][king-php-backend] started ${worker_count} worker(s) in ${mode} mode on port ${bind_port}"
+  if [[ "${reuseport_value}" == "1" && "${worker_count}" -gt 1 ]]; then
+    echo "[video-chat][king-php-backend] enabled SO_REUSEPORT for trusted ${mode} worker group"
+  fi
 }
 
 normalized_mode_override="$(echo "${SERVER_MODE_OVERRIDE}" | tr '[:upper:]' '[:lower:]' | xargs || true)"

demo/video-chat/docker-compose.v1.yml

@@ -126,7 +126,7 @@ services:
       VIDEOCHAT_V1_TURN_STATIC_AUTH_SECRET_FILE: "${VIDEOCHAT_V1_TURN_STATIC_AUTH_SECRET_FILE:-}"
       VIDEOCHAT_V1_TURN_EXTERNAL_IP: "${VIDEOCHAT_V1_TURN_EXTERNAL_IP:-}"
       VIDEOCHAT_V1_TURN_RELAY_MIN_PORT: "${VIDEOCHAT_V1_TURN_RELAY_MIN_PORT:-49160}"
-      VIDEOCHAT_V1_TURN_RELAY_MAX_PORT: "${VIDEOCHAT_V1_TURN_RELAY_MAX_PORT:-49200}"
+      VIDEOCHAT_V1_TURN_RELAY_MAX_PORT: "${VIDEOCHAT_V1_TURN_RELAY_MAX_PORT:-49660}"
     entrypoint:
       - sh
       - -lc
@@ -161,7 +161,7 @@ services:
     ports:
       - "${VIDEOCHAT_V1_TURN_PORT:-3478}:3478/tcp"
       - "${VIDEOCHAT_V1_TURN_PORT:-3478}:3478/udp"
-      - "${VIDEOCHAT_V1_TURN_RELAY_MIN_PORT:-49160}-${VIDEOCHAT_V1_TURN_RELAY_MAX_PORT:-49200}:${VIDEOCHAT_V1_TURN_RELAY_MIN_PORT:-49160}-${VIDEOCHAT_V1_TURN_RELAY_MAX_PORT:-49200}/udp"
+      - "${VIDEOCHAT_V1_TURN_RELAY_MIN_PORT:-49160}-${VIDEOCHAT_V1_TURN_RELAY_MAX_PORT:-49660}:${VIDEOCHAT_V1_TURN_RELAY_MIN_PORT:-49160}-${VIDEOCHAT_V1_TURN_RELAY_MAX_PORT:-49660}/udp"
     restart: unless-stopped
 
   videochat-frontend-v1:
@@ -254,6 +254,8 @@ services:
       VIDEOCHAT_EDGE_TURN_DOMAIN: "${VIDEOCHAT_DEPLOY_TURN_DOMAIN:-turn.${VIDEOCHAT_V1_PUBLIC_HOST:-127.0.0.1}}"
       VIDEOCHAT_EDGE_CDN_DOMAIN: "${VIDEOCHAT_DEPLOY_CDN_DOMAIN:-cdn.${VIDEOCHAT_V1_PUBLIC_HOST:-127.0.0.1}}"
       VIDEOCHAT_EDGE_CDN_ALIASES: "${VIDEOCHAT_DEPLOY_CDN_ALIASES:-cnd.${VIDEOCHAT_V1_PUBLIC_HOST:-127.0.0.1}}"
+      VIDEOCHAT_EDGE_EXTERNAL_DOMAINS: "${VIDEOCHAT_DEPLOY_EXTERNAL_DOMAINS:-}"
+      VIDEOCHAT_EDGE_EXTERNAL_UPSTREAM: "${VIDEOCHAT_DEPLOY_EXTERNAL_UPSTREAM:-}"
       VIDEOCHAT_EDGE_CERT_FILE: /run/certs/live/fullchain.pem
       VIDEOCHAT_EDGE_KEY_FILE: /run/certs/live/privkey.pem
       VIDEOCHAT_EDGE_API_UPSTREAM: videochat-backend-v1:18080

demo/video-chat/edge/edge.php

@@ -12,6 +12,15 @@
 $turnDomain = strtolower(trim((string) (getenv('VIDEOCHAT_EDGE_TURN_DOMAIN') ?: 'turn.' . $domain)));
 $cdnDomain = strtolower(trim((string) (getenv('VIDEOCHAT_EDGE_CDN_DOMAIN') ?: 'cdn.' . $domain)));
 $cdnAliasInput = trim((string) (getenv('VIDEOCHAT_EDGE_CDN_ALIASES') ?: 'cnd.' . $domain));
+$externalDomainInput = trim((string) getenv('VIDEOCHAT_EDGE_EXTERNAL_DOMAINS'));
+$externalDomains = [];
+foreach (preg_split('/\s*,\s*/', $externalDomainInput) ?: [] as $externalDomain) {
+    $externalDomain = strtolower(trim((string) $externalDomain));
+    if ($externalDomain !== '') {
+        $externalDomains[] = $externalDomain;
+    }
+}
+$externalDomains = array_values(array_unique($externalDomains));
 $cdnDomains = [$cdnDomain];
 foreach (preg_split('/\s*,\s*/', $cdnAliasInput) ?: [] as $alias) {
     $alias = strtolower(trim((string) $alias));
@@ -26,6 +35,8 @@
 $apiUpstream = getenv('VIDEOCHAT_EDGE_API_UPSTREAM') ?: 'videochat-backend-v1:18080';
 $wsUpstream = getenv('VIDEOCHAT_EDGE_WS_UPSTREAM') ?: 'videochat-backend-ws-v1:18080';
 $sfuUpstream = getenv('VIDEOCHAT_EDGE_SFU_UPSTREAM') ?: 'videochat-backend-sfu-v1:18080';
+$externalUpstream = trim((string) getenv('VIDEOCHAT_EDGE_EXTERNAL_UPSTREAM'));
+$socialPreviewImagePath = getenv('VIDEOCHAT_EDGE_SOCIAL_PREVIEW_IMAGE') ?: '/assets/orgas/kingrt/social/invitation-preview.png';
 $maxHeaderBytes = (int) (getenv('VIDEOCHAT_EDGE_MAX_HEADER_BYTES') ?: '65536');
 $connectTimeout = (float) (getenv('VIDEOCHAT_EDGE_CONNECT_TIMEOUT_SECONDS') ?: '5');
 $httpIdleTimeout = (int) (getenv('VIDEOCHAT_EDGE_HTTP_IDLE_TIMEOUT_SECONDS') ?: '60');
@@ -286,7 +297,61 @@
     };
 };
 
-$serveStatic = static function ($client, array $request) use ($staticRoot, $writeResponse, $contentType, $cdnDomains, $assetVersion): void {
+$escapeHtml = static function (string $value): string {
+    return htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+};
+
+$absoluteHttpsUrl = static function (string $host, string $target) use ($domain): string {
+    $host = trim($host) !== '' ? $host : $domain;
+    $target = trim($target) !== '' ? $target : '/';
+    if ($target[0] !== '/') {
+        $target = '/' . $target;
+    }
+    return 'https://' . $host . $target;
+};
+
+$injectSocialPreview = static function (string $body, array $request) use ($domain, $cdnDomain, $socialPreviewImagePath, $escapeHtml, $absoluteHttpsUrl): string {
+    $target = (string) ($request['target'] ?: ($request['path'] ?? '/'));
+    $path = (string) ($request['path'] ?? '/');
+    $host = (string) ($request['host'] ?: $domain);
+    $assetHost = $cdnDomain !== '' ? $cdnDomain : $host;
+    $pageUrl = $absoluteHttpsUrl($host, $target);
+    $imageUrl = $absoluteHttpsUrl($assetHost, $socialPreviewImagePath);
+    $isInvite = str_starts_with($path, '/join/');
+    $title = $isInvite ? "You're invited to a KINGRT video call" : 'KINGRT Video Chat';
+    $description = $isInvite
+        ? 'Join the video call on KINGRT.'
+        : 'Run your own calls with KINGRT open-source video collaboration.';
+
+    $tags = [
+        '<meta name="description" content="' . $escapeHtml($description) . '" />',
+        '<link rel="canonical" href="' . $escapeHtml($pageUrl) . '" />',
+        '<meta property="og:type" content="website" />',
+        '<meta property="og:site_name" content="KINGRT" />',
+        '<meta property="og:title" content="' . $escapeHtml($title) . '" />',
+        '<meta property="og:description" content="' . $escapeHtml($description) . '" />',
+        '<meta property="og:url" content="' . $escapeHtml($pageUrl) . '" />',
+        '<meta property="og:image" content="' . $escapeHtml($imageUrl) . '" />',
+        '<meta property="og:image:secure_url" content="' . $escapeHtml($imageUrl) . '" />',
+        '<meta property="og:image:type" content="image/png" />',
+        '<meta property="og:image:width" content="1076" />',
+        '<meta property="og:image:height" content="562" />',
+        '<meta property="og:image:alt" content="' . $escapeHtml($title) . '" />',
+        '<meta name="twitter:card" content="summary_large_image" />',
+        '<meta name="twitter:title" content="' . $escapeHtml($title) . '" />',
+        '<meta name="twitter:description" content="' . $escapeHtml($description) . '" />',
+        '<meta name="twitter:image" content="' . $escapeHtml($imageUrl) . '" />',
+    ];
+    $meta = implode("\n    ", $tags);
+
+    if (str_contains($body, '<!-- kingrt-social-preview -->')) {
+        return str_replace('<!-- kingrt-social-preview -->', $meta, $body);
+    }
+
+    return str_replace('</head>', "    {$meta}\n  </head>", $body);
+};
+
+$serveStatic = static function ($client, array $request) use ($staticRoot, $writeResponse, $contentType, $cdnDomains, $assetVersion, $injectSocialPreview): void {
     $path = rawurldecode((string) $request['path']);
     $isCdnAsset = in_array($request['host'], $cdnDomains, true) || str_starts_with($path, '/cdn/');
     $corsHeaders = $isCdnAsset
@@ -324,6 +389,9 @@
     }
 
     $body = (string) @file_get_contents($candidate);
+    if (basename($candidate) === 'index.html') {
+        $body = $injectSocialPreview($body, $request);
+    }
     $headers = [
         'Content-Type' => $contentType($candidate),
         'Cache-Control' => basename($candidate) === 'index.html'
@@ -395,11 +463,27 @@
     $lastUpstreamReadProgress = $lastActivity;
     $lastClientWriteProgress = $lastActivity;
     $lastUpstreamWriteProgress = $lastActivity;
+    $closeWebSocketTunnel = static function () use (&$clientOpen, &$upstreamOpen, &$toClient, &$toUpstream): void {
+        // WebSocket tunnels cannot stay half-open: otherwise browser requests
+        // remain pending while the closed upstream socket sits in CLOSE_WAIT.
+        $clientOpen = false;
+        $upstreamOpen = false;
+        $toClient = '';
+        $toUpstream = '';
+    };
 
     while ($clientOpen || $upstreamOpen || $toUpstream !== '' || $toClient !== '') {
         if ((microtime(true) - $lastActivity) > $idleTimeout) {
             break;
         }
+        // Upstream may reject a websocket handshake with HTTP bytes, then close.
+        // Keep the client side alive until that buffered response is flushed.
+        if ($isWebSocket && !$upstreamOpen && $toClient === '') {
+            $clientOpen = false;
+        }
+        if ($isWebSocket && !$clientOpen && $toUpstream === '') {
+            $upstreamOpen = false;
+        }
         if (!$clientOpen) {
             $toClient = '';
         }
@@ -447,6 +531,21 @@
         foreach ($read as $stream) {
             $chunk = @fread($stream, 16384);
             if ($chunk === false) {
+                if ($isWebSocket) {
+                    if ($stream === $upstreamStream && $toClient !== '') {
+                        $upstreamOpen = false;
+                        $madeProgress = true;
+                        continue;
+                    }
+                    if ($stream === $client && $toUpstream !== '') {
+                        $clientOpen = false;
+                        $madeProgress = true;
+                        continue;
+                    }
+                    $closeWebSocketTunnel();
+                    $madeProgress = true;
+                    continue;
+                }
                 if ($stream === $client) {
                     $clientOpen = false;
                 } else {
@@ -456,6 +555,21 @@
             }
             if ($chunk === '') {
                 if (feof($stream)) {
+                    if ($isWebSocket) {
+                        if ($stream === $upstreamStream && $toClient !== '') {
+                            $upstreamOpen = false;
+                            $madeProgress = true;
+                            continue;
+                        }
+                        if ($stream === $client && $toUpstream !== '') {
+                            $clientOpen = false;
+                            $madeProgress = true;
+                            continue;
+                        }
+                        $closeWebSocketTunnel();
+                        $madeProgress = true;
+                        continue;
+                    }
                     if ($stream === $client) {
                         $clientOpen = false;
                     } else {
@@ -510,12 +624,20 @@
             if ($stream === $upstreamStream && $toUpstream !== '') {
                 $written = @fwrite($upstreamStream, $toUpstream);
                 if ($written === false) {
+                    if ($isWebSocket) {
+                        $closeWebSocketTunnel();
+                        continue;
+                    }
                     $upstreamOpen = false;
                     $toUpstream = '';
                     continue;
                 }
                 if ($written === 0) {
                     if ((microtime(true) - $lastUpstreamWriteProgress) >= $writeStallTimeout) {
+                        if ($isWebSocket) {
+                            $closeWebSocketTunnel();
+                            continue;
+                        }
                         $upstreamOpen = false;
                         $toUpstream = '';
                     } else {
@@ -531,12 +653,20 @@
             if ($stream === $client && $toClient !== '') {
                 $written = @fwrite($client, $toClient);
                 if ($written === false) {
+                    if ($isWebSocket) {
+                        $closeWebSocketTunnel();
+                        continue;
+                    }
                     $clientOpen = false;
                     $toClient = '';
                     continue;
                 }
                 if ($written === 0) {
                     if ((microtime(true) - $lastClientWriteProgress) >= $writeStallTimeout) {
+                        if ($isWebSocket) {
+                            $closeWebSocketTunnel();
+                            continue;
+                        }
                         $clientOpen = false;
                         $toClient = '';
                     } else {
@@ -559,9 +689,12 @@
     @fclose($upstreamStream);
 };
 
-$route = static function (array $request) use ($domain, $apiDomain, $wsDomain, $sfuDomain, $turnDomain, $cdnDomains, $apiUpstream, $wsUpstream, $sfuUpstream): ?string {
+$route = static function (array $request) use ($domain, $apiDomain, $wsDomain, $sfuDomain, $turnDomain, $cdnDomains, $externalDomains, $apiUpstream, $wsUpstream, $sfuUpstream, $externalUpstream): ?string {
     $host = $request['host'];
     $path = $request['path'];
+    if ($externalUpstream !== '' && in_array($host, $externalDomains, true)) {
+        return $externalUpstream;
+    }
     if (in_array($host, $cdnDomains, true)) {
         return 'static';
     }

demo/video-chat/frontend-vue/index.html

@@ -4,7 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" href="/assets/orgas/kingrt/icon.svg" type="image/svg+xml" />
-    <title>King Video Chat (Vue)</title>
+    <!-- kingrt-social-preview -->
+    <title>KINGRT Video Chat</title>
   </head>
   <body>
     <div id="app"></div>

demo/video-chat/frontend-vue/src/domain/calls/access/JoinView.vue

@@ -218,6 +218,7 @@ import {
   handleAssetVersionSocketPayload,
 } from '../../../support/assetVersion';
 import { attachForegroundReconnectHandlers } from '../../../support/foregroundReconnect';
+import { buildOptionalCallAudioCaptureConstraints } from '../../realtime/media/audioCaptureConstraints';
 import {
   applyCallBackgroundPreset as applyBackgroundPreset,
   attachCallMediaDeviceWatcher,
@@ -272,7 +273,11 @@ const {
   playSpeakerTestSound,
   startPreview,
   stopPreview,
-} = createJoinAccessPreviewController({ previewVideoRef, state });
+} = createJoinAccessPreviewController({
+  previewVideoRef,
+  state,
+  buildOptionalCallAudioCaptureConstraints,
+});
 
 function normalizeAccessId(value) {
   return String(value || '').trim().toLowerCase();

demo/video-chat/frontend-vue/src/domain/calls/access/joinPreview.js

@@ -1,6 +1,6 @@
 import { nextTick } from 'vue';
 import { BackgroundFilterController } from '../../realtime/background/controller';
-import { buildOptionalCallAudioCaptureConstraints } from '../../realtime/media/audioCaptureConstraints';
+import { buildOptionalCallAudioCaptureConstraints as defaultBuildOptionalCallAudioCaptureConstraints } from '../../realtime/media/audioCaptureConstraints';
 import { callMediaPrefs } from '../../realtime/media/preferences';
 
 function finiteNumber(value, fallback) {
@@ -74,7 +74,9 @@ function applyVolumeToStreams(streams) {
   }
 }
 
-function buildPreviewConstraints() {
+function buildPreviewConstraints(
+  buildOptionalCallAudioCaptureConstraints = defaultBuildOptionalCallAudioCaptureConstraints,
+) {
   const cameraDeviceId = String(callMediaPrefs.selectedCameraId || '').trim();
   const microphoneDeviceId = String(callMediaPrefs.selectedMicrophoneId || '').trim();
   return {
@@ -94,7 +96,11 @@ function stopStreams(streams) {
   }
 }
 
-export function createJoinAccessPreviewController({ previewVideoRef, state }) {
+export function createJoinAccessPreviewController({
+  previewVideoRef,
+  state,
+  buildOptionalCallAudioCaptureConstraints = defaultBuildOptionalCallAudioCaptureConstraints,
+}) {
   const backgroundController = new BackgroundFilterController();
   let rawStream = null;
   let previewStream = null;
@@ -133,7 +139,7 @@ export function createJoinAccessPreviewController({ previewVideoRef, state }) {
     }
 
     try {
-      rawStream = await navigator.mediaDevices.getUserMedia(buildPreviewConstraints());
+      rawStream = await navigator.mediaDevices.getUserMedia(buildPreviewConstraints(buildOptionalCallAudioCaptureConstraints));
       applyVolumeToStreams([rawStream]);
 
       previewStream = rawStream;