Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #4 from oss-videochat/maintenance
Browse files Browse the repository at this point in the history
maintenance
  • Loading branch information
jbis9051 authored Oct 3, 2020
2 parents b52390f + ec16f54 commit 36fe73a
Show file tree
Hide file tree
Showing 174 changed files with 6,729 additions and 6,443 deletions.
1 change: 1 addition & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"printWidth": 100,
"singleQuote": false,
"tabWidth": 4,
"trailingComma": "es5"
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ npm install
lerna bootstrap
lerna link # may hang, see note below
cd server
MEDIASOUP_LISTEN_IP=<YOUR IP ADDRESS>; npm run run
MEDIASOUP_LISTEN_IP=<YOUR IP ADDRESS>; npm run start
```

`lerna run build` should work, but if it doesn't, manually build with
Expand All @@ -50,7 +50,7 @@ cd ../server && npm run build
```shell script
cd server
MEDIASOUP_LISTEN_IP=<YOUR IP ADDRESS>; npm run run
MEDIASOUP_LISTEN_IP=<YOUR IP ADDRESS>; npm run start
```
## Contributing
Expand Down
8 changes: 4 additions & 4 deletions common/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"build": "tsc"
},
"dependencies": {
"typescript": "^3.9.6"
"typescript": "^3.9.7"
}
}
4 changes: 2 additions & 2 deletions common/src/enum/HostDisconnectAction.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export enum HostDisconnectAction {
CLOSE_ROOM,
TRANSFER_HOST,
CLOSE_ROOM,
TRANSFER_HOST,
}
6 changes: 3 additions & 3 deletions common/src/enum/MessageType.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export enum MessageType {
GROUP,
DIRECT,
SYSTEM,
GROUP,
DIRECT,
SYSTEM,
}
6 changes: 3 additions & 3 deletions common/src/enum/ParticipantRole.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export enum ParticipantRole {
HOST, // one host per room
MANAGER, // can do everything a host can do except create/remove other managers
MEMBER,
HOST, // one host per room
MANAGER, // can do everything a host can do except create/remove other managers
MEMBER,
}
16 changes: 8 additions & 8 deletions common/src/enum/Reactions.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export enum Reactions {
ThumbsUp,
ThumbsDown,
Laugh,
Confused,
Celebrate,
OneHundred,
QuestionMark,
Clap,
ThumbsUp,
ThumbsDown,
Laugh,
Confused,
Celebrate,
OneHundred,
QuestionMark,
Clap,
}
6 changes: 3 additions & 3 deletions common/src/helper/MediaSourceToTypeMap.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const MediaSourceToTypeMap = {
camera: "video",
microphone: "audio",
screen: "video",
camera: "video",
microphone: "audio",
screen: "video",
};
8 changes: 4 additions & 4 deletions common/src/interfaces/Input.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { MessageType } from "..";

export interface MessageInput {
content: string;
type: MessageType;
content: string;
type: MessageType;
}

export interface DirectMessageInput extends MessageInput {
to: string;
to: string;
}

export interface GroupMessageInput extends MessageInput {
group: string;
group: string;
}
6 changes: 3 additions & 3 deletions common/src/interfaces/RoomSettings.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { HostDisconnectAction } from "..";

export interface RoomSettings {
name: string;
waitingRoom: boolean;
hostDisconnectAction: HostDisconnectAction;
name: string;
waitingRoom: boolean;
hostDisconnectAction: HostDisconnectAction;
}
56 changes: 28 additions & 28 deletions common/src/interfaces/Summaries.ts
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
import { MediaState, MessageType, ParticipantRole, Reactions } from "..";

export interface RoomSummary {
id: string;
idHash: string;
name: string;
myId: string;
participants: ParticipantSummary[];
messages: MessageSummary[];
id: string;
idHash: string;
name: string;
myId: string;
participants: ParticipantSummary[];
messages: MessageSummary[];
}

export interface MessageGroupSummary {
id: string;
name: string;
members: string[];
id: string;
name: string;
members: string[];
}

export interface ParticipantSummary {
id: string;
name: string;
role: ParticipantRole;
isAlive: boolean;
mediaState: MediaState;
id: string;
name: string;
role: ParticipantRole;
isAlive: boolean;
mediaState: MediaState;
}

export interface MessageSummary {
id: string;
content: string;
created: number;
type: MessageType;
id: string;
content: string;
created: number;
type: MessageType;
}

export interface SystemMessageSummary extends MessageSummary {
permission: ParticipantRole;
type: MessageType.SYSTEM;
permission: ParticipantRole;
type: MessageType.SYSTEM;
}

export interface GroupMessageSummary extends MessageSummary {
type: MessageType.GROUP;
group: string;
from: string;
type: MessageType.GROUP;
group: string;
from: string;
}

export interface DirectMessageSummary extends MessageSummary {
type: MessageType.DIRECT;
to: string;
from: string;
type: MessageType.DIRECT;
to: string;
from: string;
}

export interface ReactionSummary {
type: Reactions;
participant: string;
type: Reactions;
participant: string;
}
6 changes: 3 additions & 3 deletions common/src/interfaces/WebRTC.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export interface MediaState {
camera: boolean;
microphone: boolean;
screen: boolean;
camera: boolean;
microphone: boolean;
screen: boolean;
}

export type MediaSource = keyof MediaState;
Expand Down
Loading

0 comments on commit 36fe73a

Please sign in to comment.