:fix: bug: charlotte xiaomawang error

FurryR · May 17, 2024 · 91bd257 · 91bd257
1 parent ba5f29f
commit 91bd257
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 47 deletions.
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -3,7 +3,7 @@
 # [👾 Hyren](https://furryr.github.io/hyren/hyren.release.user.js)
 
 > 在任何地方使用 Turbowarp 特性。
-> 
+>
 > (温馨提示) 点击标题即可安装!
 
 [![Visitors](https://hits.dwyl.com/FurryR/hyren.svg?style=flat-square)](http://github.com/FurryR/hyren)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 # [👾 Hyren](https://furryr.github.io/hyren/hyren.release.user.js)
 
 > A tampermonkey script to use Turbowarp features anywhere.
-> 
+>
 > (Hint) Click title to install!
 
 [![Visitors](https://hits.dwyl.com/FurryR/hyren.svg?style=flat-square)](http://github.com/FurryR/hyren)

diff --git a/src/compiler/renderer.ts b/src/compiler/renderer.ts
@@ -328,46 +328,45 @@ export default function patchRenderer(vm: VM) {
   }
   if (vm.runtime.renderer) {
     onReady()
-  } else {
-    const _attachRenderer = vm.runtime.constructor.prototype.attachRenderer
-    vm.runtime.constructor.prototype.attachRenderer = function (
-      renderer: RenderWebGL
-    ) {
-      const originalRenderer = this.renderer
-      // vm.runtime.constructor.prototype.attachRenderer = _attachRenderer
-      _attachRenderer.call(this, renderer)
-      // Xiaomawang attaches renderer twice.
-      if (originalRenderer !== renderer && !(renderer instanceof RenderWebGL)) {
-        if ((renderer as any).clearAllSkins) {
-          // Patch Xiaomawang private APIs
-          const { clearAllSkins } = renderer as any
-          onReady()
-          // clearAllSkins() is used to dispose all skins. This API exists because Xiaomawang's developers have skill issue.
-          renderer.constructor.prototype.clearAllSkins = clearAllSkins
-          // extractDrawable() is used to extract the drawable (for dragging or something else). It slows down the renderer for a lot, so replace it with a no-op function would be fine.
-          renderer.constructor.prototype.extractDrawable = function () {
-            return {
-              data: '',
-              x: 0,
-              y: 0,
-              width: 0,
-              height: 0,
-              scratchOffset: [0, 0]
-            }
+  }
+  const _attachRenderer = vm.runtime.constructor.prototype.attachRenderer
+  vm.runtime.constructor.prototype.attachRenderer = function (
+    renderer: RenderWebGL
+  ) {
+    const originalRenderer = this.renderer
+    // vm.runtime.constructor.prototype.attachRenderer = _attachRenderer
+    _attachRenderer.call(this, renderer)
+    // Xiaomawang attaches renderer twice.
+    if (originalRenderer !== renderer && !(renderer instanceof RenderWebGL)) {
+      if ((renderer as any).clearAllSkins) {
+        // Patch Xiaomawang private APIs
+        const { clearAllSkins } = renderer as any
+        onReady()
+        // clearAllSkins() is used to dispose all skins. This API exists because Xiaomawang's developers have skill issue.
+        renderer.constructor.prototype.clearAllSkins = clearAllSkins
+        // extractDrawable() is used to extract the drawable (for dragging or something else). It slows down the renderer for a lot, so replace it with a no-op function would be fine.
+        renderer.constructor.prototype.extractDrawable = function () {
+          return {
+            data: '',
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            scratchOffset: [0, 0]
           }
-          new ResizeObserver(() => {
-            renderer.resize(
-              renderer.canvas.clientWidth,
-              renderer.canvas.clientHeight
-            )
-            requestAnimationFrame(() => {
-              ;(renderer as any).dirty = true
-              renderer.draw()
-            })
-          }).observe(renderer.canvas)
-        } else {
-          onReady()
         }
+        new ResizeObserver(() => {
+          renderer.resize(
+            renderer.canvas.clientWidth,
+            renderer.canvas.clientHeight
+          )
+          requestAnimationFrame(() => {
+            ;(renderer as any).dirty = true
+            renderer.draw()
+          })
+        }).observe(renderer.canvas)
+      } else {
+        onReady()
       }
     }
   }

diff --git a/src/compiler/runtime.ts b/src/compiler/runtime.ts
@@ -383,13 +383,13 @@ export default function patchRuntime(vm: VM) {
     ) {
       // ClipCC has a bug about vm.installTargets -- it didn't return a Promise.
       // TODO: remove this when clipcc new version is released.
-      return Promise.resolve(_installTargets
-        .call(this, targets, extensions, wholeProject))
-        .then(() => {
-          if (wholeProject) {
-            this.runtime.parseProjectOptions()
-          }
-        })
+      return Promise.resolve(
+        _installTargets.call(this, targets, extensions, wholeProject)
+      ).then(() => {
+        if (wholeProject) {
+          this.runtime.parseProjectOptions()
+        }
+      })
     }
     vm.runtime.constructor.prototype.findProjectOptionsComment = function () {
       const target = this.getTargetForStage()

diff --git a/src/injector.ts b/src/injector.ts
@@ -6,6 +6,9 @@ import { MainLog } from './log'
 import patchRuntime from './compiler/runtime'
 
 export function loadHyren(vm: VM) {
+  if (Reflect.has(window, 'Hyren')) {
+    return
+  }
   vm.on('LOCALE_CHANGED' as any, () => {
     locale.value = (vm as any).getLocale()
   })