dsh-mobile 0.8.6 → 0.8.7

package/lib/index.mjs

@@ -2156,6 +2156,8 @@ function requestPathCategory(path) {
 		case "/mobile-access/events": return path;
 		default:
 			if (path.startsWith("/api/")) return "/api/*";
+			if (path.startsWith("/plugins/")) return "/plugins/*";
+			if (path.startsWith("/assets/")) return "/assets/*";
 			if (path.startsWith("/mobile-access/extensions/")) return "/mobile-access/extensions/*";
 			if (/^\/mobile-access\/compat-[a-f\d]{64}\.js$/u.test(path)) return "/mobile-access/compat.js";
 			if (path.startsWith("/mobile-access/")) return "/mobile-access/*";
@@ -3278,7 +3280,7 @@ function forwardableClose(code) {
 * @param upstreamCookie - gateway's signed upstream cookie; browser cookies are discarded.
 * @param options - resolved message, queue, and compression limits.
 * @param handshakeTimeoutMs - maximum handshake and close-handshake duration.
-* @returns fulfillment after both HTTP upgrades are accepted, or rejection before acceptance.
+* @returns the close handle after both HTTP upgrades are accepted, or rejection before acceptance.
 */
 function bridgeCompressedWebSocket(request, client, upstream, head, target, upstreamCookie, options, handshakeTimeoutMs) {
 	return new Promise((resolve, reject) => {
@@ -3467,7 +3469,7 @@ function bridgeCompressedWebSocket(request, client, upstream, head, target, upst
 						accepted = true;
 						clearTimeout(handshakeTimer);
 						incoming.resume();
-						resolve();
+						resolve({ close: beginClose });
 					});
 				} catch (error) {
 					stop(error instanceof Error ? error : /* @__PURE__ */ new Error("Client WebSocket upgrade failed"));
@@ -9623,9 +9625,31 @@ var MobileAccessGateway = class {
 			client.destroy();
 			upstream.destroy();
 		};
+		let closeCompressedBridge;
+		const finishGracefully = () => {
+			if (closeCompressedBridge !== void 0) closeCompressedBridge(1e3, "session expired");
+			else {
+				upstream.unpipe(client);
+				client.unpipe(upstream);
+				upstream.pause();
+				const sendCloseFrame = (socket) => {
+					if (socket.destroyed || !socket.writable) return;
+					try {
+						socket.write(Buffer.from([
+							136,
+							2,
+							3,
+							232
+						]));
+					} catch {}
+				};
+				sendCloseFrame(client);
+			}
+			setTimeout(closeBoth, 50).unref();
+		};
 		client.on("error", closeBoth);
 		upstream.on("error", closeBoth);
-		const timer = setTimeout(closeBoth, Math.max(1, authorization.expiresAt - Date.now()));
+		const timer = setTimeout(finishGracefully, Math.max(1, authorization.expiresAt - Date.now()));
 		timer.unref();
 		const record = Object.freeze({
 			...authorization,
@@ -9654,7 +9678,10 @@ var MobileAccessGateway = class {
 				const compressionTarget = new URL(this.config.upstreamOrigin.href);
 				compressionTarget.pathname = target.pathname;
 				compressionTarget.search = target.search;
-				await bridgeCompressedWebSocket(request, client, upstream, head, compressionTarget, upstreamCookie, this.config.websocketCompression, this.config.upstreamTimeoutMs);
+				const bridge = await bridgeCompressedWebSocket(request, client, upstream, head, compressionTarget, upstreamCookie, this.config.websocketCompression, this.config.upstreamTimeoutMs);
+				closeCompressedBridge = (code, reason) => {
+					bridge.close(code, reason);
+				};
 				return;
 			}
 			await new Promise((resolve, reject) => {