dsh-wsl-tool 1.10.3 → 1.10.4
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/lib/client.js +6 -1
- package/lib/config.js +26 -6
- package/package.json +1 -1
package/lib/client.js
CHANGED
|
@@ -191,7 +191,12 @@ window.__ModuleLoader__.load({
|
|
|
191
191
|
if (cursor === null || typeof cursor !== 'object') return undefined
|
|
192
192
|
cursor = cursor[step]
|
|
193
193
|
}
|
|
194
|
-
|
|
194
|
+
// A `.volatile()` field can arrive as a cosmokit cell rather than its value;
|
|
195
|
+
// the platform's own form model hands out plain values, but unwrapping here
|
|
196
|
+
// costs nothing and keeps a switch from rendering a cell object as "on".
|
|
197
|
+
return cursor !== null && typeof cursor === 'object' && typeof cursor.get === 'function'
|
|
198
|
+
? cursor.get()
|
|
199
|
+
: cursor
|
|
195
200
|
}
|
|
196
201
|
|
|
197
202
|
/**
|
package/lib/config.js
CHANGED
|
@@ -92,7 +92,25 @@ function envInt(env, name, fallback, min, max) {
|
|
|
92
92
|
|
|
93
93
|
/** A configured boolean, or the fallback when the layer did not set one. */
|
|
94
94
|
function setting(value, fallback) {
|
|
95
|
-
|
|
95
|
+
const raw = unbox(value)
|
|
96
|
+
return typeof raw === 'boolean' ? raw : fallback
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Read one configuration value, unwrapping a volatile cell.
|
|
101
|
+
*
|
|
102
|
+
* A `.volatile()` schema field does NOT resolve to its value: schemastery wraps it
|
|
103
|
+
* with cosmokit's `createVolatile(default)`, which is why the shipped plugins read
|
|
104
|
+
* theirs as `config.timeoutMs.get()` (`dsh-bash-local`). The cell is written in
|
|
105
|
+
* place when the user edits the field, and that in-place write is exactly what makes
|
|
106
|
+
* an edit apply without remounting the plugin — so reading through `.get()` is both
|
|
107
|
+
* required for correctness and how live updates arrive. A plain value (an older
|
|
108
|
+
* host, or a hand-built settings object in a test) passes through untouched.
|
|
109
|
+
*/
|
|
110
|
+
function unbox(value) {
|
|
111
|
+
return value !== null && typeof value === 'object' && typeof value.get === 'function'
|
|
112
|
+
? value.get()
|
|
113
|
+
: value
|
|
96
114
|
}
|
|
97
115
|
|
|
98
116
|
/**
|
|
@@ -101,7 +119,8 @@ function setting(value, fallback) {
|
|
|
101
119
|
* @returns a distribution name to pin, or null to use the system default.
|
|
102
120
|
*/
|
|
103
121
|
function resolveDistro(env, configured) {
|
|
104
|
-
|
|
122
|
+
const distro = unbox(configured)
|
|
123
|
+
if (typeof distro === 'string' && distro.trim() !== '') return distro.trim()
|
|
105
124
|
const raw = env.DSH_WSL_DISTRO
|
|
106
125
|
return typeof raw === 'string' && raw.trim() !== '' ? raw.trim() : null
|
|
107
126
|
}
|
|
@@ -121,7 +140,7 @@ function resolveWorkdir(env, settings) {
|
|
|
121
140
|
// Only the ON position is authoritative: off means "whatever the layers below
|
|
122
141
|
// say", so `DSH_WSL_WORKDIR=session` keeps working for a user who never opened
|
|
123
142
|
// the panel, and a fresh install still starts in `~`.
|
|
124
|
-
if (settings.startInSessionWorkspace === true) return null
|
|
143
|
+
if (unbox(settings.startInSessionWorkspace) === true) return null
|
|
125
144
|
const raw = env.DSH_WSL_WORKDIR
|
|
126
145
|
if (typeof raw !== 'string' || raw.trim() === '') return DEFAULTS.workdir
|
|
127
146
|
const value = raw.trim()
|
|
@@ -148,11 +167,12 @@ export function resolveConfig(env = process.env, settings = {}) {
|
|
|
148
167
|
const maxCommandTimeoutMs = envInt(
|
|
149
168
|
env, 'DSH_WSL_MAX_TIMEOUT_MS', DEFAULTS.maxCommandTimeoutMs, TIMEOUT_MS_MIN, DEFAULTS.maxTimerDelayMs,
|
|
150
169
|
)
|
|
151
|
-
const tools = settings.tools ?? {}
|
|
170
|
+
const tools = unbox(settings.tools) ?? {}
|
|
152
171
|
// 0 means "not configured", so the environment and the built-in default still
|
|
153
172
|
// decide; a positive value is the user's own deadline.
|
|
154
|
-
const
|
|
155
|
-
|
|
173
|
+
const configuredTimeout = unbox(settings.timeoutMs)
|
|
174
|
+
const configuredTimeoutMs = Number.isInteger(configuredTimeout) && configuredTimeout > 0
|
|
175
|
+
? configuredTimeout
|
|
156
176
|
: undefined
|
|
157
177
|
return {
|
|
158
178
|
...DEFAULTS,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-wsl-tool",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.4",
|
|
4
4
|
"description": "Run Linux commands from Windows through WSL, essentially matching a native Linux DSH for command execution: background jobs, stdin, path translation, a destructive-command guard and a WSL capability report. A left-sidebar panel switches each capability on or off, each with a one-line explanation, and an opt-in patch gives the desktop app's sidebar terminal a WSL shell. WSL calls run below the DSH sandbox, and a project on a Windows drive keeps Windows filesystem semantics.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "index.js",
|