@ai-partner-x/aiko-boot-cli 0.1.4 → 0.1.5

package/templates/{api-base → api-system}/package.json

@@ -10,7 +10,7 @@
     }
   },
   "scripts": {
-    "dev": "concurrently -n codegen,server -c blue,green \"pnpm codegen:watch\" \"node --import @swc-node/register/esm-register --watch src/server.ts\"",
+    "dev": "node --import @swc-node/register/esm-register --watch src/server.ts",
     "dev:server": "node --import @swc-node/register/esm-register --watch src/server.ts",
     "codegen:watch": "node scripts/codegen.cjs --watch",
     "init-db": "node --import @swc-node/register/esm-register src/scripts/init-db.ts",
@@ -26,30 +26,31 @@
     "@ai-partner-x/aiko-boot-starter-validation": "workspace:*",
     "@ai-partner-x/aiko-boot-starter-web": "workspace:*",
     "@ai-partner-x/aiko-boot-starter-security": "workspace:*",
-    "@ai-partner-x/aiko-boot-starter-log": "workspace:*",
     "bcryptjs": "^2.4.3",
     "jsonwebtoken": "^9.0.2",
     "better-sqlite3": "^12.6.2",
     "cors": "^2.8.5",
-    "date-fns": "^4.1.0",
     "express": "^4.18.0",
     "axios": "^1.6.0",
-    "reflect-metadata": "^0.2.1"
+    "reflect-metadata": "^0.2.1",
+    "dotenv": "^17.2.3"
   },
   "devDependencies": {
     "concurrently": "^9.2.1",
     "sql.js": "^1.11.0",
     "@swc-node/register": "^1.11.1",
     "@swc/core": "^1.15.18",
+    "@ai-partner-x/eslint-plugin-aiko-boot": "workspace:*",
     "@types/bcryptjs": "^2.4.6",
     "@types/better-sqlite3": "^7.6.13",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.5",
     "@types/node": "^20.11.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "eslint": "^8.57.1",
     "tsup": "^8.0.0",
     "tsx": "^4.7.0",
     "typescript": "^5.3.0"
   }
 }
-

package/templates/{api-base → api-system}/scripts/codegen.cjs

@@ -27,4 +27,3 @@ if (isWatch) {
     handleError(error);
   }
 }
-

package/templates/{api-base → api-system}/scripts/codegen.ts

@@ -7,4 +7,3 @@ if (isWatch) {
 } else {
   generateApiClient();
 }
-

package/templates/{scaffold-default/packages/api → api-system}/src/config/security-auto-configuration.ts

@@ -9,7 +9,6 @@ import { Component } from '@ai-partner-x/aiko-boot';
 import { getExpressApp } from '@ai-partner-x/aiko-boot-starter-web';
 import { AuthInterceptor } from '@ai-partner-x/aiko-boot-starter-security';
 import { PermissionInterceptor } from '@ai-partner-x/aiko-boot-starter-security';
-import { getLogger } from '@ai-partner-x/aiko-boot-starter-log';
 
 /**
  * 自定义安全自动配置
@@ -18,7 +17,11 @@ import { getLogger } from '@ai-partner-x/aiko-boot-starter-log';
 @AutoConfiguration({ order: 150 }) // 在WebAutoConfiguration之前执行（order: 200）
 @Component()
 export class SecurityAutoConfiguration {
-  private logger = getLogger('security-auto-configuration');
+  private logger = {
+    info: (...args: unknown[]) => console.log('[security-auto-configuration]', ...args),
+    warn: (...args: unknown[]) => console.warn('[security-auto-configuration]', ...args),
+    error: (...args: unknown[]) => console.error('[security-auto-configuration]', ...args),
+  };
 
   @OnApplicationReady({ order: 30 }) // 在WebAutoConfiguration之前（order: 50）
   async configureSecurityMiddleware(): Promise<void> {

package/templates/api-system/src/scripts/simple-reset-admin.mjs

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+
+/**
+ * 简单脚本：重新初始化数据库以设置admin123密码
+ */
+
+const { execSync } = await import('child_process');
+
+async function simpleReset() {
+  try {
+    console.log('🔄 Re-initializing database with admin123 password...');
+    console.log('⏰ This will take about 10-15 seconds...');
+
+    const result = execSync('node --import @swc-node/register/esm-register src/scripts/init-db.ts', {
+      cwd: process.cwd(),
+      stdio: 'inherit',
+      timeout: 30000
+    });
+
+    if (result.status === 0) {
+      console.log('');
+      console.log('🎉 Database initialization completed successfully!');
+      console.log('🎉 Admin password has been set to: admin123');
+      console.log('🎉 You can now login with: admin / admin123');
+      console.log('');
+      console.log('🔐 Please restart the server for changes to take effect.');
+      console.log('');
+    } else {
+      console.error('❌ Database initialization failed with code:', result.status);
+      console.error('Error output:', result.stderr);
+      process.exit(1);
+    }
+  } catch (error) {
+    console.error('❌ Error during reset:', error);
+    process.exit(1);
+  }
+}
+
+simpleReset();

package/templates/api-system/src/server.ts

@@ -0,0 +1,42 @@
+import 'reflect-metadata';
+import express from 'express';
+import { createApp } from '@ai-partner-x/aiko-boot';
+import { config as loadDotenv } from 'dotenv';
+import { existsSync } from 'fs';
+import { join } from 'path';
+
+const projectDir = process.cwd();
+const appEnv = process.env.APP_ENV || 'dev';
+const envFile = join(projectDir, `.env.${appEnv}`);
+if (existsSync(envFile)) {
+  loadDotenv({ path: envFile, override: false });
+  console.log(`Loaded env file: ${envFile}`);
+} else {
+  console.warn(`Env file not found: ${envFile}`);
+}
+
+const srcDir = join(projectDir, 'src'); // Framework scans for controller/service/mapper relative to srcDir
+const configPath = projectDir; // configPath should point to the directory with node_modules
+const context = await createApp({ srcDir, configPath, verbose: true });
+
+if (!context) {
+  console.warn('ApplicationContext not available');
+} else {
+  console.log('Security enabled: ' + context.config.get('security.enabled', true));
+}
+
+const expressApp = await import('@ai-partner-x/aiko-boot-starter-web').then(m => m.getExpressApp());
+
+if (!expressApp) {
+  console.error('Express app not available');
+  process.exit(1);
+}
+
+expressApp.use(express.json());
+
+const port = context.config.get('server.port', 3001);
+
+expressApp.listen(port, () => {
+  console.log('API Server started on port ' + port);
+  console.log('📡 API: http://localhost:' + port + '/api');
+});

package/templates/api-system/src/types/aiko-boot-starter-web.d.ts

@@ -0,0 +1,8 @@
+declare module '@ai-partner-x/aiko-boot-starter-web' {
+  /**
+   * aiko-boot-starter-web is a workspace dependency without published TS types.
+   * We only need the `getExpressApp()` export for this project.
+   */
+  export function getExpressApp(): any;
+}
+

package/templates/api-system/src/types/sqljs.d.ts

@@ -0,0 +1,18 @@
+declare module 'sql.js' {
+  export interface SqlJsInitConfig {
+    locateFile?: (file: string, prefix: string) => string;
+  }
+
+  export interface SqlJsDatabase {
+    run(sql: string, params?: unknown[]): void;
+    export(): Uint8Array;
+    close(): void;
+  }
+
+  export interface SqlJsStatic {
+    Database: new () => SqlJsDatabase;
+  }
+
+  export default function initSqlJs(config?: SqlJsInitConfig): Promise<SqlJsStatic>;
+}
+

package/templates/{api-base → api-system}/tsconfig.json

@@ -15,4 +15,3 @@
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
 }
-

package/templates/api-system/tsup.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig({
+  entry: ['src/server.ts'],
+  format: ['esm'],
+  dts: false,
+  clean: true,
+  external: [/^@ai-partner-x\//, 'reflect-metadata', 'express', 'cors'],
+  // Don't bundle to keep directory structure for Aiko Boot runtime discovery
+  bundle: false,
+  treeshake: false,
+  // Keep TypeScript source files for runtime discovery
+  splitting: false,
+});

package/templates/app-admin/.env.example

@@ -0,0 +1,18 @@
+# scaffold/admin 环境模板
+# 用法：复制为 .env.<mode>（如 .env.dev/.env.stage/.env.prod）后，填写真实地址与回调信息。
+
+APP_ENV=dev
+
+# 未授权时 redirect 的登录地址。
+# 建议保持为前端内部路径 /login（admin 内已有该路由），若使用外部 SSO 则改为完整 URL。
+VITE_APP_LOGIN=/login
+
+# 后端 API Base URL（不包含 /api 前缀）
+VITE_API_URL=http://localhost:3001
+
+# Vite dev server 代理目标（用于将前端请求的 /api 转发到后端）
+VITE_API_PROXY_TARGET=http://localhost:3001
+
+# 是否启用前端守卫（需要根据自身鉴权策略调整）
+VITE_APP_USE_GUARD=false
+

package/templates/{scaffold-default/packages/admin → app-admin}/package.json

@@ -4,12 +4,18 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build --mode prod",
+    "dev": "vite --mode dev",
+    "dev:dev": "vite --mode dev",
+    "dev:stage": "vite --mode stage",
+    "dev:prod": "vite --mode prod",
+    "build": "pnpm build:prod",
+    "build:dev": "tsc && vite build --mode dev",
+    "build:stage": "tsc && vite build --mode stage",
+    "build:prod": "tsc && vite build --mode prod",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@scaffold/api": "workspace:*",
+    "@scaffold/system": "workspace:*",
     "@scaffold/core": "workspace:*",
     "@hookform/resolvers": "^5.0.1",
     "@radix-ui/react-accordion": "^1.2.8",

package/templates/{scaffold-default/packages/admin → app-admin}/tsconfig.json

@@ -20,7 +20,7 @@
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"],
-      "@scaffold/api/client": ["../api/dist/client/index.ts"],
+      "@scaffold/system/client": ["../system/dist/client/index.ts"],
       "@scaffold/core": ["../core/src/index.ts"]
     }
   },

package/templates/app-admin/vite.config.ts

@@ -0,0 +1,31 @@
+import tailwindcss from "@tailwindcss/vite"
+import react from "@vitejs/plugin-react"
+import path from "path"
+import { defineConfig, loadEnv } from "vite"
+
+// https://vite.dev/config/
+export default defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd(), "")
+  const proxyTarget = env.VITE_API_PROXY_TARGET || "http://localhost:3001"
+
+  return {
+    plugins: [react(), tailwindcss()],
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./src"),
+        "@scaffold/system/client": path.resolve(__dirname, "../system/dist/client/index.ts"),
+        "@scaffold/core": path.resolve(__dirname, "../core/src/index.ts"),
+      },
+    },
+    server: {
+      port: 4200,
+      proxy: {
+        "/api": {
+          target: proxyTarget,
+          changeOrigin: true,
+          // rewrite: (path) => path.replace(/^\/api/, ''),
+        },
+      },
+    },
+  }
+})

package/templates/app-mobile/.env.example

@@ -0,0 +1,5 @@
+# copy this file to .env.dev/.env.stage/.env.prod and fill secure values
+NODE_ENV=development
+APP_ENV=dev
+VITE_API_URL=http://localhost:3001
+VITE_APP_LOGIN=/login

package/templates/{scaffold-default/packages/mobile → app-mobile}/package.json

@@ -4,8 +4,14 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite --port 3002",
-    "build": "tsc --noEmit && vite build",
+    "dev": "vite --mode dev --port 3002",
+    "dev:dev": "vite --mode dev --port 3002",
+    "dev:stage": "vite --mode stage --port 3002",
+    "dev:prod": "vite --mode prod --port 3002",
+    "build": "pnpm build:prod",
+    "build:dev": "tsc --noEmit && vite build --mode dev",
+    "build:stage": "tsc --noEmit && vite build --mode stage",
+    "build:prod": "tsc --noEmit && vite build --mode prod",
     "preview": "vite preview",
     "lint": "eslint src"
   },

package/templates/{scaffold-default/packages/mobile → app-mobile}/src/main.tsx

@@ -9,8 +9,9 @@ const root = createRoot(container);
 
 // Mobile 默认不配置 env 时，约定后端 API 在 scaffold/api 的默认端口 3001
 const apiBaseUrl = (import.meta.env.VITE_API_URL as string | undefined) ?? 'http://localhost:3001';
+const loginUrl = (import.meta.env.VITE_APP_LOGIN as string | undefined) ?? '/login';
 
-appAuth.setup(createBackendAuthProvider(apiBaseUrl, { loginUrl: '/login' })).then(() => {
+appAuth.setup(createBackendAuthProvider(apiBaseUrl, { loginUrl })).then(() => {
   root.render(
     <StrictMode>
       <App />

package/templates/api-base/app.config.ts

@@ -1,155 +0,0 @@
-import type { AppConfig } from '@ai-partner-x/aiko-boot';
-
-export default {
-  server: {
-    port: Number(process.env.PORT) || 3001,
-    servlet: {
-      contextPath: '/api',
-    },
-    shutdown: 'graceful',
-  },
-  logging: {
-    // 日志级别：error, warn, info, http, verbose, debug, silly
-    level: process.env.NODE_ENV === 'production' ? 'info' : 'debug',
-
-    // 输出格式：json, cli, pretty, simple
-    format: process.env.NODE_ENV === 'production' ? 'json' : 'cli',
-
-    // 是否启用颜色
-    colorize: process.env.NODE_ENV !== 'production',
-
-    // 是否显示时间戳
-    timestamp: true,
-
-    // 默认元数据
-    defaultMeta: {
-      service: 'scaffold-api',
-      version: '0.1.0',
-      env: process.env.NODE_ENV || 'development',
-    },
-
-    // 传输配置
-    transports: [
-      {
-        type: 'console',
-        enabled: true,
-        level: process.env.NODE_ENV === 'production' ? 'info' : 'debug',
-        format: process.env.NODE_ENV === 'production' ? 'json' : 'cli',
-        colorize: process.env.NODE_ENV !== 'production',
-      },
-      {
-        type: 'file',
-        enabled: true,
-        filename: './logs/log-{date}.log',
-        level: 'info',
-        maxSize: '10m',
-        maxFiles: 7,
-        format: 'json',
-        rotateByDate: true,
-        retentionDays: 30,
-        maxFileSize: 100,
-      },
-      {
-        type: 'file',
-        enabled: true,
-        filename: './logs/error-{date}.log',
-        level: 'error',
-        maxSize: '10m',
-        maxFiles: 30,
-        format: 'json',
-        rotateByDate: true,
-        retentionDays: 30,
-        maxFileSize: 100,
-      },
-    ],
-  },
-
-  database: {
-    type: 'sqlite',
-    filename: './data/app.db',
-  },
-  validation: {
-    enabled: true,
-    failFast: false,
-  },
-  security: {
-    enabled: true,
-    jwt: {
-      secret:
-        process.env.JWT_SECRET ||
-        (() => {
-          console.warn('⚠️ Using default JWT secret in development!');
-          return 'dev-only-secret';
-        })(),
-      expiresIn: '1h',
-    },
-    session: {
-      secret:
-        process.env.SESSION_SECRET ||
-        (() => {
-          console.warn('⚠️ Using default session secret in development!');
-          return 'dev-only-session-secret';
-        })(),
-      maxAge: 86400000,
-      resave: false,
-      saveUninitialized: false,
-      cookie: {
-        secure: process.env.NODE_ENV === 'production',
-        httpOnly: true,
-        sameSite: 'strict',
-        maxAge: 86400000,
-      },
-    },
-    oauth2: {
-      github: {
-        clientID:
-          process.env.GITHUB_CLIENT_ID ||
-          (() => {
-            console.warn('⚠️ Using default GitHub client ID in development!');
-            return 'your-github-client-id';
-          })(),
-        clientSecret:
-          process.env.GITHUB_CLIENT_SECRET ||
-          (() => {
-            console.warn('⚠️ Using default GitHub client secret in development!');
-            return 'your-github-client-secret';
-          })(),
-        callbackURL:
-          process.env.GITHUB_CALLBACK_URL ||
-          'http://localhost:3001/api/auth/github/callback',
-      },
-      google: {
-        clientID:
-          process.env.GOOGLE_CLIENT_ID ||
-          (() => {
-            console.warn('⚠️ Using default Google client ID in development!');
-            return 'your-google-client-id';
-          })(),
-        clientSecret:
-          process.env.GOOGLE_CLIENT_SECRET ||
-          (() => {
-            console.warn('⚠️ Using default Google client secret in development!');
-            return 'your-google-client-secret';
-          })(),
-        callbackURL:
-          process.env.GOOGLE_CALLBACK_URL ||
-          'http://localhost:3001/api/auth/google/callback',
-      },
-    },
-    publicPaths: [
-      '/api/auth/login',
-      '/api/auth/register',
-      '/api/auth/github',
-      '/api/auth/google',
-      '/api/auth/github/callback',
-      '/api/auth/google/callback',
-      '/api/public',
-    ],
-    cors: {
-      enabled: true,
-      origin: process.env.CORS_ORIGIN || '*',
-      credentials: true,
-    },
-  },
-} satisfies AppConfig;
-

package/templates/api-base/src/controller/auth.controller.ts

@@ -1,160 +0,0 @@
-import 'reflect-metadata';
-import {
-  RestController,
-  PostMapping,
-  GetMapping,
-  RequestBody,
-  RequestParam,
-  QueryParam,
-} from '@ai-partner-x/aiko-boot-starter-web';
-import { Autowired } from '@ai-partner-x/aiko-boot';
-import { Public } from '@ai-partner-x/aiko-boot-starter-security';
-import { AuthService } from '../service/auth.service.js';
-import type {
-  LoginDto,
-  LoginResultDto,
-  RefreshTokenDto,
-} from '../dto/auth.dto.js';
-import axios from 'axios';
-
-@RestController({ path: '/auth' })
-export class AuthController {
-  @Autowired()
-  private authService!: AuthService;
-
-  @PostMapping('/login')
-  @Public()
-  async login(@RequestBody() dto: LoginDto): Promise<LoginResultDto> {
-    return this.authService.login(dto);
-  }
-
-  @PostMapping('/refresh')
-  @Public()
-  async refresh(
-    @RequestBody() dto: RefreshTokenDto,
-  ): Promise<{ accessToken: string }> {
-    return this.authService.refreshToken(dto.refreshToken);
-  }
-
-  @GetMapping('/info')
-  async getUserInfo(
-    @RequestParam('_uid') userId: string,
-  ): Promise<LoginResultDto['userInfo']> {
-    return this.authService.getUserInfo(Number(userId));
-  }
-
-  @PostMapping('/logout')
-  async logout(@RequestBody() body: { token: string }): Promise<any> {
-    return this.authService.logout(body.token);
-  }
-
-  @GetMapping('/github')
-  @Public()
-  async githubAuth(@QueryParam('redirect') redirect?: string): Promise<any> {
-    const clientId = process.env.GITHUB_CLIENT_ID;
-    const redirectUri = process.env.GITHUB_CALLBACK_URL;
-    const scope = 'user:email';
-
-    const authUrl = `https://github.com/login/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(
-      redirectUri!,
-    )}&scope=${scope}${
-      redirect ? `&redirect_uri=${encodeURIComponent(redirect)}` : ''
-    }`;
-
-    return { authUrl };
-  }
-
-  @GetMapping('/github/callback')
-  @Public()
-  async githubCallback(@QueryParam('code') code: string): Promise<any> {
-    try {
-      const clientId = process.env.GITHUB_CLIENT_ID;
-      const clientSecret = process.env.GITHUB_CLIENT_SECRET;
-      const redirectUri = process.env.GITHUB_CALLBACK_URL;
-
-      const tokenResponse = await axios.post(
-        'https://github.com/login/oauth/access_token',
-        {
-          client_id: clientId,
-          client_secret: clientSecret,
-          code: code,
-          redirect_uri: redirectUri,
-        },
-        {
-          headers: { Accept: 'application/json' },
-        },
-      );
-
-      const tokens = tokenResponse.data;
-
-      const userResponse = await axios.get('https://api.github.com/user', {
-        headers: { Authorization: `Bearer ${tokens.access_token}` },
-      });
-
-      const profile = {
-        ...userResponse.data,
-        provider: 'github',
-      };
-
-      return this.authService.handleOAuthCallback(profile, tokens);
-    } catch (error) {
-      throw new Error('GitHub OAuth token exchange failed');
-    }
-  }
-
-  @GetMapping('/google')
-  @Public()
-  async googleAuth(@QueryParam('redirect') redirect?: string): Promise<any> {
-    const clientId = process.env.GOOGLE_CLIENT_ID;
-    const redirectUri = process.env.GOOGLE_CALLBACK_URL;
-    const scope = 'profile email';
-
-    const authUrl = `https://accounts.google.com/o/oauth2/v2/auth?client_id=${clientId}&redirect_uri=${encodeURIComponent(
-      redirectUri!,
-    )}&scope=${encodeURIComponent(scope)}&response_type=code${
-      redirect ? `&redirect_uri=${encodeURIComponent(redirect)}` : ''
-    }`;
-
-    return { authUrl };
-  }
-
-  @GetMapping('/google/callback')
-  @Public()
-  async googleCallback(@QueryParam('code') code: string): Promise<any> {
-    try {
-      const clientId = process.env.GOOGLE_CLIENT_ID;
-      const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
-      const redirectUri = process.env.GOOGLE_CALLBACK_URL;
-
-      const tokenResponse = await axios.post(
-        'https://oauth2.googleapis.com/token',
-        {
-          client_id: clientId,
-          client_secret: clientSecret,
-          code: code,
-          redirect_uri: redirectUri,
-          grant_type: 'authorization_code',
-        },
-      );
-
-      const tokens = tokenResponse.data;
-
-      const userResponse = await axios.get(
-        'https://www.googleapis.com/oauth2/v2/userinfo',
-        {
-          headers: { Authorization: `Bearer ${tokens.access_token}` },
-        },
-      );
-
-      const profile = {
-        ...userResponse.data,
-        provider: 'google',
-      };
-
-      return this.authService.handleOAuthCallback(profile, tokens);
-    } catch (error) {
-      throw new Error('Google OAuth token exchange failed');
-    }
-  }
-}
-