create-bubbles 0.1.23 → 0.1.24

package/template-vp-monorepo-react-nestjs/apps/server/src/modules/auth/session/session.script.ts

@@ -0,0 +1,221 @@
+export const CREATE_OR_REPLACE_SESSION_SCRIPT = String.raw`
+local function isValidTerminal(value)
+  return value == 'web' or value == 'desktop' or value == 'mobile'
+end
+
+local function isValidDigest(value)
+  return value
+    and string.len(value) == 64
+    and string.match(value, '^[0-9a-f]+$') ~= nil
+end
+
+local function isValidUserId(value)
+  return string.len(value) > 0
+    and string.len(value) <= 100
+    and string.match(value, '^[%w_-]+$') ~= nil
+end
+
+local newDigest = ARGV[1]
+local userId = ARGV[2]
+local terminal = ARGV[3]
+local idleTtlMs = tonumber(ARGV[4])
+local absoluteTtlMs = tonumber(ARGV[5])
+local loginIp = ARGV[6]
+local userAgent = ARGV[7]
+local sessionKeyPrefix = ARGV[8]
+
+if not isValidDigest(newDigest)
+  or not isValidUserId(userId)
+  or not isValidTerminal(terminal)
+  or not sessionKeyPrefix
+  or sessionKeyPrefix == ''
+then
+  return { 0, 'INVALID_ARGUMENT' }
+end
+
+
+if not idleTtlMs or not absoluteTtlMs or idleTtlMs <= 0 or absoluteTtlMs <= idleTtlMs then
+  return { 0, 'INVALID_TTL' }
+end
+
+local redisTime = redis.call('TIME')
+local nowMs = tonumber(redisTime[1]) * 1000 + math.floor(tonumber(redisTime[2]) / 1000)
+local absoluteExpiresAtMs = nowMs + absoluteTtlMs
+local initialExpiresAtMs = math.min(nowMs + idleTtlMs, absoluteExpiresAtMs)
+local oldDigest = redis.call('GET', KEYS[1])
+local oldSessionKey = nil
+
+
+if oldDigest then
+  if not isValidDigest(oldDigest) then
+    return { 0, 'INVALID_SLOT_DATA' }
+  end
+
+  oldSessionKey = sessionKeyPrefix .. oldDigest
+end
+
+
+redis.call(
+  'HSET',
+  KEYS[2],
+  'userId', userId,
+  'terminal', terminal,
+  'createdAtMs', tostring(nowMs),
+  'lastSeenAtMs', tostring(nowMs),
+  'absoluteExpiresAtMs', tostring(absoluteExpiresAtMs),
+  'loginIp', loginIp,
+  'userAgent', userAgent
+)
+
+redis.call('PEXPIREAT', KEYS[2], initialExpiresAtMs)
+redis.call('SET', KEYS[1], newDigest)
+redis.call('PEXPIREAT', KEYS[1], initialExpiresAtMs)
+
+if oldSessionKey and oldDigest ~= newDigest then
+  redis.call('DEL', oldSessionKey)
+end
+
+
+
+return {
+  1,
+  oldDigest or '',
+  tostring(initialExpiresAtMs),
+  tostring(absoluteExpiresAtMs)
+}
+`
+
+export const VALIDATE_AND_TOUCH_SESSION_SCRIPT = String.raw`
+local function isValidTerminal(value)
+  return value == 'web' or value == 'desktop' or value == 'mobile'
+end
+
+
+local function isValidUserId(value)
+  return string.len(value) > 0
+    and string.len(value) <= 100
+    and string.match(value, '^[%w_-]+$') ~= nil
+end
+
+local currentDigest = ARGV[1]
+local slotKeyPrefix = ARGV[2]
+local idleTtlMs = tonumber(ARGV[3])
+
+if not isValidDigest(currentDigest) or not idleTtlMs or idleTtlMs <= 0 then
+  return { 0, 'INVALID_ARGUMENT' }
+end
+
+local sessionValues = redis.call(
+  'HMGET',
+  KEYS[1],
+  'userId',
+  'terminal',
+  'absoluteExpiresAtMs'
+)
+
+local userId = sessionValues[1]
+local terminal = sessionValues[2]
+local absoluteExpiresAtMs = tonumber(sessionValues[3])
+
+if not userId or not terminal or not absoluteExpiresAtMs then 
+  return { 0, 'NOT_FOUND' }
+end
+
+if not isValidUserId(userId) or not isValidTerminal(terminal) then
+  return { 0, 'INVALID_SESSION_DATA' }
+end
+
+local slotKey = slotKeyPrefix .. userId .. ':' .. terminal
+local slotDigest = redis.call('GET', slotKey)
+
+if slotDigest ~= currentDigest then
+  redis.call('DEL', KEYS[1])
+  return { 0, 'REPLACED' }
+end
+
+local redisTime = redis.call('TIME')
+local nowMs = tonumber(redisTime[1]) * 1000 + math.floor(tonumber(redisTime[2]) / 1000)
+
+
+if nowMs >= absoluteExpiresAtMs then
+  redis.call('DEL', KEYS[1])
+  redis.call('DEL', slotKey)
+  return { 0, 'ABSOLUTE_EXPIRED' }
+end
+
+local expiresAtMs = math.min(nowMs + idleTtlMs, absoluteExpiresAtMs)
+redis.call('HSET', KEYS[1], 'lastSeenAtMs', tostring(nowMs))
+redis.call('PEXPIREAT', KEYS[1], expiresAtMs)
+redis.call('PEXPIREAT', slotKey, expiresAtMs)
+
+return {
+  1,
+  userId,
+  terminal,
+  tostring(expiresAtMs)
+}
+`
+
+export const LOGOUT_SESSION_SCRIPT = String.raw`
+local function isValidTerminal(value)
+  return value == 'web' or value == 'desktop' or value == 'mobile'
+end
+
+local function isValidUserId(value)
+  return string.len(value) > 0
+    and string.len(value) <= 100
+    and string.match(value, '^[%w_-]+$') ~= nil
+end
+
+local currentDigest = ARGV[1]
+local slotKeyPrefix = ARGV[2]
+
+local sessionValues = redis.call(
+  'HMGET',
+  KEYS[1],
+  'userId',
+  'terminal'
+)
+
+local userId = sessionValues[1]
+local terminal = sessionValues[2]
+
+if not userId or not terminal then
+  return { 1, 'ALREADY_GONE' }
+end
+
+if not isValidUserId(userId) or not isValidTerminal(terminal) then
+  return { 0, 'INVALID_SESSION_DATA' }
+end
+
+local slotKey = slotKeyPrefix .. userId .. ':' .. terminal
+local slotDigest = redis.call('GET', slotKey)
+
+if slotDigest == currentDigest then
+  redis.call('DEL', slotKey)
+end
+
+redis.call('DEL', KEYS[1])
+
+return { 1, 'LOGGED_OUT' }
+`
+
+export const REVOKE_USER_SESSIONS_SCRIPT = String.raw`
+local sessionKeyPrefix = ARGV[1]
+local revokedCount = 0
+
+for index = 1, #KEYS DO
+  local digest = redis.call('GET', KEYS[index])
+
+  if digest
+    and string.len(digest) == 64
+    and string.match(digest, '^[0-9a-f]+$') ~= nil then
+    redis.call('DEL', sessionKeyPrefix .. digest)
+    revokedCount = revokedCount + 1
+  end
+
+  redis.call('DEL', KEYS[index])
+end
+
+return { 1, tostring(revokedCount) }
+`

package/template-vp-monorepo-react-nestjs/apps/server/src/modules/auth/session/session.types.ts

@@ -0,0 +1,24 @@
+import { FastifyRequest } from 'fastify'
+import { SessionTerminalType } from 'shared/types'
+
+export interface CurrentAuthType {
+  userId: string
+  terminal: SessionTerminalType
+}
+
+export type AuthenticatedRequest = FastifyRequest & {
+  auth?: CurrentAuthType
+}
+
+export interface CreateSessionInput {
+  tokenDigest: string
+  userId: string
+  terminal: SessionTerminalType
+  loginIp: string
+  userAgent: string
+}
+
+export interface CreatedSession {
+  initialExpiresAtMs: number
+  absoluteExpiresAtMs: number
+}

package/template-vp-monorepo-react-nestjs/apps/server/src/modules/test/db/db.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, Get, Post } from '@nestjs/common'
+import { ApiOperation, ApiTags } from '@nestjs/swagger'
 import { DbService } from './db.service'
-import { ApiBody, ApiOperation, ApiTags } from '@nestjs/swagger'
 import { CreateUserDto } from './dto/create-user.dto'
 
 @ApiTags('DB 测试')

package/template-vp-monorepo-react-nestjs/apps/server/src/modules/test/db/dto/create-user.dto.ts

@@ -1,24 +1,22 @@
 import { users } from '@/database/schema'
 import { createInsertSchema } from 'drizzle-zod'
 import { createZodDto } from 'nestjs-zod'
-import { z } from 'zod'
 /**
  * 1. 基于数据库表生成zod schema
  *   drizzle-zod 会自动把 varchar({ length: 100 }) 翻成 .max(100)
  *   把notNull 翻成 必填字段
  */
 
-const baseSchema = createInsertSchema(users, {
-  // 数据库不知道邮箱格式， 这里用zod增强
-  email: z.email(),
-})
+const baseSchema = createInsertSchema(users)
 
 /**
  * 2. 创建用户的入参不应该包括 id 和 createdAt(这两数据库自动生成)
  */
 export const createUserSchema = baseSchema.omit({
   id: true,
+  status: true,
   createdAt: true,
+  updatedAt: true,
 })
 
 /**

package/template-vp-monorepo-react-nestjs/apps/server/src/modules/test/redis/redis.service.ts

@@ -1,5 +1,5 @@
-import { Injectable } from '@nestjs/common'
 import { InjectRedis } from '@nestjs-modules/ioredis'
+import { Injectable } from '@nestjs/common'
 import Redis from 'ioredis'
 
 @Injectable()

package/template-vp-monorepo-react-nestjs/apps/server/src/utils/env-arr.ts

@@ -0,0 +1,3 @@
+const NODE_ENV = process.env.NODE_ENV ?? 'development'
+
+export const ENV_ARR = [`.env.${NODE_ENV}.local`, `.env.local`, `.env.${NODE_ENV}`, `.env`]

package/template-vp-monorepo-react-nestjs/apps/server/test/error-catalog.spec.ts

@@ -0,0 +1,30 @@
+import { COMMON_ERRORS } from '@/common/error/common.error'
+import { AUTH_ERRORS } from '@/modules/auth/auth.errors'
+import { describe, expect, it } from 'vite-plus/test'
+
+const definitions = [...Object.values(COMMON_ERRORS), ...Object.values(AUTH_ERRORS)]
+
+describe('error catalog', () => {
+  it('uses valid and globally unique error codes', () => {
+    const codes = definitions.map((definition) => definition.code)
+
+    expect(new Set(codes).size).toBe(codes.length)
+
+    for (const definition of definitions) {
+      expect(definition.code).toMatch(/^[A-Z][A-Z0-9_]*(?:\.[A-Z][A-Z0-9_]*)+$/)
+      expect(definition.code.length).toBeLessThanOrEqual(80)
+      expect(definition.status).toBeGreaterThanOrEqual(400)
+      expect(definition.status).toBeLessThanOrEqual(599)
+      expect(definition.publicMessage.trim()).not.toBe('')
+    }
+  })
+
+  it('keeps bearerChallenge and HTTP 401 in sync', () => {
+    for (const definition of definitions) {
+      const hasBearerChallenge =
+        'bearerChallenge' in definition && definition.bearerChallenge === true
+
+      expect(hasBearerChallenge).toBe(definition.status === 401)
+    }
+  })
+})

package/template-vp-monorepo-react-nestjs/apps/server/tsconfig.build.json

@@ -1,4 +1,14 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
+  "compilerOptions": {
+    "noEmit": false,
+    "rootDir": "./src",
+    "outDir": "./dist",
+    "sourceMap": true,
+    "removeComments": true,
+    "incremental": false,
+    "declaration": false
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "test", "dist", "**/*.spec.ts"]
 }

package/template-vp-monorepo-react-nestjs/apps/server/tsconfig.json

@@ -1,28 +1,20 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "resolvePackageJsonExports": true,
-    "esModuleInterop": true,
+    "target": "ES2023",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "types": ["node"],
     "isolatedModules": true,
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "target": "ES2023",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "rootDir": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "strictNullChecks": true,
-    "forceConsistentCasingInFileNames": true,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "noFallthroughCasesInSwitch": false,
+    "emitDecoratorMetadata": true,
+    "esModuleInterop": true,
+    "noEmit": true,
+    "noUncheckedIndexedAccess": true,
     "paths": {
       "@/*": ["./src/*"]
     }
-  }
+  },
+  "include": ["src/**/*.ts", "test/**/*.ts", "*.config.ts"],
+  "exclude": ["node_modules", "dist"]
 }

package/template-vp-monorepo-react-nestjs/apps/server/vite.config.ts

@@ -0,0 +1,15 @@
+import { resolve } from 'path'
+import { defineConfig } from 'vite-plus'
+
+export default defineConfig({
+  resolve: {
+    alias: {
+      '@': resolve(__dirname, 'src'),
+    },
+  },
+  test: {
+    environment: 'node',
+    include: ['test/**/*.spec.ts'],
+    restoreMocks: true,
+  },
+})

package/template-vp-monorepo-react-nestjs/apps/web/package.json

@@ -21,6 +21,7 @@
     "react": "catalog:",
     "react-dom": "catalog:",
     "react-router": "catalog:",
+    "shared": "workspace:*",
     "tailwindcss": "catalog:"
   },
   "devDependencies": {

package/template-vp-monorepo-react-nestjs/apps/web/tsconfig.json

@@ -1,28 +1,18 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.bundler.json",
   "compilerOptions": {
-    "target": "es2023",
-    "module": "esnext",
+    "target": "ES2023",
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "jsx": "react-jsx",
-    "lib": ["ES2023", "DOM"],
     "types": ["vite-plus/client"],
     "paths": {
       "@/*": ["./src/*"]
     },
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-
-    /* Linting */
+    "erasableSyntaxOnly": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true
+    "noUncheckedIndexedAccess": true
   },
   "include": ["src"]
 }

package/template-vp-monorepo-react-nestjs/apps/web-vue/commitlint.config.js

@@ -1 +1 @@
-export default { extends: ["@commitlint/config-conventional"] };
+export default { extends: ['@commitlint/config-conventional'] }

package/template-vp-monorepo-react-nestjs/apps/web-vue/lefthook.yml

@@ -1,7 +1,7 @@
 pre-commit:
   commands:
     check:
-      glob: "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc,vue}"
+      glob: '*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc,vue}'
       run: pnpm eslint --fix {staged_files}
       stage_fixed: true
 

package/template-vp-monorepo-react-nestjs/apps/web-vue/package.json

@@ -13,7 +13,6 @@
   "dependencies": {
     "@alova/adapter-axios": "catalog:",
     "@antdv-next/icons": "catalog:",
-    "@bubblesjs/i18n-vue": "workspace:*",
     "alova": "catalog:",
     "antdv-next": "catalog:",
     "axios": "catalog:",
@@ -34,7 +33,6 @@
     "@commitlint/config-conventional": "catalog:",
     "@types/node": "catalog:",
     "@types/nprogress": "catalog:",
-    "@typescript/native": "catalog:",
     "@unocss/eslint-plugin": "catalog:",
     "@unocss/preset-attributify": "catalog:",
     "@unocss/preset-wind4": "catalog:",
@@ -47,7 +45,7 @@
     "lefthook": "catalog:",
     "oxlint": "catalog:",
     "sass": "catalog:",
-    "typescript": "catalog:typescript6",
+    "typescript": "catalog:",
     "unocss": "catalog:",
     "unplugin-auto-import": "catalog:",
     "unplugin-vue-components": "catalog:",

package/template-vp-monorepo-react-nestjs/apps/web-vue/src/api/index.ts

@@ -1,12 +1,12 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
-export const EXPIRE_TIME = 60 * 10 * 1000;
+export const EXPIRE_TIME = 60 * 10 * 1000
 
 export function getTree() {
-  return request.Get("/xxx/xx", {
+  return request.Get('/xxx/xx', {
     cacheFor: {
-      mode: "restore",
+      mode: 'restore',
       expire: EXPIRE_TIME,
     },
-  });
+  })
 }

package/template-vp-monorepo-react-nestjs/apps/web-vue/src/components/Icon/svg-icon.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 defineProps<{
-  icon: string;
-}>();
-const attrs = useAttrs();
+  icon: string
+}>()
+const attrs = useAttrs()
 </script>
 
 <template>

package/template-vp-monorepo-react-nestjs/apps/web-vue/src/hooks/chart/lib.ts

@@ -6,7 +6,7 @@ import {
   PictorialBarChart,
   PieChart,
   RadarChart,
-} from "echarts/charts";
+} from 'echarts/charts'
 import {
   AriaComponent,
   CalendarComponent,
@@ -22,11 +22,11 @@ import {
   ToolboxComponent,
   TooltipComponent,
   VisualMapComponent,
-} from "echarts/components";
-import * as echarts from "echarts/core";
+} from 'echarts/components'
+import * as echarts from 'echarts/core'
 // TODO 如果想换成SVG渲染，就导出SVGRenderer，
 //  并且放到 echarts.use 里，注释掉 CanvasRenderer
-import { /* SVGRenderer */ CanvasRenderer } from "echarts/renderers";
+import { /* SVGRenderer */ CanvasRenderer } from 'echarts/renderers'
 
 echarts.use([
   LegendComponent,
@@ -52,6 +52,6 @@ echarts.use([
   TimelineComponent,
   CalendarComponent,
   GraphicComponent,
-]);
+])
 
-export default echarts;
+export default echarts

package/template-vp-monorepo-react-nestjs/apps/web-vue/src/hooks/chart/useEcharts.ts

@@ -1,27 +1,29 @@
-import type { EChartsOption } from "echarts";
+import type { EChartsOption } from 'echarts'
 
-import type { ShallowRef } from "vue";
+import type { ShallowRef } from 'vue'
 
-import { debounce } from "radashi";
+import { debounce } from 'radashi'
 
-import echarts from "./lib";
+import echarts from './lib'
 
-type setOptionsType = (options: EChartsOption, clear?: boolean) => void;
+type setOptionsType = (options: EChartsOption, clear?: boolean) => void
 
 export function useECharts(
   elRef: Ref<HTMLDivElement> | Readonly<ShallowRef<HTMLDivElement | null>>,
 ) {
-  let chartInstance: echarts.ECharts | null = null;
-  let resizeObserver: ResizeObserver | undefined;
+  let chartInstance: echarts.ECharts | null = null
+  let resizeObserver: ResizeObserver | undefined
 
   const resize = () => {
-    chartInstance?.resize();
-  };
+    chartInstance?.resize()
+  }
 
   const initCharts = () => {
-    if (!elRef) return;
-    const el = unref(elRef);
-    if (!el) return;
+    if (!elRef)
+      return
+    const el = unref(elRef)
+    if (!el)
+      return
 
     resizeObserver = new ResizeObserver(
       debounce(
@@ -30,36 +32,39 @@ export function useECharts(
         },
         resize,
       ),
-    );
-    resizeObserver.observe(el);
+    )
+    resizeObserver.observe(el)
 
-    chartInstance = echarts.init(el);
-  };
+    chartInstance = echarts.init(el)
+  }
 
   const setOptions: setOptionsType = (options, clear = true) => {
     if (!chartInstance) {
-      initCharts();
-      if (!chartInstance) return;
+      initCharts()
+      if (!chartInstance)
+        return
     }
-    clear && chartInstance?.clear();
-    chartInstance?.setOption(options);
-  };
+    if (clear)
+      chartInstance.clear()
+    chartInstance?.setOption(options)
+  }
 
   const getInstance: () => echarts.ECharts | null = () => {
-    if (!chartInstance) initCharts();
-    return chartInstance;
-  };
+    if (!chartInstance)
+      initCharts()
+    return chartInstance
+  }
 
   onUnmounted(() => {
-    chartInstance?.dispose();
-    resizeObserver?.disconnect();
-    resizeObserver = undefined;
-  });
+    chartInstance?.dispose()
+    resizeObserver?.disconnect()
+    resizeObserver = undefined
+  })
 
   return {
     setOptions,
     resize,
     echarts,
     getInstance,
-  };
+  }
 }

package/template-vp-monorepo-react-nestjs/apps/web-vue/src/i18n/instance.ts

@@ -1,5 +1,7 @@
 import { createJsonStorage, i18n } from '@bubblesjs/i18n-core'
 
+// Initialization must finish before App renders so the first locale is available synchronously.
+// eslint-disable-next-line antfu/no-top-level-await
 export const leftStore = await i18n.init({
   locale: 'zh_CN',
   loaderMessage: async (locale?: string) => (await import(`@/locales/${locale}.json`))?.default,