@linxin666/dsh-client-ui-skin-center 0.1.6 → 0.1.7

package/lib/index.js

@@ -1,6 +1,6 @@
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import z from "schemastery";
-import { lstatSync, mkdirSync, readFileSync, readdirSync, readlinkSync, renameSync, rmdirSync, statSync, symlinkSync, unlinkSync, writeFileSync } from "node:fs";
+import { lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmdirSync, statSync, symlinkSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
@@ -130,6 +130,7 @@ function listSkinDirCandidates(skinsDir) {
 	const isDir = (p) => statSync(p, { throwIfNoEntry: false })?.isDirectory() === true;
 	for (const dir of entries) {
 		const candidate = join(skinsDir, dir);
+		if (lstatSync(candidate, { throwIfNoEntry: false })?.isSymbolicLink() === true) continue;
 		if (!isDir(candidate)) continue;
 		if (statSync(join(candidate, "skin.json"), { throwIfNoEntry: false })) out.push(candidate);
 	}
@@ -159,7 +160,19 @@ function listSkinDirCandidates(skinsDir) {
 */
 function loadRegistry(skinsDir = SKINS_DIR) {
 	const out = {};
+	const seenReal = /* @__PURE__ */ new Set();
 	for (const dir of listSkinDirCandidates(skinsDir)) {
+		let real;
+		try {
+			real = realpathSync(dir);
+		} catch {
+			real = dir;
+		}
+		if (seenReal.has(real)) {
+			console.warn("[skin-center] duplicate skin dir (realpath) \"" + real + "\": keeping the real directory, ignoring " + dir);
+			continue;
+		}
+		seenReal.add(real);
 		const meta = readSkinMeta(dir);
 		if (meta === null || meta.wiring === void 0 || meta.package === void 0) continue;
 		if (out[meta.id] !== void 0) {
@@ -296,14 +309,30 @@ function writePatchAtomic(filePath, next) {
 * @param entry - the skin switch entry.
 * @param profileModulesDir - the profile's node_modules dir.
 */
+/** Canonical path a symlink resolves to, tolerant of a degraded link (a
+* self-referential link whose realpath would throw ELOOP); '' when absent. */
+function resolveLinkReal(linkPath) {
+	try {
+		return realpathSync(linkPath);
+	} catch {
+		return "";
+	}
+}
 function ensureSymlink(entry, profileModulesDir) {
 	const target = join(profileModulesDir, entry.pkg);
+	let entryReal;
+	try {
+		entryReal = realpathSync(entry.dir);
+	} catch {
+		entryReal = entry.dir;
+	}
+	if (entry.dir === target || entryReal === target) return false;
 	let stat = null;
 	try {
 		stat = lstatSync(target);
 	} catch {}
 	if (stat) if (stat.isSymbolicLink()) {
-		if (readlinkSync(target) === entry.dir) return false;
+		if (resolveLinkReal(target) === entryReal) return false;
 		if (process.platform === "win32" && stat.isDirectory()) rmdirSync(target);
 		else unlinkSync(target);
 	} else if (stat.isDirectory()) {
@@ -360,20 +389,37 @@ function symlinkFriendly(caller, fn) {
 	}
 }
 /**
-* Optional soft warning when a skin is not resolvable from the web profile
-* (the CLI prints it; surfaced as a soft hint, not a failure — the patch
-* stays authoritative).
+* Whether the skin package is actually resolvable as a plugin from the web
+* profile - the same directory contract the boot graph relies on when it
+* loads the `useSkin` insert row. Unlike the old soft warning, this is a
+* hard gate: the skin-center /apply endpoint must not report ok:true for a
+* skin the host cannot load. The npm aggregate layout shipped skin dirs
+* without a package.json + host entry, so /apply wrote the patch, reported
+* success, and the boot then died on MODULE_NOT_FOUND .../package.json.
+*
+* The check is structural and deterministic (pure fs): resolves what node
+* would - the profile-target package dir must carry a package.json whose
+* name is this skin's package, and a host entry (main, else index.js) that
+* actually exists. That is exactly the resolution that failed before.
 * @param entry - the skin switch entry.
 * @param profileModulesDir - the profile's node_modules dir.
+* @returns an error message when the skin is not resolvable, else null.
 */
-function checkInstalled(entry, profileModulesDir) {
-	let ok = false;
+function checkResolvable(entry, profileModulesDir) {
+	const target = join(profileModulesDir, entry.pkg);
+	if (!statSync(target, { throwIfNoEntry: false })?.isDirectory()) return `${entry.pkg} 未安装到 profile（profile 中无 ${target}）。请先用 dsh-skin install ${entry.id.replace(/^ui-skin-/, "")} 安装，否则宿主无法加载。`;
+	const pkgPath = join(target, "package.json");
+	if (!statSync(pkgPath, { throwIfNoEntry: false })) return `${entry.pkg} 在 profile 中缺少 package.json（${pkgPath}）——聚合包皮肤目录未带可解析包元数据。`;
+	let parsed;
 	try {
-		const target = join(profileModulesDir, entry.pkg);
-		const stat = lstatSync(target);
-		ok = stat.isSymbolicLink() || stat.isDirectory() && isSkinPackageDir(target, entry);
-	} catch {}
-	return ok ? null : `${entry.pkg} 未安装到 profile；先用 dsh-skin install ${entry.id.replace(/^ui-skin-/, "")}（或 dsh plugin --profile ${DEFAULT_PROFILE} add ${entry.dir}）安装，否则加载会失败。`;
+		parsed = JSON.parse(readFileSync(pkgPath, "utf8"));
+	} catch {
+		parsed = {};
+	}
+	if (parsed.name !== entry.pkg) return `${entry.pkg} 解析到的 package.json 名为 ${String(parsed.name)}，不是本皮肤（${pkgPath}）。`;
+	const mainPath = join(target, typeof parsed.main === "string" ? parsed.main : "index.js");
+	if (!statSync(mainPath, { throwIfNoEntry: false })) return `${entry.pkg} 缺少 host 入口 ${mainPath}（package.json main 未指到可加载文件）。`;
+	return null;
 }
 /**
 * Switch the active skin. Equivalent to `dsh-skin use <name>`:
@@ -389,19 +435,17 @@ function useSkin(name, opts = {}) {
 	const registry = opts.registry ?? loadRegistry();
 	if (!official && registry[name] === void 0) throw new Error(`unknown skin "${name}". Known: ${Object.keys(registry).join(", ")} (or "official" for the stock look)`);
 	const paths = resolvePaths(opts.home, opts.profile);
-	const notices = [];
 	if (!official) {
 		const entry = registry[name];
 		symlinkFriendly(`switching to "${name}"`, () => {
 			ensureSymlink(entry, paths.profileModulesDir);
 		});
-		const warn = checkInstalled(entry, paths.profileModulesDir);
-		if (warn !== null) notices.push(warn);
+		const problem = checkResolvable(entry, paths.profileModulesDir);
+		if (problem !== null) throw new Error(problem);
 	}
 	const next = `${stripLegacySkinRows(stripManaged(readPatch(paths.patchPath))).replace(/\s+$/, "")}\n\n${renderManaged(official ? null : name, registry)}\n`;
 	writePatchAtomic(paths.patchPath, next);
-	const core = official ? "restored the official stock look — the config watcher applies it within seconds; refresh the page to see it." : `skin switched to "${name}" — the config watcher applies it within seconds; refresh the page (or the manifest re-fetches) to see it.`;
-	return notices.length ? `${core}\n${notices.join("\n")}` : core;
+	return official ? "restored the official stock look — the config watcher applies it within seconds; refresh the page to see it." : `skin switched to "${name}" — the config watcher applies it within seconds; refresh the page (or the manifest re-fetches) to see it.`;
 }
 /**
 * Read the active skin, mirroring `dsh-skin current` (prints the name or

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-client-ui-skin-center",
   "description": "In-GUI skin center for the dsh web GUI: lists the official default plus every installed skin (qq98 / ths / xp / blue-fantasy / dragon-heir / minecraft), tries it on live inside the real GUI (executes the actual client bundle, light/dark preview), exits with a full restore, and applies in one click through the host /api/skin-center API (dsh-skin use, hot-reloaded, no restart)",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "type": "module",
   "main": "lib/index.js",
   "exports": {