dsh-office-kit 0.3.1 → 0.3.2

package/dist/index.js

@@ -280,18 +280,13 @@ function statusOf(python) {
 		remedy: runtimeRemedy()
 	};
 }
-/** Inspect every candidate; return the first interpreter that proves it has all dependencies. */
-async function inspectRuntime(configFile = officePaths().configFile) {
-	let compatible;
-	let last;
-	for (const candidate of [...candidates(configFile), ...await launcherInterpreters()]) for (const expanded of await expandLauncher(candidate)) {
-		if (expanded !== candidate && !isFile(expanded)) continue;
-		const inspection = await inspectPython(expanded);
-		if (inspection.compatible && inspection.missing.length === 0) return statusOf(inspection);
-		if (inspection.compatible && compatible == null) compatible = inspection;
-		last = inspection;
-	}
+/** Pick the best interpreter: all dependencies first, then compatible-only, else none. */
+function selectRuntime(inspections) {
+	const ready = inspections.find((inspection) => inspection.compatible && inspection.missing.length === 0);
+	if (ready != null) return statusOf(ready);
+	const compatible = inspections.find((inspection) => inspection.compatible);
 	if (compatible != null) return statusOf(compatible);
+	const last = inspections[inspections.length - 1];
 	return {
 		state: "no-interpreter",
 		packages: [],
@@ -300,6 +295,17 @@ async function inspectRuntime(configFile = officePaths().configFile) {
 		...last?.error == null ? {} : { error: last.error }
 	};
 }
+/** Inspect candidates in priority order; the first fully-provisioned interpreter wins. */
+async function inspectRuntime(configFile = officePaths().configFile) {
+	const seen = [];
+	for (const candidate of [...candidates(configFile), ...await launcherInterpreters()]) for (const expanded of await expandLauncher(candidate)) {
+		if (expanded !== candidate && !isFile(expanded)) continue;
+		const inspection = await inspectPython(expanded);
+		seen.push(inspection);
+		if (inspection.compatible && inspection.missing.length === 0) return selectRuntime(seen);
+	}
+	return selectRuntime(seen);
+}
 /** Run postinstall.mjs as a child process; resolve with an error summary or undefined. */
 function runPostinstall() {
 	return new Promise((resolve) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-office-kit",
   "type": "module",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Office documents, PDF, presentations, and spreadsheets for DeepSeek Harness",
   "author": "Hairy",
   "license": "MIT",

package/postinstall.mjs

@@ -16,7 +16,7 @@
  */
 
 import { spawnSync } from 'node:child_process'
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
 import { homedir, tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import process from 'node:process'
@@ -25,15 +25,15 @@ import { fileURLToPath } from 'node:url'
 const PACKAGE_ROOT = dirname(fileURLToPath(import.meta.url))
 const IS_WINDOWS = process.platform === 'win32'
 const PYTHON_VERSION = '3.12.10'
-const RUNTIME_DIR = join(homedir(), '.dsh', 'office', 'runtime')
-const VENV_DIR = join(RUNTIME_DIR, 'venv')
+export const RUNTIME_DIR = join(homedir(), '.dsh', 'office', 'runtime')
+export const VENV_DIR = join(RUNTIME_DIR, 'venv')
 const VENV_PYTHON = join(VENV_DIR, IS_WINDOWS ? 'Scripts/python.exe' : 'bin/python')
 const LEGACY_DATA_DIR = IS_WINDOWS
   ? join(process.env.LOCALAPPDATA || join(homedir(), 'AppData', 'Local'), 'dsh-office-kit')
   : process.platform === 'darwin'
     ? join(homedir(), 'Library', 'Application Support', 'dsh-office-kit')
     : join(process.env.XDG_DATA_HOME || join(homedir(), '.local', 'share'), 'dsh-office-kit')
-const LEGACY_VENV_DIR = join(LEGACY_DATA_DIR, 'venv')
+export const LEGACY_VENV_DIR = join(LEGACY_DATA_DIR, 'venv')
 const LEGACY_VENV_PYTHON = join(LEGACY_VENV_DIR, IS_WINDOWS ? 'Scripts/python.exe' : 'bin/python')
 const CONFIG_DIR = join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), 'dsh-office-kit')
 const CONFIG_FILE = join(CONFIG_DIR, 'config.json')
@@ -181,6 +181,24 @@ function verifySignature(file) {
   }
 }
 
+/**
+ * Installer switches. PATH is appended by the installer itself (`AppendPath=1`),
+ * the install location stays the per-user default (no `TargetDir`), and the
+ * `py` launcher is kept so `py -3.12` works.
+ */
+export function installerArguments() {
+  return [
+    '/quiet',
+    'InstallAllUsers=0',
+    'AppendPath=1',
+    'CompileAll=0',
+    'Include_test=0',
+    'Include_doc=0',
+    'Include_pip=1',
+    'SimpleInstall=1',
+  ]
+}
+
 function installPython() {
   if (!IS_WINDOWS) {
     return false
@@ -191,17 +209,7 @@ function installPython() {
   download(url, installer)
   verifySignature(installer)
   log(`installing Python ${PYTHON_VERSION} into the installer default per-user location`)
-  const args = [
-    '/quiet',
-    'InstallAllUsers=0',
-    'AppendPath=1',
-    'CompileAll=0',
-    'Include_test=0',
-    'Include_doc=0',
-    'Include_pip=1',
-    'SimpleInstall=1',
-  ]
-  const result = spawnSync(installer, args, { stdio: 'inherit', timeout: 15 * 60 * 1000 })
+  const result = spawnSync(installer, installerArguments(), { stdio: 'inherit', timeout: 15 * 60 * 1000 })
   rmSync(installer, { force: true })
   if (result.status !== 0) {
     throw new Error(`Python installer exited with status ${result.status}`)
@@ -368,6 +376,21 @@ function readPackageVersion() {
   }
 }
 
-const started = Date.now()
-main()
-log(`finished in ${((Date.now() - started) / 1000).toFixed(1)}s`)
+function startedFromCli() {
+  const entry = process.argv[1]
+  if (entry == null) {
+    return false
+  }
+  try {
+    return realpathSync(entry) === realpathSync(fileURLToPath(import.meta.url))
+  }
+  catch {
+    return false
+  }
+}
+
+if (startedFromCli()) {
+  const started = Date.now()
+  main()
+  log(`finished in ${((Date.now() - started) / 1000).toFixed(1)}s`)
+}

package/python/office_cli.py

@@ -594,6 +594,9 @@ def _pdf_font() -> str:
         r"C:\Windows\Fonts\simsun.ttc",
         "/System/Library/Fonts/PingFang.ttc",
         "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
+        "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
+        "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
+        "/usr/share/fonts/truetype/arphic/uming.ttc",
         "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
     ]
     for candidate in candidates:
@@ -603,7 +606,13 @@ def _pdf_font() -> str:
                 return "OfficeCJK"
             except Exception:
                 continue
-    return "Helvetica"
+    try:
+        from reportlab.pdfbase.cidfonts import UnicodeCIDFont
+
+        pdfmetrics.registerFont(UnicodeCIDFont("STSong-Light"))
+        return "STSong-Light"
+    except Exception:
+        return "Helvetica"
 
 
 def _pdf_flowables(blocks: Iterable[dict[str, Any]], font: str, counters: dict[str, int]):