@twinsearth/dsh-2xray 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.2.1 — 2026-10-29
+
+### 修复
+
+- **设置页仍不显示**：Schemastery 改为优先通过 `createRequire(import.meta.url)` / profile 锚点解析文件后动态 import，绕开宿主模块加载器对裸 specifier 的受限解析；加载结果写入 `xray_status.settingsSchema`，可远程确认表单是否具备渲染条件。
+- **侧边栏入口优先注册**：先注册 `sidebar.panellist`，再注册主面板；主面板失败不再连带隐藏入口。
+
 ## 0.2.0 — 2026-10-29
 
 ### 新增

package/index.js

@@ -90,6 +90,7 @@ export function apply(ctx, rawConfig) {
     launcher,
     route,
     control,
+    schemaLoaded: Boolean(Config),
     logger,
     dataDir,
   })

package/lib/client.js

@@ -246,19 +246,21 @@ window.__ModuleLoader__.load({
     }
 
     function apply(ctx) {
+      // Register the sidebar entry first: a failure in the main-panel
+      // registration must not hide the entry.
       ctx.effect(
         () =>
-          ctx.slots.inject('main', () =>
-            ctx.slots.register({ name: 'main', key: PANEL_ID }, XrayPage),
+          ctx.slots.inject('sidebar.panellist', () =>
+            ctx.slots.register({ name: 'sidebar.panellist', id: PANEL_ID, order: 1, label: () => '2Xray' }, GlobeIcon),
           ),
-        'dsh-2xray: main panel',
+        'dsh-2xray: sidebar entry',
       )
       ctx.effect(
         () =>
-          ctx.slots.inject('sidebar.panellist', () =>
-            ctx.slots.register({ name: 'sidebar.panellist', id: PANEL_ID, order: 1, label: () => '2Xray' }, GlobeIcon),
+          ctx.slots.inject('main', () =>
+            ctx.slots.register({ name: 'main', key: PANEL_ID }, XrayPage),
           ),
-        'dsh-2xray: sidebar entry',
+        'dsh-2xray: main panel',
       )
     }
 

package/lib/schema.js

@@ -19,11 +19,6 @@ import { join } from 'node:path'
 import { pathToFileURL } from 'node:url'
 
 async function loadSchema() {
-  try {
-    return (await import('@deepseek-ai/schemastery')).default
-  } catch {
-    // local checkout / test: borrow the profile's copy
-  }
   const home = process.env.USERPROFILE ?? process.env.HOME
   const anchors = home
     ? [
@@ -31,13 +26,29 @@ async function loadSchema() {
         join(home, '.dsh', 'profiles', 'web', 'package.json'),
       ]
     : []
-  for (const anchor of anchors) {
-    try {
+
+  // Prefer Node's own resolver: a bare `import()` inside a plugin may be served
+  // by the harness module loader, whose table does not necessarily contain a
+  // peer package such as Schemastery even though it sits in node_modules.
+  const attempts = [
+    () => {
+      const file = createRequire(import.meta.url).resolve('@deepseek-ai/schemastery')
+      return import(pathToFileURL(file).href)
+    },
+    ...anchors.map((anchor) => () => {
       const file = createRequire(anchor).resolve('@deepseek-ai/schemastery')
-      const module = await import(pathToFileURL(file).href)
-      return module.default ?? module
+      return import(pathToFileURL(file).href)
+    }),
+    () => import('@deepseek-ai/schemastery'),
+  ]
+
+  for (const attempt of attempts) {
+    try {
+      const module = await attempt()
+      const candidate = module?.default ?? module
+      if (typeof candidate === 'function' && typeof candidate.object === 'function') return candidate
     } catch {
-      // try the next profile
+      // try the next resolution route
     }
   }
   throw new Error('@deepseek-ai/schemastery is not resolvable')

package/lib/supervisor.js

@@ -86,6 +86,7 @@ export class Supervisor {
   #resolveBinaryFn
   #control
   #activeNode
+  #schemaLoaded = false
   #now
 
   constructor({
@@ -100,6 +101,7 @@ export class Supervisor {
     probes = {},
     resolveBinaryFn = resolveBinary,
     control,
+    schemaLoaded = false,
     now = () => Date.now(),
   }) {
     this.config = config
@@ -108,6 +110,7 @@ export class Supervisor {
     this.#launcher = launcher
     this.#route = route
     this.#control = control
+    this.#schemaLoaded = schemaLoaded
     this.#activeNode = config.activeNode
     this.#logger = logger
     this.dataDir = dataDir
@@ -646,6 +649,7 @@ export class Supervisor {
       detail: this.#detail ?? null,
       enabled: this.config.enabled,
       takeover: this.config.takeover,
+      settingsSchema: this.#schemaLoaded,
       nodes: this.config.nodes.map((node) => ({ id: node.id, tag: node.tag, address: node.address, port: node.port })),
       activeNode: this.#activeNode,
       control: this.#control ? { enabled: true, ...this.#control.snapshot() } : { enabled: false },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/dsh-2xray",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "private": false,
   "description": "DSH-2Xray: supervises xray-core and routes DSH process-wide HTTP(S) traffic through its local inbound, with optional multi-node gRPC control plane",
   "type": "module",

package/test/client.test.js

@@ -45,12 +45,12 @@ test('the client bundle registers a main panel and a sidebar entry', async () =>
 
   assert.deepEqual(
     registrations.map((entry) => entry.definition.name),
-    ['main', 'sidebar.panellist'],
+    ['sidebar.panellist', 'main'],
   )
-  assert.equal(registrations[0].definition.key, 'xray')
-  assert.equal(registrations[1].definition.id, 'xray')
-  assert.equal(registrations[1].definition.order, 1)
-  assert.equal(registrations[1].definition.label(), '2Xray')
-  const icon = registrations[1].component()
+  assert.equal(registrations[0].definition.id, 'xray')
+  assert.equal(registrations[0].definition.order, 1)
+  assert.equal(registrations[0].definition.label(), '2Xray')
+  const icon = registrations[0].component()
   assert.equal(icon.type, 'svg')
+  assert.equal(registrations[1].definition.key, 'xray')
 })