Variet/gravity_control
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: LS ConnectRPC use HTTPS when detected, not port heuristic

Browse Source
This commit is contained in:
authentik Default Admin
2026-03-07 18:31:13 +09:00
parent 91b3a7ef20
commit f2ed431aa5
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
extension/gravity-bridge-0.2.0.vsix
View File

Binary file not shown.

12
extension/out/extension.js
View File

@@ -122,6 +122,7 @@ function activate(context) {
let lsPort = null; let lsPort = null;
let lsCsrf = ''; let lsCsrf = '';
let lsPid = null; let lsPid = null;
let lsUseTls = false; // track detected protocol
let lastStepIndex = {}; // cascadeId → last known step index let lastStepIndex = {}; // cascadeId → last known step index
async function discoverLS() { async function discoverLS() {
return new Promise((resolve) => { return new Promise((resolve) => {
@@ -210,8 +211,15 @@ function activate(context) {
let data = ''; let data = '';
res.on('data', (chunk) => { data += chunk; }); res.on('data', (chunk) => { data += chunk; });
res.on('end', () => { res.on('end', () => {
// Any response (even error) means ConnectRPC is here
console.log(`Gravity Bridge: [LS] port ${port} (${useTls ? 'https' : 'http'}) status=${res.statusCode} body=${data.substring(0, 200)}`); console.log(`Gravity Bridge: [LS] port ${port} (${useTls ? 'https' : 'http'}) status=${res.statusCode} body=${data.substring(0, 200)}`);
// If HTTP got "HTTPS server" response, retry with HTTPS
if (!useTls && data.includes('HTTPS server')) {
tryProto(https, true);
return;
}
if (res.statusCode !== 404) {
lsUseTls = useTls; // remember which protocol worked
}
resolve(res.statusCode !== 404); resolve(res.statusCode !== 404);
}); });
}); });
@@ -238,7 +246,7 @@ function activate(context) {
return new Promise((resolve) => { return new Promise((resolve) => {
const http = require('http'); const http = require('http');
const https = require('https'); const https = require('https');
const proto = lsPort > 40000 ? https : http; // heuristic const proto = lsUseTls ? https : http; // use detected protocol
const body = JSON.stringify(payload); const body = JSON.stringify(payload);
const req = proto.request({ const req = proto.request({
hostname: '127.0.0.1', hostname: '127.0.0.1',

2
extension/out/extension.js.map
View File

File diff suppressed because one or more lines are too long

12
extension/src/extension.ts
View File

@@ -101,6 +101,7 @@ export function activate(context: vscode.ExtensionContext) {
let lsPort: number | null = null; let lsPort: number | null = null;
let lsCsrf: string = ''; let lsCsrf: string = '';
let lsPid: number | null = null; let lsPid: number | null = null;
let lsUseTls: boolean = false; // track detected protocol
let lastStepIndex: Record<string, number> = {}; // cascadeId → last known step index let lastStepIndex: Record<string, number> = {}; // cascadeId → last known step index
async function discoverLS(): Promise<boolean> { async function discoverLS(): Promise<boolean> {
@@ -198,8 +199,15 @@ export function activate(context: vscode.ExtensionContext) {
let data = ''; let data = '';
res.on('data', (chunk: any) => { data += chunk; }); res.on('data', (chunk: any) => { data += chunk; });
res.on('end', () => { res.on('end', () => {
// Any response (even error) means ConnectRPC is here
console.log(`Gravity Bridge: [LS] port ${port} (${useTls ? 'https' : 'http'}) status=${res.statusCode} body=${data.substring(0, 200)}`); console.log(`Gravity Bridge: [LS] port ${port} (${useTls ? 'https' : 'http'}) status=${res.statusCode} body=${data.substring(0, 200)}`);
// If HTTP got "HTTPS server" response, retry with HTTPS
if (!useTls && data.includes('HTTPS server')) {
tryProto(https, true);
return;
}
if (res.statusCode !== 404) {
lsUseTls = useTls; // remember which protocol worked
}
resolve(res.statusCode !== 404); resolve(res.statusCode !== 404);
}); });
}); });
@@ -224,7 +232,7 @@ export function activate(context: vscode.ExtensionContext) {
return new Promise((resolve) => { return new Promise((resolve) => {
const http = require('http'); const http = require('http');
const https = require('https'); const https = require('https');
const proto = lsPort! > 40000 ? https : http; // heuristic const proto = lsUseTls ? https : http; // use detected protocol
const body = JSON.stringify(payload); const body = JSON.stringify(payload);
const req = proto.request({ const req = proto.request({
hostname: '127.0.0.1', hostname: '127.0.0.1',