added a few changes and added support for custom events

This commit is contained in:
Clinton Yeboah 2017-06-11 13:42:23 +05:30
parent d44a480584
commit a6dd6643b6
3 changed files with 47 additions and 32 deletions

View file

@ -4,9 +4,12 @@ export default new class {
} }
addListener(label, callback, vm) { addListener(label, callback, vm) {
if(typeof callback == 'function'){ if (typeof callback == 'function') {
this.listeners.has(label) || this.listeners.set(label, []); if (!this.listeners.has(label)) {
this.listeners.get(label).push({callback: callback, vm: vm}); this.listeners.set(label, []);
}
this.listeners.get(label).push({ callback: callback, vm: vm })
return true return true
} }
@ -39,7 +42,7 @@ export default new class {
if (listeners && listeners.length) { if (listeners && listeners.length) {
listeners.forEach((listener) => { listeners.forEach((listener) => {
listener.callback.call(listener.vm,...args) listener.callback.call(listener.vm, ...args)
}); });
return true; return true;
} }

View file

@ -3,16 +3,16 @@ import Emitter from './Emitter'
export default { export default {
install(Vue, connection, store){ install(Vue, connection, store) {
if(!connection) throw new Error("[Vue-Socket.io] cannot locate connection") if (!connection) throw new Error("[Vue-Socket.io] cannot locate connection")
let observer = new Observer(connection, store) let observer = new Observer(connection, store)
Vue.prototype.$socket = observer.Socket; Vue.prototype.$socket = observer.Socket;
Vue.mixin({ Vue.mixin({
created(){ created() {
let sockets = this.$options['sockets'] let sockets = this.$options['sockets']
this.$options.sockets = new Proxy({}, { this.$options.sockets = new Proxy({}, {
@ -28,16 +28,16 @@ export default {
} }
}) })
if(sockets){ /*if(sockets){
Object.keys(sockets).forEach((key) => { Object.keys(sockets).forEach((key) => {
this.$options.sockets[key] = sockets[key]; this.$options.sockets[key] = sockets[key];
}); });
} }*/
}, },
beforeDestroy(){ beforeDestroy() {
let sockets = this.$options['sockets'] let sockets = this.$options['sockets']
if(sockets){ if (sockets) {
Object.keys(sockets).forEach((key) => { Object.keys(sockets).forEach((key) => {
delete this.$options.sockets[key] delete this.$options.sockets[key]
}); });

View file

@ -1,27 +1,35 @@
import Emitter from './Emitter' import Emitter from './Emitter'
import Socket from 'socket.io-client' import Socket from 'socket.io-client'
export default class{ export default class {
constructor(connection, store) { constructor(connection, store) {
if(typeof connection == 'string'){ if (typeof connection == 'string') {
this.Socket = Socket(connection); this.Socket = Socket(connection);
}else{ } else {
this.Socket = connection this.Socket = connection
} }
if(store) this.store = store; if (store) this.store = store;
this.onEvent() this.onEvent()
} }
onEvent(){ onEvent() {
this.Socket.onevent = (packet) => { this.Socket.onevent = (packet) => {
Emitter.emit(packet.data[0], packet.data[1]); let custom = Emitter.emit(packet.data[0], packet.data[1]);
if(this.store) this.passToStore('SOCKET_'+packet.data[0], [ ...packet.data.slice(1)]) // user has not registered a handler for this event
// perhaps its needed elsewhere, eg. a library
// so emit the event locally
if (!custom) {
let onevent = this.Socket.onevent;
onevent.call(this, packet);
}
if (this.store) this.passToStore(packet.data[0], [...packet.data.slice(1)])
}; };
let _this = this; let _this = this;
@ -30,30 +38,34 @@ export default class{
.forEach((value) => { .forEach((value) => {
_this.Socket.on(value, (data) => { _this.Socket.on(value, (data) => {
Emitter.emit(value, data); Emitter.emit(value, data);
if(_this.store) _this.passToStore('SOCKET_'+value, data) if (_this.store) _this.passToStore(value, data)
}) })
}) })
} }
passToStore(event, payload){ passToStore(event, payload) {
if(!event.startsWith('SOCKET_')) return this.passToMutation(event, payload);
this.passToAction(event, payload);
}
for(let namespaced in this.store._mutations) { passToMutation(event, payload) {
for (let namespaced in this.store._mutations) {
let mutation = namespaced.split('/').pop() let mutation = namespaced.split('/').pop()
if(mutation === event.toUpperCase()) this.store.commit(namespaced, payload)
}
for(let namespaced in this.store._actions) { if (mutation === `SOCKET_ ${event}`.toUpperCase()) {
this.store.commit(namespaced, payload)
}
}
}
passToAction(event, payload) {
for (let namespaced in this.store._actions) {
let action = namespaced.split('/').pop() let action = namespaced.split('/').pop()
if(!action.startsWith('socket_')) continue if (action === `socket_${event}`) {
this.store.dispatch(namespaced, payload)
let camelcased = 'socket_'+event }
.replace('SOCKET_', '')
.replace(/^([A-Z])|[\W\s_]+(\w)/g, (match, p1, p2) => p2 ? p2.toUpperCase() : p1.toLowerCase())
if(action === camelcased) this.store.dispatch(namespaced, payload)
} }
} }
} }