dsh-plugin-container 0.5.0 → 0.5.1

package/README.md

@@ -90,7 +90,7 @@ npm publish --access public --provenance
 ```bash
 npm install
 npm run build     # src/client -> lib/client.js
-npm test          # 53 tests
+npm test          # 55 tests
 npm pack          # pre-release check
 ```
 

package/README.zh-CN.md

@@ -90,7 +90,7 @@ npm publish --access public --provenance
 ```bash
 npm install
 npm run build     # src/client -> lib/client.js
-npm test          # 53 tests
+npm test          # 55 tests
 npm pack          # 发布前检查
 ```
 

package/lib/client.js

@@ -1284,7 +1284,7 @@ function BuildImageDialog({ open, t, api, provider, defaultDir = "", pickDirecto
         if (id !== requestId.current) return;
         setInfo(value);
         setFile((current) => value.dockerfiles.includes(current) ? current : value.dockerfiles[0] ?? "");
-        if (value.suggestedTag !== "") setTag((current) => tagEdited || current !== "" ? current : value.suggestedTag);
+        if (value.suggestedTag !== "" && !tagEdited) setTag(value.suggestedTag);
       } catch {
         if (id === requestId.current) setInfo(null);
       }
@@ -1293,9 +1293,9 @@ function BuildImageDialog({ open, t, api, provider, defaultDir = "", pickDirecto
   }, [api, dir, open, tagEdited]);
   const args = (0, import_react4.useMemo)(() => buildArgs.split(/\n/u).map((line) => line.trim()).filter(Boolean), [buildArgs]);
   const tagValid = IMAGE_REF.test(tag.trim());
-  const dirOk = info !== null && info.isDirectory && info.dockerfiles.length > 0;
   const trimmedDir = dir.trim();
   const dirChecked = info !== null && info.path === trimmedDir;
+  const dirOk = dirChecked && info.isDirectory && info.dockerfiles.length > 0;
   let dirLine = null;
   if (trimmedDir !== "" && !dirChecked) dirLine = { tone: "hint", text: t("imgBuildDirChecking") };
   else if (dirChecked && !info.exists) dirLine = { tone: "err", text: t("imgBuildDirMissing") };
@@ -1356,7 +1356,7 @@ ${parts.join(" ")}`;
         /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Button, { size: "sm", variant: "primary", onClick: submit, disabled: busy || !dirOk || !tagValid, children: busy ? t("imgBuilding") : t("imgBuildStart") })
       ] }),
       children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("form", { className: "dsh-docker-run-form", onSubmit: submit, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("label", { className: "dsh-docker-field", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "dsh-docker-field", children: [
           /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { children: t("imgBuildDir") }),
           /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "dsh-docker-image-picker", children: [
             /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-container",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "private": false,
   "description": "DSH sidebar container panel for macOS Docker runtimes and Apple container",
   "type": "module",

package/src/client/build-image.jsx

@@ -61,7 +61,8 @@ export default function BuildImageDialog({ open, t, api, provider, defaultDir =
         if (id !== requestId.current) return
         setInfo(value)
         setFile((current) => (value.dockerfiles.includes(current) ? current : (value.dockerfiles[0] ?? '')))
-        if (value.suggestedTag !== '') setTag((current) => (tagEdited || current !== '' ? current : value.suggestedTag))
+        // Follow the folder until the user types their own tag.
+        if (value.suggestedTag !== '' && !tagEdited) setTag(value.suggestedTag)
       } catch {
         if (id === requestId.current) setInfo(null)
       }
@@ -71,9 +72,9 @@ export default function BuildImageDialog({ open, t, api, provider, defaultDir =
 
   const args = useMemo(() => buildArgs.split(/\n/u).map((line) => line.trim()).filter(Boolean), [buildArgs])
   const tagValid = IMAGE_REF.test(tag.trim())
-  const dirOk = info !== null && info.isDirectory && info.dockerfiles.length > 0
   const trimmedDir = dir.trim()
   const dirChecked = info !== null && info.path === trimmedDir
+  const dirOk = dirChecked && info.isDirectory && info.dockerfiles.length > 0
 
   let dirLine = null
   if (trimmedDir !== '' && !dirChecked) dirLine = { tone: 'hint', text: t('imgBuildDirChecking') }
@@ -141,7 +142,8 @@ export default function BuildImageDialog({ open, t, api, provider, defaultDir =
       }
     >
       <form className="dsh-docker-run-form" onSubmit={submit}>
-        <label className="dsh-docker-field">
+        {/* A div, not a label: clicking the caption should not open the folder picker. */}
+        <div className="dsh-docker-field">
           <span>{t('imgBuildDir')}</span>
           <div className="dsh-docker-image-picker">
             <input
@@ -160,7 +162,7 @@ export default function BuildImageDialog({ open, t, api, provider, defaultDir =
           {dirLine === null || dirLine.tone === 'hint'
             ? <span className="dsh-docker-hint">{dirLine?.text ?? t('imgBuildDirHint')}</span>
             : <span className={dirLine.tone === 'ok' ? 'dsh-docker-line-ok' : 'dsh-docker-line-err'}>{dirLine.text}</span>}
-        </label>
+        </div>
         {dirOk && info.dockerfiles.length > 1 && (
           <label className="dsh-docker-field">
             <span>{t('imgBuildFile')}</span>

package/src/host/apple.js

@@ -397,7 +397,7 @@ export class AppleProvider {
     if (kind === 'image') {
       if (action === 'pull') {
         const platform = platformOf(payload.platform)
-        return this.run({ argv: ['image', 'pull', ...(platform === undefined ? [] : ['--platform', platform]), safeImageRef(payload.id ?? payload.reference)], cwd: payload.cwd, title: payload.title ?? 'container image pull' }, signal)
+        return this.run({ argv: ['image', 'pull', ...(platform === undefined ? [] : ['--platform', platform]), safeImageRef(payload.id ?? payload.reference)], cwd: payload.cwd, timeoutMs: LONG_JOB_MS, title: payload.title ?? 'container image pull' }, signal)
       }
       if (action === 'build') {
         const spec = buildSpec(payload)

package/src/host/images.js

@@ -77,8 +77,10 @@ function statOrNull(value) {
 export function buildSpec(payload) {
   const tag = imageRef(payload.tag, 'tag')
   assertLowercaseRepository(tag)
-  const contextDir = requireString(payload.contextDir, 'contextDir', { max: 4096 })
-  if (!isAbsolute(contextDir) || contextDir.includes('\0')) throw new CommandError('构建目录必须是绝对路径')
+  const rawDir = requireString(payload.contextDir, 'contextDir', { max: 4096 })
+  if (!isAbsolute(rawDir) || rawDir.includes('\0')) throw new CommandError('构建目录必须是绝对路径')
+  // Normalise so `/a/b/` and `/a/b/./` compare equal to the resolved Dockerfile path below.
+  const contextDir = resolve(rawDir)
   const dirStat = statOrNull(contextDir)
   if (dirStat === null) throw new CommandError(`构建目录不存在: ${contextDir}`)
   if (!dirStat.isDirectory()) throw new CommandError(`不是目录: ${contextDir}`)
@@ -87,7 +89,8 @@ export function buildSpec(payload) {
   if (payload.file !== undefined && payload.file !== null && String(payload.file).trim() !== '') {
     const name = requireString(String(payload.file).trim(), 'file', { max: 1024 })
     const resolved = resolve(contextDir, name)
-    if (resolved !== contextDir && !resolved.startsWith(`${contextDir}${sep}`)) throw new CommandError('Dockerfile 必须位于构建目录内')
+    const prefix = contextDir.endsWith(sep) ? contextDir : `${contextDir}${sep}`
+    if (resolved !== contextDir && !resolved.startsWith(prefix)) throw new CommandError('Dockerfile 必须位于构建目录内')
     const fileStat = statOrNull(resolved)
     if (fileStat === null || !fileStat.isFile()) throw new CommandError(`找不到 Dockerfile: ${name}`)
     file = resolved

package/src/host/service.js

@@ -7,7 +7,7 @@
  * records live in this plugin's memory and disappear on unload.
  */
 import { homedir } from 'node:os'
-import { statSync } from 'node:fs'
+import { readFileSync, statSync } from 'node:fs'
 
 import {
   CommandError,
@@ -42,6 +42,15 @@ import {
 import { createRuntimeResolver } from './runtime.js'
 import { codeOf, isRecord, messageOf, optionalInteger, requireString } from './util.js'
 
+/** Reported by `ping`; read once so it always matches the published package. */
+const PLUGIN_VERSION = (() => {
+  try {
+    return String(JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8')).version)
+  } catch {
+    return 'unknown'
+  }
+})()
+
 const STATUS_CACHE_MS = 1500
 const CONTEXT_CACHE_MS = 10_000
 const VALUE_CACHE_MS = 1500
@@ -190,7 +199,7 @@ export class DockerService {
           return ok({
             ok: true,
             plugin: 'dsh-plugin-container',
-            version: '0.2.0',
+            version: PLUGIN_VERSION,
             dockerPath: this.cli.dockerPath ?? null,
             containerPath: this.apple.cli.containerPath ?? null,
           })
@@ -776,6 +785,13 @@ export class DockerService {
       if (action === 'pull') {
         const platform = platformOf(payload.platform)
         argv = ['pull', ...(platform === undefined ? [] : ['--platform', platform]), id]
+        return this.run({
+          argv,
+          context: payload.context,
+          cwd: payload.cwd,
+          timeoutMs: LONG_JOB_MS,
+          title: payload.title ?? `拉取镜像 ${id}`,
+        }, signal)
       }
       else if (action === 'delete') argv = ['rmi', id]
     } else if (kind === 'volume' && action === 'delete') {