chore: add offline~offline realm for testing (#392)

menduz · web-flow · commit a2fe442ab388 · 2022-08-02T14:31:11.000-03:00
* wip

* lint
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,21 +71,21 @@
   "dependencies": {
     "@dcl/catalyst-peer": "^1.0.4",
     "@dcl/comms3-transports": "^1.0.0-20220701150400.commit-69b1b53",
-    "@dcl/crypto": "^3.0.1",
+    "@dcl/crypto": "^3.1.0",
     "@dcl/ecs-math": "^1.0.1",
     "@dcl/ecs-quests": "^1.3.1",
-    "@dcl/feature-flags": "^1.0.1",
+    "@dcl/feature-flags": "^1.1.0",
     "@dcl/hashing": "^1.1.0",
     "@dcl/kernel-interface": "^2.0.0-20210922153939.commit-017905d",
     "@dcl/legacy-ecs": "^6.10.1-2191620277.commit-7b74643",
     "@dcl/protocol": "^1.0.0-2671957171.commit-72389ab",
     "@dcl/rpc": "^1.0.1-20220608232056.commit-741737c",
-    "@dcl/schemas": "^4.7.0",
-    "@dcl/urn-resolver": "^1.3.2-20220605050328.commit-45a2981",
+    "@dcl/schemas": "^5.4.6",
+    "@dcl/urn-resolver": "^1.4.0",
     "@redux-saga/simple-saga-monitor": "^1.1.2",
     "@types/redux-logger": "^3.0.9",
     "blob-to-buffer": "^1.2.8",
-    "dcl-catalyst-client": "^12.0.1",
+    "dcl-catalyst-client": "^12.0.8",
     "dcl-quests-client": "^2.10.0",
     "dcl-scene-writer": "^1.1.2",
     "dcl-social-client": "^1.4.1",
diff --git a/packages/shared/comms/index.ts b/packages/shared/comms/index.ts
@@ -21,8 +21,9 @@ import { InstanceConnection as V3InstanceConnection } from './v3/InstanceConnect
 import { removePeerByUUID, removeMissingPeers } from './peers'
 import { lastPlayerPositionReport } from 'shared/world/positionThings'
 import { ProfileType } from 'shared/profiles/types'
+import { OfflineRoomConnection } from './offline-room-connection'
 
-export type CommsVersion = 'v1' | 'v2' | 'v3' | 'v4'
+export type CommsVersion = 'v1' | 'v2' | 'v3' | 'v4' | 'offline'
 export type CommsMode = CommsV1Mode | CommsV2Mode
 export type CommsV1Mode = 'local' | 'remote'
 export type CommsV2Mode = 'p2p' | 'server'
@@ -186,6 +187,11 @@ export async function connectComms(realm: Realm): Promise<CommsContext | null> {
 
       break
     }
+    case 'offline': {
+      connection = new OfflineRoomConnection()
+
+      break
+    }
     default: {
       throw new Error(`unrecognized comms mode "${COMMS}" "${protocol}"`)
     }
diff --git a/packages/shared/comms/offline-room-connection.ts b/packages/shared/comms/offline-room-connection.ts
@@ -0,0 +1,22 @@
+import { CommsEvents, RoomConnection } from '../comms/interface/index'
+import mitt from 'mitt'
+
+export class OfflineRoomConnection implements RoomConnection {
+  events = mitt<CommsEvents>()
+
+  constructor() {}
+  async connect(): Promise<void> {}
+  async sendPositionMessage() {}
+  async sendParcelUpdateMessage() {}
+  async sendProfileMessage() {}
+  async sendProfileRequest() {}
+  async sendProfileResponse() {}
+  async sendInitialMessage() {}
+  async sendParcelSceneCommsMessage() {}
+  async sendChatMessage() {}
+  sendTopicMessage() {}
+  sendTopicIdentityMessage() {}
+  async setTopics() {}
+  async disconnect() {}
+  async sendVoiceMessage() {}
+}
diff --git a/packages/shared/dao/sagas.ts b/packages/shared/dao/sagas.ts
@@ -217,7 +217,7 @@ function* initializeCatalystCandidates() {
 }
 
 export async function checkValidRealm(realm: Realm) {
-  if (realm.protocol === 'v1') {
+  if (realm.protocol === 'v1' || realm.protocol === 'offline') {
     return true
   } else if (realm.protocol === 'v2') {
     const realmHasValues = realm && realm.hostname
diff --git a/packages/shared/profiles/sagas.ts b/packages/shared/profiles/sagas.ts
@@ -23,7 +23,7 @@ import {
   ProfileSuccessAction,
   profileFailure
 } from './actions'
-import { getCurrentUserProfile, getProfileFromStore } from './selectors'
+import { getCurrentUserProfileDirty, getProfileFromStore } from './selectors'
 import { buildServerMetadata, ensureAvatarCompatibilityFormat } from './transformations/profileToServerFormat'
 import { ContentFile, ProfileType, ProfileUserInfo } from './types'
 import { ExplorerIdentity } from 'shared/session/types'
@@ -258,13 +258,18 @@ function* handleSaveLocalAvatar(saveAvatar: SaveProfileDelta) {
   const userId: string = yield select(getCurrentUserId)
 
   try {
-    const savedProfile: Avatar | null = yield select(getCurrentUserProfile)
+    // get the avatar, no matter if it is in a loading or dirty state
+    const savedProfile: Avatar | null = yield select(getCurrentUserProfileDirty)
     const currentVersion: number = Math.max(savedProfile?.version || 0, 0)
 
     const identity: ExplorerIdentity = yield select(getCurrentIdentity)
     const network: ETHEREUM_NETWORK = yield select(getCurrentNetwork)
 
-    const profile = {
+    const profile: Avatar = {
+      hasClaimedName: false,
+      name: createFakeName(),
+      description: '',
+      tutorialStep: 0,
       ...savedProfile,
       ...saveAvatar.payload.profile,
       userId,
@@ -281,7 +286,7 @@ function* handleSaveLocalAvatar(saveAvatar: SaveProfileDelta) {
     }
 
     // save the profile in the local storage
-    yield localProfilesRepo.persist(profile.ethAddress, network, profile)
+    yield apply(localProfilesRepo, 'persist', [profile.ethAddress, network, profile])
 
     // save the profile in the store
     yield put(profileSuccess(profile))
diff --git a/packages/shared/profiles/schemaValidation.ts b/packages/shared/profiles/schemaValidation.ts
@@ -1,4 +1,4 @@
-import { Avatar, AvatarInfo, generateValidator, JSONSchema } from '@dcl/schemas'
+import { Avatar, AvatarInfo, generateLazyValidator, JSONSchema } from '@dcl/schemas'
 
 /**
  * The schema validation requires strict IPFS "snapshots"
@@ -20,4 +20,4 @@ const stringSnapshotAvatarSchema: JSONSchema<Avatar> = {
   }
 } as any
 
-export const validateAvatar = generateValidator<Avatar>(stringSnapshotAvatarSchema)
+export const validateAvatar = generateLazyValidator<Avatar>(stringSnapshotAvatarSchema)
diff --git a/packages/shared/profiles/selectors.ts b/packages/shared/profiles/selectors.ts
@@ -33,6 +33,13 @@ export const getCurrentUserProfile = (store: RootProfileState & RootSessionState
   return currentUserId ? getProfile(store, currentUserId) : null
 }
 
+export const getCurrentUserProfileDirty = (store: RootProfileState & RootSessionState): Avatar | null => {
+  const currentUserId = getCurrentUserId(store)
+  if (!currentUserId) return null
+  const [_status, data] = getProfileStatusAndData(store, currentUserId)
+  return data || null
+}
+
 export const getCurrentUserProfileStatusAndData = (
   store: RootProfileState & RootSessionState
 ): [ProfileStatus | undefined, Avatar | undefined] => {
diff --git a/packages/shared/quests/client.ts b/packages/shared/quests/client.ts
@@ -11,7 +11,7 @@ export async function questsClient() {
   const servers = getServerConfigurations(net)
   return new QuestsClient({
     baseUrl: servers.questsUrl,
-    authChainProvider: (payload) => Authenticator.signPayload(identity!, payload)
+    authChainProvider: (payload) => Authenticator.signPayload(identity!, payload) as any
   })
 }
 
diff --git a/packages/shared/session/actions.ts b/packages/shared/session/actions.ts
@@ -15,7 +15,7 @@ export const authenticate = (provider: IEthereumProvider, isGuest: boolean) =>
 export type AuthenticateAction = ReturnType<typeof authenticate>
 
 export const SIGNUP = '[SESSION] SignUp'
-export const signUp = (email: string) => action(SIGNUP, { email })
+export const signUp = (email: string, name: string) => action(SIGNUP, { email, name })
 export type SignUpAction = ReturnType<typeof signUp>
 
 export const USER_AUTHENTIFIED = '[SESSION] User authentified'
diff --git a/packages/shared/session/sagas.ts b/packages/shared/session/sagas.ts
@@ -36,7 +36,7 @@ import { localProfilesRepo } from '../profiles/sagas'
 import { getCurrentIdentity, getIsGuestLogin, isLoginCompleted } from './selectors'
 import { waitForRealmInitialized } from '../dao/sagas'
 import { profileRequest, PROFILE_SUCCESS, saveProfileDelta, SEND_PROFILE_TO_RENDERER } from '../profiles/actions'
-import { LoginState } from '@dcl/kernel-interface'
+import { DecentralandIdentity, LoginState } from '@dcl/kernel-interface'
 import { RequestManager } from 'eth-connect'
 import { ensureMetaConfigurationInitialized } from 'shared/meta'
 import { Store } from 'redux'
@@ -196,6 +196,7 @@ function* signUpHandler(action: SignUpAction) {
 
   yield put(
     saveProfileDelta({
+      name: action.payload.name,
       userId: identity.address,
       ethAddress: identity.rawAddress,
       version: 0,
@@ -330,7 +331,8 @@ export function initializeSessionObserver() {
     globalObservable.emit('accountState', {
       hasProvider: !!session.provider,
       loginStatus: session.loginState as LoginState,
-      identity: session.identity,
+      // TODO: the authChain may have an undefined field. DecentralandIdentity got outdated
+      identity: session.identity as any as DecentralandIdentity | undefined,
       network: session.network,
       isGuest: !!session.isGuestLogin
     })
diff --git a/packages/unity-interface/BrowserInterface.ts b/packages/unity-interface/BrowserInterface.ts
@@ -64,7 +64,7 @@ import { getAuthHeaders } from 'atomicHelpers/signedFetch'
 import { Authenticator } from '@dcl/crypto'
 import { denyPortableExperiences, removeScenePortableExperience } from 'shared/portableExperiences/actions'
 import { setDecentralandTime } from 'shared/apis/host/EnvironmentAPI'
-import { Avatar, generateValidator, JSONSchema } from '@dcl/schemas'
+import { Avatar, generateLazyValidator, JSONSchema } from '@dcl/schemas'
 import { sceneLifeCycleObservable } from 'shared/world/SceneWorker'
 import { transformSerializeOpt } from 'unity-interface/transformSerializationOpt'
 
@@ -161,7 +161,7 @@ export const rendererSaveProfileSchema: JSONSchema<RendererSaveProfile> = {
   }
 } as any
 
-const validateRendererSaveProfile = generateValidator<RendererSaveProfile>(rendererSaveProfileSchema)
+const validateRendererSaveProfile = generateLazyValidator<RendererSaveProfile>(rendererSaveProfileSchema)
 
 // the BrowserInterface is a visitor for messages received from Unity
 export class BrowserInterface {
@@ -378,8 +378,7 @@ export class BrowserInterface {
   }
 
   public SendPassport(passport: { name: string; email: string }) {
-    store.dispatch(saveProfileDelta({ name: passport.name }))
-    store.dispatch(signUp(passport.email))
+    store.dispatch(signUp(passport.email, passport.name))
   }
 
   public RequestOwnProfileUpdate() {
diff --git a/test/atomicHelpers/SortedLimitedQueue.test.ts b/test/atomicHelpers/SortedLimitedQueue.test.ts
@@ -41,7 +41,7 @@ describe('SortedLimitedQueue', () => {
   })
 
   it('can queue more than the length limit and the first elements get removed', () => {
-    const queued = []
+    const queued: number[] = []
     const length = 20
 
     for (let i = 0; i < length; i++) {
diff --git a/test/scene-system/fetchWrapper.spec.ts b/test/scene-system/fetchWrapper.spec.ts
@@ -4,7 +4,7 @@ import * as sinon from 'sinon'
 import { sleep } from 'atomicHelpers/sleep'
 import { createFetch, FetchFunction } from 'scene-system/sdk/Fetch'
 
-const originalFetch: FetchFunction = async (resource: RequestInfo, init?: RequestInit) => {
+const originalFetch: FetchFunction = async (resource, init) => {
   return new Response()
 }
 
@@ -34,10 +34,10 @@ describe('Fetch Wrapped for scenes', () => {
   const wrappedDelayFetch = createFetch({
     canUseFetch: true,
     log,
-    originalFetch: async (_resource: RequestInfo, init?: RequestInit) => {
+    originalFetch: async (_resource, init) => {
       await sleep(timePerFetchSleep)
 
-      if (init.signal?.aborted) {
+      if (init!.signal?.aborted) {
         const a = new Error('Abort')
         a.name = 'AbortError'
         throw a
@@ -107,19 +107,19 @@ describe('Fetch Wrapped for scenes', () => {
   })
 
   it('should abort fetch if reaches the timeout opt 1', async () => {
-    let error: Error = null
+    let error: Error | null = null
 
     try {
       await wrappedDelayFetch('https://test.test/', { timeout: 10 })
     } catch (err: any) {
       console.log(err)
       error = err
     }
-    expect(error.name).to.eql('AbortError')
+    expect(error!.name).to.eql('AbortError')
   })
 
   it('should abort fetch if reaches the timeout opt 2', async () => {
-    let error: Error = null
+    let error: Error | null = null
     let counter = 0
     await Promise.all([
       wrappedDelayFetch('https://test.test/', { timeout: 5 }).catch((err) => {
@@ -128,7 +128,7 @@ describe('Fetch Wrapped for scenes', () => {
       }),
       wrappedDelayFetch('https://test.test/', {}).then(() => counter++)
     ])
-    expect(error.name).to.eql('AbortError')
+    expect(error!.name).to.eql('AbortError')
     expect(counter).to.eql(2)
   })
 })
diff --git a/test/scene-system/websocketWrapper.spec.ts b/test/scene-system/websocketWrapper.spec.ts
@@ -6,7 +6,7 @@ class FakeWebSocket {
 }
 
 describe('Websocket wrapped for scenes', () => {
-  let originalWebSocket = WebSocket
+  let originalWebSocket: any = WebSocket
   before(() => {
     originalWebSocket = WebSocket
     // @ts-ignore
diff --git a/test/tsconfig.json b/test/tsconfig.json
@@ -3,7 +3,7 @@
     "target": "es2017",
     "outDir": "out",
     "declaration": false,
-    "strictNullChecks": false,
+    "strictNullChecks": true,
     "lib": ["es2017", "dom"],
     "baseUrl": "../packages",
     "types": ["mocha", "@dcl/posix", "segment-analytics"],

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ function* initializeCatalystCandidates() {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`export async function checkValidRealm(realm: Realm) {`
`220`		`- if (realm.protocol === 'v1') {`
	`220`	`+ if (realm.protocol === 'v1' \|\| realm.protocol === 'offline') {`
`221`	`221`	`return true`
`222`	`222`	`} else if (realm.protocol === 'v2') {`
`223`	`223`	`const realmHasValues = realm && realm.hostname`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Avatar, AvatarInfo, generateValidator, JSONSchema } from '@dcl/schemas'`
	`1`	`+import { Avatar, AvatarInfo, generateLazyValidator, JSONSchema } from '@dcl/schemas'`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* The schema validation requires strict IPFS "snapshots"`
`@@ -20,4 +20,4 @@ const stringSnapshotAvatarSchema: JSONSchema<Avatar> = {`
`20`	`20`	`}`
`21`	`21`	`} as any`
`22`	`22`
`23`		`-export const validateAvatar = generateValidator<Avatar>(stringSnapshotAvatarSchema)`
	`23`	`+export const validateAvatar = generateLazyValidator<Avatar>(stringSnapshotAvatarSchema)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export async function questsClient() {`
`11`	`11`	`const servers = getServerConfigurations(net)`
`12`	`12`	`return new QuestsClient({`
`13`	`13`	`baseUrl: servers.questsUrl,`
`14`		`- authChainProvider: (payload) => Authenticator.signPayload(identity!, payload)`
	`14`	`+ authChainProvider: (payload) => Authenticator.signPayload(identity!, payload) as any`
`15`	`15`	`})`
`16`	`16`	`}`
`17`	`17`