@liujitcn/kratos-taro-app-core 0.0.18 → 0.0.19

package/README.md

@@ -26,7 +26,7 @@
 
 模块必须同时提供运行时定义和 `./build` 导出。构建入口返回模块名称、包根目录与页面清单；runner 根据宿主的静态 `module-manifest.ts` 解析模块顺序，扫描页面并创建事务。
 
-runner 支持命名导入和默认导入的模块，后注册模块可以覆盖相同物理路由。页面私有 `components` 不会成为路由，模块 static 会先合并到宿主再由 Taro 编译。H5 下，runner 根据页面 `navigationStyle` 和 `navigationBar*` 配置生成默认顶部导航栏；微信小程序继续使用原生导航栏。构建失败、正常退出和收到终止信号时都会执行恢复。
+runner 支持命名导入和默认导入的模块，后注册模块可以覆盖相同物理路由。页面私有 `components` 不会成为路由，模块 static 会先合并到宿主再由 Taro 编译。H5 下，runner 根据页面 `navigationStyle` 和 `navigationBar*` 配置生成默认顶部导航栏；微信小程序继续使用原生导航栏。构建失败、正常退出和收到终止信号时都会执行恢复；传入 `--prepare-only` 时只装配页面供类型检查使用，配合 `--cleanup-only` 在检查结束后恢复，不启动 Taro 编译。
 
 ## 验证
 

package/dist/runner.mjs

@@ -15,6 +15,9 @@ import { dirname, relative, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { spawn } from "node:child_process";
 import ts from "typescript";
+var sourceVersionCounter = 0;
+var PAGE_ASSEMBLY_WAIT_TIMEOUT_MS = 3e4;
+var PAGE_ASSEMBLY_POLL_INTERVAL_MS = 25;
 async function main() {
   const options = parseArguments(process.argv.slice(2));
   const hostRoot = process.cwd();
@@ -23,6 +26,7 @@ async function main() {
   const baseConfigFile = resolve(inputDir, "app.config.base.json");
   const transactionFile = resolve(hostRoot, ".kratos-taro-app-pages-state.json");
   recoverBuildTransaction(transactionFile, inputDir, appConfigFile);
+  if (options.cleanupOnly) return;
   const originalAppConfig = readFileSync(appConfigFile, "utf8");
   const manifest = JSON.parse(readFileSync(baseConfigFile, "utf8"));
   const modules = await loadBuildModules(hostRoot, resolve(inputDir, "module-manifest.ts"));
@@ -38,34 +42,24 @@ async function main() {
       });
     });
   });
-  const generatedFiles = [...pageMap.values()].flatMap((page) => {
-    const pageFile = resolve(inputDir, `${page.route}.tsx`);
-    const configFile = resolve(inputDir, `${page.route}.config.ts`);
-    return [pageFile, configFile].filter((file) => !existsSync(file));
-  });
-  const staticRoot = resolve(inputDir, "static");
-  const staticFiles = collectModuleStaticFiles(
-    modules.map((module) => resolve(module.root, "src/static")),
-    staticRoot
-  );
-  const generatedStaticFiles = staticFiles.map(({ target }) => target);
-  const transaction = {
-    inputDir,
+  const pageAssembly = preparePageAssembly({
     appConfigFile,
+    baseManifest: manifest,
+    inputDir,
+    moduleStaticRoots: modules.map((module) => resolve(module.root, "src/static")),
     originalAppConfig,
-    generatedFiles,
-    generatedStaticFiles,
-    ownerPid: process.pid
-  };
-  writeFileSync(transactionFile, `${JSON.stringify(transaction, null, 2)}
-`, { flag: "wx" });
+    pageMap: [...pageMap.values()],
+    transactionFile
+  });
   let cleaned = false;
   const cleanup = () => {
     if (cleaned) return;
     cleaned = true;
-    cleanupTransaction(transaction);
-    if (existsSync(transactionFile)) unlinkSync(transactionFile);
+    releasePageAssembly(transactionFile, pageAssembly.leaseFile);
   };
+  if (options.prepareOnly) {
+    return;
+  }
   const handleSignal = (signal) => {
     child?.kill(signal);
   };
@@ -73,34 +67,14 @@ async function main() {
   process.once("SIGINT", () => handleSignal("SIGINT"));
   process.once("SIGTERM", () => handleSignal("SIGTERM"));
   try {
-    pageMap.forEach((page) => {
-      appendPage(manifest, page.route);
-      const pageFile = resolve(inputDir, `${page.route}.tsx`);
-      const configFile = resolve(inputDir, `${page.route}.config.ts`);
-      if (!existsSync(pageFile)) {
-        mkdirSync(dirname(pageFile), { recursive: true });
-        writeFileSync(pageFile, createPageWrapper(page));
-      }
-      if (!existsSync(configFile)) {
-        writeFileSync(configFile, createPageConfig(page));
-      }
-    });
-    staticFiles.forEach(({ source, target }) => {
-      mkdirSync(dirname(target), { recursive: true });
-      copyFileSync(source, target);
-    });
-    writeFileSync(
-      appConfigFile,
-      `export default defineAppConfig(${JSON.stringify(manifest, null, 2)})
-`
-    );
     const args = ["exec", "taro", "build", "--type", options.type, "--mode", options.mode];
     if (options.watch) args.push("--watch");
     child = spawn(process.platform === "win32" ? "pnpm.cmd" : "pnpm", args, {
       cwd: hostRoot,
       env: {
         ...process.env,
-        NODE_ENV: options.mode === "development" ? "development" : "production"
+        NODE_ENV: options.mode === "development" ? "development" : "production",
+        KRATOS_TARO_OUTPUT_ROOT: process.env.KRATOS_TARO_OUTPUT_ROOT || (options.type === "h5" ? "dist/h5" : "dist/mp-weixin")
       },
       stdio: "inherit"
     });
@@ -123,6 +97,8 @@ function parseArguments(args) {
   let type;
   let mode = "production";
   let watch = false;
+  let prepareOnly = false;
+  let cleanupOnly = false;
   for (let index = 0; index < args.length; index += 1) {
     const argument = args[index];
     if (argument === "--type") {
@@ -133,12 +109,16 @@ function parseArguments(args) {
       mode = args[++index] || mode;
     } else if (argument === "--watch") {
       watch = true;
+    } else if (argument === "--prepare-only") {
+      prepareOnly = true;
+    } else if (argument === "--cleanup-only") {
+      cleanupOnly = true;
     } else {
       throw new Error(`\u672A\u77E5\u53C2\u6570\uFF1A${argument}`);
     }
   }
   if (!type) throw new Error("\u7F3A\u5C11 --type h5|weapp");
-  return { type, mode, watch };
+  return { type, mode, watch, prepareOnly, cleanupOnly };
 }
 async function loadBuildModules(hostRoot, manifestFile) {
   const source = readFileSync(manifestFile, "utf8");
@@ -185,26 +165,212 @@ async function loadBuildModules(hostRoot, manifestFile) {
   );
 }
 function recoverBuildTransaction(transactionFile, inputDir, appConfigFile) {
+  const lockFile = `${transactionFile}.lock`;
+  acquirePageAssemblyLock(lockFile);
+  try {
+    const transaction = readBuildTransaction(transactionFile, inputDir, appConfigFile);
+    if (!transaction || isPageAssemblyActive(transaction, transactionFile)) return;
+    restoreBuildTransaction(transaction, transactionFile);
+  } finally {
+    releasePageAssemblyLock(lockFile);
+  }
+}
+function preparePageAssembly(options) {
+  const lockFile = `${options.transactionFile}.lock`;
+  acquirePageAssemblyLock(lockFile);
+  try {
+    let transaction = readBuildTransaction(
+      options.transactionFile,
+      options.inputDir,
+      options.appConfigFile
+    );
+    if (transaction && isPageAssemblyActive(transaction, options.transactionFile)) {
+      return {
+        transaction,
+        leaseFile: createPageAssemblyLease(options.transactionFile)
+      };
+    }
+    let originalAppConfig = options.originalAppConfig;
+    if (transaction) {
+      originalAppConfig = transaction.originalAppConfig;
+      restoreBuildTransaction(transaction, options.transactionFile);
+    }
+    const generatedFiles = options.pageMap.flatMap((page) => {
+      const pageFile = resolve(options.inputDir, `${page.route}.tsx`);
+      const configFile = resolve(options.inputDir, `${page.route}.config.ts`);
+      return [pageFile, configFile].filter(
+        (file) => !existsSync(file) || isGeneratedPageFile(file) || isGeneratedPageConfig(file)
+      );
+    });
+    const staticFiles = collectModuleStaticFiles(
+      options.moduleStaticRoots,
+      resolve(options.inputDir, "static")
+    );
+    transaction = {
+      inputDir: options.inputDir,
+      appConfigFile: options.appConfigFile,
+      originalAppConfig,
+      generatedFiles,
+      generatedStaticFiles: staticFiles.map(({ target }) => target),
+      ownerPid: process.pid,
+      ready: false
+    };
+    writeBuildTransaction(options.transactionFile, transaction, "wx");
+    const leaseFile = createPageAssemblyLease(options.transactionFile);
+    try {
+      options.pageMap.forEach((page) => {
+        appendPage(options.baseManifest, page.route);
+        const pageFile = resolve(options.inputDir, `${page.route}.tsx`);
+        const configFile = resolve(options.inputDir, `${page.route}.config.ts`);
+        if (!existsSync(pageFile)) {
+          mkdirSync(dirname(pageFile), { recursive: true });
+          writeFileSync(pageFile, createPageWrapper(page));
+        }
+        if (!existsSync(configFile)) writeFileSync(configFile, createPageConfig(page));
+      });
+      staticFiles.forEach(({ source, target }) => {
+        mkdirSync(dirname(target), { recursive: true });
+        copyFileSync(source, target);
+      });
+      writeFileSync(
+        options.appConfigFile,
+        `export default defineAppConfig(${JSON.stringify(options.baseManifest, null, 2)})
+`
+      );
+      transaction.ready = true;
+      writeBuildTransaction(options.transactionFile, transaction);
+      return { transaction, leaseFile };
+    } catch (error) {
+      releasePageAssemblyLease(leaseFile);
+      restoreBuildTransaction(transaction, options.transactionFile);
+      throw error;
+    }
+  } finally {
+    releasePageAssemblyLock(lockFile);
+  }
+}
+function readBuildTransaction(transactionFile, inputDir, appConfigFile) {
   if (!existsSync(transactionFile)) return;
   const transaction = JSON.parse(readFileSync(transactionFile, "utf8"));
   if (transaction.inputDir !== inputDir || transaction.appConfigFile !== appConfigFile) {
     throw new Error(`Taro \u6784\u5EFA\u4E8B\u52A1\u76EE\u5F55\u4E0D\u5339\u914D\uFF1A${transactionFile}`);
   }
-  if (transaction.ownerPid !== process.pid && isProcessRunning(transaction.ownerPid)) {
-    throw new Error(
-      `\u9875\u9762\u88C5\u914D\u5DF2\u7531\u8FDB\u7A0B ${transaction.ownerPid} \u4F7F\u7528\uFF0C\u8BF7\u5148\u505C\u6B62\u53E6\u4E00\u4E2A H5 \u6216\u5C0F\u7A0B\u5E8F\u5F00\u53D1\u8FDB\u7A0B`
-    );
-  }
-  cleanupTransaction(transaction);
-  unlinkSync(transactionFile);
+  return transaction;
 }
-function cleanupTransaction(transaction) {
+function writeBuildTransaction(transactionFile, transaction, flag) {
+  writeFileSync(
+    transactionFile,
+    `${JSON.stringify(transaction, null, 2)}
+`,
+    flag ? { flag } : void 0
+  );
+}
+function restoreBuildTransaction(transaction, transactionFile) {
   for (const file of [...transaction.generatedFiles].reverse()) {
     if (existsSync(file)) unlinkSync(file);
     removeEmptyParents(dirname(file), transaction.inputDir);
   }
-  removeGeneratedStaticFiles(transaction.generatedStaticFiles, resolve(transaction.inputDir, "static"));
+  removeGeneratedStaticFiles(
+    transaction.generatedStaticFiles ?? [],
+    resolve(transaction.inputDir, "static")
+  );
   writeFileSync(transaction.appConfigFile, transaction.originalAppConfig);
+  if (existsSync(transactionFile)) unlinkSync(transactionFile);
+}
+function releasePageAssembly(transactionFile, leaseFile) {
+  releasePageAssemblyLease(leaseFile);
+  const lockFile = `${transactionFile}.lock`;
+  acquirePageAssemblyLock(lockFile);
+  try {
+    const transaction = readBuildTransactionFromFile(transactionFile);
+    if (!transaction || isPageAssemblyActive(transaction, transactionFile)) return;
+    restoreBuildTransaction(transaction, transactionFile);
+  } finally {
+    releasePageAssemblyLock(lockFile);
+  }
+}
+function readBuildTransactionFromFile(transactionFile) {
+  if (!existsSync(transactionFile)) return;
+  return JSON.parse(readFileSync(transactionFile, "utf8"));
+}
+function createPageAssemblyLease(transactionFile) {
+  const leaseDirectory = `${transactionFile}.leases`;
+  mkdirSync(leaseDirectory, { recursive: true });
+  const leaseFile = resolve(
+    leaseDirectory,
+    `${process.pid}-${Date.now()}-${++sourceVersionCounter}.lease`
+  );
+  writeFileSync(leaseFile, `${JSON.stringify({ ownerPid: process.pid })}
+`, { flag: "wx" });
+  return leaseFile;
+}
+function releasePageAssemblyLease(leaseFile) {
+  if (existsSync(leaseFile)) unlinkSync(leaseFile);
+  const leaseDirectory = dirname(leaseFile);
+  if (existsSync(leaseDirectory) && !readdirSync(leaseDirectory).length) {
+    try {
+      rmdirSync(leaseDirectory);
+    } catch (error) {
+      const code = error.code;
+      if (code !== "ENOTEMPTY" && code !== "EEXIST") throw error;
+    }
+  }
+}
+function isPageAssemblyActive(transaction, transactionFile) {
+  if (listActivePageLeases(`${transactionFile}.leases`).length) return true;
+  return transaction.ownerPid !== void 0 && transaction.ownerPid !== process.pid && isProcessRunning(transaction.ownerPid);
+}
+function listActivePageLeases(leaseDirectory) {
+  if (!existsSync(leaseDirectory)) return [];
+  const activePids = [];
+  for (const entry of readdirSync(leaseDirectory)) {
+    const leaseFile = resolve(leaseDirectory, entry);
+    try {
+      const lease = JSON.parse(readFileSync(leaseFile, "utf8"));
+      if (lease.ownerPid && isProcessRunning(lease.ownerPid)) {
+        activePids.push(lease.ownerPid);
+      } else {
+        unlinkSync(leaseFile);
+      }
+    } catch {
+      unlinkSync(leaseFile);
+    }
+  }
+  return activePids;
+}
+function acquirePageAssemblyLock(lockFile) {
+  const deadline = Date.now() + PAGE_ASSEMBLY_WAIT_TIMEOUT_MS;
+  while (true) {
+    try {
+      writeFileSync(lockFile, `${JSON.stringify({ ownerPid: process.pid })}
+`, { flag: "wx" });
+      return;
+    } catch (error) {
+      if (error.code !== "EEXIST") throw error;
+      const ownerPid = readPageAssemblyLockOwner(lockFile);
+      if (ownerPid !== void 0 && !isProcessRunning(ownerPid)) {
+        unlinkSync(lockFile);
+        continue;
+      }
+      if (Date.now() >= deadline) throw new Error(`\u7B49\u5F85 Taro \u9875\u9762\u88C5\u914D\u9501\u8D85\u65F6\uFF1A${lockFile}`);
+      waitForPageAssembly(PAGE_ASSEMBLY_POLL_INTERVAL_MS);
+    }
+  }
+}
+function releasePageAssemblyLock(lockFile) {
+  if (!existsSync(lockFile)) return;
+  if (readPageAssemblyLockOwner(lockFile) === process.pid) unlinkSync(lockFile);
+}
+function readPageAssemblyLockOwner(lockFile) {
+  try {
+    return JSON.parse(readFileSync(lockFile, "utf8")).ownerPid;
+  } catch {
+    return;
+  }
+}
+function waitForPageAssembly(milliseconds) {
+  const buffer = new SharedArrayBuffer(4);
+  Atomics.wait(new Int32Array(buffer), 0, 0, milliseconds);
 }
 function isProcessRunning(pid) {
   try {
@@ -272,7 +438,7 @@ function appendPage(manifest, route) {
   if (!subpackage.pages.includes(subRoute)) subpackage.pages.push(subRoute);
 }
 function createPageWrapper(page) {
-  return `import KratosPage from ${JSON.stringify(page.source)}
+  return `import KratosPage from ${JSON.stringify(`${page.source}.tsx`)}
 import { KratosPageFrame } from '@liujitcn/kratos-taro-app-core/components/KratosPageFrame'
 import { KratosTabBar } from '@liujitcn/kratos-taro-app-core/components/KratosTabBar'
 
@@ -298,6 +464,12 @@ function createPageConfig(page) {
   return `export default definePageConfig(${JSON.stringify(page.style ?? {}, null, 2)})
 `;
 }
+function isGeneratedPageFile(file) {
+  return existsSync(file) && readFileSync(file, "utf8").includes("\u81EA\u52A8\u751F\u6210\u7684\u6A21\u5757\u9875\u9762\u5305\u88C5\u5668");
+}
+function isGeneratedPageConfig(file) {
+  return existsSync(file) && readFileSync(file, "utf8").includes("definePageConfig(");
+}
 function normalizeRoute(route) {
   return route.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\.tsx$/, "");
 }

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.18",
+  "version": "0.0.19",
   "type": "module",
   "files": [
     "dist",

package/src/components/KratosTabBar.scss

@@ -18,6 +18,7 @@
   align-items: center;
   justify-content: center;
   flex-direction: column;
+  transform: translateY(clamp(1PX, env(safe-area-inset-bottom), 7PX));
   color: #333;
   font-size: 10PX;
   line-height: 12PX;

package/src/rpc/base/v1/config.ts

@@ -1,11 +1,11 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/config.proto
 
 /* eslint-disable */
-import type { BaseConfigSite } from "../../common/v1/enum";
+import type { BaseConfigSite } from "./enum";
 
 /** 获取系统配置条件 */
 export interface GetConfigRequest {

package/src/rpc/{common → base}/v1/enum.ts

@@ -1,18 +1,31 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
-// source: common/v1/enum.proto
+// source: base/v1/enum.proto
 
 /* eslint-disable */
 
-/** 状态 */
-export enum Status {
-  UNKNOWN = 0,
-  /** ENABLE - 启用 */
-  ENABLE = 1,
-  /** DISABLE - 禁用 */
-  DISABLE = 2,
+/** AI 助手消息状态 */
+export enum AiMessageStatus {
+  /** UNKNOWN_AMS - 未知AI助手消息状态 */
+  UNKNOWN_AMS = 0,
+  /** GENERATING_AMS - 生成中 */
+  GENERATING_AMS = 1,
+  /** SUCCESS_AMS - 成功 */
+  SUCCESS_AMS = 2,
+  /** FAILED_AMS - 失败 */
+  FAILED_AMS = 3,
+}
+
+/** 终端类型 */
+export enum Terminal {
+  /** UNKNOWN_TERMINAL - 未知终端 */
+  UNKNOWN_TERMINAL = 0,
+  /** TERMINAL_APP - 移动端 */
+  TERMINAL_APP = 1,
+  /** TERMINAL_ADMIN - 管理端 */
+  TERMINAL_ADMIN = 2,
 }
 
 /** 系统配置位置 */
@@ -39,33 +52,3 @@ export enum PasswordCryptoScene {
   /** UPDATE_USER_PASSWORD - 个人修改密码加密场景 */
   UPDATE_USER_PASSWORD = 4,
 }
-
-/** AI 助手消息状态 */
-export enum AiMessageStatus {
-  /** UNKNOWN_AAMS - 未知AI助手消息状态 */
-  UNKNOWN_AAMS = 0,
-  /** GENERATING_AAMS - 生成中 */
-  GENERATING_AAMS = 1,
-  /** SUCCESS_AAMS - 成功 */
-  SUCCESS_AAMS = 2,
-  /** FAILED_AAMS - 失败 */
-  FAILED_AAMS = 3,
-}
-
-/** 支付通知资源类型 */
-export enum ResourceType {
-  /** TRANSACTION - 支付 */
-  TRANSACTION = 0,
-  /** REFUND - 退款 */
-  REFUND = 1,
-}
-
-/** 终端类型 */
-export enum Terminal {
-  /** TERMINAL_UNSPECIFIED - 未知终端 */
-  TERMINAL_UNSPECIFIED = 0,
-  /** TERMINAL_APP - 移动端 */
-  TERMINAL_APP = 1,
-  /** TERMINAL_ADMIN - 管理端 */
-  TERMINAL_ADMIN = 2,
-}

package/src/rpc/base/v1/file.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/file.proto
 

package/src/rpc/base/v1/login.ts

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/login.proto
 
 /* eslint-disable */
-import type { PasswordCryptoScene } from "../../common/v1/enum";
 import type { PasswordCrypto } from "../../common/v1/types";
 import type { Empty } from "../../google/protobuf/empty";
+import type { PasswordCryptoScene } from "./enum";
 
 /** 验证码获取条件 */
 export interface CaptchaRequest {

package/src/rpc/base/v1/mcp.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/mcp.proto
 

package/src/rpc/base/v1/oauth.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/oauth.proto
 

package/src/rpc/base/v1/sse.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: base/v1/sse.proto
 

package/src/rpc/common/v1/common.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: common/v1/common.proto
 

package/src/rpc/common/v1/types.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: common/v1/types.proto
 

package/src/rpc/google/protobuf/empty.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: google/protobuf/empty.proto
 

package/src/rpc/google/protobuf/wrappers.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: google/protobuf/wrappers.proto
 

package/src/rpc/system/app/v1/auth.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/app/v1/auth.proto
 

package/src/rpc/system/app/v1/base_area.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/app/v1/base_area.proto
 

package/src/rpc/system/app/v1/base_dict.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/app/v1/base_dict.proto
 

package/src/rpc/system/app/v1/base_menu.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/app/v1/base_menu.proto
 

package/src/rpc/system/common/v1/enum.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.7.7
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/common/v1/enum.proto
 

package/src/runner.ts

@@ -34,13 +34,25 @@ type BuildTransaction = {
   originalAppConfig: string
   generatedFiles: string[]
   generatedStaticFiles: string[]
-  ownerPid: number
+  ownerPid?: number
+  ready?: boolean
 }
 
+type PageAssembly = {
+  transaction: BuildTransaction
+  leaseFile: string
+}
+
+let sourceVersionCounter = 0
+const PAGE_ASSEMBLY_WAIT_TIMEOUT_MS = 30_000
+const PAGE_ASSEMBLY_POLL_INTERVAL_MS = 25
+
 type CliOptions = {
   type: 'h5' | 'weapp'
   mode: string
   watch: boolean
+  prepareOnly: boolean
+  cleanupOnly: boolean
 }
 
 /** 运行 Taro 构建并在进程结束后恢复临时页面。 */
@@ -52,6 +64,7 @@ async function main(): Promise<void> {
   const baseConfigFile = resolve(inputDir, 'app.config.base.json')
   const transactionFile = resolve(hostRoot, '.kratos-taro-app-pages-state.json')
   recoverBuildTransaction(transactionFile, inputDir, appConfigFile)
+  if (options.cleanupOnly) return
 
   const originalAppConfig = readFileSync(appConfigFile, 'utf8')
   const manifest = JSON.parse(readFileSync(baseConfigFile, 'utf8')) as AppManifest
@@ -69,33 +82,24 @@ async function main(): Promise<void> {
     })
   })
 
-  const generatedFiles = [...pageMap.values()].flatMap((page) => {
-    const pageFile = resolve(inputDir, `${page.route}.tsx`)
-    const configFile = resolve(inputDir, `${page.route}.config.ts`)
-    return [pageFile, configFile].filter((file) => !existsSync(file))
-  })
-  const staticRoot = resolve(inputDir, 'static')
-  const staticFiles = collectModuleStaticFiles(
-    modules.map((module) => resolve(module.root, 'src/static')),
-    staticRoot,
-  )
-  const generatedStaticFiles = staticFiles.map(({ target }) => target)
-  const transaction: BuildTransaction = {
-    inputDir,
+  const pageAssembly = preparePageAssembly({
     appConfigFile,
+    baseManifest: manifest,
+    inputDir,
+    moduleStaticRoots: modules.map((module) => resolve(module.root, 'src/static')),
     originalAppConfig,
-    generatedFiles,
-    generatedStaticFiles,
-    ownerPid: process.pid,
-  }
-  writeFileSync(transactionFile, `${JSON.stringify(transaction, null, 2)}\n`, { flag: 'wx' })
+    pageMap: [...pageMap.values()],
+    transactionFile,
+  })
 
   let cleaned = false
   const cleanup = () => {
     if (cleaned) return
     cleaned = true
-    cleanupTransaction(transaction)
-    if (existsSync(transactionFile)) unlinkSync(transactionFile)
+    releasePageAssembly(transactionFile, pageAssembly.leaseFile)
+  }
+  if (options.prepareOnly) {
+    return
   }
   const handleSignal = (signal: NodeJS.Signals) => {
     child?.kill(signal)
@@ -105,27 +109,6 @@ async function main(): Promise<void> {
   process.once('SIGTERM', () => handleSignal('SIGTERM'))
 
   try {
-    pageMap.forEach((page) => {
-      appendPage(manifest, page.route)
-      const pageFile = resolve(inputDir, `${page.route}.tsx`)
-      const configFile = resolve(inputDir, `${page.route}.config.ts`)
-      if (!existsSync(pageFile)) {
-        mkdirSync(dirname(pageFile), { recursive: true })
-        writeFileSync(pageFile, createPageWrapper(page))
-      }
-      if (!existsSync(configFile)) {
-        writeFileSync(configFile, createPageConfig(page))
-      }
-    })
-    staticFiles.forEach(({ source, target }) => {
-      mkdirSync(dirname(target), { recursive: true })
-      copyFileSync(source, target)
-    })
-    writeFileSync(
-      appConfigFile,
-      `export default defineAppConfig(${JSON.stringify(manifest, null, 2)})\n`,
-    )
-
     const args = ['exec', 'taro', 'build', '--type', options.type, '--mode', options.mode]
     if (options.watch) args.push('--watch')
     child = spawn(process.platform === 'win32' ? 'pnpm.cmd' : 'pnpm', args, {
@@ -133,6 +116,9 @@ async function main(): Promise<void> {
       env: {
         ...process.env,
         NODE_ENV: options.mode === 'development' ? 'development' : 'production',
+        KRATOS_TARO_OUTPUT_ROOT:
+          process.env.KRATOS_TARO_OUTPUT_ROOT ||
+          (options.type === 'h5' ? 'dist/h5' : 'dist/mp-weixin'),
       },
       stdio: 'inherit',
     })
@@ -156,6 +142,8 @@ function parseArguments(args: string[]): CliOptions {
   let type: CliOptions['type'] | undefined
   let mode = 'production'
   let watch = false
+  let prepareOnly = false
+  let cleanupOnly = false
   for (let index = 0; index < args.length; index += 1) {
     const argument = args[index]
     if (argument === '--type') {
@@ -166,12 +154,16 @@ function parseArguments(args: string[]): CliOptions {
       mode = args[++index] || mode
     } else if (argument === '--watch') {
       watch = true
+    } else if (argument === '--prepare-only') {
+      prepareOnly = true
+    } else if (argument === '--cleanup-only') {
+      cleanupOnly = true
     } else {
       throw new Error(`未知参数：${argument}`)
     }
   }
   if (!type) throw new Error('缺少 --type h5|weapp')
-  return { type, mode, watch }
+  return { type, mode, watch, prepareOnly, cleanupOnly }
 }
 
 async function loadBuildModules(
@@ -237,27 +229,244 @@ function recoverBuildTransaction(
   inputDir: string,
   appConfigFile: string,
 ): void {
+  const lockFile = `${transactionFile}.lock`
+  acquirePageAssemblyLock(lockFile)
+  try {
+    const transaction = readBuildTransaction(transactionFile, inputDir, appConfigFile)
+    if (!transaction || isPageAssemblyActive(transaction, transactionFile)) return
+    restoreBuildTransaction(transaction, transactionFile)
+  } finally {
+    releasePageAssemblyLock(lockFile)
+  }
+}
+
+function preparePageAssembly(options: {
+  appConfigFile: string
+  baseManifest: AppManifest
+  inputDir: string
+  moduleStaticRoots: string[]
+  originalAppConfig: string
+  pageMap: PageEntry[]
+  transactionFile: string
+}): PageAssembly {
+  const lockFile = `${options.transactionFile}.lock`
+  acquirePageAssemblyLock(lockFile)
+  try {
+    let transaction = readBuildTransaction(
+      options.transactionFile,
+      options.inputDir,
+      options.appConfigFile,
+    )
+    if (transaction && isPageAssemblyActive(transaction, options.transactionFile)) {
+      return {
+        transaction,
+        leaseFile: createPageAssemblyLease(options.transactionFile),
+      }
+    }
+
+    let originalAppConfig = options.originalAppConfig
+    if (transaction) {
+      originalAppConfig = transaction.originalAppConfig
+      restoreBuildTransaction(transaction, options.transactionFile)
+    }
+
+    const generatedFiles = options.pageMap.flatMap((page) => {
+      const pageFile = resolve(options.inputDir, `${page.route}.tsx`)
+      const configFile = resolve(options.inputDir, `${page.route}.config.ts`)
+      return [pageFile, configFile].filter(
+        (file) => !existsSync(file) || isGeneratedPageFile(file) || isGeneratedPageConfig(file),
+      )
+    })
+    const staticFiles = collectModuleStaticFiles(
+      options.moduleStaticRoots,
+      resolve(options.inputDir, 'static'),
+    )
+    transaction = {
+      inputDir: options.inputDir,
+      appConfigFile: options.appConfigFile,
+      originalAppConfig,
+      generatedFiles,
+      generatedStaticFiles: staticFiles.map(({ target }) => target),
+      ownerPid: process.pid,
+      ready: false,
+    }
+    writeBuildTransaction(options.transactionFile, transaction, 'wx')
+    const leaseFile = createPageAssemblyLease(options.transactionFile)
+    try {
+      options.pageMap.forEach((page) => {
+        appendPage(options.baseManifest, page.route)
+        const pageFile = resolve(options.inputDir, `${page.route}.tsx`)
+        const configFile = resolve(options.inputDir, `${page.route}.config.ts`)
+        if (!existsSync(pageFile)) {
+          mkdirSync(dirname(pageFile), { recursive: true })
+          writeFileSync(pageFile, createPageWrapper(page))
+        }
+        if (!existsSync(configFile)) writeFileSync(configFile, createPageConfig(page))
+      })
+      staticFiles.forEach(({ source, target }) => {
+        mkdirSync(dirname(target), { recursive: true })
+        copyFileSync(source, target)
+      })
+      writeFileSync(
+        options.appConfigFile,
+        `export default defineAppConfig(${JSON.stringify(options.baseManifest, null, 2)})\n`,
+      )
+      transaction.ready = true
+      writeBuildTransaction(options.transactionFile, transaction)
+      return { transaction, leaseFile }
+    } catch (error) {
+      releasePageAssemblyLease(leaseFile)
+      restoreBuildTransaction(transaction, options.transactionFile)
+      throw error
+    }
+  } finally {
+    releasePageAssemblyLock(lockFile)
+  }
+}
+
+function readBuildTransaction(
+  transactionFile: string,
+  inputDir: string,
+  appConfigFile: string,
+): BuildTransaction | undefined {
   if (!existsSync(transactionFile)) return
   const transaction = JSON.parse(readFileSync(transactionFile, 'utf8')) as BuildTransaction
   if (transaction.inputDir !== inputDir || transaction.appConfigFile !== appConfigFile) {
     throw new Error(`Taro 构建事务目录不匹配：${transactionFile}`)
   }
-  if (transaction.ownerPid !== process.pid && isProcessRunning(transaction.ownerPid)) {
-    throw new Error(
-      `页面装配已由进程 ${transaction.ownerPid} 使用，请先停止另一个 H5 或小程序开发进程`,
-    )
-  }
-  cleanupTransaction(transaction)
-  unlinkSync(transactionFile)
+  return transaction
 }
 
-function cleanupTransaction(transaction: BuildTransaction): void {
+function writeBuildTransaction(
+  transactionFile: string,
+  transaction: BuildTransaction,
+  flag?: 'wx',
+): void {
+  writeFileSync(
+    transactionFile,
+    `${JSON.stringify(transaction, null, 2)}\n`,
+    flag ? { flag } : undefined,
+  )
+}
+
+function restoreBuildTransaction(transaction: BuildTransaction, transactionFile: string): void {
   for (const file of [...transaction.generatedFiles].reverse()) {
     if (existsSync(file)) unlinkSync(file)
     removeEmptyParents(dirname(file), transaction.inputDir)
   }
-  removeGeneratedStaticFiles(transaction.generatedStaticFiles, resolve(transaction.inputDir, 'static'))
+  removeGeneratedStaticFiles(
+    transaction.generatedStaticFiles ?? [],
+    resolve(transaction.inputDir, 'static'),
+  )
   writeFileSync(transaction.appConfigFile, transaction.originalAppConfig)
+  if (existsSync(transactionFile)) unlinkSync(transactionFile)
+}
+
+function releasePageAssembly(transactionFile: string, leaseFile: string): void {
+  releasePageAssemblyLease(leaseFile)
+  const lockFile = `${transactionFile}.lock`
+  acquirePageAssemblyLock(lockFile)
+  try {
+    const transaction = readBuildTransactionFromFile(transactionFile)
+    if (!transaction || isPageAssemblyActive(transaction, transactionFile)) return
+    restoreBuildTransaction(transaction, transactionFile)
+  } finally {
+    releasePageAssemblyLock(lockFile)
+  }
+}
+
+function readBuildTransactionFromFile(transactionFile: string): BuildTransaction | undefined {
+  if (!existsSync(transactionFile)) return
+  return JSON.parse(readFileSync(transactionFile, 'utf8')) as BuildTransaction
+}
+
+function createPageAssemblyLease(transactionFile: string): string {
+  const leaseDirectory = `${transactionFile}.leases`
+  mkdirSync(leaseDirectory, { recursive: true })
+  const leaseFile = resolve(
+    leaseDirectory,
+    `${process.pid}-${Date.now()}-${++sourceVersionCounter}.lease`,
+  )
+  writeFileSync(leaseFile, `${JSON.stringify({ ownerPid: process.pid })}\n`, { flag: 'wx' })
+  return leaseFile
+}
+
+function releasePageAssemblyLease(leaseFile: string): void {
+  if (existsSync(leaseFile)) unlinkSync(leaseFile)
+  const leaseDirectory = dirname(leaseFile)
+  if (existsSync(leaseDirectory) && !readdirSync(leaseDirectory).length) {
+    try {
+      rmdirSync(leaseDirectory)
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException).code
+      if (code !== 'ENOTEMPTY' && code !== 'EEXIST') throw error
+    }
+  }
+}
+
+function isPageAssemblyActive(transaction: BuildTransaction, transactionFile: string): boolean {
+  if (listActivePageLeases(`${transactionFile}.leases`).length) return true
+  return (
+    transaction.ownerPid !== undefined &&
+    transaction.ownerPid !== process.pid &&
+    isProcessRunning(transaction.ownerPid)
+  )
+}
+
+function listActivePageLeases(leaseDirectory: string): number[] {
+  if (!existsSync(leaseDirectory)) return []
+  const activePids: number[] = []
+  for (const entry of readdirSync(leaseDirectory)) {
+    const leaseFile = resolve(leaseDirectory, entry)
+    try {
+      const lease = JSON.parse(readFileSync(leaseFile, 'utf8')) as { ownerPid?: number }
+      if (lease.ownerPid && isProcessRunning(lease.ownerPid)) {
+        activePids.push(lease.ownerPid)
+      } else {
+        unlinkSync(leaseFile)
+      }
+    } catch {
+      unlinkSync(leaseFile)
+    }
+  }
+  return activePids
+}
+
+function acquirePageAssemblyLock(lockFile: string): void {
+  const deadline = Date.now() + PAGE_ASSEMBLY_WAIT_TIMEOUT_MS
+  while (true) {
+    try {
+      writeFileSync(lockFile, `${JSON.stringify({ ownerPid: process.pid })}\n`, { flag: 'wx' })
+      return
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== 'EEXIST') throw error
+      const ownerPid = readPageAssemblyLockOwner(lockFile)
+      if (ownerPid !== undefined && !isProcessRunning(ownerPid)) {
+        unlinkSync(lockFile)
+        continue
+      }
+      if (Date.now() >= deadline) throw new Error(`等待 Taro 页面装配锁超时：${lockFile}`)
+      waitForPageAssembly(PAGE_ASSEMBLY_POLL_INTERVAL_MS)
+    }
+  }
+}
+
+function releasePageAssemblyLock(lockFile: string): void {
+  if (!existsSync(lockFile)) return
+  if (readPageAssemblyLockOwner(lockFile) === process.pid) unlinkSync(lockFile)
+}
+
+function readPageAssemblyLockOwner(lockFile: string): number | undefined {
+  try {
+    return (JSON.parse(readFileSync(lockFile, 'utf8')) as { ownerPid?: number }).ownerPid
+  } catch {
+    return
+  }
+}
+
+function waitForPageAssembly(milliseconds: number): void {
+  const buffer = new SharedArrayBuffer(4)
+  Atomics.wait(new Int32Array(buffer), 0, 0, milliseconds)
 }
 
 function isProcessRunning(pid: number): boolean {
@@ -334,7 +543,7 @@ function appendPage(manifest: AppManifest, route: string): void {
 }
 
 function createPageWrapper(page: PageEntry): string {
-  return `import KratosPage from ${JSON.stringify(page.source)}
+  return `import KratosPage from ${JSON.stringify(`${page.source}.tsx`)}
 import { KratosPageFrame } from '@liujitcn/kratos-taro-app-core/components/KratosPageFrame'
 import { KratosTabBar } from '@liujitcn/kratos-taro-app-core/components/KratosTabBar'
 
@@ -361,6 +570,14 @@ function createPageConfig(page: PageEntry): string {
   return `export default definePageConfig(${JSON.stringify(page.style ?? {}, null, 2)})\n`
 }
 
+function isGeneratedPageFile(file: string): boolean {
+  return existsSync(file) && readFileSync(file, 'utf8').includes('自动生成的模块页面包装器')
+}
+
+function isGeneratedPageConfig(file: string): boolean {
+  return existsSync(file) && readFileSync(file, 'utf8').includes('definePageConfig(')
+}
+
 function normalizeRoute(route: string): string {
   return route
     .replace(/\\/g, '/')

package/src/stores/setting.ts

@@ -1,6 +1,6 @@
 import { create } from 'zustand'
 import { defConfigService } from '../api/base/config'
-import { BaseConfigSite } from '../rpc/common/v1/enum'
+import { BaseConfigSite } from '../rpc/base/v1/enum'
 
 const REQUIRED_APP_CONFIGS = [
   { key: 'serviceProtocol', name: '服务条款' },

package/src/utils/http.ts

@@ -113,7 +113,7 @@ async function sendRequest<T>(
         ...(accessToken ? { Authorization: accessToken } : {}),
       },
     })
-    const responseData = response.data as ErrorData
+    const responseData = response.data as ErrorData | null | undefined
     if (response.statusCode >= 200 && response.statusCode < 300 && !isAuthErrorResponse(responseData)) {
       return response.data as T
     }
@@ -129,7 +129,7 @@ async function sendRequest<T>(
       handleAuthExpiredByMode(authMode, requestUrl, responseData)
       throw response
     }
-    await Taro.showToast({ icon: 'none', title: responseData.message || '请求错误' })
+    await Taro.showToast({ icon: 'none', title: responseData?.message || '请求错误' })
     throw response
   } catch (error) {
     if (
@@ -243,7 +243,7 @@ async function promptRelogin(): Promise<void> {
 function handleAuthExpiredByMode(
   authMode: AuthMode,
   url: string,
-  responseData: ErrorData,
+  responseData: ErrorData | null | undefined,
 ): void {
   if (authMode === 'required' && !AUTH_EXPIRED_EXCLUDED_URL_SET.has(url)) {
     void promptRelogin()
@@ -251,7 +251,7 @@ function handleAuthExpiredByMode(
   }
   silentClearAuthData()
   if (authMode !== 'optional') {
-    void Taro.showToast({ icon: 'none', title: responseData.message || '请求错误' })
+    void Taro.showToast({ icon: 'none', title: responseData?.message || '请求错误' })
   }
 }
 

package/src/utils/passwordCrypto.ts

@@ -1,7 +1,7 @@
 import Taro from '@tarojs/taro'
 import * as miniCrypto from 'asmcrypto.js'
 import { defLoginService } from '../api/base/login'
-import { PasswordCryptoScene } from '../rpc/common/v1/enum'
+import { PasswordCryptoScene } from '../rpc/base/v1/enum'
 import type { PasswordCrypto } from '../rpc/common/v1/types'
 
 type MiniCrypto = typeof import('asmcrypto.js')