hansjone/netxops
1
0
Fork 0
mirror of https://github.com/hansjone/netxops.git synced 2026-10-15 08:30:44 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Netx Ops settings card visibility and restore package.json.

Browse source 
Register settings.section eagerly (like im-ops) with multi-namespace configForms candidates so Desktop Settings shows Netx Ops; package.json had been overwritten to @deepseek-ai/dsh-desktop which broke local-path installs.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-10-09 18:03:09 +08:00
parent 5dcce3c749
commit 3861006c13
3 changed files with 199 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

123
lib/client.js
View file

@ -2631,11 +2631,30 @@ var inject = [
"slots",
"locale"
];
function entryIdOf(ctx) {
function namespaceCandidates(ctx) {
const fiber = ctx.fiber?.entry;
const raw = fiber?.options?.id ?? fiber?.id ?? ctx.name ?? NETXOPS_NS;
const id = String(raw).replace(/^:/, "").trim();
return id.length > 0 ? id : NETXOPS_NS;
const raw = [
fiber?.options?.id,
fiber?.id,
fiber?.options?.name,
ctx.name,
NETXOPS_NS,
"dsh-netxops"
];
const out = [];
for (const item of raw) {
if (typeof item !== "string" || !item.trim())
continue;
const id = item.replace(/^:/, "").trim();
if (!id || out.includes(id))
continue;
if (id === "dsh-netxops" && !out.includes(NETXOPS_NS))
out.push(NETXOPS_NS);
out.push(id);
}
if (!out.includes(NETXOPS_NS))
out.push(NETXOPS_NS);
return out;
}
function apply(ctx) {
ctx.effect(() => {
@ -2653,6 +2672,8 @@ function apply(ctx) {
const t = ctx.locale.bind(LOCALE_NS);
let card;
let wiredExtras = false;
let sectionRegistered = false;
let pluginsItemId;
const ensureCard = (scope) => {
if (card)
return card;
@ -2664,8 +2685,10 @@ function apply(ctx) {
return card;
};
const registerSection = (owner) => {
if (sectionRegistered)
return () => {};
try {
return ctx.slots.inject("settings.section", () => ctx.slots.register({
const off = ctx.slots.inject("settings.section", () => ctx.slots.register({
name: "settings.section",
id: NETXOPS_NS,
order: 24,
@ -2673,14 +2696,21 @@ function apply(ctx) {
locale: LOCALE_NS,
inject: () => owner.inject()
}, NetxopsCard));
sectionRegistered = true;
return () => {
sectionRegistered = false;
off();
};
} catch (error) {
ctx.logger?.warn?.("netxops: settings.section unavailable: %s", error);
return () => {};
}
};
const registerPluginsItem = (owner, id) => {
if (pluginsItemId === id)
return () => {};
try {
return ctx.slots.inject("plugins.item", () => ctx.slots.register({
const off = ctx.slots.inject("plugins.item", () => ctx.slots.register({
name: "plugins.item",
id,
order: 24,
@ -2688,47 +2718,72 @@ function apply(ctx) {
locale: LOCALE_NS,
inject: () => owner.inject()
}, NetxopsCard));
pluginsItemId = id;
return () => {
if (pluginsItemId === id)
pluginsItemId = undefined;
off();
};
} catch (error) {
ctx.logger?.warn?.("netxops: plugins.item unavailable: %s", error);
return () => {};
}
};
const mountUi = (owner, ns, opts) => {
const offs = [];
if (opts.section)
offs.push(registerSection(owner));
if (opts.pluginsItem)
offs.push(registerPluginsItem(owner, ns));
return () => {
for (const off of offs)
off();
};
};
const tryGetForm = (forms, candidates) => {
if (typeof forms.get !== "function")
return;
for (const ns of candidates) {
try {
const scope = forms.get(ns);
if (scope && typeof scope.getSnapshot === "function")
return { ns, scope };
} catch {}
}
return;
};
ctx.inject(["configForms"], (formsCtx) => {
const forms = formsCtx.configForms;
if (!forms) {
formsCtx.logger?.warn?.("netxops: configForms inject fired but service missing");
return;
}
const entryId = entryIdOf(formsCtx);
const ns = entryId || NETXOPS_NS;
if (typeof forms.whileServed === "function" && typeof forms.get === "function") {
formsCtx.logger?.info?.("netxops: settings card via configForms.whileServed (%s)", ns);
formsCtx.effect(() => forms.whileServed([ns], (served) => {
if (!served.has(ns))
const candidates = namespaceCandidates(formsCtx);
formsCtx.logger?.info?.("netxops: configForms candidates=%s", candidates.join(","));
if (typeof forms.whileServed === "function") {
formsCtx.effect(() => forms.whileServed(candidates, (served) => {
const ns = candidates.find((id) => served.has(id));
if (!ns) {
formsCtx.logger?.warn?.("netxops: whileServed fired but none of %s are served (have=%s)", candidates.join(","), [...served].join(",") || "(empty)");
return () => {};
const owner = ensureCard(forms.get(ns));
const offItem = registerPluginsItem(owner, ns);
const offSection = registerSection(owner);
return () => {
offItem();
offSection();
};
}), "netxops: plugins.item whileServed");
return;
}
const hit = tryGetForm(forms, [ns, ...candidates]);
if (!hit) {
formsCtx.logger?.warn?.("netxops: served %s but configForms.get failed", ns);
return () => {};
}
formsCtx.logger?.info?.("netxops: settings via whileServed (%s)", hit.ns);
const owner = ensureCard(hit.scope);
return mountUi(owner, hit.ns, { section: true, pluginsItem: true });
}), "netxops: configForms whileServed");
}
if (typeof forms.get === "function") {
formsCtx.logger?.info?.("netxops: settings card via configForms.get (%s)", ns);
const owner = ensureCard(forms.get(ns));
formsCtx.effect(() => {
const offItem = registerPluginsItem(owner, ns);
const offSection = registerSection(owner);
return () => {
offItem();
offSection();
};
}, "netxops: configForms slots");
} else {
formsCtx.logger?.warn?.("netxops: configForms present but .get missing");
const immediate = tryGetForm(forms, candidates);
if (immediate) {
formsCtx.logger?.info?.("netxops: settings eager mount (%s)", immediate.ns);
const owner = ensureCard(immediate.scope);
formsCtx.effect(() => mountUi(owner, immediate.ns, { section: true, pluginsItem: true }), "netxops: configForms eager slots");
} else if (typeof forms.whileServed !== "function") {
formsCtx.logger?.warn?.("netxops: configForms present but no get/whileServed match for %s", candidates.join(","));
}
});
ctx.inject(["settingsScope"], (scopeCtx) => {