Merge pull request amberframework#150 from amber-crystal/nick/js_sock…

…et_update added options to javascript Socket
kellytaylor · Jul 28, 2017 · 26fba1c · 26fba1c
2 parents 79451bf + 5225945
commit 26fba1c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/assets/js/amber.js b/assets/js/amber.js
@@ -1,5 +1,5 @@
 import { Socket } from './websockets/socket'
 
-export default {
+module.exports = {
   Socket: Socket
 }
diff --git a/assets/js/amber.min.js b/assets/js/amber.min.js
diff --git a/assets/js/webpack.config.js b/assets/js/webpack.config.js
@@ -0,0 +1,26 @@
+var webpack = require('webpack')
+
+module.exports = {
+  entry: './amber.js',
+  output: {
+    filename: 'amber.min.js',
+    library: 'Amber'
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.js?$/,
+        exclude: /node_modules/,
+        loader: 'babel',
+        query: {
+          presets: ['es2015']
+        }
+      }
+    ]
+  },
+  plugins: [
+    new webpack.optimize.UglifyJsPlugin({
+      compress: { warnings: false }
+    })
+  ]
+};
diff --git a/assets/js/websockets/socket.js b/assets/js/websockets/socket.js
@@ -8,10 +8,17 @@ export class Socket {
   }
 
   connect (params) {
-    return new Promise((resolve, reject) => {
-      let location = window.location.hostname
-      if (window.location.port) location += `:${window.location.port}`
-      this.ws = new WebSocket(`ws://${location}${this.endpoint}`)
+    let opts = {
+      location: window.location.hostname,
+      port: window.location.port,
+      protocol: window.location.protocol === 'https:' ? 'wss:' : 'ws:',
+    }
+
+    if (params) Object.assign(opts, params)
+    if (opts.port) opts.location += `:${opts.port}`
+
+    return new Promise((resolve, reject) => {      
+      this.ws = new WebSocket(`${opts.protocol}//${opts.location}${this.endpoint}`)
       this.ws.onmessage = (msg) => { this.handleMessage(msg) }
       this.ws.onopen = () => resolve()
     })