@swmansion/argent 0.16.2-next.1 → 0.16.2-next.2

package/dist/cli-cmds.mjs

@@ -6620,7 +6620,7 @@ var ALLOWED = {
   },
   "toolserver:start": {},
   "toolserver:stop": {
-    reason: oneOf(["idle", "signal", "crash"]),
+    reason: oneOf(["idle", "signal", "crash", "deferred"]),
     uptime_ms: DURATION_MS,
     total_tool_calls: COUNT,
     ...FAILURE_SIGNAL,

package/dist/installer.mjs

@@ -16514,7 +16514,7 @@ var ALLOWED = {
   },
   "toolserver:start": {},
   "toolserver:stop": {
-    reason: oneOf(["idle", "signal", "crash"]),
+    reason: oneOf(["idle", "signal", "crash", "deferred"]),
     uptime_ms: DURATION_MS,
     total_tool_calls: COUNT,
     ...FAILURE_SIGNAL,

package/dist/mcp-server.mjs

@@ -18067,7 +18067,7 @@ var ALLOWED = {
   },
   "toolserver:start": {},
   "toolserver:stop": {
-    reason: oneOf(["idle", "signal", "crash"]),
+    reason: oneOf(["idle", "signal", "crash", "deferred"]),
     uptime_ms: DURATION_MS,
     total_tool_calls: COUNT,
     ...FAILURE_SIGNAL,

package/dist/tool-server.cjs

@@ -46737,7 +46737,7 @@ var require_application = __commonJS({
     var finalhandler = require_finalhandler();
     var debug = require_src()("express:application");
     var View = require_view();
-    var http3 = require("node:http");
+    var http4 = require("node:http");
     var methods = require_utils3().methods;
     var compileETag = require_utils3().compileETag;
     var compileQueryParser = require_utils3().compileQueryParser;
@@ -46970,7 +46970,7 @@ var require_application = __commonJS({
       tryRender(view, renderOptions, done);
     };
     app.listen = function listen() {
-      var server = http3.createServer(this);
+      var server = http4.createServer(this);
       var args = slice.call(arguments);
       if (typeof args[args.length - 1] === "function") {
         var done = args[args.length - 1] = once(args[args.length - 1]);
@@ -47458,11 +47458,11 @@ var require_negotiator = __commonJS({
     var preferredMediaTypes = require_mediaType();
     module2.exports = Negotiator;
     module2.exports.Negotiator = Negotiator;
-    function Negotiator(request2) {
+    function Negotiator(request3) {
       if (!(this instanceof Negotiator)) {
-        return new Negotiator(request2);
+        return new Negotiator(request3);
       }
-      this.request = request2;
+      this.request = request3;
     }
     Negotiator.prototype.charset = function charset(available) {
       var set2 = this.charsets(available);
@@ -57250,12 +57250,12 @@ var require_request = __commonJS({
     var accepts = require_accepts();
     var isIP = require("node:net").isIP;
     var typeis = require_type_is();
-    var http3 = require("node:http");
+    var http4 = require("node:http");
     var fresh = require_fresh();
     var parseRange = require_range_parser();
     var parse4 = require_parseurl();
     var proxyaddr = require_proxy_addr();
-    var req = Object.create(http3.IncomingMessage.prototype);
+    var req = Object.create(http4.IncomingMessage.prototype);
     module2.exports = req;
     req.get = req.header = function header(name) {
       if (!name) {
@@ -67854,7 +67854,7 @@ var require_response = __commonJS({
     var deprecate = require_depd()("express");
     var encodeUrl = require_encodeurl();
     var escapeHtml = require_escape_html();
-    var http3 = require("node:http");
+    var http4 = require("node:http");
     var onFinished = require_on_finished();
     var mime = require_mime_types2();
     var path36 = require("node:path");
@@ -67870,7 +67870,7 @@ var require_response = __commonJS({
     var resolve7 = path36.resolve;
     var vary = require_vary();
     var { Buffer: Buffer2 } = require("node:buffer");
-    var res = Object.create(http3.ServerResponse.prototype);
+    var res = Object.create(http4.ServerResponse.prototype);
     module2.exports = res;
     res.status = function status(code) {
       if (!Number.isInteger(code)) {
@@ -74627,12 +74627,12 @@ var require_service = __commonJS({
       this.requestDelimited = Boolean(requestDelimited);
       this.responseDelimited = Boolean(responseDelimited);
     }
-    Service.prototype.rpcCall = function rpcCall(method, requestCtor, responseCtor, request2, callback) {
-      if (!request2)
+    Service.prototype.rpcCall = function rpcCall(method, requestCtor, responseCtor, request3, callback) {
+      if (!request3)
         throw TypeError("request must be specified");
       var self2 = this;
       if (!callback)
-        return util.asPromise(rpcCall, self2, method, requestCtor, responseCtor, request2);
+        return util.asPromise(rpcCall, self2, method, requestCtor, responseCtor, request3);
       if (!self2.rpcImpl) {
         setTimeout(function() {
           callback(Error("already ended"));
@@ -74642,7 +74642,7 @@ var require_service = __commonJS({
       try {
         return self2.rpcImpl(
           method,
-          requestCtor[self2.requestDelimited ? "encodeDelimited" : "encode"](request2).finish(),
+          requestCtor[self2.requestDelimited ? "encodeDelimited" : "encode"](request3).finish(),
           function rpcCallback(err, response) {
             if (err) {
               self2.emit("error", err, method);
@@ -75457,8 +75457,8 @@ var require_service2 = __commonJS({
       this.methodsArray.length; ++i) {
         var methodName = util.lcFirst((method = this._methodsArray[i]).resolve().name).replace(/[^$\w_]/g, "");
         rpcService[methodName] = /* @__PURE__ */ (function(method2, requestType, responseType) {
-          return function rpcMethod(request2, callback) {
-            return rpc.Service.prototype.rpcCall.call(this, method2, requestType, responseType, request2, callback);
+          return function rpcMethod(request3, callback) {
+            return rpc.Service.prototype.rpcCall.call(this, method2, requestType, responseType, request3, callback);
           };
         })(method, method.resolvedRequestType.ctor, method.resolvedResponseType.ctor);
       }
@@ -81142,7 +81142,7 @@ var require_websocket = __commonJS({
     "use strict";
     var EventEmitter2 = require("events");
     var https = require("https");
-    var http3 = require("http");
+    var http4 = require("http");
     var net6 = require("net");
     var tls = require("tls");
     var { randomBytes, createHash: createHash3 } = require("crypto");
@@ -81684,7 +81684,7 @@ var require_websocket = __commonJS({
       }
       const defaultPort = isSecure ? 443 : 80;
       const key = randomBytes(16).toString("base64");
-      const request2 = isSecure ? https.request : http3.request;
+      const request3 = isSecure ? https.request : http4.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
       opts.createConnection = opts.createConnection || (isSecure ? tlsConnect : netConnect);
@@ -81761,12 +81761,12 @@ var require_websocket = __commonJS({
         if (opts.auth && !options.headers.authorization) {
           options.headers.authorization = "Basic " + Buffer.from(opts.auth).toString("base64");
         }
-        req = websocket._req = request2(opts);
+        req = websocket._req = request3(opts);
         if (websocket._redirects) {
           websocket.emit("redirect", websocket.url, req);
         }
       } else {
-        req = websocket._req = request2(opts);
+        req = websocket._req = request3(opts);
       }
       if (opts.timeout) {
         req.on("timeout", () => {
@@ -82180,7 +82180,7 @@ var require_websocket_server = __commonJS({
   "../../node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
     var EventEmitter2 = require("events");
-    var http3 = require("http");
+    var http4 = require("http");
     var { Duplex } = require("stream");
     var { createHash: createHash3 } = require("crypto");
     var extension2 = require_extension();
@@ -82261,8 +82261,8 @@ var require_websocket_server = __commonJS({
           );
         }
         if (options.port != null) {
-          this._server = http3.createServer((req, res) => {
-            const body = http3.STATUS_CODES[426];
+          this._server = http4.createServer((req, res) => {
+            const body = http4.STATUS_CODES[426];
             res.writeHead(426, {
               "Content-Length": body.length,
               "Content-Type": "text/plain"
@@ -82551,7 +82551,7 @@ var require_websocket_server = __commonJS({
       this.destroy();
     }
     function abortHandshake(socket, code, message, headers) {
-      message = message || http3.STATUS_CODES[code];
+      message = message || http4.STATUS_CODES[code];
       headers = {
         Connection: "close",
         "Content-Type": "text/html",
@@ -82560,7 +82560,7 @@ var require_websocket_server = __commonJS({
       };
       socket.once("finish", socket.destroy);
       socket.end(
-        `HTTP/1.1 ${code} ${http3.STATUS_CODES[code]}\r
+        `HTTP/1.1 ${code} ${http4.STATUS_CODES[code]}\r
 ` + Object.keys(headers).map((h) => `${h}: ${headers[h]}`).join("\r\n") + "\r\n\r\n" + message
       );
     }
@@ -103928,7 +103928,7 @@ var ALLOWED = {
   },
   "toolserver:start": {},
   "toolserver:stop": {
-    reason: oneOf(["idle", "signal", "crash"]),
+    reason: oneOf(["idle", "signal", "crash", "deferred"]),
     uptime_ms: DURATION_MS,
     total_tool_calls: COUNT,
     ...FAILURE_SIGNAL2,
@@ -109786,22 +109786,22 @@ var Subscriber = class {
     const broadcast = new Broadcast();
     void (async () => {
       for (; ; ) {
-        const request2 = await broadcast.requested();
-        if (!request2)
+        const request3 = await broadcast.requested();
+        if (!request3)
           break;
-        void this.#runSubscribe(path36, request2);
+        void this.#runSubscribe(path36, request3);
       }
     })();
     return broadcast;
   }
-  async #runSubscribe(broadcast, request2) {
+  async #runSubscribe(broadcast, request3) {
     const version4 = this.#session.version;
     const requestId = await this.#session.nextRequestId();
     if (requestId === void 0) {
-      request2.track.close(new Error("session closed"));
+      request3.track.close(new Error("session closed"));
       return;
     }
-    console.debug(`subscribe start: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
+    console.debug(`subscribe start: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
     try {
       const stream = await this.#session.openBi();
       try {
@@ -109809,22 +109809,22 @@ var Subscriber = class {
         const msg = new Subscribe({
           requestId,
           trackNamespace: broadcast,
-          trackName: request2.track.name,
-          subscriberPriority: request2.priority
+          trackName: request3.track.name,
+          subscriberPriority: request3.priority
         });
         await msg.encode(stream.writer, version4);
-        console.debug(`subscribe written: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
-        this.#subscribes.set(requestId, request2.track);
+        console.debug(`subscribe written: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
+        this.#subscribes.set(requestId, request3.track);
         const respTypeId = await stream.reader.u53();
         if (respTypeId === SubscribeOk.id) {
           const ok = await SubscribeOk.decode(stream.reader, version4);
           if (ok.trackAlias !== requestId) {
             this.#subscribes.delete(requestId);
-            this.#subscribes.set(ok.trackAlias, request2.track);
+            this.#subscribes.set(ok.trackAlias, request3.track);
           }
-          console.debug(`subscribe ok: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
+          console.debug(`subscribe ok: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
           try {
-            await Promise.race([stream.reader.closed, request2.track.closed]);
+            await Promise.race([stream.reader.closed, request3.track.closed]);
             if (version4 === Version.DRAFT_14 || version4 === Version.DRAFT_15 || version4 === Version.DRAFT_16) {
               try {
                 await stream.writer.u53(Unsubscribe.id);
@@ -109833,9 +109833,9 @@ var Subscriber = class {
               } catch {
               }
             }
-            request2.track.close();
+            request3.track.close();
             stream.close();
-            console.debug(`subscribe close: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
+            console.debug(`subscribe close: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
           } finally {
             this.#subscribes.delete(ok.trackAlias);
           }
@@ -109858,8 +109858,8 @@ var Subscriber = class {
       }
     } catch (err) {
       const e = error51(err);
-      request2.track.close(e);
-      console.warn(`subscribe error: id=${requestId} broadcast=${broadcast} track=${request2.track.name} error=${e.message}`);
+      request3.track.close(e);
+      console.warn(`subscribe error: id=${requestId} broadcast=${broadcast} track=${request3.track.name} error=${e.message}`);
     }
   }
   /**
@@ -111401,19 +111401,19 @@ var Subscriber2 = class {
     const broadcast = new Broadcast();
     void (async () => {
       for (; ; ) {
-        const request2 = await broadcast.requested();
-        if (!request2)
+        const request3 = await broadcast.requested();
+        if (!request3)
           break;
-        void this.#runSubscribe(path36, request2);
+        void this.#runSubscribe(path36, request3);
       }
     })();
     return broadcast;
   }
-  async #runSubscribe(broadcast, request2) {
+  async #runSubscribe(broadcast, request3) {
     const id = this.#subscribeNext++;
-    this.#subscribes.set(id, request2.track);
-    console.debug(`subscribe start: id=${id} broadcast=${broadcast} track=${request2.track.name}`);
-    const msg = new Subscribe2({ id, broadcast, track: request2.track.name, priority: request2.priority });
+    this.#subscribes.set(id, request3.track);
+    console.debug(`subscribe start: id=${id} broadcast=${broadcast} track=${request3.track.name}`);
+    const msg = new Subscribe2({ id, broadcast, track: request3.track.name, priority: request3.priority });
     const stream = await Stream.open(this.#quic);
     await stream.writer.u53(StreamId.Subscribe);
     await msg.encode(stream.writer, this.version);
@@ -111422,24 +111422,24 @@ var Subscriber2 = class {
       if (!("ok" in resp)) {
         throw new Error("first subscribe response must be SUBSCRIBE_OK");
       }
-      console.debug(`subscribe ok: id=${id} broadcast=${broadcast} track=${request2.track.name}`);
-      const waits = [stream.reader.closed, request2.track.closed];
+      console.debug(`subscribe ok: id=${id} broadcast=${broadcast} track=${request3.track.name}`);
+      const waits = [stream.reader.closed, request3.track.closed];
       switch (this.version) {
         case Version2.DRAFT_01:
         case Version2.DRAFT_02:
           break;
         default:
-          waits.push(this.#runPriorityUpdates(id, broadcast, request2.track, msg, stream));
+          waits.push(this.#runPriorityUpdates(id, broadcast, request3.track, msg, stream));
           break;
       }
       await Promise.race(waits);
-      request2.track.close();
+      request3.track.close();
       stream.close();
-      console.debug(`subscribe close: id=${id} broadcast=${broadcast} track=${request2.track.name}`);
+      console.debug(`subscribe close: id=${id} broadcast=${broadcast} track=${request3.track.name}`);
     } catch (err) {
       const e = error51(err);
-      request2.track.close(e);
-      console.warn(`subscribe error: id=${id} broadcast=${broadcast} track=${request2.track.name} error=${e.message}`);
+      request3.track.close(e);
+      console.warn(`subscribe error: id=${id} broadcast=${broadcast} track=${request3.track.name} error=${e.message}`);
       stream.abort(e);
     } finally {
       this.#subscribes.delete(id);
@@ -151001,6 +151001,27 @@ function createRegistry() {
   return registry2;
 }
 
+// ../tool-server/src/utils/probe-argent-tool-server.ts
+var http3 = __toESM(require("node:http"));
+function probeArgentToolServer(host, port, timeoutMs = 500) {
+  return new Promise((resolve7) => {
+    const req = http3.request(
+      { host, port, path: "/tools", method: "GET", timeout: timeoutMs },
+      (res) => {
+        const isArgentPeer = res.statusCode === 200 || res.statusCode === 401;
+        res.resume();
+        resolve7(isArgentPeer);
+      }
+    );
+    req.on("error", () => resolve7(false));
+    req.on("timeout", () => {
+      req.destroy();
+      resolve7(false);
+    });
+    req.end();
+  });
+}
+
 // ../tool-server/src/utils/simulator-watcher.ts
 var import_node_child_process29 = require("node:child_process");
 var import_node_util20 = require("node:util");
@@ -151480,31 +151501,51 @@ function start() {
       } catch {
       }
     });
+    const bindSignal = {
+      error_code: FAILURE_CODES.ARGENT_UNCLASSIFIED_FAILURE,
+      failure_stage: "toolserver_bind",
+      failure_area: "tool_server",
+      error_kind: "crash"
+    };
     server.on("error", (err) => {
-      eventLog?.error({
-        type: "tool_server.bind_failed",
-        msg: `Tool server failed to bind ${HOST}:${PORT}.`,
-        host: HOST,
-        port: PORT,
-        failureSignal: {
-          error_code: FAILURE_CODES.ARGENT_UNCLASSIFIED_FAILURE,
-          failure_stage: "toolserver_bind",
-          failure_area: "tool_server",
-          error_kind: "crash"
-        }
-      });
       const code = err.code ? `${err.code}: ` : "";
-      crashShutdown(
-        `Failed to bind ${HOST}:${PORT}`,
-        `${code}${err.message}`,
-        {
-          error_code: FAILURE_CODES.ARGENT_UNCLASSIFIED_FAILURE,
-          failure_stage: "toolserver_bind",
-          failure_area: "tool_server",
-          error_kind: "crash"
-        },
-        err
-      );
+      const crashBind = () => {
+        eventLog?.error({
+          type: "tool_server.bind_failed",
+          msg: `Tool server failed to bind ${HOST}:${PORT}.`,
+          host: HOST,
+          port: PORT,
+          failureSignal: {
+            error_code: bindSignal.error_code,
+            failure_stage: bindSignal.failure_stage,
+            failure_area: bindSignal.failure_area,
+            error_kind: bindSignal.error_kind
+          }
+        });
+        crashShutdown(`Failed to bind ${HOST}:${PORT}`, `${code}${err.message}`, bindSignal, err);
+      };
+      if (err.code === "EADDRINUSE") {
+        void probeArgentToolServer(HOST, PORT).then((isArgentPeer) => {
+          if (!isArgentPeer) {
+            crashBind();
+            return;
+          }
+          process.stderr.write(
+            `Another argent tool-server already owns ${HOST}:${PORT}; deferring to it (redundant instance).
+`
+          );
+          eventLog?.info({
+            type: "tool_server.deferred_to_existing",
+            msg: `Deferred to an existing tool-server on ${HOST}:${PORT}.`,
+            host: HOST,
+            port: PORT
+          });
+          shutdownReason = "deferred";
+          void shutdown2?.(0);
+        });
+        return;
+      }
+      crashBind();
     });
     httpHandle.attachChromiumWebsockets(server);
   }).catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.16.2-next.1",
+  "version": "0.16.2-next.2",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {