Haha

.eslintrc.yml

@@ -21,6 +21,9 @@ settings:
   react:
     version: 'detect'
 rules:
+  no-empty:
+    - error
+    - allowEmptyCatch: true
   linebreak-style:
     - error
     - unix

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: '[BUG REPORT]'
+title: ''
 labels: 'bug'
 assignees: ''
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: '[FEATURE]'
+title: ''
 labels: 'enhancement'
 assignees: ''
 ---

TODO.md

@@ -6,7 +6,7 @@
 - [x] Move the default server to a better host.
 - [x] Rewrite all error messages to be even more human-readable.
 - [ ] Integrate an official server list into the client.
-- [ ] Detect the reason *why* the server can't provide offsets: i.e. Among Us just updated, it's an old version of Among Us, the server hasn't updated, etc.
+- [x] Detect the reason *why* the server can't provide offsets: i.e. Among Us just updated, it's an old version of Among Us, the server hasn't updated, etc.
 
 ### Stretch
 
@@ -18,20 +18,20 @@
 - [ ] Add a microphone boost slider.
 - [ ] Add a speaker adjustment slider.
 - [ ] Add individual adjustment sliders to each of the players.
-- [ ] Handle all RTC errors to make it unnecessary to ever re-open an RTC connection.
+- [x] Handle all RTC errors to make it unnecessary to ever re-open an RTC connection.
 - [ ] Detect reason for RTC failure: NAT type, etc?
-- [ ] Re-enable all `navigator.getUserMedia` functions that can be re-enabled with autoGainControl kicking in.
-- [ ] Move all player-to-player communication logic to RTC data channels, versus sending them over the websocket.
+- [x] Re-enable all `navigator.getUserMedia` functions that can be re-enabled with autoGainControl kicking in.
+- [x] Move all player-to-player communication logic to RTC data channels, versus sending them over the websocket.
 
 ### Stretch
 
 - [ ] Implement an optional TURN server.
 
 ## Game Reader
 
-- [ ] Fix unicode characters in player names
+- [x] Fix unicode characters in player names
 - [ ] Indicate to the user when it can't read memory properly. Example: screen displays `MENU` while in lobby due to some misplaced offset.
-- [ ] Don't use the Unity Analytics file to read the game version. Use either a hash of the GameAssembly dll, or DMA it from the process.
+- [x] Don't use the Unity Analytics file to read the game version. Use either a hash of the GameAssembly dll, or DMA it from the process.
 
 ### Stretch
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crewlink",
-  "version": "1.1.6",
+  "version": "2.0.1",
   "license": "GPL-3.0-or-later",
   "description": "Free, open, Among Us proximity voice chat",
   "repository": {
@@ -45,11 +45,13 @@
     "axios": "^0.21.0",
     "cross-spawn": "^7.0.3",
     "deep-equal": "^2.0.5",
+    "electron-overlay-window": "^1.0.4",
     "electron-store": "^6.0.1",
     "electron-updater": "^4.3.5",
     "electron-window-state": "^5.0.3",
     "iohook": "^0.7.1",
     "memoryjs": "git://github.com/Rob--/memoryjs",
+    "pretty-bytes": "^5.5.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "registry-js": "^1.12.0",
@@ -68,6 +70,7 @@
     "@types/deep-equal": "^1.0.1",
     "@types/js-yaml": "^3.12.5",
     "@types/node": "12",
+    "@types/pretty-bytes": "^5.2.0",
     "@types/react": "^16.9.53",
     "@types/react-dom": "^16.9.8",
     "@types/simple-peer": "^9.6.1",
@@ -76,6 +79,7 @@
     "@types/webpack-env": "^1.15.3",
     "@typescript-eslint/eslint-plugin": "^4.9.1",
     "@typescript-eslint/parser": "^4.9.1",
+    "arraybuffer-loader": "^1.0.8",
     "electron": "9.3.3",
     "electron-builder": "^22.9.1",
     "electron-webpack": "^2.8.2",

src/common/AmongUsState.ts

@@ -6,10 +6,13 @@ export interface AmongUsState {
 	isHost: boolean;
 	clientId: number;
 	hostId: number;
+	commsSabotaged: boolean;
 }
+
 export interface Player {
 	ptr: number;
 	id: number;
+	clientId: number;
 	name: string;
 	colorId: number;
 	hatId: number;
@@ -26,10 +29,43 @@ export interface Player {
 	y: number;
 	inVent: boolean;
 }
+
+export enum MapType {
+	THE_SKELD,
+	MIRA_HQ,
+	POLUS,
+	UNKNOWN,
+}
+
 export enum GameState {
 	LOBBY,
 	TASKS,
 	DISCUSSION,
 	MENU,
 	UNKNOWN,
 }
+
+export interface Client {
+	playerId: number;
+	clientId: number;
+}
+export interface SocketClientMap {
+	[socketId: string]: Client;
+}
+export interface OtherTalking {
+	[playerId: number]: boolean; // isTalking
+}
+
+export interface AudioConnected {
+	[peer: string]: boolean; // isConnected
+}
+
+export interface VoiceState {
+	otherTalking: OtherTalking;
+	playerSocketIds: {
+		[index: number]: string;
+	};
+	otherDead: OtherTalking;
+	socketClients: SocketClientMap;
+	audioConnected: AudioConnected;
+}

src/common/ISettings.d.ts

@@ -9,9 +9,14 @@ export interface ISettings {
 	muteShortcut: string;
 	hideCode: boolean;
 	enableSpatialAudio: boolean;
+	meetingOverlay: boolean;
+	overlayPosition: 'left' | 'right' | 'hidden';
 	localLobbySettings: ILobbySettings;
 }
 
 export interface ILobbySettings {
 	maxDistance: number;
+	haunting: boolean;
+	hearImpostorsInVents: boolean;
+	commsSabotage: boolean;
 }

src/common/ipc-messages.ts

@@ -0,0 +1,44 @@
+import { ProgressInfo } from 'builder-util-runtime';
+
+// Renderer --> Main (send/on)
+export enum IpcMessages {
+	SHOW_ERROR_DIALOG = 'SHOW_ERROR_DIALOG',
+	OPEN_AMONG_US_GAME = 'OPEN_AMONG_US_GAME',
+	RESTART_CREWLINK = 'RESTART_CREWLINK',
+	QUIT_CREWLINK = 'QUIT_CREWLINK',
+	SEND_TO_OVERLAY = 'SEND_TO_OVERLAY',
+}
+
+// Renderer 1 --> Overlay Window (send/on)
+export enum IpcOverlayMessages {
+	NOTIFY_GAME_STATE_CHANGED = 'NOTIFY_GAME_STATE_CHANGED',
+	NOTIFY_VOICE_STATE_CHANGED = 'NOTIFY_VOICE_STATE_CHANGED',
+	NOTIFY_SETTINGS_CHANGED = 'NOTIFY_SETTINGS_CHANGED',
+}
+
+// Renderer --> Main (sendSync/on)
+export enum IpcSyncMessages {
+	GET_INITIAL_STATE = 'GET_INITIAL_STATE',
+}
+
+// Renderer --> Main (invoke/handle)
+export enum IpcHandlerMessages {
+	START_HOOK = 'START_HOOK',
+}
+
+// Main --> Renderer (send/on)
+export enum IpcRendererMessages {
+	NOTIFY_GAME_OPENED = 'NOTIFY_GAME_OPENED',
+	NOTIFY_GAME_STATE_CHANGED = 'NOTIFY_GAME_STATE_CHANGED',
+	TOGGLE_DEAFEN = 'TOGGLE_DEAFEN',
+	TOGGLE_MUTE = 'TOGGLE_MUTE',
+	PUSH_TO_TALK = 'PUSH_TO_TALK',
+	ERROR = 'ERROR',
+	AUTO_UPDATER_STATE = 'AUTO_UPDATER_STATE',
+}
+
+export interface AutoUpdaterState {
+	state: 'error' | 'available' | 'downloading' | 'downloaded' | 'unavailable';
+	error?: string;
+	progress?: ProgressInfo;
+}