2 Commits

Author SHA1 Message Date
7b532d6520 feat: per-pack public flag + developer installer variants
manifest.json 의 각 pack 에 public(boolean) 을 추가하고, 대상(audience)별로
설치기를 구분한다.
- ManifestEntry.public 추가. 미지정=공개(하위호환). store 가 upsert/rename 시
  기존 public 보존, 신규 pack 은 public=true 기본. setPackPublic() 추가.
- 사이트 pack 편집기에 "공개" 체크박스 추가(체크=일반, 해제=개발자용). 저장 시
  manifest 엔트리 public 갱신, 편집기 진입 시 현재 값 표시.
- shared/audience.ts: 빌드의 musicQuizAudience(package.json)로 대상 판별.
  일반 설치기=public!==false 만, 개발자용=public===false 만 노출.
- 간편/리소스팩 설치기 packs 로드에서 audience 필터 적용.
- 개발자용 빌드 구성(electron-builder-dev.yml, electron-builder-rp-dev.yml)과
  dist:win:dev / dist:win:rp:dev 스크립트 추가(artifact: *-Dev-*). v0.3.20.

Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
2026-07-11 00:32:06 +09:00
f0e07e06d6 installer: port page = check-only (no auto-open), big open/notOpen message
요청 반영: 간편설치기 포트포워딩 페이지가 포트를 직접 열지 않고 "열려 있는지"만
확인한다.
- server:portForward 를 UPnP 자동 개방/재점검 없이 외부 도달 점검만 하도록 변경,
  결과를 open/notOpen 으로 반환(PortForwardResult status 타입도 변경).
- 열려 있으면 외부 접속 주소를 크게, 안 열려 있으면 "직접 포트포워딩 해주세요"
  를 크게 표시.
- 페이지 체크에서만 쓰이던 openPortViaUpnp/removeUpnpMapping 제거(고아 코드).
- 참고: 서버 기동 시 run.bat 의 UPnP 자동 개방 주입(injectUpnpToRunBat)은 이번엔
  유지. v0.3.19.

Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
2026-07-11 00:12:55 +09:00
13 changed files with 193 additions and 127 deletions

35
electron-builder-dev.yml Normal file
View File

@@ -0,0 +1,35 @@
appId: kr.tkrmagid.musicquiz.installer.dev
productName: MusicQuizInstaller
# 개발자용 빌드: manifest 의 public===false 인 pack 만 노출한다.
# musicQuizAudience 를 package.json 에 박아 런타임에서 대상(audience)을 판별.
extraMetadata:
main: dist/installer/main.js
musicQuizAudience: developer
directories:
output: release
buildResources: build
files:
- dist/installer/**
- dist/shared/**
- installer/**
- build/icon.*
- package.json
- "!node_modules/@img/sharp-linux-*"
- "!node_modules/@img/sharp-linuxmusl-*"
- "!node_modules/@img/sharp-libvips-linux-*"
- "!node_modules/@img/sharp-libvips-linuxmusl-*"
extraResources:
- from: .
to: .
filter:
- .env.build
- from: locales
to: locales
filter:
- "**/*"
win:
target: portable
artifactName: MusicQuizInstaller-Dev-${version}-Portable.${ext}
icon: build/icon.ico
portable:
artifactName: MusicQuizInstaller-Dev-${version}-Portable.${ext}

View File

@@ -0,0 +1,35 @@
appId: kr.tkrmagid.musicquiz.installer-rp.dev
productName: MusicQuizResourcepackInstaller
# 개발자용 리소스팩 설치기: manifest 의 public===false 인 pack 만 노출.
extraMetadata:
main: dist/installer-rp/main.js
musicQuizAudience: developer
directories:
output: release
buildResources: build
files:
- dist/installer-rp/**
- dist/shared/**
- installer-rp/**
- installer/styles.css
- build/icon.*
- package.json
- "!node_modules/@img/sharp-linux-*"
- "!node_modules/@img/sharp-linuxmusl-*"
- "!node_modules/@img/sharp-libvips-linux-*"
- "!node_modules/@img/sharp-libvips-linuxmusl-*"
extraResources:
- from: .
to: .
filter:
- .env.build
- from: locales
to: locales
filter:
- "**/*"
win:
target: portable
artifactName: MusicQuizResourcepackInstaller-Dev-${version}-Portable.${ext}
icon: build/icon.ico
portable:
artifactName: MusicQuizResourcepackInstaller-Dev-${version}-Portable.${ext}

View File

@@ -820,16 +820,20 @@ function renderSubStep35(host, back, done) {
var result = await installerApi.checkPortForward(port) var result = await installerApi.checkPortForward(port)
state.serverInstall.portStatus = result state.serverInstall.portStatus = result
var address = formatServerAddress(result.externalIp, result.port) var address = formatServerAddress(result.externalIp, result.port)
if (result.status === 'preForwarded') { if (result.status === 'open') {
resultMsg.innerHTML = tt('step3.sub35.preForwarded', { address: address }) // 열려 있으면 외부 접속 주소를 크게 표시.
resultMsg.classList.add('success') resultMsg.innerHTML =
} else if (result.status === 'upnpOk') { '<div style="margin-top:12px;padding:18px;border:1px solid var(--success);border-radius:10px;background:rgba(63,185,80,0.12);text-align:center;">' +
resultMsg.innerHTML = tt('step3.sub35.upnpOk', { address: address }) '<div style="font-size:14px;color:var(--text-muted);">' + escapeHtml(tt('step3.sub35.openTitle')) + '</div>' +
resultMsg.classList.add('success') '<div style="font-size:30px;font-weight:800;margin-top:8px;user-select:all;word-break:break-all;">' + escapeHtml(address) + '</div>' +
'</div>'
} else { } else {
resultMsg.innerHTML = (result.message || tt('step3.sub35.manualHint')) + // 안 열려 있으면 "직접 포트포워딩 해주세요" 를 크게 표시.
tt('step3.sub35.manualDetail', { address: address }) resultMsg.innerHTML =
resultMsg.classList.add('warn') '<div style="margin-top:12px;padding:18px;border:1px solid var(--danger);border-radius:10px;background:rgba(248,81,73,0.10);text-align:center;">' +
'<div style="font-size:26px;font-weight:800;">' + escapeHtml(tt('step3.sub35.notOpenBig')) + '</div>' +
'<div style="font-size:13px;color:var(--text-muted);margin-top:10px;">' + escapeHtml(tt('step3.sub35.notOpenHint', { address: address, port: result.port })) + '</div>' +
'</div>'
} }
nextBtn.disabled = false nextBtn.disabled = false
} catch (err) { } catch (err) {

View File

@@ -124,14 +124,13 @@
}, },
"sub35": { "sub35": {
"heading": "포트포워딩", "heading": "포트포워딩",
"description": "UPNP를 개방해 외부 접속을 허용합니다.", "description": "포트가 외부에서 열려 있는지 확인합니다. (설치기가 직접 열지는 않습니다)",
"portLabel": "포트", "portLabel": "포트",
"recheck": "재점검", "recheck": "재점검",
"checking": "확인 중...", "checking": "확인 중...",
"preForwarded": "포트포워딩 성공! 친구는 <strong>{{address}}</strong> 주소로 서버에 접속할 수 있습니다. (이미 외부 개방되어 있음)", "openTitle": "포트가 열려 있습니다! 친구 접속 주소",
"upnpOk": "포트포워딩 성공! 친구는 <strong>{{address}}</strong> 주소로 서버에 접속할 수 있습니다. (UPnP로 자동 개방 완료)", "notOpenBig": "직접 포트포워딩 해주세요.",
"manualHint": "직접 포트포워딩을 해주세요.", "notOpenHint": "공유기에서 외부 TCP {{port}} 를 이 PC 로 포워딩하세요. (외부 주소: {{address}})",
"manualDetail": "<br><small>외부 주소: {{address}}</small>",
"checkFailed": "점검 실패: {{message}}", "checkFailed": "점검 실패: {{message}}",
"ipUnknown": "확인 불가" "ipUnknown": "확인 불가"
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "minecraft-music-quiz-installer", "name": "minecraft-music-quiz-installer",
"version": "0.3.18", "version": "0.3.20",
"description": "마인크래프트 음악퀴즈 간편설치기 + 관리 사이트", "description": "마인크래프트 음악퀴즈 간편설치기 + 관리 사이트",
"main": "dist/installer/main.js", "main": "dist/installer/main.js",
"scripts": { "scripts": {
@@ -14,7 +14,9 @@
"build:launcher-icon": "node scripts/build-launcher-icon.cjs", "build:launcher-icon": "node scripts/build-launcher-icon.cjs",
"dist:win": "npm run preinstall:sharp-win32 && npm run build:launcher-icon && tsc -p tsconfig.installer.json && electron-builder --win --config electron-builder.yml", "dist:win": "npm run preinstall:sharp-win32 && npm run build:launcher-icon && tsc -p tsconfig.installer.json && electron-builder --win --config electron-builder.yml",
"dist:win:rp": "npm run preinstall:sharp-win32 && tsc -p tsconfig.installer-rp.json && electron-builder --win --config electron-builder-rp.yml", "dist:win:rp": "npm run preinstall:sharp-win32 && tsc -p tsconfig.installer-rp.json && electron-builder --win --config electron-builder-rp.yml",
"dist:win:pf": "tsc -p tsconfig.installer-pf.json && electron-builder --win --config electron-builder-pf.yml" "dist:win:pf": "tsc -p tsconfig.installer-pf.json && electron-builder --win --config electron-builder-pf.yml",
"dist:win:dev": "npm run preinstall:sharp-win32 && npm run build:launcher-icon && tsc -p tsconfig.installer.json && electron-builder --win --config electron-builder-dev.yml",
"dist:win:rp:dev": "npm run preinstall:sharp-win32 && tsc -p tsconfig.installer-rp.json && electron-builder --win --config electron-builder-rp-dev.yml"
}, },
"dependencies": { "dependencies": {
"@types/archiver": "^7.0.0", "@types/archiver": "^7.0.0",

View File

@@ -12,6 +12,7 @@ import { normalizePackDefinition } from '../shared/store.js'
import { getAppDataDir, getMcCustomDir } from '../shared/paths.js' import { getAppDataDir, getMcCustomDir } from '../shared/paths.js'
import { loadEnv, getManifestUrl } from '../shared/env.js' import { loadEnv, getManifestUrl } from '../shared/env.js'
import { loadComponentI18n } from '../shared/i18n.js' import { loadComponentI18n } from '../shared/i18n.js'
import { resolveAudience, isPackVisibleForAudience, type Audience } from '../shared/audience.js'
import type { RpFetchedPack } from './types.js' import type { RpFetchedPack } from './types.js'
import { ensureYtDlpExe } from './ytdlp.js' import { ensureYtDlpExe } from './ytdlp.js'
import { ensureFfmpegExe } from './ffmpeg.js' import { ensureFfmpegExe } from './ffmpeg.js'
@@ -112,6 +113,16 @@ const state: RpInstallerState = {
let mainWindow: BrowserWindow | null = null let mainWindow: BrowserWindow | null = null
// 이 빌드의 대상(일반/개발자용). package.json 의 musicQuizAudience 로 결정.
function getAudience(): Audience {
try {
const pkg = JSON.parse(fs.readFileSync(path.join(app.getAppPath(), 'package.json'), 'utf8'))
return resolveAudience(pkg.musicQuizAudience)
} catch {
return resolveAudience(undefined)
}
}
function deriveBaseUrl(manifestUrl: string): string { function deriveBaseUrl(manifestUrl: string): string {
try { try {
const parsed = new URL(manifestUrl) const parsed = new URL(manifestUrl)
@@ -202,9 +213,12 @@ ipcMain.handle('rp:packs:load', async (_event, manifestUrlInput?: string): Promi
} }
sendLog(t('log.manifestDownload', { url: state.manifestUrl })) sendLog(t('log.manifestDownload', { url: state.manifestUrl }))
const manifest = await fetchJson<Manifest>(state.manifestUrl) const manifest = await fetchJson<Manifest>(state.manifestUrl)
const audience = getAudience()
const results: RpFetchedPack[] = [] const results: RpFetchedPack[] = []
for (const entry of manifest.packs ?? []) { for (const entry of manifest.packs ?? []) {
if (typeof entry?.file !== 'string') continue if (typeof entry?.file !== 'string') continue
// 대상(audience)에 맞지 않는 pack 은 건너뛴다(일반=public, 개발자용=non-public).
if (!isPackVisibleForAudience(entry.public, audience)) continue
const listUrl = `${state.baseUrl}/file/list/${encodeURIComponent(entry.file)}.json` const listUrl = `${state.baseUrl}/file/list/${encodeURIComponent(entry.file)}.json`
const packUrl = `${state.baseUrl}/manifest/${encodeURIComponent(entry.file)}.json` const packUrl = `${state.baseUrl}/manifest/${encodeURIComponent(entry.file)}.json`
try { try {

View File

@@ -22,10 +22,21 @@ import type { Manifest, PackDefinition } from '../shared/types.js'
import { normalizePackDefinition } from '../shared/store.js' import { normalizePackDefinition } from '../shared/store.js'
import { loadEnv, getManifestUrl } from '../shared/env.js' import { loadEnv, getManifestUrl } from '../shared/env.js'
import { loadComponentI18n } from '../shared/i18n.js' import { loadComponentI18n } from '../shared/i18n.js'
import { resolveAudience, isPackVisibleForAudience, type Audience } from '../shared/audience.js'
import { LAUNCHER_PROFILE_ICON } from './launcherIcon.js' import { LAUNCHER_PROFILE_ICON } from './launcherIcon.js'
loadEnv() loadEnv()
// 이 빌드의 대상(일반/개발자용). package.json 의 musicQuizAudience 로 결정.
function getAudience(): Audience {
try {
const pkg = JSON.parse(fs.readFileSync(path.join(app.getAppPath(), 'package.json'), 'utf8'))
return resolveAudience(pkg.musicQuizAudience)
} catch {
return resolveAudience(undefined)
}
}
const i18n = loadComponentI18n('installer') const i18n = loadComponentI18n('installer')
const t = i18n.t const t = i18n.t
export const localeDict = i18n.dict export const localeDict = i18n.dict
@@ -136,9 +147,12 @@ ipcMain.handle('packs:load', async (_event, manifestUrlInput?: string): Promise<
} }
sendLog(t('log.manifestDownload', { url: state.manifestUrl })) sendLog(t('log.manifestDownload', { url: state.manifestUrl }))
const manifest = await fetchJson<Manifest>(state.manifestUrl) const manifest = await fetchJson<Manifest>(state.manifestUrl)
const audience = getAudience()
const results: FetchedPack[] = [] const results: FetchedPack[] = []
for (const entry of manifest.packs ?? []) { for (const entry of manifest.packs ?? []) {
if (typeof entry?.file !== 'string') continue if (typeof entry?.file !== 'string') continue
// 대상(audience)에 맞지 않는 pack 은 건너뛴다(일반=public, 개발자용=non-public).
if (!isPackVisibleForAudience(entry.public, audience)) continue
const packUrl = `${state.baseUrl}/manifest.json`.replace(/manifest\.json$/, `manifest/${entry.file}.json`) const packUrl = `${state.baseUrl}/manifest.json`.replace(/manifest\.json$/, `manifest/${entry.file}.json`)
try { try {
const raw = await fetchJson<Partial<PackDefinition>>(packUrl) const raw = await fetchJson<Partial<PackDefinition>>(packUrl)
@@ -860,12 +874,7 @@ ipcMain.handle('server:portForward', async (_event, port: number): Promise<PortF
const targetPort = Number.isFinite(port) && port > 0 ? port : 25565 const targetPort = Number.isFinite(port) && port > 0 ? port : 25565
sendLog(t('log.portCheckStart', { port: targetPort })) sendLog(t('log.portCheckStart', { port: targetPort }))
// 1차 점검 전에 우리가 이전 실행에서 만든 UPnP 매핑이 남아 있으면 먼저 제거한다. // 설치기는 포트를 직접 열지 않는다. 외부에서 이미 열려 있는지만 확인한다.
// 이렇게 해야 "사용자 라우터 규칙이 활성화돼서 외부 접근이 가능한 상태" 와 "UPnP 매핑 덕분에 접근 가능한 상태" 가 구별된다.
// 사용자 규칙이 비활성/없으면 1차 점검은 false 가 되어 UPnP 시도 단계로 자연스럽게 넘어간다.
sendLog(t('log.upnpCleanup'))
await removeUpnpMapping(targetPort)
// 외부 IP 확보: 공용 API → 실패 시 UPnP 게이트웨이의 외부 IP로 폴백. // 외부 IP 확보: 공용 API → 실패 시 UPnP 게이트웨이의 외부 IP로 폴백.
let externalIp = await detectExternalIpHttp() let externalIp = await detectExternalIpHttp()
if (externalIp) { if (externalIp) {
@@ -877,9 +886,9 @@ ipcMain.handle('server:portForward', async (_event, port: number): Promise<PortF
else sendLog(t('log.externalIpUpnpFail')) else sendLog(t('log.externalIpUpnpFail'))
} }
// 1차 점검: 외부에서 이미 접근 가능한지 (서버가 떠 있거나, 우리가 임시 리스너 띄워서 검증). // 외부에서 포트가 닿는지 점검(서버가 떠 있거나, 임시 리스너 검증).
sendLog(t('log.probeStart')) sendLog(t('log.probeStart'))
let probe = await probePortFromOutside(targetPort, externalIp) const probe = await probePortFromOutside(targetPort, externalIp)
if (!externalIp && probe.detectedIp) externalIp = probe.detectedIp if (!externalIp && probe.detectedIp) externalIp = probe.detectedIp
const verdict = probe.reachable === true const verdict = probe.reachable === true
? t('log.probeVerdictSuccess') ? t('log.probeVerdictSuccess')
@@ -888,47 +897,9 @@ ipcMain.handle('server:portForward', async (_event, port: number): Promise<PortF
if (probe.reachable === true) { if (probe.reachable === true) {
sendLog(t('log.probePreForwarded', { addr: externalIp || t('log.ipUnknown'), port: targetPort })) sendLog(t('log.probePreForwarded', { addr: externalIp || t('log.ipUnknown'), port: targetPort }))
return { status: 'preForwarded', externalIp, port: targetPort } return { status: 'open', externalIp, port: targetPort }
} }
return { status: 'notOpen', externalIp, port: targetPort }
// UPnP 시도.
sendLog(t('log.upnpTryOpen', { port: targetPort }))
try {
await openPortViaUpnp(targetPort)
sendLog(t('log.upnpReqOk'))
} catch (error) {
const msg = (error as Error).message || String(error)
sendLog(t('log.upnpTryFail', { message: msg }))
return {
status: 'upnpFailed',
externalIp,
port: targetPort,
message: t('log.upnpFailDetail', { message: msg })
}
}
// NAT 반영 지연을 고려해 최대 3회 재점검.
for (let attempt = 1; attempt <= 3; attempt++) {
await sleep(1500)
sendLog(t('log.upnpRecheck', { attempt }))
probe = await probePortFromOutside(targetPort, externalIp)
if (!externalIp && probe.detectedIp) externalIp = probe.detectedIp
if (probe.reachable === true) {
sendLog(t('log.upnpDone', { port: targetPort }))
await removeUpnpMapping(targetPort)
return { status: 'upnpOk', externalIp, port: targetPort }
}
}
// 테스트 목적으로 만든 매핑 정리. 실제 개방은 run.bat 이 담당.
sendLog(t('log.upnpCleanupTest'))
await removeUpnpMapping(targetPort)
const reason = probe.reachable === false
? t('log.upnpFailReason1')
: t('log.upnpFailReason2', { detail: probe.detail })
sendLog(reason)
return { status: 'upnpFailed', externalIp, port: targetPort, message: reason }
}) })
async function detectExternalIpHttp(): Promise<string> { async function detectExternalIpHttp(): Promise<string> {
@@ -1124,64 +1095,6 @@ function fetchIfconfigCoPortOnce(port: number): Promise<IfconfigPortResult> {
}) })
} }
function removeUpnpMapping(port: number): Promise<void> {
return new Promise((resolve) => {
let settled = false
const done = () => { if (!settled) { settled = true; resolve() } }
let client: ReturnType<typeof natUpnp.createClient> | null = null
try {
client = natUpnp.createClient()
} catch (err) {
sendLog(t('log.upnpClientFailRemove', { message: (err as Error).message }))
done()
return
}
const timer = setTimeout(() => {
try { client && client.close() } catch {}
sendLog(t('log.upnpRemoveTimeout'))
done()
}, 8000)
client.portUnmapping({ public: port, protocol: 'tcp' }, (err: Error | null) => {
clearTimeout(timer)
try { client && client.close() } catch {}
if (err) sendLog(t('log.upnpRemoveAttempt', { message: err.message }))
else sendLog(t('log.upnpRemoveDone', { port }))
done()
})
})
}
function openPortViaUpnp(port: number): Promise<void> {
return new Promise((resolve, reject) => {
let settled = false
const done = (err?: Error) => {
if (settled) return
settled = true
if (err) reject(err)
else resolve()
}
let client: ReturnType<typeof natUpnp.createClient> | null = null
try {
client = natUpnp.createClient()
} catch (err) {
done(err as Error)
return
}
const timer = setTimeout(() => {
try { client && client.close() } catch {}
done(new Error(t('errors.upnpTimeout')))
}, 15000)
client.portMapping(
{ public: port, private: port, ttl: 0, description: 'MusicQuiz Server', protocol: 'tcp' },
(error: Error | null) => {
clearTimeout(timer)
try { client && client.close() } catch {}
done(error || undefined)
}
)
})
}
function sleep(ms: number): Promise<void> { function sleep(ms: number): Promise<void> {
return new Promise((resolve) => setTimeout(resolve, ms)) return new Promise((resolve) => setTimeout(resolve, ms))
} }

View File

@@ -36,7 +36,8 @@ export interface RamCheckResult {
} }
export interface PortForwardResult { export interface PortForwardResult {
status: 'preForwarded' | 'upnpOk' | 'upnpFailed' // 설치기는 포트를 직접 열지 않고 "열려 있는지"만 확인한다.
status: 'open' | 'notOpen'
externalIp?: string externalIp?: string
port: number port: number
message?: string message?: string

View File

@@ -16,10 +16,12 @@ import {
normalizePackDefinition, normalizePackDefinition,
normalizePackList, normalizePackList,
readAccounts, readAccounts,
readManifest,
renamePack, renamePack,
sanitizePackKey, sanitizePackKey,
saveTerm, saveTerm,
savePackList, savePackList,
setPackPublic,
setTermVisibility setTermVisibility
} from '../../shared/store.js' } from '../../shared/store.js'
import { fetchReleaseVersions } from '../../shared/mojang.js' import { fetchReleaseVersions } from '../../shared/mojang.js'
@@ -122,11 +124,15 @@ opRouter.get('/op/dashboard/:packName', requireAuth, async (req, res, next) => {
return return
} }
const releases = await fetchReleaseVersions() const releases = await fetchReleaseVersions()
const manifest = await readManifest()
const entry = manifest.packs.find((e) => e.file === packKey)
const isPublic = entry ? entry.public !== false : true
res.render('op/editor', { res.render('op/editor', {
userId: req.session.userId, userId: req.session.userId,
packKey, packKey,
pack: definition, pack: definition,
releases releases,
isPublic
}) })
} catch (error) { } catch (error) {
next(error) next(error)
@@ -519,6 +525,9 @@ opRouter.post('/op/dashboard/:packName', requireAuth, async (req, res, next) =>
return return
} }
const finalKey = await renamePack(packKey, requestedKey, normalized) const finalKey = await renamePack(packKey, requestedKey, normalized)
// 체크박스는 체크됐을 때만 전송되므로, 없으면 비공개(개발자용).
const isPublic = pickFirstValue(req.body.isPublic) === 'on' || pickFirstValue(req.body.isPublic) === 'true'
await setPackPublic(finalKey, isPublic)
res.redirect(`/op/dashboard/${finalKey}`) res.redirect(`/op/dashboard/${finalKey}`)
} catch (error) { } catch (error) {
next(error) next(error)

20
src/shared/audience.ts Normal file
View File

@@ -0,0 +1,20 @@
// 설치기 "대상(audience)" 구분. 빌드 시 package.json 에 박히는 musicQuizAudience
// 값으로 결정한다(electron-builder extraMetadata).
// - 'public' : 일반 설치기. manifest 의 public!==false 인 pack 만 노출.
// - 'developer' : 개발자용 설치기. public===false 인 pack 만 노출.
// 이 모듈은 electron 에 의존하지 않는 순수 로직만 둔다(server 빌드에도 포함되므로).
export type Audience = 'public' | 'developer'
export function resolveAudience(raw: unknown): Audience {
return raw === 'developer' ? 'developer' : 'public'
}
/**
* 주어진 pack 의 public 플래그가 현재 audience 에게 보여야 하는지.
* public 미지정(undefined)은 공개로 간주한다(하위호환).
*/
export function isPackVisibleForAudience(isPublic: boolean | undefined, audience: Audience): boolean {
const isPublicPack = isPublic !== false
return audience === 'developer' ? !isPublicPack : isPublicPack
}

View File

@@ -18,8 +18,15 @@ export async function readManifest(): Promise<Manifest> {
return { packs: [] } return { packs: [] }
} }
return { return {
packs: parsed.packs.filter((entry): entry is ManifestEntry => packs: parsed.packs
.filter((entry): entry is ManifestEntry =>
typeof entry?.name === 'string' && typeof entry?.file === 'string') typeof entry?.name === 'string' && typeof entry?.file === 'string')
.map((entry) => ({
name: entry.name,
file: entry.file,
// public 은 명시적 boolean 만 보존. 미지정은 그대로 undefined(=공개 취급).
...(typeof entry.public === 'boolean' ? { public: entry.public } : {})
}))
} }
} catch (error) { } catch (error) {
if ((error as NodeJS.ErrnoException).code === 'ENOENT') { if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
@@ -245,15 +252,32 @@ type ManifestSyncAction = 'add' | 'remove' | 'upsert'
async function syncManifestWith(key: string, name: string, action: ManifestSyncAction): Promise<void> { async function syncManifestWith(key: string, name: string, action: ManifestSyncAction): Promise<void> {
const manifest = await readManifest() const manifest = await readManifest()
const existing = manifest.packs.find((entry) => entry.file === key)
const filtered = manifest.packs.filter((entry) => entry.file !== key) const filtered = manifest.packs.filter((entry) => entry.file !== key)
if (action === 'remove') { if (action === 'remove') {
await writeManifest({ packs: filtered }) await writeManifest({ packs: filtered })
return return
} }
filtered.push({ name: name || key, file: key }) const entry: ManifestEntry = { name: name || key, file: key }
// 기존 public 값은 이름 변경/수정(upsert) 시에도 보존. 신규(add)는 기본 공개(true).
entry.public = existing && typeof existing.public === 'boolean' ? existing.public : true
filtered.push(entry)
await writeManifest({ packs: filtered }) await writeManifest({ packs: filtered })
} }
/** manifest 엔트리의 public(공개 여부) 플래그를 설정한다. */
export async function setPackPublic(key: string, isPublic: boolean): Promise<void> {
const manifest = await readManifest()
let changed = false
for (const entry of manifest.packs) {
if (entry.file === key) {
entry.public = isPublic
changed = true
}
}
if (changed) await writeManifest(manifest)
}
function defaultPackList(): PackList { function defaultPackList(): PackList {
return { musicPlaylistUrl: '', imagePlaylistUrl: '', music: [], images: [] } return { musicPlaylistUrl: '', imagePlaylistUrl: '', music: [], images: [] }
} }

View File

@@ -37,6 +37,11 @@ export interface PackDefinition {
export interface ManifestEntry { export interface ManifestEntry {
name: string name: string
file: string file: string
/**
* 공개 여부. true(또는 미지정)면 일반 설치기(간편/리소스팩)에 노출,
* false 면 개발자용 설치기에만 노출된다. 하위호환: 값이 없으면 공개로 간주.
*/
public?: boolean
} }
export interface Manifest { export interface Manifest {

View File

@@ -30,6 +30,11 @@
</label> </label>
</div> </div>
<label style="display:flex;align-items:center;gap:10px;margin:8px 0;">
<input type="checkbox" name="isPublic" <%= (typeof isPublic === 'undefined' || isPublic) ? 'checked' : '' %> style="width:auto;" />
<span>공개 (체크 시 일반 설치기에 표시 / 해제 시 개발자용 설치기에만 표시)</span>
</label>
<div class="gridTwo"> <div class="gridTwo">
<label> <label>
<span><%= t('editor.mcVersion') %></span> <span><%= t('editor.mcVersion') %></span>