@tesser-sh/gateway 0.57.0 → 0.58.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +64 -27
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -103,6 +103,7 @@ var STATUS = {
|
|
|
103
103
|
idle: 502,
|
|
104
104
|
"wake-failed": 503,
|
|
105
105
|
"no-port": 404,
|
|
106
|
+
removed: 410,
|
|
106
107
|
"not-shared": 404,
|
|
107
108
|
unavailable: 503
|
|
108
109
|
};
|
|
@@ -127,6 +128,8 @@ function viewerText(state) {
|
|
|
127
128
|
return `${state.box.name} didn't wake up: ${state.reason}`;
|
|
128
129
|
case "no-port":
|
|
129
130
|
return `${state.box.name} has no port ${state.port}`;
|
|
131
|
+
case "removed":
|
|
132
|
+
return `${state.box.name} was removed; \`tesser ls\` lists the boxes you have`;
|
|
130
133
|
case "not-shared":
|
|
131
134
|
return "nothing is shared here";
|
|
132
135
|
case "unavailable":
|
|
@@ -203,6 +206,8 @@ function body(state, owner) {
|
|
|
203
206
|
retry: !1,
|
|
204
207
|
rest: `${who(state.box)}<ul>${state.ports.map((p) => `<li><span class="name ports mono"><a href="${escapeHtml(p.href)}">:${p.port}</a></span></li>`).join("")}</ul>`
|
|
205
208
|
};
|
|
209
|
+
case "removed":
|
|
210
|
+
return { headline: `${state.box.name} was removed`, spinner: !1, retry: !1, rest: `<p class="sub">${escapeHtml(state.box.boxId)} is gone, and its dev server with it.</p>${cmd("tesser ls")}` };
|
|
206
211
|
case "not-shared":
|
|
207
212
|
return { headline: "Nothing is shared here", spinner: !1, retry: !1, rest: '<p class="sub">This link was never shared, or it was unshared. Ask whoever sent it for a new one.</p>' };
|
|
208
213
|
case "unavailable":
|
|
@@ -444,6 +449,9 @@ import { Clock as Clock2, Context, Duration, Effect as Effect2, Schedule, Schema
|
|
|
444
449
|
class BoxNotShared extends Schema.TaggedError()("BoxNotShared", { boxId: Schema.String }) {
|
|
445
450
|
}
|
|
446
451
|
|
|
452
|
+
class BoxRemoved extends Schema.TaggedError()("BoxRemoved", { boxId: Schema.String, name: Schema.String }) {
|
|
453
|
+
}
|
|
454
|
+
|
|
447
455
|
class DirectoryUnavailable extends Schema.TaggedError()("DirectoryUnavailable", { reason: Schema.String }) {
|
|
448
456
|
}
|
|
449
457
|
|
|
@@ -492,46 +500,55 @@ var wakingPage = Effect2.fn("Proxy.wakingPage")(function* (request, box, port, s
|
|
|
492
500
|
if (box.app === "none")
|
|
493
501
|
return yield* page(request, { kind: "idle", box: viewerBox(box) });
|
|
494
502
|
return yield* notAnswering(request, box, port);
|
|
495
|
-
}), serve = Effect2.fn("Proxy.serve")(function* (request, route, box) {
|
|
503
|
+
}), RECHECK = Duration.seconds(3), serve = Effect2.fn("Proxy.serve")(function* (request, route, box) {
|
|
496
504
|
let { port, path, headers } = route;
|
|
497
505
|
if (request.headers.get("upgrade")?.toLowerCase() === "websocket")
|
|
498
506
|
return { _tag: "websocket", box, port, path, headers };
|
|
499
|
-
let replayable = request.method === "GET" || request.method === "HEAD", document = wantsDocument(request), attempt = Effect2.suspend(() => route.fetch(box, new Request(`http://${headers.get("host")}${path}`, {
|
|
507
|
+
let waker = yield* Waker, replayable = request.method === "GET" || request.method === "HEAD", document = wantsDocument(request), attempt = Effect2.suspend(() => route.fetch(box, new Request(`http://${headers.get("host")}${path}`, {
|
|
500
508
|
method: request.method,
|
|
501
509
|
headers,
|
|
502
510
|
body: replayable ? void 0 : request.body,
|
|
503
511
|
redirect: "manual",
|
|
504
512
|
signal: request.signal,
|
|
505
513
|
...replayable ? {} : { duplex: "half" }
|
|
506
|
-
})));
|
|
507
|
-
return yield* (document || !replayable ? attempt :
|
|
508
|
-
UpstreamRefused: () => document ? refused(request, box, port) : notAnswering(request, box, port),
|
|
514
|
+
}))), stillUp = (refusal) => waker.awake(box.boxId).pipe(Effect2.catchTag("DirectoryUnavailable", () => Effect2.fail(refusal))), retried = attempt.pipe(Effect2.tapErrorTag("UpstreamRefused", stillUp), Effect2.retry(startingRetry));
|
|
515
|
+
return yield* (document || !replayable ? attempt : retried).pipe(Effect2.flatMap((response) => Effect2.map(route.present(box, response), respond)), Effect2.catchTags({
|
|
516
|
+
UpstreamRefused: (refusal) => document ? stillUp(refusal).pipe(Effect2.timeoutOption(RECHECK), Effect2.flatMap((up) => up._tag === "Some" ? refused(request, box, port) : comingUp(request, box, port)), Effect2.catchTag("UpstreamRefused", () => refused(request, box, port))) : notAnswering(request, box, port),
|
|
509
517
|
UpstreamTimedOut: () => notAnswering(request, box, port)
|
|
510
518
|
}));
|
|
511
|
-
}),
|
|
519
|
+
}), comingUp = Effect2.fn("Proxy.comingUp")(function* (request, box, port) {
|
|
520
|
+
let status = yield* (yield* Waker).status(box.boxId);
|
|
521
|
+
return yield* wakingPage(request, box, port, "machine", status?.since ?? (yield* Clock2.currentTimeMillis));
|
|
522
|
+
}), dormant = Effect2.fn("Proxy.dormant")(function* (request, box, port, waiting) {
|
|
523
|
+
let waker = yield* Waker;
|
|
524
|
+
if (box.power === "asleep" && userNavigation(request))
|
|
525
|
+
yield* waker.wake(box.boxId);
|
|
526
|
+
let status = yield* waker.status(box.boxId);
|
|
527
|
+
if (box.power === "asleep" && status?.failure)
|
|
528
|
+
return yield* page(request, { kind: "wake-failed", box: viewerBox(box), reason: status.failure });
|
|
529
|
+
if (box.power === "asleep" && status === null)
|
|
530
|
+
return yield* page(request, { kind: "asleep", box: viewerBox(box) });
|
|
531
|
+
if (!wantsDocument(request))
|
|
532
|
+
return yield* waiting;
|
|
533
|
+
if (box.power === "launching" && status === null)
|
|
534
|
+
return yield* page(request, { kind: "booting", box: viewerBox(box) });
|
|
535
|
+
return yield* wakingPage(request, box, port, "machine", status?.since ?? (yield* Clock2.currentTimeMillis));
|
|
536
|
+
}), settled = (request, route, box) => serve(request, route, box).pipe(Effect2.catchTags({
|
|
537
|
+
BoxAsleep: () => dormant(request, { ...box, power: "asleep" }, route.port, comingUp(request, box, route.port)),
|
|
538
|
+
WakeFailed: (e) => page(request, { kind: "wake-failed", box: viewerBox(box), reason: e.reason })
|
|
539
|
+
})), handle = Effect2.fn("Proxy.handle")(function* (request) {
|
|
512
540
|
let resolved = yield* (yield* Resolver).resolve(request);
|
|
513
541
|
if (resolved instanceof Response)
|
|
514
542
|
return respond(resolved);
|
|
515
|
-
let { box, port } = resolved
|
|
516
|
-
if (box.power
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
if (box.power === "asleep" && status?.failure)
|
|
521
|
-
return yield* page(request, { kind: "wake-failed", box: viewerBox(box), reason: status.failure });
|
|
522
|
-
if (box.power === "asleep" && status === null)
|
|
523
|
-
return yield* page(request, { kind: "asleep", box: viewerBox(box) });
|
|
524
|
-
if (wantsDocument(request)) {
|
|
525
|
-
if (box.power === "launching" && status === null)
|
|
526
|
-
return yield* page(request, { kind: "booting", box: viewerBox(box) });
|
|
527
|
-
return yield* wakingPage(request, box, port, "machine", status?.since ?? (yield* Clock2.currentTimeMillis));
|
|
528
|
-
}
|
|
529
|
-
return yield* serve(request, resolved, yield* waker.awake(box.boxId));
|
|
530
|
-
}
|
|
531
|
-
return yield* serve(request, resolved, box);
|
|
543
|
+
let { box, port } = resolved;
|
|
544
|
+
if (box.power === "awake")
|
|
545
|
+
return yield* settled(request, resolved, box);
|
|
546
|
+
let waker = yield* Waker;
|
|
547
|
+
return yield* dormant(request, box, port, Effect2.flatMap(waker.awake(box.boxId), (up) => settled(request, resolved, up)));
|
|
532
548
|
}, (effect, request) => effect.pipe(Effect2.catchTags({
|
|
533
549
|
BoxAsleep: (e) => page(request, { kind: "asleep", box: { boxId: e.boxId, name: e.boxId, sharedBy: null } }),
|
|
534
550
|
BoxNotShared: () => page(request, { kind: "not-shared" }),
|
|
551
|
+
BoxRemoved: (e) => page(request, { kind: "removed", box: { boxId: e.boxId, name: e.name, sharedBy: null } }),
|
|
535
552
|
DirectoryUnavailable: () => page(request, { kind: "unavailable" }),
|
|
536
553
|
WakeFailed: (e) => page(request, { kind: "wake-failed", box: { boxId: e.boxId, name: e.boxId, sharedBy: null }, reason: e.reason })
|
|
537
554
|
})));
|
|
@@ -998,7 +1015,7 @@ class Tunnel {
|
|
|
998
1015
|
}
|
|
999
1016
|
|
|
1000
1017
|
// src/relay.ts
|
|
1001
|
-
var TICKET_HEADER = "x-tesser-ticket", WAKE_TIMEOUT = Duration2.minutes(5), WAKE_RETRY_MS = 30000, DIAL_GRACE = Duration2.seconds(30), RECHECK_MS = 60000, STALE_MS = 300000, RETRYABLE = /* @__PURE__ */ new Set([0, 408, 409, 429]), Ticket = Schema2.Struct({
|
|
1018
|
+
var TICKET_HEADER = "x-tesser-ticket", WAKE_TIMEOUT = Duration2.minutes(5), WAKE_RETRY_MS = 30000, DIAL_GRACE = Duration2.seconds(30), RECHECK_MS = 60000, STALE_MS = 300000, RETRYABLE = /* @__PURE__ */ new Set([0, 408, 409, 429]), LOOKUP_REUSE_MS = 1000, ASK_TIMEOUT = Duration2.seconds(10), Ticket = Schema2.Struct({
|
|
1002
1019
|
org: Schema2.String,
|
|
1003
1020
|
box: Schema2.String,
|
|
1004
1021
|
name: Schema2.String,
|
|
@@ -1028,6 +1045,7 @@ class BoxRelay extends DurableObject {
|
|
|
1028
1045
|
verifiedAt = /* @__PURE__ */ new Map;
|
|
1029
1046
|
unstored = /* @__PURE__ */ new Map;
|
|
1030
1047
|
failingSince = /* @__PURE__ */ new Map;
|
|
1048
|
+
lookups = /* @__PURE__ */ new Map;
|
|
1031
1049
|
constructor(ctx, env) {
|
|
1032
1050
|
super(ctx, env);
|
|
1033
1051
|
ctx.setWebSocketAutoResponse(new WebSocketRequestResponsePair(MUX_PING, MUX_PONG));
|
|
@@ -1215,11 +1233,30 @@ class BoxRelay extends DurableObject {
|
|
|
1215
1233
|
this.webSocketClose(ws, 1006, "socket error");
|
|
1216
1234
|
}
|
|
1217
1235
|
ask(call) {
|
|
1218
|
-
return Effect4.tryPromise({ try: call, catch: (err) => new DirectoryUnavailable({ reason: err instanceof Error ? err.message : String(err) }) });
|
|
1236
|
+
return Effect4.tryPromise({ try: call, catch: (err) => new DirectoryUnavailable({ reason: err instanceof Error ? err.message : String(err) }) }).pipe(Effect4.timeoutOrElse({ duration: ASK_TIMEOUT, orElse: () => Effect4.fail(new DirectoryUnavailable({ reason: "tesser didn't answer in time" })) }));
|
|
1237
|
+
}
|
|
1238
|
+
sharedLookup(boxId, viewer) {
|
|
1239
|
+
let now = Date.now();
|
|
1240
|
+
for (let [key, l] of this.lookups)
|
|
1241
|
+
if (l.settledAt === null ? now - l.startedAt > Duration2.toMillis(ASK_TIMEOUT) : now - l.settledAt > LOOKUP_REUSE_MS)
|
|
1242
|
+
this.lookups.delete(key);
|
|
1243
|
+
let key = viewer ?? "", reused = this.lookups.get(key);
|
|
1244
|
+
if (reused !== void 0)
|
|
1245
|
+
return reused.answer;
|
|
1246
|
+
let lookup = {
|
|
1247
|
+
answer: this.lookupBox(boxId, viewer).then((answer) => (lookup.settledAt = Date.now(), answer), (err) => {
|
|
1248
|
+
if (this.lookups.get(key) === lookup)
|
|
1249
|
+
this.lookups.delete(key);
|
|
1250
|
+
throw err;
|
|
1251
|
+
}),
|
|
1252
|
+
startedAt: now,
|
|
1253
|
+
settledAt: null
|
|
1254
|
+
};
|
|
1255
|
+
return this.lookups.set(key, lookup), lookup.answer;
|
|
1219
1256
|
}
|
|
1220
1257
|
layer(viewer) {
|
|
1221
1258
|
let self = this, remote = Effect4.fn("Relay.remote")(function* (boxId) {
|
|
1222
|
-
let { status, body } = yield* self.ask(() => self.
|
|
1259
|
+
let { status, body } = yield* self.ask(() => self.sharedLookup(boxId, viewer));
|
|
1223
1260
|
if (status === 403 || status === 404)
|
|
1224
1261
|
return yield* new BoxNotShared({ boxId });
|
|
1225
1262
|
if (status !== 200) {
|
|
@@ -1256,7 +1293,7 @@ class BoxRelay extends DurableObject {
|
|
|
1256
1293
|
}
|
|
1257
1294
|
let now = yield* Clock3.currentTimeMillis;
|
|
1258
1295
|
if (viewer !== null && now - (self.verifiedAt.get(viewer) ?? 0) > RECHECK_MS) {
|
|
1259
|
-
let answer = yield* self.ask(() => self.
|
|
1296
|
+
let answer = yield* self.ask(() => self.sharedLookup(boxId, viewer)).pipe(Effect4.orElseSucceed(() => null)), verdict = self.verdict(viewer, answer, now, !1);
|
|
1260
1297
|
if (verdict === "revoked" || verdict === "refused")
|
|
1261
1298
|
return yield* new BoxNotShared({ boxId });
|
|
1262
1299
|
if (verdict === "stale")
|