combine isClient isNode (#7919)

HexaField · web-flow · commit 7e85f23a695e · 2023-04-25T08:42:11.000+10:00
diff --git a/packages/engine/src/assets/classes/AssetLoader.ts b/packages/engine/src/assets/classes/AssetLoader.ts
@@ -21,8 +21,8 @@ import {
 
 import { getMutableState, getState } from '@etherealengine/hyperflux'
 
+import { isClient } from '../../common/functions/getEnvironment'
 import { isAbsolutePath } from '../../common/functions/isAbsolutePath'
-import { isClient } from '../../common/functions/isClient'
 import { Engine } from '../../ecs/classes/Engine'
 import { EngineState } from '../../ecs/classes/EngineState'
 import { Entity } from '../../ecs/classes/Entity'
diff --git a/packages/engine/src/assets/functions/createGLTFLoader.ts b/packages/engine/src/assets/functions/createGLTFLoader.ts
@@ -2,7 +2,7 @@ import { VRMLoaderPlugin } from '@pixiv/three-vrm'
 
 import { getState } from '@etherealengine/hyperflux'
 
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
 import { EngineState } from '../../ecs/classes/EngineState'
 import { EngineRenderer } from '../../renderer/WebGLRendererSystem'
diff --git a/packages/engine/src/audio/systems/MediaSystem.ts b/packages/engine/src/audio/systems/MediaSystem.ts
@@ -5,7 +5,7 @@ import logger from '@etherealengine/common/src/logger'
 import { addActionReceptor, getMutableState, getState } from '@etherealengine/hyperflux'
 
 import { AssetLoader } from '../../assets/classes/AssetLoader'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
 import { EngineState } from '../../ecs/classes/EngineState'
 import { defineQuery, getComponent, getMutableComponent } from '../../ecs/functions/ComponentFunctions'
diff --git a/packages/engine/src/avatar/AvatarSpawnSystem.ts b/packages/engine/src/avatar/AvatarSpawnSystem.ts
@@ -4,7 +4,7 @@ import { Quaternion, Vector3 } from 'three'
 import { UserId } from '@etherealengine/common/src/interfaces/UserId'
 import { defineActionQueue, getMutableState, none, removeActionQueue } from '@etherealengine/hyperflux'
 
-import { isClient } from '../common/functions/isClient'
+import { isClient } from '../common/functions/getEnvironment'
 import { defineQuery, getComponent, hasComponent, removeQuery } from '../ecs/functions/ComponentFunctions'
 import { defineSystem } from '../ecs/functions/SystemFunctions'
 import { WorldNetworkAction } from '../networking/functions/WorldNetworkAction'
diff --git a/packages/engine/src/avatar/components/AvatarIKComponents.ts b/packages/engine/src/avatar/components/AvatarIKComponents.ts
@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
 import { Bone, Object3D, Vector3 } from 'three'
 
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { proxifyQuaternion, proxifyVector3 } from '../../common/proxies/createThreejsProxy'
 import { Entity } from '../../ecs/classes/Entity'
 import {
diff --git a/packages/engine/src/avatar/functions/avatarFunctions.ts b/packages/engine/src/avatar/functions/avatarFunctions.ts
@@ -7,7 +7,7 @@ import { AssetLoader } from '../../assets/classes/AssetLoader'
 import { AssetType } from '../../assets/enum/AssetType'
 import { AnimationManager } from '../../avatar/AnimationManager'
 import { LoopAnimationComponent } from '../../avatar/components/LoopAnimationComponent'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { iOS } from '../../common/functions/isMobile'
 import { EngineActions, EngineState } from '../../ecs/classes/EngineState'
 import { Entity } from '../../ecs/classes/Entity'
diff --git a/packages/engine/src/common/classes/GenerateMeshBVHWorker.ts b/packages/engine/src/common/classes/GenerateMeshBVHWorker.ts
@@ -3,7 +3,7 @@ import { Box3, BufferAttribute, BufferGeometry, InterleavedBufferAttribute } fro
 import { MeshBVH } from 'three-mesh-bvh'
 import Worker from 'web-worker'
 
-import { isClient } from '../functions/isClient'
+import { isClient } from '../functions/getEnvironment'
 
 export class GenerateMeshBVHWorker {
   running: boolean
diff --git a/packages/engine/src/common/functions/Timer.ts b/packages/engine/src/common/functions/Timer.ts
@@ -1,6 +1,6 @@
 import { Engine } from '../../ecs/classes/Engine'
 import { EngineRenderer } from '../../renderer/WebGLRendererSystem'
-import { isClient } from './isClient'
+import { isClient } from './getEnvironment'
 import { nowMilliseconds } from './nowMilliseconds'
 import { ServerLoop } from './ServerLoop'
 
diff --git a/packages/engine/src/common/functions/getEnvironment.ts b/packages/engine/src/common/functions/getEnvironment.ts
@@ -7,7 +7,8 @@ const isWebWorker =
   typeof self === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope'
 /* eslint-enable no-restricted-globals */
 
-const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null
+const isClient =
+  typeof process !== 'object' || typeof process.versions !== 'object' || typeof process.versions.node === 'undefined'
 
 /**
  * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0
@@ -19,7 +20,7 @@ const isJsDom = () =>
   navigator.userAgent.includes('Node.js') ||
   navigator.userAgent.includes('jsdom')
 
-export { isBrowser, isWebWorker, isNode, isJsDom }
+export { isBrowser, isWebWorker, isClient, isJsDom }
 
 // ==== //
 
diff --git a/packages/engine/src/common/functions/isBot.ts b/packages/engine/src/common/functions/isBot.ts
@@ -1,4 +1,4 @@
-import { isClient } from './isClient'
+import { isClient } from './getEnvironment'
 
 export function isBot(window: Window) {
   if (!isClient) return false
diff --git a/packages/engine/src/common/functions/isClient.ts b/packages/engine/src/common/functions/isClient.ts
diff --git a/packages/engine/src/common/functions/performance.ts b/packages/engine/src/common/functions/performance.ts
@@ -1,3 +1,3 @@
-import { isClient } from './isClient'
+import { isClient } from './getEnvironment'
 
 export const performance: Performance = isClient ? window.performance : require('perf_hooks').performance
diff --git a/packages/engine/src/input/systems/ClientInputSystem.ts b/packages/engine/src/input/systems/ClientInputSystem.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
 import { defineSystem } from '../../ecs/functions/SystemFunctions'
 import { EngineRenderer } from '../../renderer/WebGLRendererSystem'
diff --git a/packages/engine/src/interaction/systems/EquippableSystem.ts b/packages/engine/src/interaction/systems/EquippableSystem.ts
@@ -4,7 +4,7 @@ import { Vector3 } from 'three'
 import { defineActionQueue, dispatchAction } from '@etherealengine/hyperflux'
 
 import { getHandTarget } from '../../avatar/components/AvatarIKComponents'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
 import { EngineActions } from '../../ecs/classes/EngineState'
 import { Entity } from '../../ecs/classes/Entity'
diff --git a/packages/engine/src/interaction/systems/MountPointSystem.ts b/packages/engine/src/interaction/systems/MountPointSystem.ts
@@ -8,7 +8,7 @@ import { AvatarStates } from '../../avatar/animation/Util'
 import { AvatarAnimationComponent } from '../../avatar/components/AvatarAnimationComponent'
 import { AvatarComponent } from '../../avatar/components/AvatarComponent'
 import { AvatarControllerComponent } from '../../avatar/components/AvatarControllerComponent'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
 import { EngineActions, EngineState } from '../../ecs/classes/EngineState'
 import {
diff --git a/packages/engine/src/patchEngineNode.ts b/packages/engine/src/patchEngineNode.ts
@@ -1,6 +1,6 @@
-import { isNode } from './common/functions/getEnvironment'
+import { isClient } from './common/functions/getEnvironment'
 
-if (isNode) {
+if (!isClient) {
   const { Blob } = require('buffer')
   const fetch = require('node-fetch')
 
diff --git a/packages/engine/src/renderer/materials/functions/LoadVideoTexture.ts b/packages/engine/src/renderer/materials/functions/LoadVideoTexture.ts
@@ -1,6 +1,6 @@
 import { VideoTexture } from 'three'
 
-import { isClient } from '../../../common/functions/isClient'
+import { isClient } from '../../../common/functions/getEnvironment'
 import { EngineRenderer } from '../../WebGLRendererSystem'
 
 export default function loadVideoTexture(src, onLoad = (result) => {}) {
diff --git a/packages/engine/src/scene/components/EnvmapComponent.ts b/packages/engine/src/scene/components/EnvmapComponent.ts
@@ -18,7 +18,7 @@ import {
 import { getMutableState, getState, useHookstate } from '@etherealengine/hyperflux'
 
 import { AssetLoader } from '../../assets/classes/AssetLoader'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { SceneState } from '../../ecs/classes/Scene'
 import {
   defineComponent,
diff --git a/packages/engine/src/scene/components/MediaComponent.ts b/packages/engine/src/scene/components/MediaComponent.ts
@@ -12,7 +12,7 @@ import { AssetLoader } from '../../assets/classes/AssetLoader'
 import { AssetClass } from '../../assets/enum/AssetClass'
 import { AudioState } from '../../audio/AudioState'
 import { removePannerNode } from '../../audio/PositionalAudioFunctions'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Entity } from '../../ecs/classes/Entity'
 import {
   ComponentType,
diff --git a/packages/engine/src/scene/components/SkyboxComponent.ts b/packages/engine/src/scene/components/SkyboxComponent.ts
@@ -4,7 +4,7 @@ import { Color, CubeTexture, sRGBEncoding } from 'three'
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
 
 import { AssetLoader } from '../../assets/classes/AssetLoader'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { SceneState } from '../../ecs/classes/Scene'
 import { defineComponent, useComponent } from '../../ecs/functions/ComponentFunctions'
 import { EngineRenderer } from '../../renderer/WebGLRendererSystem'
diff --git a/packages/engine/src/scene/functions/loaders/VolumetricFunctions.ts b/packages/engine/src/scene/functions/loaders/VolumetricFunctions.ts
@@ -7,7 +7,7 @@ import { DissolveEffect } from '@etherealengine/engine/src/avatar/DissolveEffect
 import { getMutableState } from '@etherealengine/hyperflux'
 import type VolumetricPlayer from '@etherealengine/volumetric/player'
 
-import { isClient } from '../../../common/functions/isClient'
+import { isClient } from '../../../common/functions/getEnvironment'
 import { iOS } from '../../../common/functions/isMobile'
 import { EngineState } from '../../../ecs/classes/EngineState'
 import { Entity } from '../../../ecs/classes/Entity'
diff --git a/packages/engine/src/scene/systems/PortalLoadSystem.ts b/packages/engine/src/scene/systems/PortalLoadSystem.ts
@@ -2,7 +2,7 @@ import { useEffect } from 'react'
 import { Euler, Texture } from 'three'
 
 import { AssetLoader } from '../../assets/classes/AssetLoader'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
 import { Entity } from '../../ecs/classes/Entity'
 import { defineQuery, getComponent, removeQuery } from '../../ecs/functions/ComponentFunctions'
diff --git a/packages/engine/src/scene/systems/SceneObjectSystem.tsx b/packages/engine/src/scene/systems/SceneObjectSystem.tsx
@@ -16,8 +16,7 @@ import { getMutableState, getState, ReactorProps, useHookstate } from '@ethereal
 
 import { createGLTFLoader } from '../../assets/functions/createGLTFLoader'
 import { loadDRACODecoderNode } from '../../assets/loaders/gltf/NodeDracoLoader'
-import { isNode } from '../../common/functions/getEnvironment'
-import { isClient } from '../../common/functions/isClient'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
 import { EngineState } from '../../ecs/classes/EngineState'
 import { Entity } from '../../ecs/classes/Entity'
diff --git a/packages/engine/src/xrui/functions/createXRUI.tsx b/packages/engine/src/xrui/functions/createXRUI.tsx
@@ -6,7 +6,7 @@ import { Group } from 'three'
 import { WebContainer3D } from '@etherealengine/xrui/core/three/WebContainer3D'
 import { WebLayerManager } from '@etherealengine/xrui/core/three/WebLayerManager'
 
-import { isNode } from '../../common/functions/getEnvironment'
+import { isClient } from '../../common/functions/getEnvironment'
 import { Entity } from '../../ecs/classes/Entity'
 import { addComponent, getComponent, getMutableComponent, setComponent } from '../../ecs/functions/ComponentFunctions'
 import { createEntity } from '../../ecs/functions/EntityFunctions'
@@ -20,7 +20,7 @@ import { XRUIComponent } from '../components/XRUIComponent'
 import { XRUIStateContext } from '../XRUIStateContext'
 
 export function createXRUI<S extends State<any> | null>(UIFunc: React.FC, state = null as S): XRUI<S> {
-  if (isNode) throw new Error('XRUI is not supported in nodejs')
+  if (!isClient) throw new Error('XRUI is not supported in nodejs')
 
   const entity = createEntity()
 
diff --git a/packages/hyperflux/functions/StateFunctions.ts b/packages/hyperflux/functions/StateFunctions.ts
@@ -2,7 +2,7 @@ import { createState, SetInitialStateAction, State } from '@hookstate/core'
 
 import { DeepReadonly } from '@etherealengine/common/src/DeepReadonly'
 import multiLogger from '@etherealengine/common/src/logger'
-import { isNode } from '@etherealengine/engine/src/common/functions/getEnvironment'
+import { isClient } from '@etherealengine/engine/src/common/functions/getEnvironment'
 
 import { HyperFlux, HyperStore } from './StoreFunctions'
 
@@ -62,7 +62,7 @@ const stateNamespaceKey = 'ee.hyperflux'
  * we need to pass in a schema or validator function to this function (we should use ts-pattern for this).
  */
 export const syncStateWithLocalStorage = (stateDefinition: ReturnType<typeof defineState<any>>, keys: string[]) => {
-  if (isNode) return
+  if (!isClient) return
   const state = getMutableState(stateDefinition)
 
   for (const key of keys) {
diff --git a/packages/projects/loadSystemInjection.ts b/packages/projects/loadSystemInjection.ts
@@ -1,6 +1,6 @@
 import { EntityUUID } from '@etherealengine/common/src/interfaces/EntityUUID'
 import type { SceneJson } from '@etherealengine/common/src/interfaces/SceneInterface'
-import { isClient } from '@etherealengine/engine/src/common/functions/isClient'
+import { isClient } from '@etherealengine/engine/src/common/functions/getEnvironment'
 import { ComponentType } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
 import { SystemDefinitions, SystemUUID } from '@etherealengine/engine/src/ecs/functions/SystemFunctions'
 import {
diff --git a/packages/xrui/core/WebRenderer.ts b/packages/xrui/core/WebRenderer.ts
@@ -1,6 +1,6 @@
 import { ResizeObserver as Polyfill } from '@juggle/resize-observer'
 
-import { isClient } from '@etherealengine/engine/src/common/functions/isClient'
+import { isClient } from '@etherealengine/engine/src/common/functions/getEnvironment'
 
 import { EventCallback, WebLayer } from './WebLayer'
 import { WebLayerManagerBase } from './WebLayerManagerBase'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { isClient } from './isClient'`
	`1`	`+import { isClient } from './getEnvironment'`
`2`	`2`
`3`	`3`	`export function isBot(window: Window) {`
`4`	`4`	`if (!isClient) return false`