@gadmin2n/schematics 0.0.139 → 0.0.141

package/dist/lib/application/files/gadmin2-game-angle-demo/server/migrate-between-pg-schemas.js

@@ -47,8 +47,9 @@ if (process.env.DATABASE_URL) {
   sourcePgConfig = {
     host: url.hostname,
     port: Number(url.port),
-    user: url.username,
-    password: url.password,
+    // WHATWG URL 的 username/password getter 返回 percent-encoded 形式，需 decode 还原字面量，否则含 ^ 等特殊字符的密码会认证失败
+    user: decodeURIComponent(url.username),
+    password: decodeURIComponent(url.password),
     database: url.pathname.slice(1),
   };
   if (!process.env.PG_SCHEMA) {
@@ -84,8 +85,9 @@ if (hasTargetDatabaseConfig) {
     targetPgConfig = {
       host: url.hostname,
       port: Number(url.port),
-      user: url.username,
-      password: url.password,
+      // WHATWG URL 的 username/password getter 返回 percent-encoded 形式，需 decode 还原字面量，否则含 ^ 等特殊字符的密码会认证失败
+      user: decodeURIComponent(url.username),
+      password: decodeURIComponent(url.password),
       database: url.pathname.slice(1),
     };
     if (!process.env.PG_SCHEMA_TARGET) {

package/dist/lib/application/files/gadmin2-game-angle-demo/server/package.json

@@ -33,7 +33,8 @@
     "push:db": "dotenv -e .env.local -e .env  -- prisma db push --skip-generate",
     "seed": "dotenv -e .env.local -e .env  -- ts-node seed/index.ts",
     "prisma:studio": "dotenv -e .env.local -e .env  -- prisma studio",
-    "gen:jwt": "dotenv -e .env.local -e .env  -- ts-node scripts/gen-jwt.ts"
+    "gen:jwt": "dotenv -e .env.local -e .env  -- ts-node scripts/gen-jwt.ts",
+    "migrate:human-approval-configs": "dotenv -e .env.local -e .env -- ts-node scripts/migrate-human-approval-configs.ts"
   },
   "dependencies": {
     "@agendajs/postgres-backend": "^3.0.5",
@@ -61,6 +62,8 @@
     "@prisma/instrumentation": "6.19.0",
     "@temporalio/client": "^1.11.6",
     "agenda": "^6.2.5",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
     "axios": "^1.13.2",
     "cache-manager": "^6.4.3",
     "class-transformer": "^0.5.1",
@@ -91,7 +94,7 @@
   "devDependencies": {
     "@faker-js/faker": "^10.4.0",
     "@gadmin2n/prisma-nest-generator": "^0.0.49",
-    "@gadmin2n/prisma-react-generator": "^0.0.71",
+    "@gadmin2n/prisma-react-generator": "^0.0.72",
     "@nestjs/cli": "^11.0.21",
     "@nestjs/testing": "^10.4.15",
     "@swc/cli": "^0.8.1",

package/dist/lib/application/files/gadmin2-game-angle-demo/server/prisma.config.ts

@@ -7,9 +7,18 @@ dotenv.config({ path: path.resolve(__dirname, '.env.local') });
 dotenv.config({ path: path.resolve(__dirname, '.env') });
 
 // 从连接串的 ?schema= 读取外部表所在 schema,缺省 public
-const schema =
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  new URL(process.env.DATABASE_URL!).searchParams.get('schema') ?? 'public';
+// 注意：prisma generate 等离线命令在构建镜像时可能没有 DATABASE_URL
+// （真实连接串只在被 dockerignore 的 .env.local 中），此处必须容错，避免 new URL 抛错导致配置加载失败
+function resolveSchema(): string {
+  const url = process.env.DATABASE_URL;
+  if (!url) return 'public';
+  try {
+    return new URL(url).searchParams.get('schema') ?? 'public';
+  } catch {
+    return 'public';
+  }
+}
+const schema = resolveSchema();
 
 export default defineConfig({
   engine: 'classic',

package/dist/lib/application/files/gadmin2-game-angle-demo/server/scripts/gen-jwt.ts

@@ -49,7 +49,14 @@ async function main() {
     process.exit(1);
   }
 
-  const ttl = expiresIn ? parseInt(expiresIn, 10) : 7 * 24 * 60 * 60; // 默认 7 天
+  const ttl = expiresIn ? parseInt(expiresIn, 10) : 3600; // 默认 1 小时（单位：秒）
+
+  if (Number.isNaN(ttl) || ttl <= 0) {
+    console.error(
+      `[gen-jwt] --expiresIn must be a positive integer (seconds), got "${expiresIn}".`,
+    );
+    process.exit(1);
+  }
 
   const token = await TaiHuId.sign(
     {

package/dist/lib/application/files/gadmin2-game-angle-demo/server/scripts/migrate-human-approval-configs.ts

@@ -0,0 +1,86 @@
+import { NestFactory } from '@nestjs/core';
+import { readFileSync } from 'fs';
+import { PrismaService } from 'nestjs-prisma';
+import { resolve } from 'path';
+import { AppModule } from '../src/app.module';
+import {
+  ApprovalSubjectMapping,
+  normalizeLegacyApprovalConfig,
+} from '../src/modules/humanApproval/legacy-approval-config-migration';
+import { WorkflowNodeInstanceService } from '../src/modules/workflowNodeInstance/workflowNodeInstance.service';
+
+type MappingFile = Record<string, ApprovalSubjectMapping>;
+
+async function main() {
+  const args = process.argv.slice(2);
+  const apply = args.includes('--apply');
+  const mappingPath = valueAfter(args, '--mapping');
+  const mapping = mappingPath
+    ? (JSON.parse(readFileSync(resolve(mappingPath), 'utf8')) as MappingFile)
+    : {};
+  const app = await NestFactory.createApplicationContext(AppModule, {
+    logger: false,
+  });
+  try {
+    const prisma = app.get(PrismaService);
+    const nodeInstances = app.get(WorkflowNodeInstanceService);
+    const instances = await prisma.workflowNodeInstance.findMany({
+      where: { nodeType: { runtimeKey: 'human_approval' } },
+      include: { nodeType: { select: { schemaVersion: true } } },
+      orderBy: { id: 'asc' },
+    });
+    const report = {
+      scanned: instances.length,
+      ready: 0,
+      applied: 0,
+      alreadyCurrent: 0,
+      requiresMapping: [] as Array<{ instance: string; refs: string[] }>,
+      invalid: [] as Array<{ instance: string; errors: string[] }>,
+    };
+    for (const instance of instances) {
+      const key = instance.code ?? String(instance.id);
+      const result = normalizeLegacyApprovalConfig(
+        instance.config,
+        mapping[key] ?? {},
+      );
+      if (result.status === 'ALREADY_CURRENT') {
+        report.alreadyCurrent += 1;
+      } else if (result.status === 'REQUIRES_MAPPING') {
+        report.requiresMapping.push({ instance: key, refs: result.refs });
+      } else if (result.status === 'INVALID') {
+        report.invalid.push({ instance: key, errors: result.errors });
+      } else {
+        report.ready += 1;
+        if (apply) {
+          await nodeInstances.updateConfigured(
+            Number(instance.id),
+            {
+              config: result.config as unknown as Record<string, unknown>,
+            },
+            { userId: 'system:migrate-human-approval' },
+          );
+          report.applied += 1;
+        }
+      }
+    }
+    console.log(JSON.stringify(report, null, 2));
+    if (report.requiresMapping.length || report.invalid.length)
+      process.exitCode = 2;
+  } finally {
+    await app.close();
+  }
+}
+
+function valueAfter(args: string[], flag: string): string | undefined {
+  const index = args.indexOf(flag);
+  if (index < 0) return undefined;
+  const value = args[index + 1];
+  if (!value || value.startsWith('--'))
+    throw new Error(`${flag} requires a path`);
+  return value;
+}
+
+main().catch((error) => {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exitCode = 1;
+});