Rplace DB connector into knex

.babelrc

@@ -0,0 +1,7 @@
+{
+    "presets": [
+        "react",
+        "es2015",
+        "stage-2"
+    ]
+}

.gitignore

@@ -8,3 +8,4 @@ bower_components
 lib
 node_modules
 npm-debug.log
+dist

gulpfile.js

@@ -0,0 +1,79 @@
+'use strict';
+
+const browserify = require('browserify');
+const fs = require('fs');
+const gulp = require('gulp');
+const babel = require('gulp-babel');
+const express = require('gulp-express');
+const gutil = require('gulp-util');
+const source = require('vinyl-source-stream');
+const buffer = require('vinyl-buffer');
+const watchify = require('watchify');
+
+gulp.task('default', ['build']);
+
+gulp.task('build', ['build:server', 'build:browser']);
+gulp.task('build:server', ['babel']);
+gulp.task('build:browser', ['browserify']);
+
+gulp.task('serve', ['express']);
+
+gulp.task('watch', ['watch:server', 'watch:browser']);
+gulp.task('watch:server', ['express'], () => {
+    gulp.watch(['src/**/*', '!src/browser/**/*'], ['babel', express.run]);
+});
+gulp.task('watch:browser', ['watchify'], () =>
+    gulp.watch(['src/**/*', '!src/server/**/*'], ['watchify']));
+
+gulp.task(
+    'sync-lib',
+    next => {
+        let read = (dir) =>
+            fs.readdirSync(dir)
+                .map(item => `${dir}/${item}`)
+                .map(item => 
+                    fs.statSync(item).isDirectory()
+                    ? read(item).concat([ item ])
+                    : [ item ]
+                )
+                .reduce((a, b) => a.concat(b));
+        read('lib')
+            .filter(item => !fs.existsSync(item.replace(/^lib/, 'src')))
+            .forEach(item => {
+                gutil.log(`rm ${item}`);
+                if (fs.statSync(item).isDirectory()) {
+                    fs.rmdirSync(item);
+                } else {
+                    fs.unlinkSync(item);
+                }
+            });
+        return next();
+    }
+);
+
+gulp.task(
+    'babel', ['sync-lib'],
+    () => gulp.src('src/**/*.js')
+        .pipe(babel())
+        .pipe(gulp.dest('lib'))
+);
+
+const BrowserifyConfig = {
+    entries: ['lib/browser'],
+};
+const bundle = function(b) {
+    return function() {
+        return b.bundle()
+            .on('error', e => gutil.log(e))
+            .pipe(source('browser.js'))
+            .pipe(buffer())
+            .pipe(gulp.dest('dist'));
+    };
+};
+const w = watchify(browserify(Object.assign({}, watchify.args, BrowserifyConfig)));
+w.on('update', bundle);
+w.on('log', gutil.log);
+gulp.task('watchify', ['babel'], bundle(w));
+gulp.task('browserify', ['babel'], bundle(browserify(BrowserifyConfig)));
+
+gulp.task('express', ['babel'], () => express.run(['.']));

package.json

@@ -2,7 +2,7 @@
   "name": "beniimo-chat",
   "version": "0.0.1",
   "description": "Beniimo TRPG chat system",
-  "main": "index.js",
+  "main": "lib/server",
   "directories": {
     "test": "test"
   },
@@ -14,18 +14,31 @@
   "dependencies": {
     "connect-session-knex": "^1.0.17",
     "crypto": "~0.0.3",
-    "express": "~4.13.2",
+    "express": "^4.13.3",
     "express-session": "^1.12.1",
     "express-socket.io-session": "^1.3.1",
-    "jquery-deferred": "~0.3.0",
+    "jquery-deferred": "^0.3.0",
     "knex": "^0.9.0",
     "mysql": "~2.10.0",
-    "socket.io": "~1.3.7"
+    "socket.io": "^1.3.7"
   },
   "devDependencies": {
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
+    "browserify": "^13.0.0",
+    "connect-session-knex": "^1.0.17",
+    "express-session": "^1.13.0",
     "grunt": "^0.4.5",
     "grunt-bower-task": "^0.4.0",
     "grunt-contrib-sass": "^0.8.1",
-    "grunt-contrib-watch": "^0.6.1"
+    "grunt-contrib-watch": "^0.6.1",
+    "gulp": "^3.9.0",
+    "gulp-babel": "^6.1.1",
+    "gulp-express": "^0.3.5",
+    "gulp-util": "^3.0.7",
+    "vinyl-buffer": "^1.0.0",
+    "vinyl-source-stream": "^1.1.0",
+    "watchify": "^3.7.0"
   }
 }

js/main.js → src/browser/main.js

@@ -65,7 +65,6 @@ var makeColor = function (data) {
                 templateUrl: 'template/lobby.html',
                 controller: 'Lobby'
             });
-
         })
         .config(function ($mdThemingProvider) {
             $mdThemingProvider.theme('default')

js/socket.js → src/browser/socket.js

@@ -2,19 +2,14 @@ angular.module('BeniimoOnlineSocket', ['btford.socket-io'])
 .factory('socket', function ($location, socketFactory) {
     'use strict';
 
-    var socket = io.connect('http://' + location.host,
-            {
-                //path: '/chat/socket.io',
-                transports: ['websocket'],
-                reconnectionDelay: 0,
-                timeout: 3000
-            });
+    var socket = io.connect();
 
     var factory = socketFactory({
-        ioSocket: socket
+        ioSocket: socket,
     });
 
     factory.on('hello', function (user) {
+        console.log('hello', user);
         factory.user = user;
     });