yarn fmt

2025-03-21 16:10:49 -04:00
parent 2cca1376e2
commit 4c9851efbf
7 changed files with 124 additions and 97 deletions
--- a/src/clientSideScene/CameraControls.ts
+++ b/src/clientSideScene/CameraControls.ts
@ -981,17 +981,21 @@ export class CameraControls {
  }

  async saveRemoteCameraState() {
-    const cameraViewStateResponse = await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: { type: 'default_camera_get_view' },
-    })
+    const cameraViewStateResponse =
+      await this.engineCommandManager.sendSceneCommand({
+        type: 'modeling_cmd_req',
+        cmd_id: uuidv4(),
+        cmd: { type: 'default_camera_get_view' },
+      })
    if (!cameraViewStateResponse) return
-    if ('resp' in cameraViewStateResponse
-      && 'modeling_response' in cameraViewStateResponse.resp.data
-      && 'data' in cameraViewStateResponse.resp.data.modeling_response
-      && 'view' in cameraViewStateResponse.resp.data.modeling_response.data) {
-      this.oldCameraState = cameraViewStateResponse.resp.data.modeling_response.data.view
+    if (
+      'resp' in cameraViewStateResponse &&
+      'modeling_response' in cameraViewStateResponse.resp.data &&
+      'data' in cameraViewStateResponse.resp.data.modeling_response &&
+      'view' in cameraViewStateResponse.resp.data.modeling_response.data
+    ) {
+      this.oldCameraState =
+        cameraViewStateResponse.resp.data.modeling_response.data.view
    }
  }

--- a/src/components/ModelStateIndicator.tsx
+++ b/src/components/ModelStateIndicator.tsx
@ -3,11 +3,7 @@ import { useEngineCommands } from '@src/components/EngineCommands'
 import { Spinner } from '@src/components/Spinner'

 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import {
-  faPlay,
-  faPause,
-  faSpinner,
-} from '@fortawesome/free-solid-svg-icons'
+import { faPlay, faPause, faSpinner } from '@fortawesome/free-solid-svg-icons'

 export const ModelStateIndicator = () => {
  const engineStreamState = useSelector(engineStreamActor, (state) => state)
@ -18,30 +14,34 @@ export const ModelStateIndicator = () => {

  if (engineStreamState.value === EngineStreamState.Paused) {
    className += 'text-secondary'
-    icon = <FontAwesomeIcon
-      data-testid={dataTestId + '-paused'}
-      icon={faPause}
-      width="20"
-      height="20"
-    />
+    icon = (
+      <FontAwesomeIcon
+        data-testid={dataTestId + '-paused'}
+        icon={faPause}
+        width="20"
+        height="20"
+      />
+    )
  } else if (engineStreamState.value === EngineStreamState.Playing) {
    className += 'text-secondary'
    icon = (
-        <FontAwesomeIcon
-          data-testid={dataTestId + '-execution-done'}
-          icon={faPlay}
-          width="20"
-          height="20"
-        />
+      <FontAwesomeIcon
+        data-testid={dataTestId + '-execution-done'}
+        icon={faPlay}
+        width="20"
+        height="20"
+      />
    )
  } else {
    className += 'text-secondary'
-    icon = <FontAwesomeIcon
-      data-testid={dataTestId + '-resuming'}
-      icon={faSpinner}
-      width="20"
-      height="20"
-    />
+    icon = (
+      <FontAwesomeIcon
+        data-testid={dataTestId + '-resuming'}
+        icon={faSpinner}
+        width="20"
+        height="20"
+      />
+    )
  }

  return (
--- a/src/components/NetworkHealthIndicator.tsx
+++ b/src/components/NetworkHealthIndicator.tsx
@ -86,7 +86,7 @@ export const NetworkHealthIndicator = () => {
    error,
    setHasCopied,
    hasCopied,
-    ping
+    ping,
  } = useNetworkContext()

  return (
@ -130,10 +130,12 @@ export const NetworkHealthIndicator = () => {
            {NETWORK_HEALTH_TEXT[overallState]}
          </p>
        </div>
-        <div
-          className={`flex items-center justify-between p-2 rounded-t-sm`}
-        >
-          <h2 className={`text-xs font-sans font-normal ${overallConnectionStateColor[overallState].icon}`}>Ping</h2>
+        <div className={`flex items-center justify-between p-2 rounded-t-sm`}>
+          <h2
+            className={`text-xs font-sans font-normal ${overallConnectionStateColor[overallState].icon}`}
+          >
+            Ping
+          </h2>
          <p
            data-testid="network"
            className={`font-bold text-xs uppercase px-2 py-1 rounded-sm ${overallConnectionStateColor[overallState].icon}`}
--- a/src/hooks/useNetworkStatus.tsx
+++ b/src/hooks/useNetworkStatus.tsx
@ -71,7 +71,7 @@ export function useNetworkStatus() {
        ? NetworkHealthState.Disconnected
        : hasIssues || hasIssues === undefined
        ? NetworkHealthState.Issue
-        : ping > (16.6*3) // we consider ping longer than 3 frames as weak
+        : ping > 16.6 * 3 // we consider ping longer than 3 frames as weak
        ? NetworkHealthState.Weak
        : NetworkHealthState.Ok
    )
--- a/src/lang/std/engineConnection.ts
+++ b/src/lang/std/engineConnection.ts
@ -332,15 +332,19 @@ class EngineConnection extends EventTarget {

    this.pingIntervalId = setInterval(() => {
      // Only start a new ping when the other is fulfilled.
-      if (this.pingPongSpan.ping) { return }
+      if (this.pingPongSpan.ping) {
+        return
+      }

      // Don't start pinging until we're connected.
-      if (this.state.type !== EngineConnectionStateType.ConnectionEstablished) { return }
+      if (this.state.type !== EngineConnectionStateType.ConnectionEstablished) {
+        return
+      }

      this.send({ type: 'ping' })
      this.pingPongSpan = {
        ping: new Date(),
-        pong: undefined
+        pong: undefined,
      }
    }, pingIntervalMs)

@ -1000,7 +1004,10 @@ class EngineConnection extends EventTarget {
              this.pingPongSpan.pong = new Date()
              this.dispatchEvent(
                new CustomEvent(EngineConnectionEvents.PingPongChanged, {
-                  detail: Math.min(999, Math.floor(this.pingPongSpan.pong - this.pingPongSpan.ping)),
+                  detail: Math.min(
+                    999,
+                    Math.floor(this.pingPongSpan.pong - this.pingPongSpan.ping)
+                  ),
                })
              )
              // Clear the initial ping so our interval ping loop can fire again
--- a/src/lib/settings/initialSettings.tsx
+++ b/src/lib/settings/initialSettings.tsx
@ -219,67 +219,83 @@ export function createSettings() {
          (typeof v === 'number' &&
            v >= 1 * MS_IN_MINUTE &&
            v <= 60 * MS_IN_MINUTE),
-        Component: ({ value: settingValueInStorage, updateValue: writeSettingValueToStorage }) => {
+        Component: ({
+          value: settingValueInStorage,
+          updateValue: writeSettingValueToStorage,
+        }) => {
          const [timeoutId, setTimeoutId] = useState(undefined)
-          const [preview, setPreview] = useState(settingValueInStorage === undefined ? settingValueInStorage : (settingValueInStorage / MS_IN_MINUTE))
-          const onChangeRange = (e: React.SyntheticEvent) => setPreview(e.currentTarget.value)
+          const [preview, setPreview] = useState(
+            settingValueInStorage === undefined
+              ? settingValueInStorage
+              : settingValueInStorage / MS_IN_MINUTE
+          )
+          const onChangeRange = (e: React.SyntheticEvent) =>
+            setPreview(e.currentTarget.value)
          const onSaveRange = (e: React.SyntheticEvent) => {
            if (preview === undefined) return
-            writeSettingValueToStorage(Number(e.currentTarget.value) * MS_IN_MINUTE)
+            writeSettingValueToStorage(
+              Number(e.currentTarget.value) * MS_IN_MINUTE
+            )
          }

          return (
-          <div className="flex item-center gap-4 px-2 m-0 py-0">
-            <div className="flex flex-col">
-              <input
-                type="checkbox"
-                checked={settingValueInStorage !== undefined}
-                onChange={(event) => {
-                    if (timeoutId) { return }
+            <div className="flex item-center gap-4 px-2 m-0 py-0">
+              <div className="flex flex-col">
+                <input
+                  type="checkbox"
+                  checked={settingValueInStorage !== undefined}
+                  onChange={(event) => {
+                    if (timeoutId) {
+                      return
+                    }
                    const isChecked = event.currentTarget.checked
                    clearTimeout(timeoutId)
-                    setTimeoutId(setTimeout(() => {
-                      const requested = !isChecked ? undefined : 5
-                      setPreview(requested)
-                      writeSettingValueToStorage(requested === undefined ? undefined : Number(requested) * MS_IN_MINUTE)
-                      setTimeoutId(undefined)
-                    }, 100))
+                    setTimeoutId(
+                      setTimeout(() => {
+                        const requested = !isChecked ? undefined : 5
+                        setPreview(requested)
+                        writeSettingValueToStorage(
+                          requested === undefined
+                            ? undefined
+                            : Number(requested) * MS_IN_MINUTE
+                        )
+                        setTimeoutId(undefined)
+                      }, 100)
+                    )
+                  }}
+                  className="block w-4 h-4"
+                />
+                <div></div>
+              </div>
+              <div className="flex flex-col grow">
+                <input
+                  type="range"
+                  onChange={onChangeRange}
+                  onMouseUp={onSaveRange}
+                  onKeyUp={onSaveRange}
+                  onPointerUp={onSaveRange}
+                  disabled={preview === undefined}
+                  value={
+                    preview !== null && preview !== undefined ? preview : 5
                  }
-                }
-                className="block w-4 h-4"
-              />
-              <div></div>
+                  min={1}
+                  max={60}
+                  step={1}
+                  className="block flex-1"
+                />
+                {preview !== undefined && preview !== null && (
+                  <div>
+                    {preview / MS_IN_MINUTE === 60
+                      ? '1 hour'
+                      : preview / MS_IN_MINUTE === 1
+                      ? '1 minute'
+                      : preview + ' minutes'}
+                  </div>
+                )}
+              </div>
            </div>
-            <div className="flex flex-col grow">
-              <input
-                type="range"
-                onChange={onChangeRange}
-                onMouseUp={onSaveRange}
-                onKeyUp={onSaveRange}
-                onPointerUp={onSaveRange}
-                disabled={preview === undefined}
-                value={
-                  preview !== null && preview !== undefined
-                    ? preview
-                    : 5
-                }
-                min={1}
-                max={60}
-                step={1}
-                className="block flex-1"
-              />
-              {preview !== undefined && preview !== null && (
-                <div>
-                  {preview / MS_IN_MINUTE === 60
-                    ? '1 hour'
-                    : preview / MS_IN_MINUTE === 1
-                    ? '1 minute'
-                    : preview + ' minutes'}
-                </div>
-              )}
-            </div>
-          </div>
-        )},
+          )
+        },
      }),
      allowOrbitInSketchMode: new Setting<boolean>({
        defaultValue: false,
--- a/src/machines/engineStreamMachine.ts
+++ b/src/machines/engineStreamMachine.ts
@ -118,9 +118,7 @@ export const engineStreamMachine = setup({
        // will not reexecute.
        // When calling cache before _any_ executions it errors, but non-fatal.
        await rustContext
-          .clearSceneAndBustCache(
-            { settings: await jsAppSettings() },
-          )
+          .clearSceneAndBustCache({ settings: await jsAppSettings() })
          .catch(console.warn)

        await kclManager.executeCode(params.zoomToFit)