poc working

packages/core/src/BaseComponent.ts

@@ -32,12 +32,10 @@ import {
   BaseComponentContract,
 } from './types'
 import {
-  getAuthError,
   getAuthState,
   getAuthStatus,
 } from './redux/features/session/sessionSelectors'
 import { compoundEventAttachAction } from './redux/actions'
-import { AuthError } from './CustomErrors'
 import { proxyFactory } from './utils/proxyUtils'
 import { executeActionWorker } from './workers'
 
@@ -837,34 +835,16 @@ export class BaseComponent<
       case 'authorizing':
         return new Promise((resolve, reject) => {
           // @ts-expect-error
-          this.once('session.connected', (event: any) => {
-            console.log('session.connected', event)
+          this.once('session.connected', () => {
+            this.logger.info('session.connected')
             resolve(this)
           })
+
           // @ts-expect-error
-          this.once('session.auth_error', (event: any) => {
-            console.log('session.auth_error', event)
-            // const error = authError
-            //   ? new AuthError(authError.code, authError.message)
-            //   : new Error('Unauthorized')
-            //   reject(error)
-            reject(new Error('Unauthorized'))
+          this.once('session.auth_error', (error: any) => {
+            this.logger.info('session.auth_error', error)
+            reject(error)
           })
-          // const unsubscribe = this.store.subscribe(() => {
-          //   const authStatus = getAuthStatus(this.store.getState())
-          //   const authError = getAuthError(this.store.getState())
-
-          //   if (authStatus === 'authorized') {
-          //     resolve(this)
-          //     unsubscribe()
-          //   } else if (authStatus === 'unauthorized') {
-          //     const error = authError
-          //       ? new AuthError(authError.code, authError.message)
-          //       : new Error('Unauthorized')
-          //     reject(error)
-          //     unsubscribe()
-          //   }
-          // })
         })
 
       case 'unauthorized':

packages/core/src/redux/index.ts

@@ -125,8 +125,7 @@ const configureStore = (options: ConfigureStoreOptions) => {
     runSaga,
     channels,
     dispatch: (action: any) => {
-      swStore.rootPut(action)
-      // store.dispatch(action)
+      return swStore.dispatch(action)
     },
     getState: () => {
       return swStore.getState()

packages/core/src/redux/rootSaga.ts

@@ -25,6 +25,7 @@ import {
 import { AuthError } from '../CustomErrors'
 import { PubSubChannel, RootChannel, SessionChannel } from './interfaces'
 import { createRestartableSaga } from './utils/sagaHelpers'
+import { Action } from 'redux'
 // import { componentCleanupSaga } from './features/component/componentSaga'
 
 interface StartSagaOptions {
@@ -138,20 +139,18 @@ export function* initSessionSaga({
 export function* reauthenticateWorker({
   session,
   token,
-  rootChannel,
   pubSubChannel,
 }: {
   session: BaseSession
   token: string
-  rootChannel: RootChannel
   pubSubChannel: PubSubChannel
 }) {
   try {
     if (session.reauthenticate) {
       session.token = token
       yield call(session.reauthenticate)
       // Update the store with the new "connect result"
-      yield put(rootChannel, sessionActions.connected(session.rpcConnectResult))
+      yield put(sessionActions.connected(session.rpcConnectResult))
       yield put(pubSubChannel, sessionConnectedAction())
     }
   } catch (error) {
@@ -180,11 +179,8 @@ export function* sessionStatusWatcher(options: StartSagaOptions): SagaIterator {
       getLogger().info('sessionStatusWatcher', action.type, action.payload)
       switch (action.type) {
         case authSuccessAction.type: {
-          const { session, pubSubChannel, rootChannel } = options
-          yield put(
-            rootChannel,
-            sessionActions.connected(session.rpcConnectResult)
-          )
+          const { session, pubSubChannel } = options
+          yield put(sessionActions.connected(session.rpcConnectResult))
           yield put(pubSubChannel, sessionConnectedAction())
           break
         }
@@ -203,7 +199,6 @@ export function* sessionStatusWatcher(options: StartSagaOptions): SagaIterator {
           yield fork(reauthenticateWorker, {
             session: options.session,
             token: action.payload.token,
-            rootChannel: options.rootChannel,
             pubSubChannel: options.pubSubChannel,
           })
           break
@@ -267,12 +262,14 @@ export default (options: RootSagaOptions) => {
       setDebugOptions(userOptions.debug)
     }
 
+    const actions: string[] = [initAction.type, reauthAction.type]
+    const filter = (action: Action) => actions.includes(action.type)
     while (true) {
       /**
        * Wait for an initAction to start
        */
       getLogger().info('RootSaga WAIT INIT')
-      const action = yield take(channels.rootChannel, initAction.type)
+      const action = yield take(channels.rootChannel, filter)
       getLogger().info('RootSaga GO ...')
 
       /**

packages/core/src/redux/swStore.ts

@@ -1,16 +1,9 @@
 import { runSaga } from '@redux-saga/core'
-import type { Task, Action, Saga } from '@redux-saga/types'
-// import {
-//   fork,
-//   select,
-//   take,
-//   put,
-//   all,
-//   cancelled,
-// } from '@redux-saga/core/effects'
+import type { Task, Saga } from '@redux-saga/types'
 import { getLogger } from '../utils'
 import { SDKState } from './interfaces'
 import { InternalChannels } from '../utils/interfaces'
+import { AnyAction } from './toolkit'
 
 interface CreateSwStoreParams {
   channels: InternalChannels
@@ -42,8 +35,53 @@ export const createSWStore = ({ channels }: CreateSwStoreParams) => {
     // this will be used to orchestrate take and put Effects
     channel: channels.rootChannel,
     // this will be used to resolve put Effects
-    dispatch(action: Action) {
+    dispatch(action: AnyAction) {
       logger.warn('swStore >> Dispatch', action)
+
+      // Process the action within reducers
+      switch (action.type) {
+        case 'session/connected':
+          state.session = {
+            ...state.session,
+            authStatus: 'authorized',
+            authState: action.payload?.authorization,
+            authCount: state.session.authCount + 1,
+            protocol: action.payload?.protocol ?? '',
+            iceServers: action.payload?.ice_servers ?? [],
+          }
+          break
+        case 'components/upsert':
+          if (action.payload.id in state.components.byId) {
+            state.components = {
+              ...state,
+              byId: {
+                ...state.components.byId,
+                [action.payload.id]: {
+                  ...state.components.byId[action.payload.id],
+                  ...action.payload,
+                },
+              },
+            }
+          } else {
+            state.components = {
+              ...state,
+              byId: {
+                ...state.components.byId,
+                [action.payload.id]: action.payload,
+              },
+            }
+          }
+          break
+        default:
+          getLogger().warn('Unhandled dispatch', action.type)
+      }
+
+      channels.rootChannel.put(action)
+      // runSaga(myIO, function* () {
+      //   yield put(channels.rootChannel, action)
+      // })
+
+      return action
     },
     // this will be used to resolve select Effects
     getState,
@@ -62,16 +100,11 @@ export const createSWStore = ({ channels }: CreateSwStoreParams) => {
       rootTask.cancel()
     },
     runWorker: (worker: Saga, options: any) => {
-      logger.warn('swStore >> runWorker', worker, options)
+      // logger.warn('swStore >> runWorker', worker, options)
       return runSaga(myIO, worker, options)
     },
-    // statePut: (action: Action) => {
-    //   logger.warn('swStore >> statePut', action)
-    //   runSaga(myIO, function* () {
-    //     yield put(action)
-    //   })
-    // },
-    rootPut: (action: Action) => {
+    dispatch: (action: AnyAction) => myIO.dispatch(action),
+    rootPut: (action: AnyAction) => {
       logger.warn('swStore >> rootPut', action)
       channels.rootChannel.put(action)
     },

packages/core/src/testUtils.ts

@@ -4,6 +4,7 @@ import {
   PubSubChannel,
   SwEventChannel,
   SessionChannel,
+  RootChannel,
 } from './redux/interfaces'
 import { BaseSession } from './BaseSession'
 import { RPCConnectResult, InternalSDKLogger } from './utils/interfaces'
@@ -120,12 +121,14 @@ export const rpcConnectResultVRT: RPCConnectResult = {
     {
       urls: 'turn.swire.io:443',
       credential: 'sFTwvi8ShXcYNOcyYjFy3ATIUpQ=',
+      // @ts-ignore
       credentialType: 'password',
       username: '1619521908:8f0a119a-cda7-4497-a47d-c81493b824d4',
     },
   ],
 }
 
+export const createRootChannel = (): RootChannel => multicastChannel()
 export const createPubSubChannel = (): PubSubChannel => multicastChannel()
 export const createSwEventChannel = (): SwEventChannel => multicastChannel()
 export const createSessionChannel = (): SessionChannel => channel()