dsh-tool-vision 0.3.5 → 0.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client.js +29 -7
- package/package.json +3 -2
- package/vendor/dsh-settings-expose.js +75 -0
package/client.js
CHANGED
|
@@ -116,10 +116,7 @@ window.__ModuleLoader__.load({
|
|
|
116
116
|
function VisionSection(props) {
|
|
117
117
|
var t = props.t;
|
|
118
118
|
var scope = props.scope;
|
|
119
|
-
var snapshot = react.
|
|
120
|
-
function (cb) { return scope.subscribe(cb); },
|
|
121
|
-
function () { return scope.getSnapshot(); }
|
|
122
|
-
);
|
|
119
|
+
var [snapshot, setSnapshot] = react.useState(function () { return scope.getSnapshot(); });
|
|
123
120
|
var ready = snapshot.status === "ready" && snapshot.value !== void 0;
|
|
124
121
|
var [draft, setDraft] = react.useState({});
|
|
125
122
|
var [busy, setBusy] = react.useState(false);
|
|
@@ -128,13 +125,19 @@ window.__ModuleLoader__.load({
|
|
|
128
125
|
|
|
129
126
|
react.useEffect(function () {
|
|
130
127
|
scope.load();
|
|
131
|
-
|
|
128
|
+
var alive = true;
|
|
129
|
+
var sync = function () { if (alive) setSnapshot(scope.getSnapshot()); };
|
|
130
|
+
var un = typeof scope.subscribe === "function" ? scope.subscribe(sync) : null;
|
|
131
|
+
return function () { alive = false; if (un) un(); if (scope.dispose) scope.dispose(); };
|
|
132
132
|
}, [scope]);
|
|
133
|
-
//
|
|
133
|
+
// Seed the draft ONLY when the snapshot becomes ready — never on value
|
|
134
|
+
// churn. settingsScope.getSnapshot() returns a fresh object per call,
|
|
135
|
+
// so depending on snapshot.value would reset user input on every render
|
|
136
|
+
// (typing appears dead).
|
|
134
137
|
react.useEffect(function () {
|
|
135
138
|
if (ready) setDraft(function (prev) { return Object.assign({}, prev, valueToDraft(snapshot.value)); });
|
|
136
139
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
137
|
-
}, [ready
|
|
140
|
+
}, [ready]);
|
|
138
141
|
|
|
139
142
|
if (snapshot.status === "unavailable") {
|
|
140
143
|
return h("p", { className: "__tv_unavailable" }, t("unavailable"));
|
|
@@ -184,15 +187,34 @@ window.__ModuleLoader__.load({
|
|
|
184
187
|
});
|
|
185
188
|
Promise.all(writes).then(function () {
|
|
186
189
|
setBusy(false); setNotice(t("saved"));
|
|
190
|
+
if (scope.load) scope.load();
|
|
187
191
|
}).catch(function (e) {
|
|
188
192
|
setBusy(false); setError(t("error") + ": " + String(e && e.message || e));
|
|
189
193
|
});
|
|
190
194
|
}
|
|
191
195
|
|
|
196
|
+
function reseedDraft() {
|
|
197
|
+
if (typeof scope.load === "function") {
|
|
198
|
+
var p = scope.load();
|
|
199
|
+
if (p && typeof p.then === "function") {
|
|
200
|
+
p.then(function () {
|
|
201
|
+
var fresh = scope.getSnapshot();
|
|
202
|
+
if (fresh.status === "ready" && fresh.value !== void 0) setDraft(Object.assign({}, valueToDraft(fresh.value)));
|
|
203
|
+
}).catch(function () {});
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
setTimeout(function () {
|
|
208
|
+
var fresh = scope.getSnapshot();
|
|
209
|
+
if (fresh.status === "ready" && fresh.value !== void 0) setDraft(Object.assign({}, valueToDraft(fresh.value)));
|
|
210
|
+
}, 120);
|
|
211
|
+
}
|
|
212
|
+
|
|
192
213
|
function onReset() {
|
|
193
214
|
setBusy(true); setNotice(null); setError(null);
|
|
194
215
|
Promise.all(FIELDS.map(function (f) { return scope.unset(f.key); })).then(function () {
|
|
195
216
|
setBusy(false); setNotice(t("saved"));
|
|
217
|
+
reseedDraft();
|
|
196
218
|
}).catch(function (e) {
|
|
197
219
|
setBusy(false); setError(t("error") + ": " + String(e && e.message || e));
|
|
198
220
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-tool-vision",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.7",
|
|
4
4
|
"description": "DeepSeek Harness 外置视觉模型插件:inspect_image 把本地图片或 http(s) 图片 URL 发给任意 OpenAI 兼容端点,视觉模型看图的文字回答直接带回对话;附 Web UI 设置栏。",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "index.js",
|
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
"client.js",
|
|
20
20
|
"README.md",
|
|
21
21
|
"README.zh.md",
|
|
22
|
-
"LICENSE"
|
|
22
|
+
"LICENSE",
|
|
23
|
+
"vendor"
|
|
23
24
|
],
|
|
24
25
|
"homepage": "https://github.com/Scorp1o117/dsh-tool-vision",
|
|
25
26
|
"keywords": [
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* dsh-host-apiproxy exposes only namespaces listed in its hard-coded
|
|
3
|
+
* WEB_SETTINGS_NAMESPACES allowlist to the Web settings client. A namespace
|
|
4
|
+
* registered by a third-party plugin answers `settings-not-exposed` even
|
|
5
|
+
* though it is registered — upstream explicitly defers letting plugins
|
|
6
|
+
* expose their own configuration.
|
|
7
|
+
*
|
|
8
|
+
* This module idempotently patches that allowlist in the dsh installation
|
|
9
|
+
* actually loaded by the host process, so the plugin's settings section
|
|
10
|
+
* becomes visible in the Web UI without manual edits. A dsh update
|
|
11
|
+
* overwrites the file; the next plugin start re-patches it.
|
|
12
|
+
*/
|
|
13
|
+
import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
14
|
+
import { createRequire } from "node:module";
|
|
15
|
+
import { dirname, join, sep } from "node:path";
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Ensure `nsName` is present in dsh-host-apiproxy's WEB_SETTINGS_NAMESPACES.
|
|
19
|
+
* No-op when already exposed or when the file cannot be located/patched.
|
|
20
|
+
* @param {import("cordis").Context} ctx
|
|
21
|
+
* @param {string} nsName - settings namespace short name (e.g. "tdai-memory").
|
|
22
|
+
* @param {{info?: Function, warn?: Function}} logger - dsh logger.
|
|
23
|
+
*/
|
|
24
|
+
export function ensureSettingsNamespaceExposed(ctx, nsName, logger) {
|
|
25
|
+
void ctx;
|
|
26
|
+
try {
|
|
27
|
+
const target = findApiproxyIndex();
|
|
28
|
+
if (!target) {
|
|
29
|
+
logger?.warn?.(`[settings-expose] could not locate dsh-host-apiproxy; add "${nsName}" to WEB_SETTINGS_NAMESPACES in dsh-host-apiproxy/lib/index.js to get a Web settings section`);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
let src;
|
|
33
|
+
try {
|
|
34
|
+
src = readFileSync(target, "utf8");
|
|
35
|
+
} catch (error) {
|
|
36
|
+
logger?.warn?.(`[settings-expose] cannot read ${target}: ${String(error)}`);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
const body = src.match(/const WEB_SETTINGS_NAMESPACES = \[([\s\S]*?)\];/)?.[1] ?? "";
|
|
40
|
+
if (body.includes(`"${nsName}"`)) return; // already exposed (manual or previous patch)
|
|
41
|
+
const patched = src.replace(/(const WEB_SETTINGS_NAMESPACES = \[[\s\S]*?)(\n\s*\];)/, (_, pre, post) => {
|
|
42
|
+
const trailingComma = /,\s*$/.test(pre) ? "" : ",";
|
|
43
|
+
const sep2 = pre.trimEnd().endsWith("[") ? "" : trailingComma;
|
|
44
|
+
return `${pre}${sep2}\n\t"${nsName}"${post}`;
|
|
45
|
+
});
|
|
46
|
+
if (patched === src) {
|
|
47
|
+
logger?.warn?.(`[settings-expose] allowlist pattern not found in ${target}; add "${nsName}" to WEB_SETTINGS_NAMESPACES manually`);
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
writeFileSync(target, patched, "utf8");
|
|
51
|
+
logger?.info?.(`[settings-expose] added "${nsName}" to WEB_SETTINGS_NAMESPACES (${target}) — restart dsh web for the settings section to appear`);
|
|
52
|
+
} catch (error) {
|
|
53
|
+
logger?.warn?.(`[settings-expose] failed: ${String(error)}`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function findApiproxyIndex() {
|
|
58
|
+
// 1) The host process has already loaded dsh-host-apiproxy: read the real
|
|
59
|
+
// module path from the CommonJS module cache (any install layout).
|
|
60
|
+
try {
|
|
61
|
+
const Module = createRequire(import.meta.url)("module");
|
|
62
|
+
const cache = Module._cache ?? {};
|
|
63
|
+
for (const key of Object.keys(cache)) {
|
|
64
|
+
if (key.includes(`${sep}dsh-host-apiproxy${sep}`) && key.endsWith(`${sep}index.js`)) return key;
|
|
65
|
+
}
|
|
66
|
+
} catch { /* fall through */ }
|
|
67
|
+
// 2) Fallback: sibling of @deepseek-ai/dsh-settings (dsh's nested layout).
|
|
68
|
+
try {
|
|
69
|
+
const require = createRequire(import.meta.url);
|
|
70
|
+
const settingsEntry = require.resolve("@deepseek-ai/dsh-settings");
|
|
71
|
+
const candidate = join(dirname(dirname(dirname(settingsEntry))), "dsh-host-apiproxy", "lib", "index.js");
|
|
72
|
+
if (existsSync(candidate)) return candidate;
|
|
73
|
+
} catch { /* fall through */ }
|
|
74
|
+
return "";
|
|
75
|
+
}
|