@lark-apaas/devtool-kits 1.2.20 → 1.2.22-alpha.0

package/dist/index.d.cts

@@ -166,6 +166,8 @@ type Middleware = RouteMiddleware | GlobalMiddleware;
 interface OpenapiMiddlewareOptions {
     /** Path to the openapi.json file */
     openapiFilePath: string;
+    /** Path to the OpenAPI spec source file (when set, serves /openapi/spec with /openapi/* filtered and $refs resolved) */
+    openapiSpecFilePath?: string;
     /** Enable source code enhancement */
     enableEnhancement?: boolean;
     /** Server directory for source code scanning (defaults to context.rootDir) */

package/dist/index.d.ts

@@ -166,6 +166,8 @@ type Middleware = RouteMiddleware | GlobalMiddleware;
 interface OpenapiMiddlewareOptions {
     /** Path to the openapi.json file */
     openapiFilePath: string;
+    /** Path to the OpenAPI spec source file (when set, serves /openapi/spec with /openapi/* filtered and $refs resolved) */
+    openapiSpecFilePath?: string;
     /** Enable source code enhancement */
     enableEnhancement?: boolean;
     /** Server directory for source code scanning (defaults to context.rootDir) */

package/dist/index.js

@@ -1388,12 +1388,154 @@ function createOpenapiHandler(openapiFilePath, enableEnhancement, serverDir) {
 }
 __name(createOpenapiHandler, "createOpenapiHandler");
 
+// src/middlewares/openapi/spec-controller.ts
+import fs4 from "fs/promises";
+import crypto2 from "crypto";
+var MAX_REF_DEPTH = 5;
+var EMPTY_OPENAPI_SPEC = {
+  openapi: "3.0.0",
+  info: {
+    title: "\u5F00\u653E API",
+    version: "0.0.0"
+  },
+  paths: {},
+  components: {
+    schemas: {}
+  }
+};
+function createOpenapiSpecHandler(openapiSpecFilePath) {
+  let cache = null;
+  return async (_req, res, context) => {
+    try {
+      let fileBuffer;
+      try {
+        fileBuffer = await fs4.readFile(openapiSpecFilePath, "utf-8");
+      } catch (err) {
+        if (err?.code === "ENOENT") {
+          return res.json(EMPTY_OPENAPI_SPEC);
+        }
+        throw err;
+      }
+      const currentHash = crypto2.createHash("md5").update(fileBuffer).digest("hex");
+      if (cache && cache.fileHash === currentHash) {
+        return res.json(cache.data);
+      }
+      let parsed;
+      try {
+        parsed = JSON.parse(fileBuffer);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : "Invalid JSON";
+        return res.status(500).json({
+          error: "Failed to load OpenAPI spec",
+          message: `${openapiSpecFilePath} invalid: ${message}`
+        });
+      }
+      if (!parsed || typeof parsed !== "object" || !parsed.paths || typeof parsed.paths !== "object") {
+        return res.status(500).json({
+          error: "Failed to load OpenAPI spec",
+          message: `${openapiSpecFilePath} missing "paths"`
+        });
+      }
+      const result = buildFilteredSpec(parsed, context.basePath ?? "");
+      cache = {
+        data: result,
+        fileHash: currentHash
+      };
+      res.json(result);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : "Unknown error";
+      res.status(500).json({
+        error: "Failed to load OpenAPI spec",
+        message
+      });
+    }
+  };
+}
+__name(createOpenapiSpecHandler, "createOpenapiSpecHandler");
+function buildFilteredSpec(spec, globalPrefix) {
+  const schemas = spec.components?.schemas ?? {};
+  const paths = spec.paths ?? {};
+  const filteredPaths = {};
+  const cleanPrefix = globalPrefix.replace(/\/+$/, "");
+  for (const [pathKey, methods] of Object.entries(paths)) {
+    const cleanPath = stripPrefix(pathKey, cleanPrefix);
+    if (!cleanPath.startsWith("/openapi")) continue;
+    filteredPaths[cleanPath] = {};
+    for (const [method, operation] of Object.entries(methods)) {
+      if ([
+        "parameters",
+        "summary",
+        "description",
+        "servers"
+      ].includes(method)) continue;
+      filteredPaths[cleanPath][method] = resolveRefsDeep(structuredClone(operation), schemas);
+    }
+  }
+  return {
+    openapi: spec.openapi ?? "3.0.0",
+    paths: filteredPaths,
+    components: {
+      schemas: resolveAllSchemaRefs(structuredClone(schemas))
+    }
+  };
+}
+__name(buildFilteredSpec, "buildFilteredSpec");
+function stripPrefix(pathStr, prefix) {
+  if (prefix && pathStr.startsWith(prefix)) {
+    return pathStr.slice(prefix.length);
+  }
+  return pathStr;
+}
+__name(stripPrefix, "stripPrefix");
+function resolveRefsDeep(obj, schemas, depth = 0) {
+  if (depth > MAX_REF_DEPTH || obj === null || obj === void 0) return obj;
+  if (typeof obj !== "object") return obj;
+  if (Array.isArray(obj)) {
+    return obj.map((item) => resolveRefsDeep(item, schemas, depth));
+  }
+  const record = obj;
+  if (typeof record["$ref"] === "string") {
+    const resolved = resolveRef(record["$ref"], schemas);
+    if (resolved !== void 0) {
+      return resolveRefsDeep(structuredClone(resolved), schemas, depth + 1);
+    }
+    return record;
+  }
+  const result = {};
+  for (const [key, value] of Object.entries(record)) {
+    result[key] = resolveRefsDeep(value, schemas, depth);
+  }
+  return result;
+}
+__name(resolveRefsDeep, "resolveRefsDeep");
+function resolveRef(ref, schemas) {
+  const prefix = "#/components/schemas/";
+  if (ref.startsWith(prefix)) {
+    const name = ref.slice(prefix.length);
+    return schemas[name];
+  }
+  return void 0;
+}
+__name(resolveRef, "resolveRef");
+function resolveAllSchemaRefs(schemas) {
+  const result = {};
+  for (const [name, schema] of Object.entries(schemas)) {
+    result[name] = resolveRefsDeep(schema, schemas);
+  }
+  return result;
+}
+__name(resolveAllSchemaRefs, "resolveAllSchemaRefs");
+
 // src/middlewares/openapi/router.ts
 function createOpenapiRouter(options, context) {
-  const { openapiFilePath, enableEnhancement, serverDir } = options;
+  const { openapiFilePath, openapiSpecFilePath, enableEnhancement, serverDir } = options;
   const router = express.Router();
   const handler = createOpenapiHandler(openapiFilePath, enableEnhancement, serverDir);
   router.get("/openapi.json", (req, res) => handler(req, res, context));
+  if (openapiSpecFilePath) {
+    const specHandler = createOpenapiSpecHandler(openapiSpecFilePath);
+    router.get("/openapi/spec", (req, res) => specHandler(req, res, context));
+  }
   return router;
 }
 __name(createOpenapiRouter, "createOpenapiRouter");
@@ -1404,18 +1546,25 @@ var OPENAPI_ROUTES = [
     method: "GET",
     path: "/openapi.json",
     description: "Serve enhanced OpenAPI specification with source code references"
+  },
+  {
+    method: "GET",
+    path: "/openapi/spec",
+    description: "Serve OpenAPI specification for /openapi/*"
   }
 ];
 function createOpenapiMiddleware(options) {
-  const { openapiFilePath, enableEnhancement = true, serverDir } = options;
+  const { openapiFilePath, openapiSpecFilePath, enableEnhancement = true, serverDir } = options;
+  const routes = openapiSpecFilePath ? OPENAPI_ROUTES : OPENAPI_ROUTES.filter((route) => route.path !== "/openapi/spec");
   return {
     name: "openapi",
     mountPath: "/dev",
-    routes: OPENAPI_ROUTES,
+    routes,
     enabled: /* @__PURE__ */ __name((context) => context.isDev, "enabled"),
     createRouter: /* @__PURE__ */ __name((context) => {
       return createOpenapiRouter({
         openapiFilePath,
+        openapiSpecFilePath,
         enableEnhancement,
         serverDir
       }, context);
@@ -1428,7 +1577,7 @@ __name(createOpenapiMiddleware, "createOpenapiMiddleware");
 import express2 from "express";
 
 // src/middlewares/dev-logs/utils.ts
-import { promises as fs4 } from "fs";
+import { promises as fs5 } from "fs";
 import { isAbsolute, join as join2, relative } from "path";
 
 // src/middlewares/dev-logs/helper/path-matcher.ts
@@ -1480,7 +1629,7 @@ function getRelativePath(filePath) {
 __name(getRelativePath, "getRelativePath");
 async function fileExists(filePath) {
   try {
-    await fs4.access(filePath);
+    await fs5.access(filePath);
     return true;
   } catch {
     return false;
@@ -1563,9 +1712,9 @@ __name(serializeError, "serializeError");
 import { join as join4 } from "path";
 
 // src/middlewares/dev-logs/services/file-reader.ts
-import { promises as fs5 } from "fs";
+import { promises as fs6 } from "fs";
 async function readFileReverse(filePath, chunkSize, processLine) {
-  const handle = await fs5.open(filePath, "r");
+  const handle = await fs6.open(filePath, "r");
   try {
     const stats = await handle.stat();
     let position = stats.size;
@@ -1810,8 +1959,8 @@ async function readRecentTraceCalls(filePath, page, pageSize, pathFilter, method
   const handleRequestCompleted = /* @__PURE__ */ __name((builder, entry, message) => {
     builder.hasCompleted = true;
     builder.endTime = entry.time;
-    builder.statusCode = extractNumber(message, /status_code:\s*(\d+)/);
-    builder.durationMs = extractNumber(message, /duration_ms:\s*(\d+)/);
+    builder.statusCode = typeof entry.status_code === "number" ? entry.status_code : extractNumber(message, /status_code:\s*(\d+)/);
+    builder.durationMs = typeof entry.duration_ms === "number" ? entry.duration_ms : extractNumber(message, /duration_ms:\s*(\d+)/);
     if (!builder.path && entry.path) {
       builder.path = String(entry.path);
     }
@@ -2527,7 +2676,7 @@ function createHealthCheckHandler(options = {}) {
 __name(createHealthCheckHandler, "createHealthCheckHandler");
 
 // src/middlewares/dev-logs/sse/log-watcher.ts
-import * as fs6 from "fs";
+import * as fs7 from "fs";
 import * as path3 from "path";
 function mapPinoLevelToServerLogLevel2(pinoLevel) {
   if (typeof pinoLevel === "string") {
@@ -2746,12 +2895,12 @@ var LogWatcher = class {
   */
   watchFile(config) {
     const filePath = path3.join(this.logDir, config.fileName);
-    if (!fs6.existsSync(filePath)) {
+    if (!fs7.existsSync(filePath)) {
       this.log(`File not found, skipping: ${config.fileName}`);
       return;
     }
     try {
-      const stats = fs6.statSync(filePath);
+      const stats = fs7.statSync(filePath);
       this.filePositions.set(config.fileName, stats.size);
       this.log(`Initialized position for ${config.fileName}: ${stats.size} bytes`);
     } catch (error) {
@@ -2759,7 +2908,7 @@ var LogWatcher = class {
       this.filePositions.set(config.fileName, 0);
     }
     try {
-      const watcher = fs6.watch(filePath, (eventType) => {
+      const watcher = fs7.watch(filePath, (eventType) => {
         if (eventType === "change") {
           this.handleFileChange(config);
         }
@@ -2797,7 +2946,7 @@ var LogWatcher = class {
     const filePath = path3.join(this.logDir, config.fileName);
     const lastPosition = this.filePositions.get(config.fileName) || 0;
     try {
-      const stats = fs6.statSync(filePath);
+      const stats = fs7.statSync(filePath);
       const currentSize = stats.size;
       if (currentSize < lastPosition) {
         this.log(`File ${config.fileName} was truncated, resetting position`);
@@ -2810,11 +2959,11 @@ var LogWatcher = class {
       }
       const readSize = currentSize - lastPosition;
       const buffer = Buffer.alloc(readSize);
-      const fd = fs6.openSync(filePath, "r");
+      const fd = fs7.openSync(filePath, "r");
       try {
-        fs6.readSync(fd, buffer, 0, readSize, lastPosition);
+        fs7.readSync(fd, buffer, 0, readSize, lastPosition);
       } finally {
-        fs6.closeSync(fd);
+        fs7.closeSync(fd);
       }
       this.filePositions.set(config.fileName, currentSize);
       const content = buffer.toString("utf8");
@@ -3220,11 +3369,11 @@ import express3 from "express";
 
 // src/middlewares/collect-logs/controller.ts
 import { join as join7 } from "path";
-import fs8 from "fs";
+import fs9 from "fs";
 
 // src/middlewares/collect-logs/utils.ts
 import { isAbsolute as isAbsolute2, join as join6 } from "path";
-import fs7 from "fs";
+import fs8 from "fs";
 function resolveLogDir2(provided) {
   if (!provided) {
     return join6(process.cwd(), "logs");
@@ -3233,8 +3382,8 @@ function resolveLogDir2(provided) {
 }
 __name(resolveLogDir2, "resolveLogDir");
 function ensureDir(dir) {
-  if (!fs7.existsSync(dir)) {
-    fs7.mkdirSync(dir, {
+  if (!fs8.existsSync(dir)) {
+    fs8.mkdirSync(dir, {
       recursive: true
     });
   }
@@ -3266,7 +3415,7 @@ function collectLogsHandler(logDir, fileName) {
         ...logContent,
         server_time: (/* @__PURE__ */ new Date()).toISOString()
       }) + "\n";
-      await fs8.promises.appendFile(filePath, logLine);
+      await fs9.promises.appendFile(filePath, logLine);
       res.json({
         success: true
       });
@@ -3294,7 +3443,7 @@ function collectLogsBatchHandler(logDir, fileName) {
           server_time: (/* @__PURE__ */ new Date()).toISOString()
         }) + "\n");
       }
-      await fs8.promises.appendFile(filePath, logLines.join(""));
+      await fs9.promises.appendFile(filePath, logLines.join(""));
       res.json({
         success: true
       });