diff --git a/@types/ws.d.ts b/@types/ws.d.ts index 10bbba8..13e1f24 100644 --- a/@types/ws.d.ts +++ b/@types/ws.d.ts @@ -1,5 +1,5 @@ -import { GUIConfig } from "../modules/module.cfg-loader" -import { AuthResponse, CheckTokenResponse, EpisodeListResponse, FolderTypes, QueueItem, ResolveItemsData, ResponseBase, SearchData, SearchResponse } from "./messageHandler" +import { GUIConfig } from '../modules/module.cfg-loader'; +import { AuthResponse, CheckTokenResponse, EpisodeListResponse, FolderTypes, QueueItem, ResolveItemsData, ResponseBase, SearchData, SearchResponse } from './messageHandler'; export type WSMessage = { name: T, diff --git a/gui.ts b/gui.ts index 681877a..0b191df 100644 --- a/gui.ts +++ b/gui.ts @@ -1 +1 @@ -import './gui/server/index' \ No newline at end of file +import './gui/server/index'; \ No newline at end of file diff --git a/gui/server/index.ts b/gui/server/index.ts index 7286322..ade665c 100644 --- a/gui/server/index.ts +++ b/gui/server/index.ts @@ -18,7 +18,7 @@ export { app, cfg }; app.use(express.json()); app.use(cors()); -app.use(express.static(path.join(workingDir, 'gui', 'server', 'build'), { maxAge: 1000 * 60 * 20 })) +app.use(express.static(path.join(workingDir, 'gui', 'server', 'build'), { maxAge: 1000 * 60 * 20 })); const server = app.listen(cfg.gui.port, () => { console.log(`[INFO] GUI server started on port ${cfg.gui.port}`); diff --git a/gui/server/serviceHandler.ts b/gui/server/serviceHandler.ts index 5751872..5d46fa4 100644 --- a/gui/server/serviceHandler.ts +++ b/gui/server/serviceHandler.ts @@ -39,7 +39,7 @@ export default class ServiceHandler { return respond(false); this.service = undefined; respond(true); - }) + }); this.ws.events.on('auth', async ({ data }, respond) => { if (this.service === undefined) diff --git a/gui/server/services/base.ts b/gui/server/services/base.ts index e9237d6..8b4dc57 100644 --- a/gui/server/services/base.ts +++ b/gui/server/services/base.ts @@ -1,7 +1,7 @@ import { DownloadInfo, FolderTypes, ProgressData, QueueItem } from '../../../@types/messageHandler'; import { RandomEvent, RandomEvents } from '../../../@types/randomEvents'; import WebSocketHandler from '../websocket'; -import copy from "copy-to-clipboard"; +import copy from 'copy-to-clipboard'; import open from 'open'; import { cfg } from '..'; import path from 'path'; @@ -65,11 +65,11 @@ export default class Base { async openFile(data: [FolderTypes, string]) { switch (data[0]) { - case 'config': - open(path.join(cfg.dir.config, data[1])); - break; - case 'content': - throw new Error('No subfolders'); + case 'config': + open(path.join(cfg.dir.config, data[1])); + break; + case 'content': + throw new Error('No subfolders'); } } diff --git a/gui/server/websocket.ts b/gui/server/websocket.ts index 3568360..648fad0 100644 --- a/gui/server/websocket.ts +++ b/gui/server/websocket.ts @@ -1,10 +1,10 @@ -import { IncomingMessage, Server } from "http"; +import { IncomingMessage, Server } from 'http'; import ws, { WebSocket } from 'ws'; -import { RandomEvent, RandomEvents } from "../../@types/randomEvents"; -import { MessageTypes, UnknownWSMessage, WSMessage } from "../../@types/ws"; -import { EventEmitter } from "events"; -import { cfg } from "."; -import { isSetuped } from "../../modules/module.cfg-loader"; +import { RandomEvent, RandomEvents } from '../../@types/randomEvents'; +import { MessageTypes, UnknownWSMessage, WSMessage } from '../../@types/ws'; +import { EventEmitter } from 'events'; +import { cfg } from '.'; +import { isSetuped } from '../../modules/module.cfg-loader'; declare interface ExternalEvent { on(event: T, listener: (msg: WSMessage, respond: (data: MessageTypes[T][1]) => void) => void): this; @@ -37,9 +37,9 @@ export default class WebSocketHandler { name: json.name }), (er) => { if (er) - console.log(`[ERROR] [WS] ${er}`) + console.log(`[ERROR] [WS] ${er}`); }); - }) + }); }); }); }); @@ -50,7 +50,7 @@ export default class WebSocketHandler { if (!this.authenticate(request)) { socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n'); socket.destroy(); - console.log(`[INFO] [WS] ${request.socket.remoteAddress} tried to connect but used a wrong password.`) + console.log(`[INFO] [WS] ${request.socket.remoteAddress} tried to connect but used a wrong password.`); return; } this.wsServer.handleUpgrade(request, socket, head, socket => { @@ -67,7 +67,7 @@ export default class WebSocketHandler { if (er) console.log(`[ERROR] [WS] ${er}`); }); - }) + }); } private authenticate(request: IncomingMessage): boolean { @@ -87,14 +87,14 @@ export class PublicWebSocket { console.log(`[INFO] [WS] Connection to public ws from '${req.socket.remoteAddress}'`); socket.on('error', (er) => console.log(`[ERROR] [WS] ${er}`)); socket.on('message', (msg) => { - const data = JSON.parse(msg.toString()) as UnknownWSMessage + const data = JSON.parse(msg.toString()) as UnknownWSMessage; switch (data.name) { - case 'setuped': - this.send(socket, data.id, data.name, isSetuped()); - break; - case 'requirePassword': - this.send(socket, data.id, data.name, cfg.gui.password !== undefined); - break; + case 'setuped': + this.send(socket, data.id, data.name, isSetuped()); + break; + case 'requirePassword': + this.send(socket, data.id, data.name, cfg.gui.password !== undefined); + break; } }); }); @@ -115,7 +115,7 @@ export class PublicWebSocket { name }), (er) => { if (er) - console.log(`[ERROR] [WS] ${er}`) + console.log(`[ERROR] [WS] ${er}`); }); } } \ No newline at end of file diff --git a/modules/build.ts b/modules/build.ts index 8835554..aff5da5 100644 --- a/modules/build.ts +++ b/modules/build.ts @@ -61,8 +61,8 @@ async function buildBinary(buildType: BuildTypes, gui: boolean) { fs.copySync('./docs/', `${buildDir}/docs/`); fs.copySync('./LICENSE.md', `${buildDir}/docs/LICENSE.md`); if (gui) { - fs.copySync('./gui', `${buildDir}/gui`) - fs.copySync('./node_modules/open/xdg-open', `${buildDir}/xdg-open`) + fs.copySync('./gui', `${buildDir}/gui`); + fs.copySync('./node_modules/open/xdg-open', `${buildDir}/xdg-open`); } if(fs.existsSync(`${buildsDir}/${buildFull}.7z`)){ fs.removeSync(`${buildsDir}/${buildFull}.7z`); diff --git a/modules/module.cfg-loader.ts b/modules/module.cfg-loader.ts index 7f2291e..e9a674b 100644 --- a/modules/module.cfg-loader.ts +++ b/modules/module.cfg-loader.ts @@ -12,7 +12,7 @@ export { workingDir }; const binCfgFile = path.join(workingDir, 'config', 'bin-path'); const dirCfgFile = path.join(workingDir, 'config', 'dir-path'); -const guiCfgFile = path.join(workingDir, 'config', 'gui') +const guiCfgFile = path.join(workingDir, 'config', 'gui'); const cliCfgFile = path.join(workingDir, 'config', 'cli-defaults'); const sessCfgFile = path.join(workingDir, 'config', 'session'); const setupFile = path.join(workingDir, 'config', 'setup'); @@ -57,7 +57,7 @@ const writeYamlCfgFile = (file: T, data: WriteObje if (fs.existsSync(fn)) fs.removeSync(fn); fs.writeFileSync(fn, yaml.stringify(data)); -} +}; export type GUIConfig = { port: number, @@ -237,21 +237,20 @@ const isSetuped = (): boolean => { if (!fs.existsSync(fn)) return false; return JSON.parse(fs.readFileSync(fn).toString()).setuped; -} +}; const setSetuped = (bool: boolean) => { const fn = `${setupFile}.json`; if (bool) { fs.writeFileSync(fn, JSON.stringify({ setuped: true - }, null, 2)) + }, null, 2)); } else { if (fs.existsSync(fn)) { fs.removeSync(fn); + } } - - } -} +}; export {