fix #38

howardchung · Jan 23, 2025 · 7721946 · 7721946
1 parent 3727321
commit 7721946
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 13 deletions.
diff --git a/server/vm/docker.ts b/server/vm/docker.ts
@@ -49,7 +49,7 @@ export class Docker extends VMManager {
       `
       #!/bin/bash
       set -e
-      PORT=$(comm -23 <(seq 5000 5063 | sort) <(ss -Htan | awk '{print $4}' | cut -d':' -f2 | sort -u) | shuf | head -n 1)
+      PORT=$(comm -23 <(seq 5000 5063 | sort) <(ss -Htan | awk '{print $4}' | cut -d':' -f2 | sort -u) | head -n 1)
       INDEX=$(($PORT - 5000))
       UDP_START=$((59000+$INDEX*100))
       UDP_END=$((59099+$INDEX*100))

diff --git a/server/vm/utils.ts b/server/vm/utils.ts
@@ -52,17 +52,19 @@ function createVMManager(poolConfig: PoolConfig): VMManager {
 }
 
 export function getVMManagerConfig(): PoolConfig[] {
-  return config.VM_MANAGER_CONFIG.split(',').map((c) => {
-    const split = c.split(':');
-    return {
-      provider: split[0],
-      isLarge: split[1] === 'large',
-      region: split[2] as PoolRegion,
-      minSize: Number(split[3]),
-      limitSize: Number(split[4]),
-      hostname: split[5],
-    };
-  });
+  return config.VM_MANAGER_CONFIG.split(',')
+    .filter(Boolean)
+    .map((c) => {
+      const split = c.split(':');
+      return {
+        provider: split[0],
+        isLarge: split[1] === 'large',
+        region: split[2] as PoolRegion,
+        minSize: Number(split[3]),
+        limitSize: Number(split[4]),
+        hostname: split[5],
+      };
+    });
 }
 
 export function getBgVMManagers(): { [key: string]: VMManager } {

diff --git a/server/vmWorker.ts b/server/vmWorker.ts
@@ -106,7 +106,7 @@ app.get('/isFreePoolFull', async (req, res) => {
       return isFull;
     }),
   );
-  const isFull = fullResult.every(Boolean);
+  const isFull = freePools.length && fullResult.every(Boolean);
   res.json({ isFull });
 });
 

diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx
@@ -2368,6 +2368,25 @@ export default class App extends React.Component<AppProps, AppState> {
                             ]}
                           ></Dropdown>
                         )}
+                        {this.playingVBrowser() &&
+                          isMobile() &&
+                          this.state.controller === this.socket.id && (
+                            <Button
+                              fluid
+                              className="toolButton"
+                              icon
+                              labelPosition="left"
+                              color="blue"
+                              disabled={!this.haveLock()}
+                              onClick={() => {
+                                const dummy = document.getElementById('dummy');
+                                dummy?.focus();
+                              }}
+                            >
+                              <Icon name="keyboard" />
+                              Keyboard
+                            </Button>
+                          )}
                         {this.playingVBrowser() && (
                           <Button
                             fluid

diff --git a/src/components/VBrowser/VBrowser.tsx b/src/components/VBrowser/VBrowser.tsx
@@ -18,6 +18,7 @@ export default class VBrowser extends React.Component<{
   setQuality: (quality: string) => void;
   doPlay: () => Promise<void>;
 }> {
+  state = { dummyValue: '' };
   // private observer = new ResizeObserver(this.onResize);
   private keyboard = GuacamoleKeyboard();
   private focused = false;
@@ -374,6 +375,80 @@ export default class VBrowser extends React.Component<{
             style={{ width: '100%' }}
           />
           <audio id="iPhoneAudio" />
+          <input
+            type="text"
+            id="dummy"
+            value={this.state.dummyValue}
+            style={{
+              position: 'absolute',
+              left: 0,
+              top: 0,
+              height: 0,
+              opacity: 0,
+            }}
+            onFocus={() => {
+              this.focused = true;
+              this.setState({ dummyValue: '' });
+            }}
+            onBlur={() => {
+              this.focused = false;
+              this.setState({ dummyValue: '' });
+            }}
+            onKeyDown={(e) => {
+              if (e.keyCode !== 229) {
+                document
+                  .getElementById('leftOverlay')
+                  ?.dispatchEvent(new KeyboardEvent('keydown', { key: e.key }));
+              }
+            }}
+            onKeyUp={(e) => {
+              if (e.keyCode !== 229) {
+                document
+                  .getElementById('leftOverlay')
+                  ?.dispatchEvent(new KeyboardEvent('keyup', { key: e.key }));
+              }
+            }}
+            onChange={(e) => {
+              const oldVal = this.state.dummyValue;
+              const newVal = e.target.value;
+              if (newVal.length > oldVal.length) {
+                //keyup/keydown don't work on Chrome mobile for alphanumeric chars
+                // see https://stackoverflow.com/questions/36753548/keycode-on-android-is-always-229
+                // grab the last value out of the textfield instead and send that event
+                document
+                  .getElementById('leftOverlay')
+                  ?.dispatchEvent(
+                    new KeyboardEvent('keydown', {
+                      key: newVal.slice(-1).toLowerCase(),
+                    }),
+                  );
+                document
+                  .getElementById('leftOverlay')
+                  ?.dispatchEvent(
+                    new KeyboardEvent('keyup', {
+                      key: newVal.slice(-1).toLowerCase(),
+                    }),
+                  );
+                // this.$client.sendData('keydown', { key: newVal.slice(-1).charCodeAt(0) });
+                // this.$client.sendData('keyup', { key: newVal.slice(-1).charCodeAt(0) });
+              } else {
+                document
+                  .getElementById('leftOverlay')
+                  ?.dispatchEvent(
+                    new KeyboardEvent('keydown', { key: 'Backspace' }),
+                  );
+                document
+                  .getElementById('leftOverlay')
+                  ?.dispatchEvent(
+                    new KeyboardEvent('keyup', { key: 'Backspace' }),
+                  );
+                // Backspace is 65288?
+                // this.$client.sendData('keydown', { key: 65288 });
+                // this.$client.sendData('keyup', { key: 65288 });
+              }
+              this.setState({ dummyValue: newVal });
+            }}
+          />
           <div
             ref={this._overlay}
             id={'leftOverlay'}

diff --git a/vite.config.js b/vite.config.js
@@ -13,5 +13,6 @@ export default {
           cert: fs.readFileSync(process.env.SSL_CRT_FILE),
         }
       : null,
+    allowedHosts: true,
   },
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,6 @@ export default { @@
               cert: fs.readFileSync(process.env.SSL_CRT_FILE),
             }
           : null,
+        allowedHosts: true,
       },
     };