lunibee 0.3.1 → 0.3.2

package/dist/sharding/index.js

@@ -2,7 +2,7 @@
 // packages/sharding/package.json
 var package_default = {
   name: "@lunibee/sharding",
-  version: "0.3.1",
+  version: "0.3.2",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -606,6 +606,7 @@ class WebSocketTransport {
         decoded = this.#decoder.push(event.data);
       } catch (error) {
         this.#handlers.onError(this.#asError(error));
+        this.#failDecoding(generation);
         return;
       }
       if (!(decoded instanceof Promise)) {
@@ -623,6 +624,7 @@ class WebSocketTransport {
         if (!this.#owns(generation))
           return;
         this.#handlers.onError(this.#asError(error));
+        this.#failDecoding(generation);
       });
     });
     socket.addEventListener("close", (event) => {
@@ -651,6 +653,10 @@ class WebSocketTransport {
       return false;
     }
   }
+  #failDecoding(generation) {
+    if (this.#owns(generation))
+      this.close(4000, "decoder failure");
+  }
   close(code = 1000, reason = "") {
     const socket = this.#socket;
     if (!socket)
@@ -993,6 +999,13 @@ class Gateway {
   constructor(options) {
     if (!options.token?.trim())
       throw new TypeError("A Gateway token is required.");
+    for (const key of [
+      "reconnectBaseDelay",
+      "reconnectMaxDelay",
+      "connectTimeout"
+    ])
+      if (options[key] !== undefined && !(options[key] > 0))
+        throw new RangeError(`Gateway ${key} must be greater than 0.`);
     const resolvedIntents = resolveGatewayIntents(options.intents);
     if (!Number.isInteger(resolvedIntents) || resolvedIntents < 0)
       throw new TypeError("Gateway intents must be a non-negative integer.");
@@ -1001,6 +1014,7 @@ class Gateway {
       shardCount: 1,
       reconnect: true,
       maxReconnectAttempts: Infinity,
+      connectTimeout: 30000,
       reconnectBaseDelay: 1000,
       reconnectMaxDelay: 30000,
       heartbeatAckTimeout: 1e4,
@@ -1076,7 +1090,7 @@ class Gateway {
     this.#reconnect.cancel();
     this.#closed = false;
     this.#setState("CONNECT" /* Connect */);
-    const connectURL = this.#options.compress ? url.includes("compress=") ? url : `${url}&compress=zlib-stream` : url;
+    const connectURL = this.#options.compress ? url.includes("compress=") ? url : `${url}${url.includes("?") ? "&" : "?"}compress=zlib-stream` : url;
     return this.#reconnect.attempt(() => this.#open(connectURL));
   }
   close() {
@@ -1162,6 +1176,8 @@ class Gateway {
     const count = this.#options.shardCount;
     if (count <= 1)
       return true;
+    if (!/^\d{1,20}$/.test(guildId))
+      return false;
     return Number((BigInt(guildId) >> 22n) % BigInt(count)) === this.#options.shardId;
   }
   requestGuildMembers(data) {
@@ -1177,8 +1193,16 @@ class Gateway {
       return;
     this.#token = this.#session.beginConnection();
     const result = this.#transport.connect(url);
-    if (result.ok)
+    if (result.ok) {
+      const token = this.#token;
+      clearTimeout(this.#connectTimer);
+      this.#connectTimer = setTimeout(() => {
+        if (token === this.#token && !this.#closed)
+          this.#transport.close(4000, "connect timeout");
+      }, this.#options.connectTimeout);
+      this.#connectTimer.unref?.();
       return;
+    }
     const failure = this.#normalizeError(result.error);
     this.#emitError(failure);
     if (this.#options.reconnect) {
@@ -1188,7 +1212,9 @@ class Gateway {
       this.#settleConnect(failure);
     }
   }
+  #connectTimer;
   #onOpen() {
+    clearTimeout(this.#connectTimer);
     this.#heartbeat.watch();
     this.#emit("open", undefined);
     this.#settleConnect();
@@ -1256,7 +1282,8 @@ class Gateway {
     this.#emit("RAW", { event: event ?? "UNKNOWN", data });
     if (this.#closed)
       return;
-    this.#emit(event ?? "dispatch", data);
+    if (event == null || /^[A-Z][A-Z0-9_]*$/.test(event))
+      this.#emit(event ?? "dispatch", data);
   }
   #handleHello(interval) {
     this.#setState(this.#session.canResume ? "RESUME" /* Resume */ : "HELLO" /* Hello */);
@@ -1319,6 +1346,7 @@ class Gateway {
     this.#reconnect.settle(error);
   }
   #clearTimers() {
+    clearTimeout(this.#connectTimer);
     this.#reconnect.cancel();
     this.#heartbeat.stop();
   }
@@ -1474,13 +1502,19 @@ class ClusterWorker {
   #onDisconnect;
   #counter = 0;
   #closed = false;
-  constructor(context, endpoint = process) {
+  constructor(context, endpoint = process, options = {}) {
     if (typeof endpoint.send !== "function")
       throw new Error("ClusterWorker needs an IPC channel: run it in a process forked by ClusterManager.");
     this.context = context;
     this.#endpoint = endpoint;
     this.#onMessage = (frame) => this.#handle(frame);
-    this.#onDisconnect = () => this.#failAll("The parent went away.");
+    const exitOnLoss = options.exitOnParentLoss ?? endpoint === process;
+    const exit = options.exit ?? ((code) => process.exit(code));
+    this.#onDisconnect = () => {
+      this.#failAll("The parent went away.");
+      if (exitOnLoss && !this.#closed)
+        exit(1);
+    };
     endpoint.on("message", this.#onMessage);
     endpoint.on("disconnect", this.#onDisconnect);
   }
@@ -1591,6 +1625,7 @@ class BroadcastChannelTransport {
 }
 var BUS_FRAME = "__lunibeeBus";
 var PEER_DOWN_FRAME = "__lunibeePeerDown";
+var LOCAL = new WeakMap;
 
 class IpcTransport {
   #endpoint;
@@ -1611,9 +1646,18 @@ class IpcTransport {
         this.#down?.(record[PEER_DOWN_FRAME]);
     };
     endpoint.on("message", this.#listener);
+    let local = LOCAL.get(endpoint);
+    if (!local)
+      LOCAL.set(endpoint, local = new Set);
+    local.add(this);
   }
   post(message) {
     this.#endpoint.send({ [BUS_FRAME]: message });
+    for (const peer of LOCAL.get(this.#endpoint) ?? [])
+      if (peer !== this) {
+        const copy = structuredClone(message);
+        queueMicrotask(() => peer.#message?.(copy));
+      }
   }
   onMessage(listener) {
     this.#message = listener;
@@ -1623,6 +1667,7 @@ class IpcTransport {
   }
   close() {
     this.#endpoint.off("message", this.#listener);
+    LOCAL.get(this.#endpoint)?.delete(this);
   }
 }
 function defaultTransport(name) {
@@ -1645,6 +1690,7 @@ class ShardBus {
   #transport;
   #maxPending;
   #handlers = new Map;
+  #responders = new Map;
   #errorHandlers = new Set;
   #shardId;
   #namespace;
@@ -1675,7 +1721,13 @@ class ShardBus {
     return this;
   }
   off(type, handler) {
-    this.#handlers.get(type)?.delete(handler);
+    const handlers = this.#handlers.get(type);
+    handlers?.delete(handler);
+    const responder = this.#responders.get(type)?.get(handler);
+    if (responder) {
+      handlers?.delete(responder);
+      this.#responders.get(type).delete(handler);
+    }
     return this;
   }
   onError(handler) {
@@ -1697,7 +1749,7 @@ class ShardBus {
     return this.#publish(null, type, data);
   }
   respond(type, handler) {
-    return this.on(type, async (message) => {
+    const wrapper = async (message) => {
       if (!message.expectsReply)
         return;
       const reply = { requestId: message.id };
@@ -1707,7 +1759,12 @@ class ShardBus {
         reply.error = error instanceof Error ? error.message : String(error);
       }
       this.#publish(message.source, REPLY_TYPE, reply);
-    });
+    };
+    let byType = this.#responders.get(type);
+    if (!byType)
+      this.#responders.set(type, byType = new Map);
+    byType.set(handler, wrapper);
+    return this.on(type, wrapper);
   }
   async request(target, type, data, timeoutMs = 5000) {
     if (!Number.isInteger(target) || target < 0)
@@ -1868,7 +1925,7 @@ class ShardSupervisor {
     recent.push(now);
     this.#restarts.set(id, recent);
     const base = Math.min(maxDelay, restartDelay * backoff ** (recent.length - 1));
-    return Math.round(base * (1 + jitter * this.#random()));
+    return Math.min(maxDelay, Math.round(base * (1 + jitter * this.#random())));
   }
   reset(id) {
     if (id === undefined)
@@ -1896,6 +1953,7 @@ class IdentifyCoordinator {
   #remaining;
   #total;
   #resetAt = Number.POSITIVE_INFINITY;
+  #period = 24 * 60 * 60 * 1000;
   #timer;
   #timerAt = Number.POSITIVE_INFINITY;
   #closed = false;
@@ -1922,6 +1980,9 @@ class IdentifyCoordinator {
       this.#total = options.budget.total;
       this.#remaining = options.budget.remaining;
       this.#resetAt = this.#now() + options.budget.resetAfter;
+      this.#period = options.budget.period ?? this.#period;
+      if (!(this.#period > 0))
+        throw new RangeError("budget.period must be positive.");
     }
   }
   get remaining() {
@@ -1995,7 +2056,8 @@ class IdentifyCoordinator {
     const now = this.#now();
     if (this.#total !== undefined && now >= this.#resetAt) {
       this.#remaining = this.#total;
-      this.#resetAt = Number.POSITIVE_INFINITY;
+      while (now >= this.#resetAt)
+        this.#resetAt += this.#period;
     }
     let next = Number.POSITIVE_INFINITY;
     for (const key of this.#keys.values()) {
@@ -2007,11 +2069,6 @@ class IdentifyCoordinator {
       }
       if (this.#remaining !== undefined && this.#remaining <= 0) {
         const waiter = key.queue[0];
-        if (this.#resetAt === Number.POSITIVE_INFINITY) {
-          key.queue.shift();
-          waiter.fail(new Error("The session start limit is exhausted."));
-          continue;
-        }
         this.#onBudgetWait?.({
           shardId: waiter.shardId,
           waitMs: this.#resetAt - now
@@ -2265,7 +2322,9 @@ class RemoteHosts {
   #watchdog;
   #epoch = 0;
   #ping = 0;
-  #unauthenticated = 0;
+  #pending = new Set;
+  #pendingByAddress = new Map;
+  #rates = new Map;
   constructor(options, hooks) {
     if (typeof options.secret !== "string" || options.secret.length < 16)
       throw new RangeError("remote.secret must be a string of at least 16 characters.");
@@ -2303,8 +2362,17 @@ class RemoteHosts {
       hostname: hostname ?? "127.0.0.1",
       ...tls ? { tls } : {},
       fetch: (request, server) => {
+        const peer = server.requestIP(request)?.address;
+        const address = this.#options.clientAddress?.(request, peer) ?? peer ?? "unknown";
+        if (!this.#allowConnection(address))
+          return new Response("Too many connections.", {
+            status: 429
+          });
         if (server.upgrade(request, {
-          data: { nonce: randomBytes(16).toString("hex") }
+          data: {
+            nonce: randomBytes(16).toString("hex"),
+            address
+          }
         }))
           return;
         return new Response("Lunibee cluster coordinator", {
@@ -2398,14 +2466,46 @@ class RemoteHosts {
       return false;
     }
   }
+  #allowConnection(address) {
+    const rate = this.#options.connectionsPerSecond ?? 10;
+    const now = Date.now();
+    let bucket = this.#rates.get(address);
+    if (!bucket) {
+      bucket = { tokens: rate, at: now };
+      this.#rates.set(address, bucket);
+      if (this.#rates.size > 1e4)
+        this.#rates.delete(this.#rates.keys().next().value);
+    }
+    bucket.tokens = Math.min(rate, bucket.tokens + (now - bucket.at) / 1000 * rate);
+    bucket.at = now;
+    if (bucket.tokens < 1)
+      return false;
+    bucket.tokens--;
+    return true;
+  }
+  #evict(victim) {
+    this.#uncount(victim);
+    clearTimeout(victim.data.helloTimer);
+    victim.close(RemoteClose.TooManyConnections, "Too many connections.");
+  }
   #open(ws) {
-    if (this.#unauthenticated >= (this.#options.maxUnauthenticated ?? 16)) {
-      ws.close(RemoteClose.TooManyConnections, "Too many connections.");
-      return;
+    const address = ws.data.address;
+    if ((this.#pendingByAddress.get(address) ?? 0) >= (this.#options.maxUnauthenticatedPerAddress ?? 4)) {
+      for (const other of this.#pending)
+        if (other.data.address === address) {
+          this.#evict(other);
+          break;
+        }
     }
-    this.#unauthenticated++;
+    if (this.#pending.size >= (this.#options.maxUnauthenticated ?? 16)) {
+      const oldest = this.#pending.values().next().value;
+      if (oldest)
+        this.#evict(oldest);
+    }
+    this.#pending.add(ws);
+    this.#pendingByAddress.set(address, (this.#pendingByAddress.get(address) ?? 0) + 1);
     ws.data.counted = true;
-    ws.data.helloTimer = setTimeout(() => ws.close(RemoteClose.HelloTimeout, "No hello."), this.#options.helloTimeout ?? 1e4);
+    ws.data.helloTimer = setTimeout(() => ws.close(RemoteClose.HelloTimeout, "No hello."), this.#options.helloTimeout ?? 3000);
     ws.send(JSON.stringify({
       t: "challenge",
       nonce: ws.data.nonce,
@@ -2496,10 +2596,15 @@ class RemoteHosts {
       waiter.check();
   }
   #uncount(ws) {
-    if (ws.data.counted) {
-      ws.data.counted = false;
-      this.#unauthenticated--;
-    }
+    if (!ws.data.counted)
+      return;
+    ws.data.counted = false;
+    this.#pending.delete(ws);
+    const left = (this.#pendingByAddress.get(ws.data.address) ?? 1) - 1;
+    if (left > 0)
+      this.#pendingByAddress.set(ws.data.address, left);
+    else
+      this.#pendingByAddress.delete(ws.data.address);
   }
   #closed(ws, reason) {
     clearTimeout(ws.data.helloTimer);
@@ -2901,6 +3006,9 @@ class ClusterManager {
     this.#infos.set(id, info);
     this.clusters.set(id, info);
     this.#allReady = false;
+    child.on("error", (error) => this.#emit("error", new Error(`Cluster ${id} process error: ${error.message}`, {
+      cause: error
+    })));
     child.on("message", (frame) => this.#onFrame(info, child, frame));
     child.once("exit", (code, signal) => this.#onExit(info, child, code, signal));
     const timeout = this.#options.startTimeout;
@@ -2942,7 +3050,7 @@ class ClusterManager {
     this.#announceDown(info.id, info.shards);
     if (this.#options.restartOnExit === false) {
       info.state = "failed";
-      this.#checkReady();
+      this.#rejectReady(info, "restartOnExit is false");
       return;
     }
     const delay = this.#supervisor.next(info.id);
@@ -2952,9 +3060,10 @@ class ClusterManager {
         this.#options.onGiveUp?.(info);
       } catch {}
       this.#emit("clusterGiveUp", info);
-      this.#checkReady();
       if (this.#options.reassignOnGiveUp)
         this.#reassign(info);
+      else
+        this.#rejectReady(info, "restarts exhausted");
       return;
     }
     info.state = "restarting";
@@ -2979,12 +3088,14 @@ class ClusterManager {
     const target = [...this.#infos.values()].filter((cluster) => cluster.state === "ready").sort((a, b) => a.shards.length - b.shards.length)[0];
     if (!target) {
       this.#emit("error", new Error(`No ready cluster can take over shards [${shardIds}] of cluster ${failed.id}.`));
+      this.#rejectReady(failed, "no ready cluster to take them");
       return;
     }
     try {
       await this.requestCluster(target.id, REQUEST_ASSIGN, { shardIds }, { timeoutMs: this.#options.startTimeout ?? 120000 });
     } catch (error) {
       this.#emit("error", new Error(`Cluster ${target.id} could not take over shards [${shardIds}]: ${error instanceof Error ? error.message : String(error)}`));
+      this.#rejectReady(failed, "reassignment failed");
       return;
     }
     if (this.#stopping || failed.state !== "failed")
@@ -2998,6 +3109,7 @@ class ClusterManager {
       from: failed.id,
       to: target.id
     });
+    this.#checkReady();
   }
   #clearStartTimer(id) {
     const timer = this.#startTimers.get(id);
@@ -3133,9 +3245,20 @@ class ClusterManager {
       throw new RangeError(`${what} is larger than maxMessageBytes (${this.#maxBytes}).`);
   }
   #onBus(from, raw) {
-    const message = raw;
-    if (!message || typeof message !== "object" || typeof message.type !== "string" || typeof message.source !== "number" || message.target !== null && !Number.isInteger(message.target))
+    let message = raw;
+    if (!message || typeof message !== "object" || typeof message.type !== "string" || message.type.length === 0 || message.type.length > 256 || message.id === undefined || typeof message.id !== "string" || message.id.length > 256 || !Number.isInteger(message.source) || message.target !== null && !Number.isInteger(message.target))
       return;
+    if (!from.shards.includes(message.source))
+      return;
+    const { type, id, source, target, data, expectsReply } = message;
+    message = {
+      type,
+      id,
+      source,
+      target,
+      data,
+      ...expectsReply === undefined ? {} : { expectsReply }
+    };
     if (this.#tooBig(message.data)) {
       this.#emit("error", new Error(`Cluster ${from.id} sent a shard-bus message of more than ${this.#maxBytes} bytes; it was not relayed.`));
       return;
@@ -3279,12 +3402,21 @@ class ClusterManager {
     });
   }
   #isReady() {
-    if (this.#infos.size === 0)
-      return false;
-    for (const cluster of this.#infos.values())
-      if (cluster.state !== "ready")
+    let ready = 0;
+    for (const cluster of this.#infos.values()) {
+      if (cluster.state === "ready")
+        ready++;
+      else if (!(cluster.state === "failed" && cluster.shards.length === 0))
         return false;
-    return true;
+    }
+    return ready > 0;
+  }
+  #rejectReady(failed, why) {
+    if (failed.shards.length === 0)
+      return;
+    const error = new Error(`Cluster ${failed.id} failed and shards [${failed.shards}] have no owner (${why}).`);
+    for (const waiter of [...this.#readyWaiters])
+      waiter.reject(error);
   }
   #checkReady() {
     if (!this.#isReady())
@@ -3448,6 +3580,7 @@ class ClusterHost {
   #watchdog;
   #retry;
   #delay;
+  #busyAttempts = 0;
   #closed = true;
   #connected = false;
   #firstConnect;
@@ -3500,6 +3633,7 @@ class ClusterHost {
     if (!this.#closed)
       return Promise.resolve();
     this.#closed = false;
+    this.#busyAttempts = 0;
     return new Promise((resolve, reject) => {
       this.#firstConnect = { resolve, reject };
       this.#open();
@@ -3550,12 +3684,31 @@ class ClusterHost {
       return false;
     }
   }
+  #refuseSpawn(socket, data) {
+    if (typeof data !== "string" || data.length > 65536)
+      return;
+    let frame;
+    try {
+      frame = JSON.parse(data);
+    } catch {
+      return;
+    }
+    if (frame?.t !== "spawn" || !Number.isInteger(frame.cluster) || !Number.isInteger(frame.epoch))
+      return;
+    this.#send(socket, {
+      t: "error",
+      cluster: frame.cluster,
+      epoch: frame.epoch,
+      message: "This host refused the spawn request (malformed or not allowed)."
+    });
+  }
   #message(socket, data) {
     if (this.#socket !== socket)
       return;
     const message = parseToHost(data);
     if (!message) {
       this.#emit("error", new Error("The coordinator sent a malformed frame."));
+      this.#refuseSpawn(socket, data);
       return;
     }
     this.#lastRx = Date.now();
@@ -3687,6 +3840,11 @@ class ClusterHost {
       return;
     const refused = code === RemoteClose.AuthFailed || code === RemoteClose.UnknownHost || code === RemoteClose.DuplicateHost || code === RemoteClose.VersionMismatch;
     const first = this.#firstConnect;
+    const busy = code === RemoteClose.TooManyConnections || code === RemoteClose.HelloTimeout;
+    if (first && busy && ++this.#busyAttempts < (this.#options.connectAttempts ?? 10)) {
+      this.#retryLater();
+      return;
+    }
     if (first) {
       this.#firstConnect = undefined;
       this.#closed = true;
@@ -3695,6 +3853,9 @@ class ClusterHost {
     }
     if (refused)
       this.#emit("error", new Error(`The coordinator refused this host (${code}: ${reason}).`));
+    this.#retryLater();
+  }
+  #retryLater() {
     const wait = Math.round(this.#delay * (1 + Math.random() * 0.2));
     this.#delay = Math.min(this.#options.maxReconnectDelay ?? 30000, this.#delay * 2);
     this.#retry = setTimeout(() => {
@@ -3757,6 +3918,7 @@ class ShardManager {
   #resolved = false;
   #destroyed = false;
   #auto;
+  #fixedCount;
   #autoScaleTimer;
   #total;
   #listeners = new Map;
@@ -3799,6 +3961,7 @@ class ShardManager {
     if (options.handshakeTimeout !== undefined && (!Number.isFinite(options.handshakeTimeout) || options.handshakeTimeout < 0))
       throw new RangeError("handshakeTimeout must be a non-negative number of milliseconds.");
     this.#total = count;
+    this.#fixedCount = count;
     this.#auto = options.shardCount === "auto";
     this.#options = {
       spawnDelay: ShardManager.IDENTIFY_INTERVAL,
@@ -3830,7 +3993,7 @@ class ShardManager {
     }
     await this.#ensureInitialized();
     await this.#start([...this.shards].filter(([, gateway]) => needsConnection(gateway)).map(([id]) => id));
-    if (this.#options.autoScaleInterval && !this.#autoScaleTimer) {
+    if (this.#options.autoScaleInterval && this.#auto && !this.#autoScaleTimer) {
       this.#autoScaleTimer = setInterval(() => {
         this.checkAutoScale();
       }, this.#options.autoScaleInterval);
@@ -3905,6 +4068,8 @@ class ShardManager {
         this.#setStatus(id, "connecting");
       const results = await Promise.allSettled(round.map((id) => this.shards.get(id).connect()));
       const failed = results.findIndex((result) => result.status === "rejected");
+      if (limit)
+        limit.remaining = Math.max(0, limit.remaining - results.filter((r) => r.status === "fulfilled").length);
       if (failed !== -1) {
         if (destroyOnFailure)
           this.destroy();
@@ -4041,7 +4206,7 @@ class ShardManager {
       return;
     if (this.#destroyed)
       this.#destroyed = false;
-    const count = this.#options.shardCount === "auto" ? await this.fetchRecommendedShardCount() : this.#options.shardCount ?? 1;
+    const count = this.#options.shardCount === "auto" ? await this.fetchRecommendedShardCount() : this.#fixedCount;
     this.#initialize(count);
   }
   #initialize(count) {
@@ -4079,6 +4244,7 @@ class ShardManager {
       this.#setStatus(id, "unstable");
       this.#emit("shardUnstable", id, info);
     });
+    this.#emit("shardCreate", id, gateway);
     return gateway;
   }
 }
@@ -4108,4 +4274,4 @@ export {
   validateShardIds
 };
 
-//# debugId=7D2FE3134CAB1F3364756E2164756E21
+//# debugId=8AD6CE4D87FD51CB64756E2164756E21