Skip to content

Commit

Permalink
Merge pull request #96 from Moros1138/fix-language-client-connection-…
Browse files Browse the repository at this point in the history 
…stability-and-restart

Fix language client connection stability and restart
  • Loading branch information
@Moros1138
Moros1138 authored Jun 11, 2024
2 parents 6fe2d52 + 3ba59bc commit b3259ec
Show file tree
Hide file tree
Showing 12 changed files with 174 additions and 105 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Each batch

It is a summary of changes that would be pertinent to the end user of the PGEtinker website. For a comprehensive history of changes made to the project, please refer to the repository's commit history.

## 2024-06-10

- Added language client automatic reconnect
- Changed to typescript, partially
- Removed glyph margin from line number gutter

## 2024-06-09

- Fixed [Issue #92](https://github.com/Moros1138/PGEtinker/issues/92)
Expand Down
14 changes: 14 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build"
"build": "tsc && vite build"
},
"devDependencies": {
"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
Expand All @@ -25,8 +25,9 @@
"lucide": "^0.372.0",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~5.1.1",
"monaco-editor-wrapper": "~5.1.1",
"monaco-languageclient": "~8.4.0",
"monaco-languageclient": "~8.4.0",
"sass": "^1.75.0",
"typescript": "^5.4.5",
"vite": "^5.0",
"vscode": "npm:@codingame/monaco-vscode-api"
}
Expand Down
78 changes: 45 additions & 33 deletions resources/js/app.js → resources/js/app.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,33 @@ import './lib/bootstrap';
import './lib/goldenLayout';
import './lib/lucide';
import version from "./lib/version";
import { conformStorage, getStorageValue, setStorageValue } from './lib/storage';
import { conformStorage, getStorageValue, setStorageValue, removeStorageKey } from './lib/storage';
// @ts-ignore
import agreeDialog from './lib/agreeDialog';
// @ts-ignore
import shareDialog from './lib/shareDialog';
// @ts-ignore
import newsDialog from './lib/newsDialog';
// @ts-ignore
import defaultLandscapeLayout from './lib/defaultLandscapeLayout';
// @ts-ignore
import defaultPortraitLayout from './lib/defaultPortraitLayout';
// @ts-ignore
import supportersDialog from './lib/supportersDialog';

// @ts-ignore
import ConsolePanel from './components/ConsolePanel';
// @ts-ignore
import CompilerOutputPanel from './components/CompilerOutputPanel';
// @ts-ignore
import EditorPanel from './components/EditorPanel';
// @ts-ignore
import PlayerPanel from './components/PlayerPanel';
// @ts-ignore
import ProblemsPanel from './components/ProblemsPanel';
import { removeStorageKey } from './lib/storage';

import axios from 'axios';
declare function GoldenLayout(...args: any[]): void;

class PGEtinker
{
Expand All @@ -27,10 +40,10 @@ class PGEtinker

layoutInitialized = false;
compiling = false;

layoutConfig = null;
layout: any;
layoutConfig: any = null;

theme = "dark";
theme: string | null = "dark";

constructor()
{
Expand Down Expand Up @@ -64,7 +77,7 @@ class PGEtinker
this.theme = "dark";

// Default Code Button
document.querySelector("#default-code").addEventListener("click", (event) =>
document.querySelector("#default-code")!.addEventListener("click", (event) =>
{
event.preventDefault();

Expand All @@ -79,7 +92,7 @@ class PGEtinker
});

// Toggle Theme Button
document.querySelector("#toggle-theme").addEventListener("click", (event) =>
document.querySelector("#toggle-theme")!.addEventListener("click", (event) =>
{
event.preventDefault();

Expand All @@ -92,9 +105,10 @@ class PGEtinker
});

// Default Layout
document.querySelector("#default-layout").addEventListener("click", (event) =>
document.querySelector("#default-layout")!.addEventListener("click", async(event) =>
{
event.preventDefault();
await this.editorPanel.onDestroy();

this.layout.destroy();

Expand All @@ -110,7 +124,7 @@ class PGEtinker
});

// Download Button
document.querySelector("#download").addEventListener("click", (event) =>
document.querySelector("#download")!.addEventListener("click", (event) =>
{
event.preventDefault();

Expand All @@ -132,7 +146,7 @@ class PGEtinker
});

// Share Button
document.querySelector("#share").addEventListener("click", (event) =>
document.querySelector("#share")!.addEventListener("click", (event) =>
{
event.preventDefault();

Expand Down Expand Up @@ -176,13 +190,13 @@ class PGEtinker
});

// Compile Button
document.querySelector("#start-stop").addEventListener("click", (event) =>
document.querySelector("#start-stop")!.addEventListener("click", (event) =>
{
event.preventDefault();
let startStopElem = document.querySelector("#start-stop");
let playIconElem = startStopElem.querySelector(".lucide-circle-play");
let stopIconElem = startStopElem.querySelector(".lucide-circle-stop");
let spanElem = startStopElem.querySelector("span");
let startStopElem = document.querySelector("#start-stop")!;
let playIconElem = startStopElem.querySelector(".lucide-circle-play")!;
let stopIconElem = startStopElem.querySelector(".lucide-circle-stop")!;
let spanElem = startStopElem.querySelector("span")!;

if(spanElem.innerHTML == "Run")
{
Expand Down Expand Up @@ -210,17 +224,15 @@ class PGEtinker
stopIconElem.classList.toggle("hidden", true);
spanElem.innerHTML = "Run";
}

startStopElem.blur();
});

document.querySelector("#supporters").addEventListener("click", (event) =>
document.querySelector("#supporters")!.addEventListener("click", (event) =>
{
event.preventDefault();
supportersDialog();
});

document.querySelector("#news-and-updates").addEventListener("click", (event) =>
document.querySelector("#news-and-updates")!.addEventListener("click", (event) =>
{
event.preventDefault();
newsDialog();
Expand Down Expand Up @@ -251,11 +263,11 @@ class PGEtinker
}
}

setActiveTab(id)
setActiveTab(id: string)
{
try
{
let panel = this.layout.root.getItemsByFilter((item) =>
let panel = this.layout.root.getItemsByFilter((item: any) =>
{
return (item.config.id == id);
})[0];
Expand Down Expand Up @@ -292,12 +304,12 @@ class PGEtinker
compile()
{
if(this.compiling)
return new Promise((_, reject) => reject());
return new Promise<void>((_, reject) => reject());

if(!this.preCompile())
return new Promise((_, reject) => reject());
return new Promise<void>((_, reject) => reject());

return new Promise((resolve, reject) =>
return new Promise<void>((resolve, reject) =>
{
axios.post("/api/compile", {
code: this.editorPanel.getValue()
Expand Down Expand Up @@ -334,15 +346,15 @@ class PGEtinker

}

compileSuccessHandler(data)
compileSuccessHandler(data: any)
{
console.log(data);
this.compilerOutputPanel.setContent(data.stdout + data.stderr);
this.playerPanel.setHtml(data.html);
this.compiling = false;
}

compileFailHandler(stderr)
compileFailHandler(stderr: any)
{
this.setActiveTab("editor");

Expand All @@ -351,12 +363,14 @@ class PGEtinker
this.compiling = false;
}


async SetupLayout()
{
document.querySelector("#pgetinker-loading").classList.toggle("display-flex", true);
document.querySelector("#pgetinker-loading")!.classList.toggle("display-flex", true);

await this.editorPanel.onPreInit();

// @ts-ignore
this.layout = new GoldenLayout(this.layoutConfig, document.querySelector("#content"))

this.consolePanel.register();
Expand All @@ -376,9 +390,8 @@ class PGEtinker
this.layout.on("initialised", async() =>
{
this.layoutInitialized = true;
window.addEventListener("resize", (event) =>
window.addEventListener("resize", () =>
{
console.log(document.body.clientWidth);
this.layout.updateSize();
});

Expand All @@ -392,7 +405,7 @@ class PGEtinker

setTimeout(() =>
{
document.querySelector("#pgetinker-loading").classList.toggle("display-flex", false);
document.querySelector("#pgetinker-loading")!.classList.toggle("display-flex", false);
this.setActiveTab("editor");
}, 500)
});
Expand Down Expand Up @@ -426,15 +439,14 @@ class PGEtinker
document.body.classList.toggle("light", light);

// update golden layout theme
let goldenLayoutDarkThemeStyle = document.querySelector("#goldenlayout-dark-theme");
let goldenLayoutLightThemeStyle = document.querySelector("#goldenlayout-light-theme");
let goldenLayoutDarkThemeStyle = document.querySelector("#goldenlayout-dark-theme")! as HTMLLinkElement;
let goldenLayoutLightThemeStyle = document.querySelector("#goldenlayout-light-theme")! as HTMLLinkElement;

goldenLayoutDarkThemeStyle.disabled = light;
goldenLayoutLightThemeStyle.disabled = !light;

// update player theme
this.playerPanel.setTheme(this.theme);

}, 200);

}
Expand Down
Loading

0 comments on commit b3259ec

Please sign in to comment.