@atomservice/config 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomservice/config",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "配置中心原子服务：基于 Bun 的高性能配置管理服务",
   "type": "module",
   "author": "openorson",
@@ -29,9 +29,9 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atomservice/gateway": "0.1.11"
+    "@atomservice/gateway": "0.1.13"
   },
   "peerDependencies": {
-    "@atomservice/core": "0.1.11"
+    "@atomservice/core": "0.1.13"
   }
 }

package/server/src/db/migrations.ts

@@ -2,105 +2,133 @@ import type { Migration } from "./types.ts"
 
 export const migrations: Migration[] = [
   {
-    id: "001_init",
+    id: "001_users",
     up: `
       CREATE TABLE "User" (
-        id            TEXT PRIMARY KEY,
-        email         TEXT NOT NULL UNIQUE,
-        name          TEXT NOT NULL,
-        passwordHash  TEXT NOT NULL,
-        isSuperAdmin  INTEGER NOT NULL DEFAULT 0,
-        createdAt     INTEGER NOT NULL DEFAULT (unixepoch()),
-        updatedAt     INTEGER NOT NULL DEFAULT (unixepoch())
+        "id"           TEXT PRIMARY KEY,
+        "email"        TEXT NOT NULL UNIQUE,
+        "name"         TEXT NOT NULL,
+        "passwordHash" TEXT NOT NULL,
+        "isSuperAdmin" INTEGER NOT NULL DEFAULT 0,
+        "createdAt"    INTEGER NOT NULL DEFAULT (unixepoch()),
+        "updatedAt"    INTEGER NOT NULL DEFAULT (unixepoch())
       );
-
+    `,
+  },
+  {
+    id: "002_tokens",
+    up: `
       CREATE TABLE "Token" (
-        id           TEXT PRIMARY KEY,
-        userId       TEXT NOT NULL REFERENCES "User"(id) ON DELETE CASCADE,
-        name         TEXT,
-        tokenHash    TEXT NOT NULL UNIQUE,
-        tokenPrefix  TEXT NOT NULL,
-        expiresAt    INTEGER,
-        lastUsedAt   INTEGER,
-        revoked      INTEGER NOT NULL DEFAULT 0,
-        createdAt    INTEGER NOT NULL DEFAULT (unixepoch())
+        "id"          TEXT PRIMARY KEY,
+        "userId"      TEXT NOT NULL REFERENCES "User"("id") ON DELETE CASCADE,
+        "name"        TEXT,
+        "tokenHash"   TEXT NOT NULL UNIQUE,
+        "tokenPrefix" TEXT NOT NULL,
+        "expiresAt"   INTEGER,
+        "lastUsedAt"  INTEGER,
+        "revoked"     INTEGER NOT NULL DEFAULT 0,
+        "createdAt"   INTEGER NOT NULL DEFAULT (unixepoch())
       );
-      CREATE INDEX tokenUserIdx ON "Token"(userId);
-
+      CREATE INDEX token_user_idx ON "Token"("userId");
+    `,
+  },
+  {
+    id: "003_projects",
+    up: `
       CREATE TABLE "Project" (
-        id          TEXT PRIMARY KEY,
-        slug        TEXT NOT NULL UNIQUE,
-        name        TEXT NOT NULL,
-        description TEXT,
-        createdBy   TEXT NOT NULL REFERENCES "User"(id),
-        createdAt   INTEGER NOT NULL DEFAULT (unixepoch()),
-        updatedAt   INTEGER NOT NULL DEFAULT (unixepoch())
+        "id"          TEXT PRIMARY KEY,
+        "slug"        TEXT NOT NULL UNIQUE,
+        "name"        TEXT NOT NULL,
+        "description" TEXT,
+        "createdBy"   TEXT NOT NULL REFERENCES "User"("id"),
+        "createdAt"   INTEGER NOT NULL DEFAULT (unixepoch()),
+        "updatedAt"   INTEGER NOT NULL DEFAULT (unixepoch())
       );
-
+    `,
+  },
+  {
+    id: "004_project_members",
+    up: `
       CREATE TABLE "ProjectMember" (
-        projectId TEXT NOT NULL REFERENCES "Project"(id) ON DELETE CASCADE,
-        userId    TEXT NOT NULL REFERENCES "User"(id) ON DELETE CASCADE,
-        role      TEXT NOT NULL,
-        joinedAt  INTEGER NOT NULL DEFAULT (unixepoch()),
-        PRIMARY KEY (projectId, userId)
+        "projectId" TEXT NOT NULL REFERENCES "Project"("id") ON DELETE CASCADE,
+        "userId"    TEXT NOT NULL REFERENCES "User"("id") ON DELETE CASCADE,
+        "role"      TEXT NOT NULL,
+        "joinedAt"  INTEGER NOT NULL DEFAULT (unixepoch()),
+        PRIMARY KEY ("projectId", "userId")
       );
-
+    `,
+  },
+  {
+    id: "005_environments",
+    up: `
       CREATE TABLE "Environment" (
-        id          TEXT PRIMARY KEY,
-        projectId   TEXT NOT NULL REFERENCES "Project"(id) ON DELETE CASCADE,
-        slug        TEXT NOT NULL,
-        name        TEXT NOT NULL,
-        description TEXT,
-        sortOrder   INTEGER NOT NULL DEFAULT 0,
-        sensitive   INTEGER NOT NULL DEFAULT 0,
-        createdBy   TEXT NOT NULL REFERENCES "User"(id),
-        createdAt   INTEGER NOT NULL DEFAULT (unixepoch()),
-        updatedAt   INTEGER NOT NULL DEFAULT (unixepoch()),
-        UNIQUE (projectId, slug)
+        "id"          TEXT PRIMARY KEY,
+        "projectId"   TEXT NOT NULL REFERENCES "Project"("id") ON DELETE CASCADE,
+        "slug"        TEXT NOT NULL,
+        "name"        TEXT NOT NULL,
+        "description" TEXT,
+        "sortOrder"   INTEGER NOT NULL DEFAULT 0,
+        "sensitive"   INTEGER NOT NULL DEFAULT 0,
+        "createdBy"   TEXT NOT NULL REFERENCES "User"("id"),
+        "createdAt"   INTEGER NOT NULL DEFAULT (unixepoch()),
+        "updatedAt"   INTEGER NOT NULL DEFAULT (unixepoch()),
+        UNIQUE ("projectId", "slug")
       );
-
+    `,
+  },
+  {
+    id: "006_apps",
+    up: `
       CREATE TABLE "App" (
-        id          TEXT PRIMARY KEY,
-        projectId   TEXT NOT NULL REFERENCES "Project"(id) ON DELETE CASCADE,
-        slug        TEXT NOT NULL,
-        name        TEXT NOT NULL,
-        description TEXT,
-        schema      TEXT NOT NULL,
-        createdBy   TEXT NOT NULL REFERENCES "User"(id),
-        createdAt   INTEGER NOT NULL DEFAULT (unixepoch()),
-        updatedAt   INTEGER NOT NULL DEFAULT (unixepoch()),
-        UNIQUE (projectId, slug)
+        "id"          TEXT PRIMARY KEY,
+        "projectId"   TEXT NOT NULL REFERENCES "Project"("id") ON DELETE CASCADE,
+        "slug"        TEXT NOT NULL,
+        "name"        TEXT NOT NULL,
+        "description" TEXT,
+        "schema"      TEXT NOT NULL,
+        "createdBy"   TEXT NOT NULL REFERENCES "User"("id"),
+        "createdAt"   INTEGER NOT NULL DEFAULT (unixepoch()),
+        "updatedAt"   INTEGER NOT NULL DEFAULT (unixepoch()),
+        UNIQUE ("projectId", "slug")
       );
-
+    `,
+  },
+  {
+    id: "007_releases",
+    up: `
       CREATE TABLE "Release" (
-        id              TEXT PRIMARY KEY,
-        appId           TEXT NOT NULL REFERENCES "App"(id) ON DELETE CASCADE,
-        environmentId   TEXT NOT NULL REFERENCES "Environment"(id) ON DELETE CASCADE,
-        semver          TEXT NOT NULL,
-        changeKind      TEXT NOT NULL,
-        status          TEXT NOT NULL DEFAULT 'unpublished',
-        notes           TEXT,
-        snapshot        TEXT NOT NULL,
-        schemaSnapshot  TEXT NOT NULL,
-        createdBy       TEXT NOT NULL REFERENCES "User"(id),
-        createdAt       INTEGER NOT NULL DEFAULT (unixepoch()),
-        UNIQUE (appId, environmentId, semver)
+        "id"             TEXT PRIMARY KEY,
+        "appId"          TEXT NOT NULL REFERENCES "App"("id") ON DELETE CASCADE,
+        "environmentId"  TEXT NOT NULL REFERENCES "Environment"("id") ON DELETE CASCADE,
+        "semver"         TEXT NOT NULL,
+        "changeKind"     TEXT NOT NULL,
+        "status"         TEXT NOT NULL DEFAULT 'unpublished',
+        "notes"          TEXT,
+        "snapshot"       TEXT NOT NULL,
+        "schemaSnapshot" TEXT NOT NULL,
+        "createdBy"      TEXT NOT NULL REFERENCES "User"("id"),
+        "createdAt"      INTEGER NOT NULL DEFAULT (unixepoch()),
+        UNIQUE ("appId", "environmentId", "semver")
       );
-      CREATE INDEX releaseLookupIdx ON "Release"(appId, environmentId, createdAt);
-
+      CREATE INDEX release_lookup_idx ON "Release"("appId", "environmentId", "createdAt");
+    `,
+  },
+  {
+    id: "008_app_tokens",
+    up: `
       CREATE TABLE "AppToken" (
-        id            TEXT PRIMARY KEY,
-        appId         TEXT NOT NULL REFERENCES "App"(id) ON DELETE CASCADE,
-        environmentId TEXT NOT NULL REFERENCES "Environment"(id) ON DELETE CASCADE,
-        name          TEXT,
-        tokenHash     TEXT NOT NULL UNIQUE,
-        tokenPrefix   TEXT NOT NULL,
-        revoked       INTEGER NOT NULL DEFAULT 0,
-        lastUsedAt    INTEGER,
-        createdBy     TEXT NOT NULL REFERENCES "User"(id),
-        createdAt     INTEGER NOT NULL DEFAULT (unixepoch())
+        "id"            TEXT PRIMARY KEY,
+        "appId"         TEXT NOT NULL REFERENCES "App"("id") ON DELETE CASCADE,
+        "environmentId" TEXT NOT NULL REFERENCES "Environment"("id") ON DELETE CASCADE,
+        "name"          TEXT,
+        "tokenHash"     TEXT NOT NULL UNIQUE,
+        "tokenPrefix"   TEXT NOT NULL,
+        "revoked"       INTEGER NOT NULL DEFAULT 0,
+        "lastUsedAt"    INTEGER,
+        "createdBy"     TEXT NOT NULL REFERENCES "User"("id"),
+        "createdAt"     INTEGER NOT NULL DEFAULT (unixepoch())
       );
-      CREATE INDEX appTokenLookupIdx ON "AppToken"(appId, environmentId);
+      CREATE INDEX app_token_lookup_idx ON "AppToken"("appId", "environmentId");
     `,
   },
 ]

package/server/src/http/router.ts

@@ -5,6 +5,7 @@ import { inspectRoutes } from "../modules/inspect.ts"
 import { memberRoutes } from "../modules/member.ts"
 import { projectRoutes } from "../modules/project.ts"
 import { releaseRoutes } from "../modules/release.ts"
+import { setupRoutes } from "../modules/setup.ts"
 import { tokenRoutes } from "../modules/token.ts"
 import { userRoutes } from "../modules/user.ts"
 import { ok, route } from "./response.ts"
@@ -16,6 +17,7 @@ function health(): Response {
 
 export const routes = {
   "/v1/health": { GET: route(health) },
+  ...setupRoutes,
   ...userRoutes,
   ...projectRoutes,
   ...memberRoutes,

package/server/src/modules/setup.ts

@@ -0,0 +1,35 @@
+import { getDb } from "../db/client.ts"
+import { HttpError, ok, readBody, requireString, route } from "../http/response.ts"
+import { EMAIL_RE } from "../shared/consts.ts"
+import { hashPassword } from "../shared/password.ts"
+import { publicUser } from "../shared/serialize.ts"
+import { newId } from "../shared/utils.ts"
+
+async function setup(req: Request): Promise<Response> {
+  const db = getDb()
+  const hasSuperAdmin = db.query(`SELECT 1 FROM "User" WHERE "isSuperAdmin" = 1 LIMIT 1`).get()
+  if (hasSuperAdmin) throw new HttpError(409, "already_setup", "已完成初始化，超管账号已存在")
+
+  const body = await readBody(req)
+  const email = requireString(body, "email", "邮箱")
+  const name = requireString(body, "name", "用户名")
+  const password = requireString(body, "password", "密码")
+
+  if (!EMAIL_RE.test(email)) throw new HttpError(400, "invalid_field", "邮箱格式不正确")
+  if (password.length < 8) throw new HttpError(400, "invalid_field", "密码至少 8 位")
+
+  const id = newId()
+  db.query(`INSERT INTO "User" ("id", "email", "name", "passwordHash", "isSuperAdmin") VALUES (?, ?, ?, ?, 1)`).run(
+    id,
+    email,
+    name,
+    await hashPassword(password),
+  )
+
+  const created = db.query(`SELECT * FROM "User" WHERE "id" = ?`).get(id)
+  return ok({ user: publicUser(created as Parameters<typeof publicUser>[0]) }, 201)
+}
+
+export const setupRoutes = {
+  "/v1/setup": { POST: route(setup) },
+}

package/server/src/shared/bootstrap.ts

@@ -10,9 +10,7 @@ export async function bootstrapAdmin(): Promise<void> {
   if (hasSuperAdmin) return
 
   const { adminEmail: email, adminPassword: password, adminName: name } = getEnv()
-  if (!email || !password) {
-    throw new Error("数据库中尚无超管账号，请通过环境变量 CONFIG_ADMIN_EMAIL 和 CONFIG_ADMIN_PASSWORD 配置初始超管")
-  }
+  if (!email || !password) return
 
   const existing = db.query(`SELECT * FROM "User" WHERE email = ?`).get(email) as UserRow | null
   if (existing) {

package/src/config.compose.ts

@@ -4,9 +4,6 @@ import { CONFIG_DEFAULT_PORT } from "./config.consts.ts"
 export interface ConfigComposeOptions {
   image: string
   dataDir: string
-  adminName?: string
-  adminEmail?: string
-  adminPassword?: string
   environment?: Record<string, string>
   hostPort?: number
 }
@@ -20,9 +17,6 @@ export function configCompose(id: string, opts: ConfigComposeOptions): string {
     if (v === undefined || v === "") return
     lines.push(`      - ${k}=${v}`)
   }
-  push("CONFIG_ADMIN_NAME", opts.adminName)
-  push("CONFIG_ADMIN_EMAIL", opts.adminEmail)
-  push("CONFIG_ADMIN_PASSWORD", opts.adminPassword)
   if (opts.environment) {
     for (const [k, v] of Object.entries(opts.environment)) push(k, v)
   }

package/src/config.options.ts

@@ -21,27 +21,6 @@ export interface ConfigOptions {
    * - 需要和 `gateway` 原子一起使用
    */
   domain?: string
-  /**
-   * 初始超级管理员用户名
-   *
-   * - 与 `adminEmail` 和 `adminPassword` 一起填写则容器首次启动时自动创建超管账号
-   *
-   * @default "admin"
-   */
-  adminName?: string
-  /**
-   * 初始超级管理员邮箱
-   *
-   * - 与 `adminPassword` 一起填写则容器首次启动时自动创建超管账号
-   * - 不填则需首次访问后通过 API 手动创建
-   */
-  adminEmail?: string
-  /**
-   * 初始超级管理员密码
-   *
-   * - 见 `adminEmail`
-   */
-  adminPassword?: string
   /**
    * 自定义环境变量
    *

package/src/config.service.ts

@@ -61,9 +61,6 @@ export function config(opts: ConfigOptions = {}): CallableService<ConfigInstance
           configCompose(containerName, {
             image: imageTag,
             dataDir,
-            adminName: opts.adminName,
-            adminEmail: opts.adminEmail,
-            adminPassword: opts.adminPassword,
             environment: opts.environment,
             hostPort: opts.hostPort,
           }),