Update typings

.gitignore

@@ -1,5 +1,10 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
+# SS
+app.log
+config.json
+dist.zip
+
 # compiled output
 /dist
 /tmp
@@ -10,6 +15,7 @@
 
 # IDEs and editors
 /.idea
+.idea
 .project
 .classpath
 .c9/

src/api/certManager.ts

@@ -4,8 +4,8 @@ import {SSManager} from "../ssmanager";
 import * as proc from "child_process";
 import * as util from "util";
 
-class CertManager {
-    public ensureCerts = async () => {
+export class CertManager {
+    public ensureCerts = async (): Promise<void> => {
         try {
             await fs.stat(path.join(SSManager.getRoot(), "../certs/server.cert"));
             await fs.stat(path.join(SSManager.getRoot(), "../certs/server.key"));
@@ -16,14 +16,14 @@ class CertManager {
         }
     };
 
-    public getOptions = async () => {
+    public getOptions = async (): Promise<object> => {
         return {
             key: await fs.readFile(path.join(SSManager.getRoot(), "../certs/server.key")),
             cert: await fs.readFile(path.join(SSManager.getRoot(), "../certs/server.cert"))
         }
     };
 
-    private generateCerts = async () => {
+    private generateCerts = async (): Promise<void> => {
         await new Promise((resolve, reject) => {
             proc.exec(util.format(path.join(SSManager.getRoot(), "/bashScripts/generateSsl.sh") + " %s", SSManager.config.api.addr), {cwd: path.join(SSManager.getRoot(), "../certs/")}, (err) => {
                 if (err) return reject(err);
@@ -33,4 +33,3 @@ class CertManager {
     };
 }
 
-export {CertManager}

src/api/controllers/games.ts

@@ -1,9 +1,7 @@
 import {SSManager} from "../../ssmanager";
 
-class GamesController {
+export class GamesController {
     public getGames = async (req, res, next) => {
         res.json({games: SSManager.configsController.games});
     };
-}
-
-export {GamesController}
+}

src/api/controllers/gameserver.ts

@@ -4,7 +4,7 @@ import {SSManager} from "../../ssmanager";
 
 import * as async from "async";
 
-class ServersController {
+export class ServersController {
     public getGameservers = async (req, res, next) => {
         const serverList = [];
 
@@ -444,6 +444,4 @@ class ServersController {
             server: newServer.getInfo()
         });
     }
-}
-
-export {ServersController}
+}

src/api/controllers/node.ts

@@ -1,7 +1,7 @@
 import * as diskspace from "diskspace";
 import * as osUtils from "os-utils";
 
-class NodeController {
+export class NodeController {
     public getStatus = async (req, res, next) => {
         osUtils.cpuUsage(function (cpu) {
             diskspace.check('/', function (err, disk) {
@@ -27,6 +27,4 @@ class NodeController {
             });
         });
     };
-}
-
-export {NodeController}
+}

src/api/controllers/plugins.ts

@@ -1,9 +1,7 @@
 import {SSManager} from "../../ssmanager";
 
-class PluginsController {
+export class PluginsController {
     public getPlugins = async (req, res, next) => {
         res.json({games: SSManager.configsController.plugins});
     };
-}
-
-export {PluginsController}
+}

src/api/server.ts

@@ -12,8 +12,9 @@ import {PluginsController} from "./controllers/plugins";
 import {ServersController} from "./controllers/gameserver";
 import {LoadedMiddleware} from "./middleware/loaded";
 import {CertManager} from "./certManager";
+import {Gameserver} from "../manager/controllers/gameserver/gameserver";
 
-class APIServer {
+export class APIServer {
     public express;
     public http;
     public io;
@@ -32,7 +33,7 @@ class APIServer {
         this.certManager = new CertManager();
     }
 
-    public bootstrapExpress = async () => {
+    public bootstrapExpress = async (): Promise<void> => {
         //Make sure certs are installed
         await this.certManager.ensureCerts();
 
@@ -111,7 +112,7 @@ class APIServer {
         await this.createHttp();
     };
 
-    private createHttp = async () => {
+    private createHttp = async (): Promise<void> => {
         SSManager.logger.verbose("HTTP server hosted on :" + SSManager.config.api.port);
 
         this.http = https.createServer(await this.certManager.getOptions(), this.express);
@@ -161,6 +162,4 @@ class APIServer {
 
         this.express.use('', apiRouter);
     };
-}
-
-export {APIServer}
+}

src/manager/controllers/configs/configManager.ts

@@ -4,7 +4,7 @@ import {SSManager} from "../../../ssmanager";
 import {IGame} from "./gameConfig";
 import {IPlugin} from "./pluginConfig";
 
-class ConfigsController {
+export class ConfigsController {
     public games: Array<IGame>;
     public plugins: Array<IPlugin>;
 
@@ -14,13 +14,11 @@ class ConfigsController {
         this.dataFolder = dataFolder;
     }
 
-    public loadGames = async () => {
+    public loadGames = async (): Promise<void> => {
         this.games = await SSUtil.dirToJson(path.join(SSManager.getRoot(), this.dataFolder, "/games/"));
     };
 
-    public loadPlugins = async () => {
+    public loadPlugins = async (): Promise<void> => {
         this.plugins = await SSUtil.dirToJson(path.join(SSManager.getRoot(), this.dataFolder, "/plugins/"));
     };
 }
-
-export { ConfigsController };

src/manager/controllers/configs/gameConfig.ts

@@ -1,4 +1,4 @@
-interface IGame {
+export interface IGame {
     name: string,
     gamedig: {
         active: boolean,
@@ -17,6 +17,4 @@ interface IGame {
         useStdout: boolean,
     },
     verify: any
-}
-
-export {IGame}
+}

src/manager/controllers/configs/pluginConfig.ts

@@ -1,8 +1,6 @@
-interface IPlugin {
+export interface IPlugin {
     game: string,
     name: string,
     install: any,
     remove: any
-}
-
-export {IPlugin}
+}

src/manager/controllers/configs/serverConfig.ts

@@ -1,6 +1,6 @@
 import {IGame} from "./gameConfig";
 
-interface IServer {
+export interface IServer {
     game: IGame,
     id: string,
     port: number,
@@ -12,6 +12,4 @@ interface IServer {
     plugins: any,
     installed: boolean,
     players: number
-}
-
-export { IServer }
+}