From db9449aa2d29b509f2b92e877008b8daa14d2977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=BCbleitner?= <daniel.huebleitner@gmail.com>
Date: Fri, 20 Sep 2019 22:39:07 +0200
Subject: [PATCH] it werks

---
 Index.ts             | 10 +++++++++-
 src/Backend.ts       | 10 +---------
 src/Frontend.ts      | 12 +-----------
 src/Responses.ts     |  1 -
 src/webpack.js       | 21 +++++++++++++--------
 test/TestBackend.ts  |  4 ++--
 test/TestFrontend.ts | 10 +++++-----
 7 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/Index.ts b/Index.ts
index f307de2..5db6b50 100644
--- a/Index.ts
+++ b/Index.ts
@@ -1,7 +1,15 @@
 import * as Back from './src/Backend';
 import * as Front from './src/Frontend';
+import * as Types from './src/Types'; 
+import * as Utils from './src/Utils'; 
+import * as Interfaces from './src/Interfaces';
+import * as Responses from './src/Responses';
 
 export {
     Back as Backend,
-    Front as Frontend
+    Front as Frontend,
+    Types, 
+    Utils, 
+    Interfaces,
+    Responses
 }
\ No newline at end of file
diff --git a/src/Backend.ts b/src/Backend.ts
index 8e633c5..6d37d02 100644
--- a/src/Backend.ts
+++ b/src/Backend.ts
@@ -6,16 +6,8 @@ import bsock = require('bsock');
 import * as T from './Types'; 
 import * as U from './Utils'; 
 import * as I from './Interfaces';
-import * as R from './Responses';
 
-export { 
-    T as Types, 
-    U as Utils, 
-    I as Interfaces,
-    R as Responses
-}
-
-export class Server{
+export class RPCServer{
     private ws = http.createServer()
     private io = bsock.createServer()
 
diff --git a/src/Frontend.ts b/src/Frontend.ts
index d277257..86b1bca 100644
--- a/src/Frontend.ts
+++ b/src/Frontend.ts
@@ -3,24 +3,14 @@
 var bsock = require('bsock')
 
 import * as T from './Types'; 
-import * as U from './Utils'; 
 import * as I from './Interfaces';
-import * as R from './Responses';
-
-export { 
-    T as Types, 
-    U as Utils, 
-    I as Interfaces,
-    R as Responses
-}
-
 
 //fix args with defaults like "force = true" -> "force"
 function stripAfterEquals(str:string){
     return str.split("=")[0]
 }
 
-export class Client implements I.Socket{
+export class RPCSocket implements I.Socket{
 
     private socket: I.Socket
     constructor(public port:number, private server: string, private tls: boolean = false){
diff --git a/src/Responses.ts b/src/Responses.ts
index 7f470bf..2b44c45 100644
--- a/src/Responses.ts
+++ b/src/Responses.ts
@@ -1,7 +1,6 @@
 
 export type Outcome = "Success" | "Error"
 
-/* Responses */
 export class Response{
     constructor(
         public message?:string
diff --git a/src/webpack.js b/src/webpack.js
index ea871b9..58d2181 100644
--- a/src/webpack.js
+++ b/src/webpack.js
@@ -1,20 +1,25 @@
 const path = require('path');
 
-const frontendConf = {
+module.exports = {
   mode: 'production',
   target: "web",
-  entry: path.resolve(__dirname, '..', 'js', 'src', 'Frontend.js'),
+  entry: path.resolve(__dirname, 'Frontend.ts'),
   output: {
-      path: path.resolve(__dirname, '..', 'js', 'src'),
-      filename: "Frontend.js",
-      libraryTarget: 'commonjs',
+      path: path.resolve(__dirname, '../js'),
+      filename: 'Frontend.min.js',
+      libraryTarget: 'window',
   },
   resolve: {
     extensions: [".ts", ".tsx", ".js"]
   },
+  module: {
+    rules: [
+      { test: /\.ts?$/, loader: "ts-loader" }
+    ]
+  },
   optimization: {
     minimize: false,
   },
-}
-
-module.exports =  [frontendConf]
+  externals: {
+  }
+}
\ No newline at end of file
diff --git a/test/TestBackend.ts b/test/TestBackend.ts
index b794756..c54df0b 100644
--- a/test/TestBackend.ts
+++ b/test/TestBackend.ts
@@ -1,6 +1,6 @@
-import { Server } from '../src/Backend'
+import { RPCServer } from '../src/Backend'
 
-new Server(20000, [{
+new RPCServer(20000, [{
     name: "HelloWorldRPCGroup",
     publicRPCs: () => [],
     localRPCs: () => [{
diff --git a/test/TestFrontend.ts b/test/TestFrontend.ts
index 12191e4..18ea8cc 100644
--- a/test/TestFrontend.ts
+++ b/test/TestFrontend.ts
@@ -1,7 +1,7 @@
-import { Client } from '../src/Frontend'
+import { RPCSocket } from '../src/Frontend'
 
-const client = new Client(20000, 'localhost')
-client.connect().then(_ => {
-    client.info().then(console.log)
-    client["HelloWorldRPCGroup"].echo("x").then(console.log)
+const socket = new RPCSocket(20000, 'localhost')
+socket.connect().then(_ => {
+    socket.info().then(console.log)
+    socket["HelloWorldRPCGroup"].echo("x").then(console.log)
 })