Compare commits

...

2 commits

Author SHA1 Message Date
4da4e06871
Add hosting/connection actions and mutations
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2019-09-17 12:12:06 +02:00
631d0c395c
Use default exports 2019-09-17 11:54:26 +02:00
7 changed files with 98 additions and 19 deletions

View file

@ -15,3 +15,5 @@ export const draft: Module<DraftState, AppState> = {
//mutations, //mutations,
//getters, //getters,
}; };
export default draft;

View file

@ -8,8 +8,8 @@ import actions from "./actions";
import mutations from "./mutations"; import mutations from "./mutations";
import getters from "./getters"; import getters from "./getters";
import { network } from "./network"; import network from "./network";
import { draft } from "./draft"; import draft from "./draft";
const store: StoreOptions<AppState> = { const store: StoreOptions<AppState> = {
state: { state: {

View file

@ -0,0 +1,23 @@
import { ActionTree } from "vuex";
import { AppState } from "../types";
import { NetworkState, StartServerOptions, ConnectOptions } from "./types";
import { PeerServer, LocalClient, PeerClient } from "@/network";
const actions: ActionTree<NetworkState, AppState> = {
startServer({ commit }, options: StartServerOptions) {
const local = new LocalClient(options.playerInfo);
const server = new PeerServer(options.roomInfo, local, options._customPeer);
commit("becomeServer", { local, server });
},
connect({ commit }, options: ConnectOptions) {
const client = new PeerClient(options.playerInfo, options._customPeer);
commit("becomeClient", { peer: client });
client.once("connected", () => {
commit("connected");
});
client.connect(options.serverID);
}
};
export default actions;

View file

@ -4,14 +4,17 @@ import { NetworkState } from "./types";
const getters: GetterTree<NetworkState, AppState> = { const getters: GetterTree<NetworkState, AppState> = {
peerID(state): string | null { peerID(state): string | null {
if (!state.connected) { switch (state.peerType) {
return null; case "server":
}
if (state.peerType == "server") {
return state.server.id; return state.server.id;
} else { case "client":
return state.peer.id; return state.peer.id;
} }
return null;
},
connectionType(state): "client" | "server" | "none" {
return state.peerType;
} }
}; };

View file

@ -2,21 +2,22 @@ import { NetworkState } from "./types";
import { AppState } from "../types"; import { AppState } from "../types";
import { Module } from "vuex"; import { Module } from "vuex";
import actions from "./actions";
import getters from "./getters"; import getters from "./getters";
const namespaced = true; const namespaced = true;
export const state: NetworkState = { export const state: NetworkState = {
connecting: false, peerType: "none",
connected: false,
name: "",
chatLog: [] chatLog: []
}; };
export const network: Module<NetworkState, AppState> = { export const network: Module<NetworkState, AppState> = {
namespaced, namespaced,
state, state,
//actions, actions,
//mutations, //mutations,
getters getters
}; };
export default network;

View file

@ -0,0 +1,29 @@
import { MutationTree } from "vuex";
import { NetworkState, ServerNetworkState, ClientNetworkState } from "./types";
import { LocalClient, PeerServer, PeerClient } from "@/network";
const mutations: MutationTree<NetworkState> = {
becomeServer(state, payload: { local: LocalClient; server: PeerServer }) {
state = {
...state,
peerType: "server",
local: payload.local,
server: payload.server
};
},
becomeClient(state, payload: { peer: PeerClient }) {
state = {
...state,
connectionStatus: "connecting",
peerType: "client",
peer: payload.peer
};
},
connected(state) {
(state as ClientNetworkState).connectionStatus = "connected";
}
};
export default mutations;

View file

@ -1,4 +1,11 @@
import { PeerClient, PeerServer, LocalClient } from "@/network"; import {
PeerClient,
PeerServer,
LocalClient,
RoomInfo,
PeerMetadata
} from "@/network";
import Peer from "peerjs";
export interface ChatMessage { export interface ChatMessage {
who: string; who: string;
@ -7,23 +14,21 @@ export interface ChatMessage {
} }
export interface SharedNetworkState { export interface SharedNetworkState {
name: string;
chatLog: ChatMessage[]; chatLog: ChatMessage[];
} }
export interface NoNetworkState extends SharedNetworkState { export interface NoNetworkState extends SharedNetworkState {
connecting: boolean; peerType: "none";
connected: false;
} }
export interface ClientNetworkState extends SharedNetworkState { export interface ClientNetworkState extends SharedNetworkState {
connected: true;
peerType: "client"; peerType: "client";
connectionStatus: "connecting" | "connected" | "error";
connectionError?: Error;
peer: PeerClient; peer: PeerClient;
} }
export interface ServerNetworkState extends SharedNetworkState { export interface ServerNetworkState extends SharedNetworkState {
connected: true;
peerType: "server"; peerType: "server";
server: PeerServer; server: PeerServer;
local: LocalClient; local: LocalClient;
@ -33,3 +38,19 @@ export type NetworkState =
| NoNetworkState | NoNetworkState
| ClientNetworkState | ClientNetworkState
| ServerNetworkState; | ServerNetworkState;
export interface StartServerOptions {
roomInfo: RoomInfo;
playerInfo: PeerMetadata;
// Testing utils
_customPeer?: Peer;
}
export interface ConnectOptions {
serverID: string;
playerInfo: PeerMetadata;
// Testing utils
_customPeer?: Peer;
}