Skip to content

fix(packaging): canonicalize the archive path in the Office engine hook #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yaojin3616 merged 1 commit into from
Oct 3, 2026
+20 −4
Merged

fix(packaging): canonicalize the archive path in the Office engine hook #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions build/office-engine-resolution.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ export function packagedArchiveRoot(dshEntryPath) {
* Hooks apply to this thread only.
*/
export function registerOfficeEngineResolution(dshEntryPath) {
const archive = packagedArchiveRoot(dshEntryPath)
if (archive === undefined) return undefined
const entryArchive = packagedArchiveRoot(dshEntryPath)
if (entryArchive === undefined) return undefined
// Compare canonical paths on both sides, as upstream does: resolved URLs are
// realpath'd below, and the entry path can differ in spelling (a symlinked
// or junctioned install directory, Windows 8.3 names or drive-letter case).
const archive = realpathSync(entryArchive)
const engines = join(archive, 'node_modules', '@deepseek-ai', 'libreoffice-kit-')
const source = pathToFileURL(engines).href
const destination = pathToFileURL(join(`${archive}.unpacked`, 'node_modules', '@deepseek-ai', 'libreoffice-kit-')).href
Expand Down
16 changes: 14 additions & 2 deletions test/office-engine-resolution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { spawnSync } from 'node:child_process'
import { mkdir, mkdtemp, realpath, rm, writeFile } from 'node:fs/promises'
import { mkdir, mkdtemp, realpath, rm, symlink, writeFile } from 'node:fs/promises'
import { createRequire } from 'node:module'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { dirname, join } from 'node:path'
import { pathToFileURL } from 'node:url'
import { afterEach, describe, expect, it } from 'vitest'
import { packagedArchiveRoot, registerOfficeEngineResolution } from '../build/office-engine-resolution.mjs'
Expand Down Expand Up @@ -63,6 +63,18 @@ describe('Office engine resolution', () => {
expect(resolveEngine(archive, entry)).toBe(join(`${archive}.unpacked`, 'node_modules', ENGINE, 'package.json'))
})

it('matches when the entry path names the install directory through a link', async () => {
// Resolved URLs are canonical; the entry path may not be (a symlinked or
// junctioned install, Windows 8.3 names). Without canonicalizing the
// archive the hook never matched and the engine stayed inside app.asar.
const { archive } = await packagedLayout()
const linked = join(dirname(dirname(archive)), 'Linked Resources')
await symlink(dirname(archive), linked, process.platform === 'win32' ? 'junction' : 'dir')
const linkedArchive = join(linked, 'app.asar')
const entry = join(linkedArchive, 'node_modules', '@deepseek-ai', 'dsh', 'lib', 'bin.js')
expect(resolveEngine(linkedArchive, entry)).toBe(join(`${archive}.unpacked`, 'node_modules', ENGINE, 'package.json'))
})

it('installs nothing outside an app.asar installation', () => {
expect(registerOfficeEngineResolution('/repo/node_modules/@deepseek-ai/dsh/lib/bin.js')).toBeUndefined()
})
Expand Down