@clazic/urban 0.2.18 → 0.2.20
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/package.json +1 -1
- package/scripts/postinstall.js +5 -2
- package/scripts/setup-poppler.js +143 -0
- package/src/daemon.js +17 -2
- package/src/install/daemon.js +8 -1
- package/src/web/server.js +1 -1
- package/web/scripts/pages/settings.js +1 -1
package/package.json
CHANGED
package/scripts/postinstall.js
CHANGED
|
@@ -12,7 +12,10 @@ try {
|
|
|
12
12
|
// ── 1. graphify 설치 (선택 기능, 실패 무시) ─────────────────────────────────
|
|
13
13
|
await import('./setup-graphify.js').catch(() => {});
|
|
14
14
|
|
|
15
|
-
// ── 2.
|
|
15
|
+
// ── 2. poppler 설치 (Windows, 선택 기능, 실패 무시) ───────────────────────────
|
|
16
|
+
await import('./setup-poppler.js').catch(() => {});
|
|
17
|
+
|
|
18
|
+
// ── 3. urban 자동 설정 (기본값으로 .env 생성) ─────────────────────────────────
|
|
16
19
|
const URBAN_HOME = process.env.URBAN_HOME ?? join(homedir(), '.urban');
|
|
17
20
|
const URBAN_PORT = process.env.URBAN_PORT ?? '7777';
|
|
18
21
|
|
|
@@ -32,7 +35,7 @@ try {
|
|
|
32
35
|
console.log(`[urban] 설정 파일 이미 존재: ${envPath}`);
|
|
33
36
|
}
|
|
34
37
|
|
|
35
|
-
// ──
|
|
38
|
+
// ── 4. 데몬 등록 + 시작 ───────────────────────────────────────────────────────
|
|
36
39
|
try {
|
|
37
40
|
const { installDaemon, startDaemon } = await import('../src/install/daemon.js');
|
|
38
41
|
const installResult = await installDaemon();
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
// setup-poppler.js: Windows에서 poppler (pdftoppm) 자동 설치
|
|
3
|
+
// 1) winget 시도 → 2) GitHub 릴리즈 직접 다운로드 폴백
|
|
4
|
+
// 실패해도 설치 자체를 중단하지 않음 (exit 0 보장)
|
|
5
|
+
|
|
6
|
+
import { execSync } from 'child_process';
|
|
7
|
+
import { existsSync, mkdirSync, rmSync, writeFileSync, readdirSync } from 'fs';
|
|
8
|
+
import { createWriteStream } from 'fs';
|
|
9
|
+
import { homedir, tmpdir } from 'os';
|
|
10
|
+
import { join } from 'path';
|
|
11
|
+
import https from 'https';
|
|
12
|
+
|
|
13
|
+
if (process.platform !== 'win32') process.exit(0);
|
|
14
|
+
|
|
15
|
+
const URBAN_HOME = process.env.URBAN_HOME ?? join(homedir(), '.urban');
|
|
16
|
+
const POPPLER_DIR = join(URBAN_HOME, 'bin', 'poppler');
|
|
17
|
+
const BIN_PATH_FILE = join(URBAN_HOME, 'bin', 'poppler-bin-path.txt');
|
|
18
|
+
|
|
19
|
+
/** 재귀적으로 pdftoppm.exe가 있는 폴더 탐색 */
|
|
20
|
+
function findBinDir(dir) {
|
|
21
|
+
if (!existsSync(dir)) return null;
|
|
22
|
+
for (const entry of readdirSync(dir, { withFileTypes: true })) {
|
|
23
|
+
const full = join(dir, entry.name);
|
|
24
|
+
if (entry.isDirectory()) {
|
|
25
|
+
const found = findBinDir(full);
|
|
26
|
+
if (found) return found;
|
|
27
|
+
} else if (entry.name.toLowerCase() === 'pdftoppm.exe') {
|
|
28
|
+
return dir;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** 시스템 PATH 또는 로컬 설치 여부 확인 */
|
|
35
|
+
function hasPdftoppm() {
|
|
36
|
+
try { execSync('where pdftoppm', { stdio: 'ignore', shell: true }); return true; } catch {}
|
|
37
|
+
return findBinDir(POPPLER_DIR) !== null;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** GitHub API에서 최신 릴리즈 zip URL 조회 */
|
|
41
|
+
function getLatestZipUrl() {
|
|
42
|
+
return new Promise((resolve, reject) => {
|
|
43
|
+
https.get({
|
|
44
|
+
hostname: 'api.github.com',
|
|
45
|
+
path: '/repos/oschwartz10612/poppler-windows/releases/latest',
|
|
46
|
+
headers: { 'User-Agent': 'urban-postinstall' },
|
|
47
|
+
}, (res) => {
|
|
48
|
+
let data = '';
|
|
49
|
+
res.on('data', d => data += d);
|
|
50
|
+
res.on('end', () => {
|
|
51
|
+
try {
|
|
52
|
+
const json = JSON.parse(data);
|
|
53
|
+
const asset = json.assets?.find(a => a.name.endsWith('.zip'));
|
|
54
|
+
resolve(asset?.browser_download_url ?? null);
|
|
55
|
+
} catch (e) { reject(e); }
|
|
56
|
+
});
|
|
57
|
+
}).on('error', reject);
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/** HTTPS 다운로드 (리다이렉트 최대 5회) */
|
|
62
|
+
function download(url, dest, hops = 5) {
|
|
63
|
+
return new Promise((resolve, reject) => {
|
|
64
|
+
if (hops <= 0) { reject(new Error('Too many redirects')); return; }
|
|
65
|
+
https.get(url, { headers: { 'User-Agent': 'urban-postinstall' } }, (res) => {
|
|
66
|
+
if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
|
|
67
|
+
download(res.headers.location, dest, hops - 1).then(resolve, reject);
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
if (res.statusCode !== 200) { reject(new Error(`HTTP ${res.statusCode}`)); return; }
|
|
71
|
+
const file = createWriteStream(dest);
|
|
72
|
+
res.pipe(file);
|
|
73
|
+
file.on('finish', () => file.close(resolve));
|
|
74
|
+
file.on('error', reject);
|
|
75
|
+
}).on('error', reject);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** unzipper로 압축 해제 */
|
|
80
|
+
async function extractZip(zipPath, destDir) {
|
|
81
|
+
const { default: unzipper } = await import('unzipper');
|
|
82
|
+
const { createReadStream } = await import('fs');
|
|
83
|
+
mkdirSync(destDir, { recursive: true });
|
|
84
|
+
await createReadStream(zipPath)
|
|
85
|
+
.pipe(unzipper.Extract({ path: destDir }))
|
|
86
|
+
.promise();
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
async function main() {
|
|
90
|
+
if (hasPdftoppm()) {
|
|
91
|
+
console.log('[urban] pdftoppm 이미 설치됨 — 건너뜀');
|
|
92
|
+
// 로컬 설치 경로가 있으면 경로 파일 업데이트
|
|
93
|
+
const binDir = findBinDir(POPPLER_DIR);
|
|
94
|
+
if (binDir) {
|
|
95
|
+
mkdirSync(join(URBAN_HOME, 'bin'), { recursive: true });
|
|
96
|
+
writeFileSync(BIN_PATH_FILE, binDir, 'utf8');
|
|
97
|
+
}
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
console.log('[urban] poppler (pdftoppm) 설치 중...');
|
|
102
|
+
|
|
103
|
+
// ── 1. winget 시도 ─────────────────────────────────────────────────
|
|
104
|
+
try {
|
|
105
|
+
execSync(
|
|
106
|
+
'winget install --exact --silent --accept-package-agreements --accept-source-agreements "oschwartz10612.poppler"',
|
|
107
|
+
{ stdio: 'pipe', shell: true, timeout: 120_000 }
|
|
108
|
+
);
|
|
109
|
+
console.log('[urban] poppler 설치 완료 (winget)');
|
|
110
|
+
return;
|
|
111
|
+
} catch {
|
|
112
|
+
console.log('[urban] winget 실패 → GitHub 릴리즈에서 직접 다운로드...');
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// ── 2. GitHub 릴리즈 직접 다운로드 ────────────────────────────────
|
|
116
|
+
const url = await getLatestZipUrl();
|
|
117
|
+
if (!url) throw new Error('GitHub 릴리즈 URL을 가져오지 못했습니다');
|
|
118
|
+
|
|
119
|
+
console.log(`[urban] 다운로드 중: ${url}`);
|
|
120
|
+
const zipPath = join(tmpdir(), 'poppler-windows.zip');
|
|
121
|
+
await download(url, zipPath);
|
|
122
|
+
|
|
123
|
+
console.log('[urban] 압축 해제 중...');
|
|
124
|
+
await extractZip(zipPath, POPPLER_DIR);
|
|
125
|
+
try { rmSync(zipPath); } catch {}
|
|
126
|
+
|
|
127
|
+
// pdftoppm.exe 위치 탐색
|
|
128
|
+
const binDir = findBinDir(POPPLER_DIR);
|
|
129
|
+
if (!binDir) throw new Error('압축 해제 후 pdftoppm.exe를 찾을 수 없습니다');
|
|
130
|
+
|
|
131
|
+
// 데몬 시작 스크립트가 PATH에 주입할 수 있도록 경로 저장
|
|
132
|
+
mkdirSync(join(URBAN_HOME, 'bin'), { recursive: true });
|
|
133
|
+
writeFileSync(BIN_PATH_FILE, binDir, 'utf8');
|
|
134
|
+
|
|
135
|
+
console.log(`[urban] poppler 설치 완료 → ${binDir}`);
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
main()
|
|
139
|
+
.catch(err => {
|
|
140
|
+
console.warn('[urban] poppler 자동 설치 실패 (계속 진행):', err.message);
|
|
141
|
+
console.warn('[urban] 수동 설치: winget install oschwartz10612.poppler');
|
|
142
|
+
})
|
|
143
|
+
.finally(() => process.exit(0));
|
package/src/daemon.js
CHANGED
|
@@ -107,8 +107,23 @@ log.info('Urban 데몬 초기화 시작', { urbanHome: URBAN_HOME });
|
|
|
107
107
|
try { execSync(`${which} ${cmd}`, { stdio: 'ignore' }); return true; } catch { return false; }
|
|
108
108
|
};
|
|
109
109
|
if (!hasBin('pdftoppm')) {
|
|
110
|
-
|
|
111
|
-
|
|
110
|
+
if (process.platform === 'win32') {
|
|
111
|
+
// postinstall에서 다운로드한 로컬 poppler 경로 확인
|
|
112
|
+
const popplerBinFile = join(URBAN_HOME, 'bin', 'poppler-bin-path.txt');
|
|
113
|
+
let injected = false;
|
|
114
|
+
try {
|
|
115
|
+
const { readFileSync } = await import('node:fs');
|
|
116
|
+
const binDir = readFileSync(popplerBinFile, 'utf8').trim();
|
|
117
|
+
if (binDir && existsSync(binDir)) {
|
|
118
|
+
process.env.PATH = binDir + ';' + process.env.PATH;
|
|
119
|
+
log.info('[preflight] poppler 로컬 경로 PATH 추가', { binDir });
|
|
120
|
+
injected = true;
|
|
121
|
+
}
|
|
122
|
+
} catch {}
|
|
123
|
+
if (!injected) {
|
|
124
|
+
log.warn('[preflight] pdftoppm 미설치 — 수동 설치: winget install oschwartz10612.poppler');
|
|
125
|
+
}
|
|
126
|
+
} else if (process.platform === 'darwin') {
|
|
112
127
|
try {
|
|
113
128
|
log.info('[preflight] brew install poppler 실행 중...');
|
|
114
129
|
execSync('brew install poppler', { stdio: 'pipe', timeout: 120_000 });
|
package/src/install/daemon.js
CHANGED
|
@@ -77,8 +77,15 @@ export function buildStartScript({ nodePath, daemonJs, urbanHome, logsDir }) {
|
|
|
77
77
|
const psQ = (s) => String(s).replace(/'/g, "''");
|
|
78
78
|
const outLog = join(logsDir, 'out.log');
|
|
79
79
|
const errLog = join(logsDir, 'err.log');
|
|
80
|
+
const popplerBinFile = join(urbanHome, 'bin', 'poppler-bin-path.txt');
|
|
80
81
|
return `# Urban daemon start script (urban install 자동 생성)
|
|
81
82
|
$env:URBAN_HOME = '${psQ(urbanHome)}'
|
|
83
|
+
# poppler (pdftoppm) 경로 자동 주입
|
|
84
|
+
$popplerBinFile = '${psQ(popplerBinFile)}'
|
|
85
|
+
if (Test-Path $popplerBinFile) {
|
|
86
|
+
$pb = (Get-Content $popplerBinFile -Raw).Trim()
|
|
87
|
+
if ($pb -and (Test-Path $pb)) { $env:PATH = $pb + ';' + $env:PATH }
|
|
88
|
+
}
|
|
82
89
|
New-Item -ItemType Directory -Force -Path '${psQ(logsDir)}' | Out-Null
|
|
83
90
|
Set-Location -Path '${psQ(urbanHome)}'
|
|
84
91
|
& '${psQ(nodePath)}' '${psQ(daemonJs)}' 1>> '${psQ(outLog)}' 2>> '${psQ(errLog)}'
|
|
@@ -106,7 +113,7 @@ $argument = '-NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "' +
|
|
|
106
113
|
$action = New-ScheduledTaskAction -Execute 'powershell.exe' -Argument $argument -WorkingDirectory $urbanHome
|
|
107
114
|
$trigger = New-ScheduledTaskTrigger -AtLogOn -User $env:USERNAME
|
|
108
115
|
$principal = New-ScheduledTaskPrincipal -UserId $env:USERNAME -LogonType Interactive -RunLevel Limited
|
|
109
|
-
$settings = New-ScheduledTaskSettingsSet -ExecutionTimeLimit ([TimeSpan]::Zero) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew -RestartCount 5 -RestartInterval (New-TimeSpan -Minutes 1)
|
|
116
|
+
$settings = New-ScheduledTaskSettingsSet -ExecutionTimeLimit ([TimeSpan]::Zero) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew -RestartCount 5 -RestartInterval (New-TimeSpan -Minutes 1)
|
|
110
117
|
Unregister-ScheduledTask -TaskName 'Urban' -Confirm:$false -ErrorAction SilentlyContinue | Out-Null
|
|
111
118
|
Register-ScheduledTask -TaskName 'Urban' -Action $action -Trigger $trigger -Principal $principal -Settings $settings | Out-Null
|
|
112
119
|
`;
|
package/src/web/server.js
CHANGED
|
@@ -532,7 +532,7 @@ async function handleApiRoute(req, res, pathname, url, { db, queues, bus, graph,
|
|
|
532
532
|
// GET /api/settings/kordoc — kordoc OCR 설정 조회
|
|
533
533
|
if (pathname === '/api/settings/kordoc' && method === 'GET') {
|
|
534
534
|
try {
|
|
535
|
-
const mode = getSecureConfig('kordoc.mode') ?? '
|
|
535
|
+
const mode = getSecureConfig('kordoc.mode') ?? 'api';
|
|
536
536
|
const cli = {
|
|
537
537
|
ocrMode: getSecureConfig('kordoc.cli.ocrMode') ?? '',
|
|
538
538
|
geminiModel: getSecureConfig('kordoc.cli.geminiModel') ?? '',
|
|
@@ -103,7 +103,7 @@ function renderProvidersList(providers) {
|
|
|
103
103
|
async function loadKordocSettings() {
|
|
104
104
|
try {
|
|
105
105
|
const data = await getJson("/api/settings/kordoc");
|
|
106
|
-
const mode = data.mode ?? "
|
|
106
|
+
const mode = data.mode ?? "api";
|
|
107
107
|
document.querySelectorAll('input[name="kordoc-mode"]').forEach((r) => { r.checked = r.value === mode; });
|
|
108
108
|
toggleKordocPanels(mode);
|
|
109
109
|
const cli = data.cli ?? {};
|