@tesser-sh/gateway 0.56.2 → 0.56.3

package/index.js

@@ -247,7 +247,15 @@ function gatewayHostBox(gatewayHost, hostname) {
 
 // ../protocol/src/mux.ts
 var MUX_WINDOW = 262144, MUX_CHUNK = 65536;
-var MUX_PING = "tesser:ping", MUX_PONG = "tesser:pong", CODES = { open: 1, head: 2, data: 3, end: 4, reset: 5, credit: 6, text: 7, binary: 8, close: 9 }, TYPES = Object.fromEntries(Object.entries(CODES).map(([k, v]) => [v, k])), encoder = /* @__PURE__ */ new TextEncoder, decoder = new TextDecoder("utf-8", { fatal: !0, ignoreBOM: !1 });
+var MUX_PING = "tesser:ping", MUX_PONG = "tesser:pong";
+function closeCode(code) {
+  if (code === 1005)
+    return 1000;
+  if (code >= 1000 && code <= 1014 && code !== 1004 && code !== 1006 || code >= 3000 && code <= 4999)
+    return code;
+  return code >= 1016 && code <= 2999 ? 1011 : 1001;
+}
+var CODES = { open: 1, head: 2, data: 3, end: 4, reset: 5, credit: 6, text: 7, binary: 8, close: 9 }, TYPES = Object.fromEntries(Object.entries(CODES).map(([k, v]) => [v, k])), encoder = /* @__PURE__ */ new TextEncoder, decoder = new TextDecoder("utf-8", { fatal: !0, ignoreBOM: !1 });
 function frame(type, stream, payload) {
   let out = new Uint8Array(5 + payload.byteLength);
   return out[0] = CODES[type], new DataView(out.buffer).setUint32(1, stream), out.set(payload, 5), out;
@@ -448,12 +456,19 @@ class WakeFailed extends Schema.TaggedError()("WakeFailed", { boxId: Schema.Stri
 class UpstreamRefused extends Schema.TaggedError()("UpstreamRefused", { boxId: Schema.String, port: Schema.Number }) {
 }
 
+class UpstreamTimedOut extends Schema.TaggedError()("UpstreamTimedOut", { boxId: Schema.String, port: Schema.Number }) {
+}
+
 class Resolver extends Context.Service()("@tesser/proxy/Resolver") {
 }
 
 class Waker extends Context.Service()("@tesser/proxy/Waker") {
 }
-var WAKING_WINDOW = Duration.minutes(5), startingRetry = { schedule: Schedule.spaced(Duration.seconds(1)), times: 60 }, respond = (response) => ({ _tag: "response", response });
+var WAKING_WINDOW = Duration.minutes(5), startingRetry = {
+  schedule: Schedule.spaced(Duration.seconds(1)),
+  times: 60,
+  while: (error) => error._tag === "UpstreamRefused"
+}, respond = (response) => ({ _tag: "response", response });
 function viewerResponse(request, state, owner = !1) {
   let status = viewerStatus(state);
   if (wantsDocument(request))
@@ -468,7 +483,7 @@ function viewerBox(box) {
 var wakingPage = Effect2.fn("Proxy.wakingPage")(function* (request, box, port, stage, since) {
   let now = yield* Clock2.currentTimeMillis;
   return yield* page(request, { kind: "waking", box: viewerBox(box), stage, port, seconds: Math.max(0, Math.round((now - since) / 1000)) });
-}), refused = Effect2.fn("Proxy.refused")(function* (request, box, port) {
+}), notAnswering = (request, box, port) => page(request, { kind: "not-answering", box: viewerBox(box), port }), refused = Effect2.fn("Proxy.refused")(function* (request, box, port) {
   let status = yield* (yield* Waker).status(box.boxId), now = yield* Clock2.currentTimeMillis;
   if (box.app === "exited")
     return yield* page(request, { kind: "stopped", box: viewerBox(box) });
@@ -476,7 +491,7 @@ var wakingPage = Effect2.fn("Proxy.wakingPage")(function* (request, box, port, s
     return yield* wakingPage(request, box, port, box.app === "running" ? "port" : "app", status.since);
   if (box.app === "none")
     return yield* page(request, { kind: "idle", box: viewerBox(box) });
-  return yield* page(request, { kind: "not-answering", box: viewerBox(box), port });
+  return yield* notAnswering(request, box, port);
 }), serve = Effect2.fn("Proxy.serve")(function* (request, route, box) {
   let { port, path, headers } = route;
   if (request.headers.get("upgrade")?.toLowerCase() === "websocket")
@@ -489,7 +504,10 @@ var wakingPage = Effect2.fn("Proxy.wakingPage")(function* (request, box, port, s
     signal: request.signal,
     ...replayable ? {} : { duplex: "half" }
   })));
-  return yield* (document || !replayable ? attempt : attempt.pipe(Effect2.retry(startingRetry))).pipe(Effect2.flatMap((response) => Effect2.map(route.present(box, response), respond)), Effect2.catchTag("UpstreamRefused", () => document ? refused(request, box, port) : page(request, { kind: "not-answering", box: viewerBox(box), port })));
+  return yield* (document || !replayable ? attempt : attempt.pipe(Effect2.retry(startingRetry))).pipe(Effect2.flatMap((response) => Effect2.map(route.present(box, response), respond)), Effect2.catchTags({
+    UpstreamRefused: () => document ? refused(request, box, port) : notAnswering(request, box, port),
+    UpstreamTimedOut: () => notAnswering(request, box, port)
+  }));
 }), handle = Effect2.fn("Proxy.handle")(function* (request) {
   let resolved = yield* (yield* Resolver).resolve(request);
   if (resolved instanceof Response)
@@ -1191,9 +1209,7 @@ class BoxRelay extends DurableObject {
       return;
     }
     let { stream } = ws.deserializeAttachment();
-    this.unstored.delete(stream);
-    let sendable = code === 1005 ? 1000 : code === 1004 || code === 1006 || code === 1015 || code < 1000 || code > 4999 ? 1001 : code;
-    this.tunnel.send({ type: "close", stream, code: sendable, reason: reason.slice(0, 120) });
+    this.unstored.delete(stream), this.tunnel.send({ type: "close", stream, code: closeCode(code), reason: reason.slice(0, 120) });
   }
   webSocketError(ws) {
     this.webSocketClose(ws, 1006, "socket error");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tesser-sh/gateway",
-  "version": "0.56.2",
+  "version": "0.56.3",
   "description": "Tesser's share gateway as a Cloudflare Worker and Durable Object, deployed in your own account",
   "license": "MIT",
   "type": "module",