jeremysamuel13andBohdan Triapitsyn
c5862cc6ee
* fix: resolve symlinks in project directory paths OpenCode stores sessions using the canonical (realpath) directory, but OpenChamber passed the unresolved symlink path in several places. The string-match directory filter would fail when a project was accessed via a symlink, making sessions invisible. Changes: - Add safeRealpathSync to settings normalization — project paths and lastDirectory are canonicalized at persistence time - Add Express middleware before the API proxy to resolve symlinks in ?directory= query params on in-flight requests - Resolve symlinks in /api/fs/list so the directory browser returns canonical paths, allowing the "already added" check to work correctly - Reconcile the in-memory projects store when the server responds with normalized paths, preventing temporary duplicates Fixes #1315 * fix: avoid sync realpath in opencode proxy --------- Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
73 lines
2.4 KiB
JavaScript
73 lines
2.4 KiB
JavaScript
import { describe, expect, it } from 'vitest';
|
|
|
|
import { createDirectoryQueryCanonicalizer } from './proxy.js';
|
|
|
|
describe('createDirectoryQueryCanonicalizer', () => {
|
|
it('canonicalizes directory query params and preserves other params', async () => {
|
|
const canonicalize = createDirectoryQueryCanonicalizer({
|
|
realpath: async (value) => value === '/link/project' ? '/real/project' : value,
|
|
});
|
|
|
|
await expect(canonicalize('/session?foo=1&directory=/link/project&bar=2'))
|
|
.resolves.toBe('/session?foo=1&directory=%2Freal%2Fproject&bar=2');
|
|
});
|
|
|
|
it('caches directory realpath lookups', async () => {
|
|
let calls = 0;
|
|
const canonicalize = createDirectoryQueryCanonicalizer({
|
|
realpath: async () => {
|
|
calls += 1;
|
|
return '/real/project';
|
|
},
|
|
});
|
|
|
|
await expect(canonicalize('/session?directory=/link/project')).resolves.toBe('/session?directory=%2Freal%2Fproject');
|
|
await expect(canonicalize('/session?directory=/link/project')).resolves.toBe('/session?directory=%2Freal%2Fproject');
|
|
expect(calls).toBe(1);
|
|
});
|
|
|
|
it('deduplicates concurrent directory realpath lookups', async () => {
|
|
let calls = 0;
|
|
let release = () => undefined;
|
|
const pending = new Promise((resolve) => {
|
|
release = () => resolve('/real/project');
|
|
});
|
|
const canonicalize = createDirectoryQueryCanonicalizer({
|
|
realpath: async () => {
|
|
calls += 1;
|
|
return pending;
|
|
},
|
|
});
|
|
|
|
const first = canonicalize('/session?directory=/link/project');
|
|
const second = canonicalize('/session?directory=/link/project');
|
|
await Promise.resolve();
|
|
|
|
expect(calls).toBe(1);
|
|
release();
|
|
await expect(Promise.all([first, second])).resolves.toEqual([
|
|
'/session?directory=%2Freal%2Fproject',
|
|
'/session?directory=%2Freal%2Fproject',
|
|
]);
|
|
});
|
|
|
|
it('falls back to the original URL when realpath fails', async () => {
|
|
const canonicalize = createDirectoryQueryCanonicalizer({
|
|
realpath: async () => {
|
|
throw new Error('missing');
|
|
},
|
|
});
|
|
|
|
await expect(canonicalize('/session?foo=1&directory=/missing/project'))
|
|
.resolves.toBe('/session?foo=1&directory=/missing/project');
|
|
});
|
|
|
|
it('leaves URLs without directory params unchanged', async () => {
|
|
const canonicalize = createDirectoryQueryCanonicalizer({
|
|
realpath: async () => '/real/project',
|
|
});
|
|
|
|
await expect(canonicalize('/session?foo=1')).resolves.toBe('/session?foo=1');
|
|
});
|
|
});
|