修正了 2.10.X 无法继续播放音乐的问题

Steve-xmh · Jun 24, 2023 · 4b0ab07 · 4b0ab07
1 parent 9a4d290
commit 4b0ab07
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 85 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -9,8 +9,8 @@
 	],
 	"description": "类 Apple Music 歌词页面插件|近乎完美的 Apple Music 歌词体验",
 	"preview": "preview.svg",
-	"version": "2.1.3",
-	"commit": "5986c3ede2036ed66036efcb854b178eab141fcc",
+	"version": "2.1.4",
+	"commit": "9a4d290ab13d48b06b12f2c3311d1d88ccb7edd2",
 	"type": "extension",
 	"noDevReload": true,
 	"ncm3-compatible": true,
@@ -29,7 +29,9 @@
 				"id": "csp-worker",
 				"from": "<meta http-equiv=\"Content-Security-Policy\" content=\"script-src ",
 				"to": "<meta http-equiv=\"Content-Security-Policy\" content=\"script-src data: blob: "
-			},
+			}
+		},
+		">= 3.0.0": {
 			"orpheus://orpheus/pub/hybrid/vendors": {
 				"type": "replace",
 				"id": "redux-dispatch-hook",

diff --git a/manifest.json b/manifest.json
@@ -9,7 +9,7 @@
     ],
     "description": "类 Apple Music 歌词页面插件|近乎完美的 Apple Music 歌词体验",
     "preview": "preview.svg",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "commit": "!SET_BY_BUILD_SCRIPT!",
     "type": "extension",
     "noDevReload": true,
@@ -29,7 +29,9 @@
                 "id": "csp-worker",
                 "from": "<meta http-equiv=\"Content-Security-Policy\" content=\"script-src ",
                 "to": "<meta http-equiv=\"Content-Security-Policy\" content=\"script-src data: blob: "
-            },
+            }
+        },
+        ">= 3.0.0": {
             "orpheus://orpheus/pub/hybrid/vendors": {
                 "type": "replace",
                 "id": "redux-dispatch-hook",

diff --git a/src/index.tsx b/src/index.tsx
@@ -231,23 +231,6 @@ window.addEventListener(
 	},
 );
 
-if (OPEN_PAGE_DIRECTLY) {
-	window.addEventListener(
-		"load",
-		() => {
-			const btn = document.querySelector<HTMLAnchorElement>(
-				"a[data-action='max']",
-			);
-			btn?.click();
-		},
-		{
-			once: true,
-		},
-	);
-}
-
-reloadStylesheet(cssContent);
-
 export const useStyles = createStyles;
 
 export const ThemeProvider: React.FC<React.PropsWithChildren> = (props) => {

diff --git a/src/utils/channel.ts b/src/utils/channel.ts
@@ -1,5 +1,5 @@
 import { isNCMV3 } from ".";
-import { log, warn } from "./logger";
+import { warn } from "./logger";
 
 const registeredEvt = new Set<string>();
 const callbacks = new Map<string, Set<Function>>();
@@ -19,29 +19,43 @@ export const appendRegisterCall = (
 	name: string,
 	namespace: string,
 	callback: Function,
-) => appendRegisterCallRaw(`${namespace}.on${name}`, callback);
+) =>
+	isNCMV3()
+		? appendRegisterCallRaw(`${namespace}.on${name}`, callback)
+		: legacyNativeCmder.appendRegisterCall(name, namespace, callback);
 
 export const appendRegisterCallRaw = (name: string, callback: Function) => {
-	if (!registeredEvt.has(name)) {
-		registeredEvt.add(name);
-		channel.registerCall(name, (...args) => {
-			onRegisterCallEvent(name, args);
-		});
+	if (isNCMV3()) {
+		if (!registeredEvt.has(name)) {
+			registeredEvt.add(name);
+			channel.registerCall(name, (...args) => {
+				onRegisterCallEvent(name, args);
+			});
+		}
+		if (!callbacks.has(name)) callbacks.set(name, new Set());
+		callbacks.get(name)?.add(callback);
+	} else {
+		throw new TypeError("该功能在 3.0.0 之前不支持");
 	}
-	if (!callbacks.has(name)) callbacks.set(name, new Set());
-	callbacks.get(name)?.add(callback);
 };
 
 export const removeRegisterCall = (
 	name: string,
 	namespace: string,
 	callback: Function,
-) => removeRegisterCallRaw(`${namespace}.on${name}`, callback);
+) =>
+	isNCMV3()
+		? removeRegisterCallRaw(`${namespace}.on${name}`, callback)
+		: legacyNativeCmder.removeRegisterCall(name, namespace, callback);
 
 export const removeRegisterCallRaw = (name: string, callback: Function) => {
-	if (callbacks.has(name)) {
-		callbacks.get(name)?.delete(callback);
-		if (callbacks.get(name)?.size === 0) callbacks.delete(name);
+	if (isNCMV3()) {
+		if (callbacks.has(name)) {
+			callbacks.get(name)?.delete(callback);
+			if (callbacks.get(name)?.size === 0) callbacks.delete(name);
+		}
+	} else {
+		throw new TypeError("该功能在 3.0.0 之前不支持");
 	}
 };
 

diff --git a/src/utils/page-injector/v2.tsx b/src/utils/page-injector/v2.tsx
@@ -9,6 +9,16 @@ import { NCMEnvWrapper } from "../../components/netease-api-wrapper";
 import { LyricView } from "../../components/lyric-player";
 import { log } from "../logger";
 
+let hideTimer: number = 0;
+
+export let mainViewElement: HTMLDivElement = document.createElement("div");
+mainViewElement.id = "applemusic-like-lyrics-view";
+let mainViewRoot: Root;
+
+export let fmViewElement: HTMLDivElement = document.createElement("div");
+fmViewElement.id = "applemusic-like-lyrics-view-fm";
+let fmViewRoot: Root;
+
 const FMPlayerWrapper: React.FC = () => {
 	const [height, setHeight] = React.useState(0);
 
@@ -55,16 +65,6 @@ const FMPlayerWrapper: React.FC = () => {
 	);
 };
 
-let hideTimer: number = 0;
-
-export let mainViewElement: HTMLDivElement = document.createElement("div");
-mainViewElement.id = "applemusic-like-lyrics-view";
-let mainViewRoot: Root;
-
-export let fmViewElement: HTMLDivElement = document.createElement("div");
-fmViewElement.id = "applemusic-like-lyrics-view-fm";
-let fmViewRoot: Root;
-
 const camelToSnakeCase = (str: string) =>
 	str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
 
@@ -127,10 +127,7 @@ export function initInjector() {
 		}
 		setControlsVisibility(true);
 		hideTimer = setTimeout(() => {
-			// const lyricPageOpened = !!document.querySelector(".g-singlec-ct.j-fflag");
-			// if (lyricPageOpened) {
 			setControlsVisibility(false);
-			// }
 		}, (hideDuration || 5) * 1000);
 	};