erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-30 04:07:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6304 from keymanapp/fix/developer/6303-move-ngrok

Browse source 
fix(developer): move ngrok to Server/bin/
This commit is contained in:
Marc Durdin 2022-03-02 09:00:19 +11:00 • committed by GitHub
commit e2bd4cdca4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
developer/server/src/config.ts
View file

@ -46,7 +46,7 @@ export class Configuration {
// ngrok configuration
this.useNgrok = cfg?.useNgrok ?? false;
this.ngrokBinPath = this.appDataPath + '../';
this.ngrokBinPath = this.appDataPath + 'bin/';
this.ngrokControlPort = cfg?.ngrokControlPort ?? 8009;
this.ngrokToken = cfg?.ngrokToken ?? '';
this.ngrokRegion = cfg?.ngrokRegion ?? '';

19
windows/src/developer/TIKE/dialogs/Keyman.Developer.UI.UfrmServerOptions.pas
View file

@ -76,6 +76,7 @@ const
SUrlNgrokAuthToken = 'https://dashboard.ngrok.com/get-started/your-authtoken';
SUrlNgrokSignup = 'https://dashboard.ngrok.com/signup';
SUrlNgrokDownload = 'https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-windows-386.zip';
SNGrokExe = 'ngrok.exe';
procedure TfrmServerOptions.cmdCreateAccountClick(Sender: TObject);
begin
@ -113,15 +114,15 @@ begin
except
on E:ENetHTTPClientException do
begin
ShowMessage(Format('Unable to download ngrok.exe: %s', [E.Message]));
ShowMessage(Format('Unable to download %s: %s', [SNGrokExe, E.Message]));
Exit;
end;
end;
if res.StatusCode <> 200 then
begin
ShowMessage(Format('Unable to download ngrok.exe: %d %s',
[res.StatusCode, res.StatusText]));
ShowMessage(Format('Unable to download %s: %d %s',
[SNGrokExe, res.StatusCode, res.StatusText]));
Exit;
end;
@ -132,7 +133,7 @@ begin
try
try
zip.Open(res.ContentStream, zmRead);
zip.Read('ngrok.exe', ms, zh);
zip.Read(SNGrokExe, ms, zh);
ms.Position := 0;
finally
zip.Free;
@ -140,8 +141,8 @@ begin
except
on E:Exception do
begin
ShowMessage(Format('Unable to extract ngrok.exe from downloaded archive: %s',
[E.Message]));
ShowMessage(Format('Unable to extract %s from downloaded archive: %s',
[SNGrokExe, E.Message]));
Exit;
end;
end;
@ -150,7 +151,7 @@ begin
except
on E:Exception do
begin
ShowMessage(Format('Unable to save ngrok.exe: %s', [E.Message]));
ShowMessage(Format('Unable to save %s: %s', [SNGrokExe, E.Message]));
Exit;
end;
end;
@ -255,7 +256,9 @@ end;
function TfrmServerOptions.NgrokPath: string;
begin
Result := GetFolderPath(CSIDL_APPDATA) + SFolderKeymanDeveloper + '\ngrok.exe';
Result := GetFolderPath(CSIDL_APPDATA) + SFolderKeymanDeveloper + '\Server\bin\';
ForceDirectories(Result);
Result := Result + SNgrokExe;
end;
procedure TfrmServerOptions.UpdateVersionLabel;