Address comments

Author: minggangw

web_bridge/README.md

@@ -51,9 +51,9 @@ Notes:
   echo the same shape (`{"id":"c1","response":{...}}`).
 - Errors are reported as `{"error":"<message>"}` frames; fatal protocol errors
   cause the socket to close with a `1008`/`1011` code.
-- 64-bit integer fields may be sent as JSON numbers, BigInt-encoded strings
-  (`"12n"`), or decimal strings; responses use the rclnodejs `toJSONSafe`
-  encoding (BigInts become `"<n>n"` strings).
+- 64-bit integer fields may be sent as JSON numbers or BigInt-encoded
+  strings (`"12n"`); responses use the rclnodejs `toJSONSafe` encoding
+  (BigInts become `"<n>n"` strings).
 
 ## Server side
 

web_bridge/bridge.js

@@ -72,7 +72,7 @@ function parseResourcePath(pathname) {
  * @param {string} [options.host='0.0.0.0'] - Host to bind to.
  * @param {Object<string,string>} [options.topicTypes] - Optional default type per topic name (e.g. {"/chatter":"std_msgs/msg/String"}).
  * @param {Object<string,string>} [options.serviceTypes] - Optional default type per service name.
- * @param {(req: import('http').IncomingMessage) => boolean} [options.verifyClient] - Optional auth hook.
+ * @param {(req: import('http').IncomingMessage) => boolean} [options.verifyClient] - Optional auth hook called with the raw HTTP upgrade request; return `false` to reject the connection.
  * @returns {Promise<{wss: WebSocketServer, close: () => Promise<void>, port: number}>}
  */
 function startWebBridge(options = {}) {
@@ -87,8 +87,19 @@ function startWebBridge(options = {}) {
 
   if (!node) throw new TypeError('startWebBridge: options.node is required');
 
+  // ws's verifyClient is invoked with `info = { origin, secure, req }`,
+  // not the raw IncomingMessage. Wrap it so users can write a simple
+  // `(req) => boolean` hook as documented above.
+  const wsVerifyClient = verifyClient
+    ? (info) => verifyClient(info.req)
+    : undefined;
+
   return new Promise((resolve, reject) => {
-    const wss = new WebSocketServer({ host, port, verifyClient });
+    const wss = new WebSocketServer({
+      host,
+      port,
+      verifyClient: wsVerifyClient,
+    });
 
     wss.on('error', reject);
 

web_bridge/cli.js

@@ -69,10 +69,19 @@ function parseArgs(argv) {
         process.exit(0);
         break;
       case '-p':
-      case '--port':
-        opts.port = Number(need(i, a));
+      case '--port': {
+        const raw = need(i, a);
+        const p = Number(raw);
+        if (!Number.isInteger(p) || p < 0 || p > 65535) {
+          console.error(
+            `error: ${a} expects an integer in 0–65535, got "${raw}"`
+          );
+          process.exit(2);
+        }
+        opts.port = p;
         i++;
         break;
+      }
       case '-H':
       case '--host':
         opts.host = need(i, a);

web_bridge/index.js

@@ -1,4 +1,17 @@
-// Copyright (c) 2026 RobotWebTools. Apache-2.0.
+// Copyright (c) 2026 RobotWebTools Contributors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 'use strict';
 
 const { startWebBridge } = require('./bridge.js');