Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e63fba0286 | ||
|
|
245a096606 | ||
|
|
6e0afe84cd |
No files matched your search
@@ -0,0 +1 @@
|
||||
66
|
||||
@@ -90,3 +90,19 @@ pnpm --filter web build:staging
|
||||
```
|
||||
|
||||
현재 정리된 기준으로 API 테스트와 웹 테스트 빌드를 통과합니다.
|
||||
|
||||
## Deployment branches
|
||||
|
||||
`main`은 항상 배포 가능한 trunk로 유지하고 dev 배포 기준으로 사용합니다.
|
||||
빌드 번호는 `BUILD_NUMBER` 파일에서 1씩 증가시키며, 현재 시작 번호는 `66`입니다.
|
||||
staging 검증이 필요할 때는 `release/66` 같은 임시 브랜치를 만들고,
|
||||
검증이 끝나면 삭제합니다.
|
||||
|
||||
```bash
|
||||
git push origin main:release/66
|
||||
pnpm deploy:web:staging
|
||||
```
|
||||
|
||||
staging Pages 배포 스크립트는 `CF_PAGES_STAGING_BRANCH`가 있으면 그 값을
|
||||
사용하고, 없으면 최신 `release/*` 브랜치를 자동으로 선택합니다. 최신 기준은
|
||||
브랜치가 가리키는 커밋 시각이며, 동률이면 브랜치명 내림차순입니다.
|
||||
@@ -97,6 +97,10 @@ describe('DakaoPublisher', () => {
|
||||
eventSource: 'lolympus',
|
||||
type: 'chat.send-message',
|
||||
correlationId: 'chat-log-1',
|
||||
resultSubjects: {
|
||||
succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
},
|
||||
});
|
||||
expect(getPublishedEnvelope(outboxService)).not.toHaveProperty(
|
||||
'replySubject',
|
||||
|
||||
@@ -3,6 +3,7 @@ import { randomUUID } from 'crypto';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import {
|
||||
DakaoCommandEnvelope,
|
||||
DakaoResultSubjects,
|
||||
DakaoSegment,
|
||||
DakaoSendMessagePayload,
|
||||
} from './dakao.types';
|
||||
@@ -16,7 +17,12 @@ const EVENT_SOURCE_DEFAULT = 'lolympus';
|
||||
@Injectable()
|
||||
export class DakaoPublisher implements OnModuleInit {
|
||||
private readonly logger = new Logger(DakaoPublisher.name);
|
||||
private sendMessageSubject = resolveDakaoNatsNames().subjects.chatSendMessage;
|
||||
private readonly names = resolveDakaoNatsNames();
|
||||
private sendMessageSubject = this.names.subjects.chatSendMessage;
|
||||
private resultSubjects: DakaoResultSubjects = {
|
||||
succeeded: this.names.subjects.chatSendMessageSucceeded,
|
||||
failed: this.names.subjects.chatSendMessageFailed,
|
||||
};
|
||||
private eventSource = EVENT_SOURCE_DEFAULT;
|
||||
|
||||
constructor(
|
||||
@@ -35,6 +41,10 @@ export class DakaoPublisher implements OnModuleInit {
|
||||
|
||||
this.sendMessageSubject =
|
||||
sendOverride || resolveDakaoNatsNames().subjects.chatSendMessage;
|
||||
this.resultSubjects = {
|
||||
succeeded: this.names.subjects.chatSendMessageSucceeded,
|
||||
failed: this.names.subjects.chatSendMessageFailed,
|
||||
};
|
||||
this.eventSource = sourceOverride || EVENT_SOURCE_DEFAULT;
|
||||
|
||||
this.logger.log(
|
||||
@@ -63,6 +73,7 @@ export class DakaoPublisher implements OnModuleInit {
|
||||
type: 'chat.send-message',
|
||||
eventSource: this.eventSource,
|
||||
correlationId: params.correlationId,
|
||||
resultSubjects: this.resultSubjects,
|
||||
payload,
|
||||
};
|
||||
await this.outboxService.enqueueAndPublish({
|
||||
|
||||
@@ -75,12 +75,18 @@ export interface DakaoSendMessagePayload {
|
||||
silence?: boolean;
|
||||
}
|
||||
|
||||
export interface DakaoResultSubjects {
|
||||
succeeded: string;
|
||||
failed: string;
|
||||
}
|
||||
|
||||
export interface DakaoCommandEnvelope<TPayload> {
|
||||
schema: 'dakao.command.v1';
|
||||
eventId: string;
|
||||
type: string;
|
||||
eventSource: string;
|
||||
correlationId?: string;
|
||||
resultSubjects?: DakaoResultSubjects;
|
||||
payload: TPayload;
|
||||
}
|
||||
|
||||
|
||||
+22
-22
@@ -1,22 +1,22 @@
|
||||
import { BrowserRouter, Link, Route, Routes } from 'react-router';
|
||||
import { useMsal } from '@azure/msal-react';
|
||||
import DevAuthSwitcher from './components/DevAuthSwitcher';
|
||||
import { DEFAULT_COMMUNITY_ID } from './config';
|
||||
import { useCommunity } from './api/hooks';
|
||||
import { isMsalConfigured } from './lib/auth/msal.config';
|
||||
import AuthCallbackPage from './pages/AuthCallback';
|
||||
import HomePage from './pages/HomePage';
|
||||
import LoginPage from './pages/Login';
|
||||
import MatchDetailPage from './pages/MatchDetailPage';
|
||||
import MatchTeamProgressPage from './pages/MatchTeamProgressPage';
|
||||
import AuctionPage from './pages/AuctionPage';
|
||||
import UserHistoryPage from './pages/UserHistoryPage';
|
||||
import CommunityInternalStatsPage from './pages/CommunityInternalStatsPage';
|
||||
import InternalMatchDetailPage from './pages/InternalMatchDetailPage';
|
||||
import LegacyImportPage from './pages/admin/LegacyImportPage';
|
||||
import LegacyMatchesPage from './pages/admin/LegacyMatchesPage';
|
||||
import MatchAdminPage from './pages/admin/MatchAdminPage';
|
||||
import TournamentCodesPage from './pages/admin/TournamentCodesPage';
|
||||
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
||||
import { useMsal } from "@azure/msal-react";
|
||||
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
||||
import { DEFAULT_COMMUNITY_ID } from "./config";
|
||||
import { useCommunity } from "./api/hooks";
|
||||
import { isMsalConfigured } from "./lib/auth/msal.config";
|
||||
import AuthCallbackPage from "./pages/AuthCallback";
|
||||
import HomePage from "./pages/HomePage";
|
||||
import LoginPage from "./pages/Login";
|
||||
import MatchDetailPage from "./pages/MatchDetailPage";
|
||||
import MatchTeamProgressPage from "./pages/MatchTeamProgressPage";
|
||||
import AuctionPage from "./pages/AuctionPage";
|
||||
import UserHistoryPage from "./pages/UserHistoryPage";
|
||||
import CommunityInternalStatsPage from "./pages/CommunityInternalStatsPage";
|
||||
import InternalMatchDetailPage from "./pages/InternalMatchDetailPage";
|
||||
import LegacyImportPage from "./pages/admin/LegacyImportPage";
|
||||
import LegacyMatchesPage from "./pages/admin/LegacyMatchesPage";
|
||||
import MatchAdminPage from "./pages/admin/MatchAdminPage";
|
||||
import TournamentCodesPage from "./pages/admin/TournamentCodesPage";
|
||||
|
||||
function MsalHeaderActions() {
|
||||
const { accounts, instance } = useMsal();
|
||||
@@ -43,7 +43,7 @@ function MsalHeaderActions() {
|
||||
|
||||
function App() {
|
||||
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
||||
const communityLabel = communityQuery.data?.name ?? 'LOLYMPUS';
|
||||
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
||||
|
||||
return (
|
||||
<BrowserRouter>
|
||||
@@ -57,7 +57,7 @@ function App() {
|
||||
{communityLabel}
|
||||
</Link>
|
||||
<div className="flex items-center gap-3">
|
||||
{DEFAULT_COMMUNITY_ID ? (
|
||||
{/* {DEFAULT_COMMUNITY_ID ? (
|
||||
<span className="text-[10px] uppercase tracking-wider text-base-content/25">
|
||||
API Live
|
||||
</span>
|
||||
@@ -65,7 +65,7 @@ function App() {
|
||||
<span className="text-[10px] uppercase tracking-wider text-amber-500/70">
|
||||
Set `VITE_DEFAULT_COMMUNITY_ID`
|
||||
</span>
|
||||
)}
|
||||
)} */}
|
||||
{isMsalConfigured && <MsalHeaderActions />}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,43 +3,159 @@ import { existsSync, readFileSync } from "node:fs";
|
||||
import { dirname, resolve } from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const scriptPath = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(scriptPath);
|
||||
const repoRoot = resolve(__dirname, "..");
|
||||
const webDir = resolve(repoRoot, "apps/web");
|
||||
|
||||
const target = process.argv[2];
|
||||
if (target !== "staging" && target !== "prod") {
|
||||
if (process.argv[1] === scriptPath) {
|
||||
main(process.argv.slice(2));
|
||||
}
|
||||
|
||||
export function main(args = process.argv.slice(2), env = process.env) {
|
||||
const target = args[0];
|
||||
if (target !== "staging" && target !== "prod") {
|
||||
console.error(
|
||||
"Usage: node scripts/deploy-cloudflare-pages.mjs <staging|prod>",
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const viteMode = target === "prod" ? "production" : "staging";
|
||||
const projectName =
|
||||
env.CF_PAGES_PROJECT_NAME ??
|
||||
env.CLOUDFLARE_PAGES_PROJECT_NAME ??
|
||||
"lolympus";
|
||||
const stagingBranch =
|
||||
target === "staging" ? resolveStagingBranch(env) : undefined;
|
||||
|
||||
validateEnv(viteMode, env);
|
||||
run("pnpm", ["--filter", "web", "run", `build:${target}`], repoRoot);
|
||||
|
||||
const deployArgs = [
|
||||
"exec",
|
||||
"wrangler",
|
||||
"pages",
|
||||
"deploy",
|
||||
"dist",
|
||||
"--project-name",
|
||||
projectName,
|
||||
];
|
||||
|
||||
if (target === "staging") {
|
||||
deployArgs.push("--branch", stagingBranch);
|
||||
console.error(
|
||||
`Deploying staging to Cloudflare Pages branch ${stagingBranch}`,
|
||||
);
|
||||
}
|
||||
|
||||
run("pnpm", deployArgs, webDir);
|
||||
}
|
||||
|
||||
export function resolveStagingBranch(env = process.env) {
|
||||
const configuredBranch = env.CF_PAGES_STAGING_BRANCH?.trim();
|
||||
if (configuredBranch) return configuredBranch;
|
||||
|
||||
refreshRemoteReleaseBranches();
|
||||
|
||||
const latestReleaseBranch = selectLatestReleaseBranch(
|
||||
listReleaseBranchRefs(),
|
||||
);
|
||||
if (latestReleaseBranch) return latestReleaseBranch;
|
||||
|
||||
console.error(
|
||||
"Usage: node scripts/deploy-cloudflare-pages.mjs <staging|prod>",
|
||||
[
|
||||
"No release/* branch found for staging deploy.",
|
||||
"Create a release branch, for example: git push origin main:release/66",
|
||||
"Or set CF_PAGES_STAGING_BRANCH explicitly.",
|
||||
].join("\n"),
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const viteMode = target === "prod" ? "production" : "staging";
|
||||
const projectName =
|
||||
process.env.CF_PAGES_PROJECT_NAME ??
|
||||
process.env.CLOUDFLARE_PAGES_PROJECT_NAME ??
|
||||
"lolympus";
|
||||
const stagingBranch = process.env.CF_PAGES_STAGING_BRANCH ?? "staging";
|
||||
export function selectLatestReleaseBranch(refRows) {
|
||||
const latestByBranch = new Map();
|
||||
|
||||
validateEnv(viteMode);
|
||||
run("pnpm", ["--filter", "web", "run", `build:${target}`], repoRoot);
|
||||
for (const row of refRows) {
|
||||
const [timestampText, refName] = row.split("\t");
|
||||
const branch = normalizeReleaseBranch(refName);
|
||||
const timestamp = Number(timestampText);
|
||||
if (!branch || !Number.isFinite(timestamp)) continue;
|
||||
|
||||
const deployArgs = [
|
||||
"exec",
|
||||
"wrangler",
|
||||
"pages",
|
||||
"deploy",
|
||||
"dist",
|
||||
"--project-name",
|
||||
projectName,
|
||||
];
|
||||
const current = latestByBranch.get(branch);
|
||||
if (!current || timestamp > current.timestamp) {
|
||||
latestByBranch.set(branch, { branch, timestamp });
|
||||
}
|
||||
}
|
||||
|
||||
if (target === "staging") {
|
||||
deployArgs.push("--branch", stagingBranch);
|
||||
const [latest] = [...latestByBranch.values()].sort((left, right) => {
|
||||
if (left.timestamp !== right.timestamp) {
|
||||
return right.timestamp - left.timestamp;
|
||||
}
|
||||
return right.branch.localeCompare(left.branch, "en", { numeric: true });
|
||||
});
|
||||
|
||||
return latest?.branch;
|
||||
}
|
||||
|
||||
run("pnpm", deployArgs, webDir);
|
||||
export function normalizeReleaseBranch(refName) {
|
||||
const branch = refName?.trim();
|
||||
if (!branch) return undefined;
|
||||
if (branch.startsWith("origin/release/")) {
|
||||
return branch.slice("origin/".length);
|
||||
}
|
||||
if (branch.startsWith("release/")) return branch;
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function listReleaseBranchRefs() {
|
||||
const result = spawnSync(
|
||||
"git",
|
||||
[
|
||||
"for-each-ref",
|
||||
"--sort=-committerdate",
|
||||
"--format=%(committerdate:unix)%09%(refname:short)",
|
||||
"refs/remotes/origin/release",
|
||||
"refs/heads/release",
|
||||
],
|
||||
{
|
||||
cwd: repoRoot,
|
||||
encoding: "utf8",
|
||||
shell: process.platform === "win32",
|
||||
},
|
||||
);
|
||||
|
||||
if (result.status !== 0) {
|
||||
const stderr = result.stderr?.trim();
|
||||
if (stderr) console.error(stderr);
|
||||
return [];
|
||||
}
|
||||
|
||||
return result.stdout.split(/\r?\n/).filter(Boolean);
|
||||
}
|
||||
|
||||
function refreshRemoteReleaseBranches() {
|
||||
spawnSync("git", ["remote", "prune", "origin"], {
|
||||
cwd: repoRoot,
|
||||
stdio: "ignore",
|
||||
shell: process.platform === "win32",
|
||||
});
|
||||
|
||||
spawnSync(
|
||||
"git",
|
||||
[
|
||||
"fetch",
|
||||
"--prune",
|
||||
"origin",
|
||||
"+refs/heads/release/*:refs/remotes/origin/release/*",
|
||||
],
|
||||
{
|
||||
cwd: repoRoot,
|
||||
stdio: "ignore",
|
||||
shell: process.platform === "win32",
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
function run(command, args, cwd) {
|
||||
const result = spawnSync(command, args, {
|
||||
@@ -52,7 +168,7 @@ function run(command, args, cwd) {
|
||||
}
|
||||
}
|
||||
|
||||
function validateEnv(mode) {
|
||||
function validateEnv(mode, env) {
|
||||
const fileEnv = [
|
||||
".env",
|
||||
".env.local",
|
||||
@@ -72,7 +188,7 @@ function validateEnv(mode) {
|
||||
"VITE_MSAL_REDIRECT_URI",
|
||||
];
|
||||
const missing = requiredKeys.filter((key) => {
|
||||
const value = process.env[key] ?? fileEnv[key];
|
||||
const value = env[key] ?? fileEnv[key];
|
||||
return !value || value.includes("<");
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user