Merge pull request #395 from boostcampwm-2022/dev

Deploy: 6주차 배포

.github/workflows/ci.yml

@@ -34,6 +34,12 @@ jobs:
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
+
+      - name: For CRDT package directory
+        shell: bash
+        run: |
+          cd @wabinar/crdt
+          npm test
 
       - name: For client directory
         run: |

.gitignore

@@ -1,6 +1,9 @@
 # ignore secret keys
 deploy-scripts/vault-secrets
 
+# ignore jest test coverage directories
+**/coverage
+
 # ignore settings for yarn berry zero install
 .yarn/*
 !.yarn/cache

@wabinar/api-types/block.ts

@@ -0,0 +1,62 @@
+import { BlockType } from '@wabinar/constants/block';
+import LinkedList, {
+  RemoteDeleteOperation,
+  RemoteInsertOperation,
+} from '@wabinar/crdt/linked-list';
+
+export interface LoadType {
+  id: string;
+}
+
+export interface LoadedType {
+  type: BlockType;
+}
+
+export interface UpdateType {
+  id: string;
+  type: BlockType;
+}
+
+export interface UpdatedType {
+  id: string;
+  type: BlockType;
+}
+
+export interface InitText {
+  id: string;
+}
+
+export interface InitializedText {
+  id: string;
+  crdt: LinkedList;
+}
+
+export interface InsertText {
+  id: string;
+  op: RemoteInsertOperation;
+}
+
+export interface InsertedText {
+  id: string;
+  op: RemoteInsertOperation;
+}
+
+export interface DeleteText {
+  id: string;
+  op: RemoteDeleteOperation;
+}
+
+export interface DeletedText {
+  id: string;
+  op: RemoteDeleteOperation;
+}
+
+export interface UpdateText {
+  id: string;
+  ops: RemoteInsertOperation[];
+}
+
+export interface UpdatedText {
+  id: string;
+  crdt: LinkedList;
+}

@wabinar/api-types/mom.ts

@@ -0,0 +1,52 @@
+import LinkedList, {
+  RemoteDeleteOperation,
+  RemoteInsertOperation,
+} from '@wabinar/crdt/linked-list';
+
+export type Mom = {
+  _id: string;
+  title: string;
+  createdAt: Date;
+};
+
+export interface Created {
+  mom: Mom;
+}
+
+export interface Select {
+  id: string;
+}
+
+export interface Selected {
+  mom: Mom;
+}
+
+export interface UpdateTitle {
+  title: string;
+}
+
+export interface UpdatedTitle {
+  title: string;
+}
+
+export interface Initialized {
+  crdt: LinkedList;
+}
+
+export interface InsertBlock {
+  blockId: string;
+  op: RemoteInsertOperation;
+}
+
+export interface InsertedBlock {
+  op: RemoteInsertOperation;
+}
+
+export interface DeleteBlock {
+  blockId: string;
+  op: RemoteDeleteOperation;
+}
+
+export interface DeletedBlock {
+  op: RemoteDeleteOperation;
+}

@wabinar/constants/socket-message.ts

@@ -9,7 +9,11 @@ export const WORKSPACE_EVENT = {
   RECEIVE_ANSWER: 'receive-answer',
   SEND_ICE: 'send-ice',
   RECEIVE_ICE: 'receive-ice',
-  RECEIVE_BYE: 'receive_bye',
+  AUDIO_STATE_CHANGED: 'audio-state-changed',
+  VIDEO_STATE_CHANGED: 'video-state-changed',
+  SEND_BYE: 'send-bye',
+  RECEIVE_BYE: 'receive-bye',
+  EXISTING_ROOM_USERS: 'existing-room-users',
 };
 
 export const MOM_EVENT = {
@@ -20,6 +24,8 @@ export const MOM_EVENT = {
   INSERT_BLOCK: 'insert-block',
   DELETE_BLOCK: 'delete-block',
   UPDATED: 'updated-mom',
+  LOADED: 'loaded-mom',
+  REQUEST_LOADED: 'request-loaded',
 };
 
 export const BLOCK_EVENT = {

@wabinar/crdt/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
   preset: 'ts-jest', // to use typescript
   verbose: true,
-  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  collectCoverage: true,
 };