@tachybase/plugin-api-logs 0.23.43 → 0.23.54

package/dist/externalVersion.js

@@ -1,15 +1,15 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "0.23.47",
-  "@tachybase/schema": "0.23.47",
+  "@tachybase/client": "0.23.58",
+  "@tachybase/schema": "0.23.58",
   "@ant-design/icons": "5.6.1",
   "react-i18next": "15.4.0",
-  "@tachybase/database": "0.23.47",
-  "@tachybase/server": "0.23.47",
-  "@tachybase/utils": "0.23.47",
+  "@tachybase/database": "0.23.58",
+  "@tachybase/actions": "0.23.58",
+  "@tachybase/server": "0.23.58",
+  "@tachybase/utils": "0.23.58",
   "antd": "5.22.5",
-  "@tachybase/components": "0.23.47",
-  "@tachybase/actions": "0.23.47",
-  "@tachybase/data-source": "0.23.47",
-  "@tachybase/resourcer": "0.23.47"
+  "@tachybase/components": "0.23.58",
+  "@tachybase/data-source": "0.23.58",
+  "@tachybase/resourcer": "0.23.58"
 };

package/dist/server/actions/apiLogsController.js

@@ -73,7 +73,7 @@ class ApiLogsController {
     __runInitializers(_init, 5, this);
   }
   async tableSync(ctx, next) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const apiLogsRepo = ctx.db.getRepository("apiLogsConfig");
     const apiLogsConfigs = await apiLogsRepo.find();
     const collectionsToInsert = [];
@@ -98,9 +98,11 @@ class ApiLogsController {
       return;
     }
     try {
-      await apiLogsRepo.createMany({ records: collectionsToInsert });
+      await apiLogsRepo.createMany({ records: collectionsToInsert, hooks: false });
+      const plugin = ctx.app.pm.get("api-logs");
+      await ((_b = plugin.apiFilter) == null ? void 0 : _b.load());
     } catch (error) {
-      ctx.throw(((_d = (_c = (_b = error == null ? void 0 : error.response) == null ? void 0 : _b.data) == null ? void 0 : _c.error) == null ? void 0 : _d.message) || "request error");
+      ctx.throw(((_e = (_d = (_c = error == null ? void 0 : error.response) == null ? void 0 : _c.data) == null ? void 0 : _d.error) == null ? void 0 : _e.message) || "request error");
     }
     await next();
   }

package/dist/server/hooks/afterCreate.d.ts

@@ -1 +1,2 @@
-export declare function handleCreate(ctx: any): Promise<void>;
+import { Context } from '@tachybase/actions';
+export declare function handleCreate(ctx: Context, next: any): Promise<void>;

package/dist/server/hooks/afterCreate.js

@@ -20,17 +20,21 @@ __export(afterCreate_exports, {
   handleCreate: () => handleCreate
 });
 module.exports = __toCommonJS(afterCreate_exports);
-async function handleCreate(ctx) {
-  var _a;
+async function handleCreate(ctx, next) {
+  var _a, _b;
+  await next();
   const { actionName, resourceName, params } = ctx.action;
   const currentTime = (/* @__PURE__ */ new Date()).toISOString();
   const apilogsRepo = ctx.db.getRepository("apiLogs");
   const currentUserId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-  const currentRecordId = params.filterByTk;
   const app = ctx.app;
   const collection = app.mainDataSource.collectionManager.getCollection(ctx.action.resourceName);
+  const currentRecordId = (_b = ctx.body) == null ? void 0 : _b[collection.filterTargetKey];
   const changes = [];
-  const changed = params.values;
+  const changed = {
+    ...params.values || {},
+    [collection.filterTargetKey]: currentRecordId
+  };
   if (changed) {
     Object.keys(changed).forEach((key) => {
       const field = collection.findField((field2) => {
@@ -47,26 +51,17 @@ async function handleCreate(ctx) {
   if (!changes.length) {
     return;
   }
-  try {
-    await apilogsRepo.create({
-      values: {
-        action: actionName,
-        createdAt: currentTime,
-        collectionName: resourceName,
-        recordId: currentRecordId,
-        userId: currentUserId,
-        changes
-      }
-    });
-  } catch (error) {
-    ctx.logger.error("Failed to create API log:", {
-      error,
+  apilogsRepo.create({
+    values: {
       action: actionName,
-      resourceName,
-      recordId: currentRecordId
-    });
-    throw new Error(`Failed to create API log: ${error.message}`);
-  }
+      createdAt: currentTime,
+      collectionName: resourceName,
+      recordId: currentRecordId,
+      userId: currentUserId,
+      changes
+    },
+    hooks: false
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/hooks/afterDestroy.d.ts

@@ -1 +1 @@
-export declare function handleDestroy(ctx: any): Promise<void>;
+export declare function handleDestroy(ctx: any, next: any): Promise<void>;

package/dist/server/hooks/afterDestroy.js

@@ -21,16 +21,40 @@ __export(afterDestroy_exports, {
 });
 module.exports = __toCommonJS(afterDestroy_exports);
 var import_getFieldChange = require("./getFieldChange");
-async function handleDestroy(ctx) {
+async function handleDestroy(ctx, next) {
+  var _a, _b;
+  const insertValues = [];
+  if (Array.isArray((_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.filterByTk)) {
+    const promises = ctx.action.params.filterByTk.map((tk) => handleGetInsertValues(ctx, tk, insertValues));
+    await Promise.all(promises);
+  } else {
+    await handleGetInsertValues(ctx, ctx.action.params.filterByTk, insertValues);
+  }
+  await next();
+  if (insertValues.length) {
+    insertDestoryValues(ctx.db, insertValues);
+  }
+}
+async function handleGetInsertValues(ctx, tk, insertValues) {
+  try {
+    const values = await getInsertValues(ctx, tk);
+    insertValues.push(values);
+  } catch (error) {
+    ctx.app.logger.error("handleDestroy error, getInsertValues: ", {
+      param: ctx.action.params,
+      error
+    });
+  }
+}
+async function getInsertValues(ctx, tk) {
   var _a;
   const { actionName, resourceName, params } = ctx.action;
-  const currentTime = (/* @__PURE__ */ new Date()).toISOString();
   const apilogsRepo = ctx.db.getRepository("apiLogs");
   const currentUserId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
   const app = ctx.app;
   const collection = app.mainDataSource.collectionManager.getCollection(ctx.action.resourceName);
   const changes = [];
-  const { changed, data: dataBefore } = await (0, import_getFieldChange.getChanged)(ctx);
+  const { changed, data: dataBefore } = await (0, import_getFieldChange.getChanged)(ctx, tk);
   Object.keys(dataBefore).forEach((key) => {
     const field = collection.findField((field2) => {
       return field2.name === key || field2.options.field === key;
@@ -42,24 +66,24 @@ async function handleDestroy(ctx) {
       });
     }
   });
-  if (!changes.length) {
-    return;
-  }
-  try {
-    await apilogsRepo.create({
-      values: {
-        action: actionName,
-        createdAt: currentTime,
-        collectionName: resourceName,
-        recordId: params.filterByTk,
-        userId: currentUserId,
-        changes
-      }
-    });
-  } catch (error) {
-    throw new Error("Failed to create API log");
+  if (changes.length) {
+    return {
+      action: actionName,
+      createdAt: /* @__PURE__ */ new Date(),
+      collectionName: resourceName,
+      recordId: tk,
+      userId: currentUserId,
+      changes
+    };
   }
 }
+async function insertDestoryValues(db, records) {
+  const apilogsRepo = db.getRepository("apiLogs");
+  await apilogsRepo.createMany({
+    records,
+    hooks: false
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   handleDestroy

package/dist/server/hooks/afterUpdate.d.ts

@@ -1 +1,2 @@
-export declare function handleUpdate(ctx: any): Promise<void>;
+import { Context } from '@tachybase/actions';
+export declare function handleUpdate(ctx: Context, next: any): Promise<any>;

package/dist/server/hooks/afterUpdate.js

@@ -21,7 +21,7 @@ __export(afterUpdate_exports, {
 });
 module.exports = __toCommonJS(afterUpdate_exports);
 var import_getFieldChange = require("./getFieldChange");
-async function handleUpdate(ctx) {
+async function handleUpdate(ctx, next) {
   var _a;
   const { actionName, resourceName, params } = ctx.action;
   const currentTime = (/* @__PURE__ */ new Date()).toISOString();
@@ -30,9 +30,9 @@ async function handleUpdate(ctx) {
   const app = ctx.app;
   const collection = app.mainDataSource.collectionManager.getCollection(ctx.action.resourceName);
   const changes = [];
-  const { changed, data: dataBefore } = await (0, import_getFieldChange.getChanged)(ctx);
+  const { changed, data: dataBefore } = await (0, import_getFieldChange.getChanged)(ctx, params.filterByTk);
   if (!changed) {
-    return;
+    return next();
   }
   changed.forEach((key) => {
     var _a2;
@@ -59,22 +59,20 @@ async function handleUpdate(ctx) {
     }
   });
   if (!changes.length) {
-    return;
-  }
-  try {
-    await apilogsRepo.create({
-      values: {
-        action: actionName,
-        createdAt: currentTime,
-        collectionName: resourceName,
-        recordId: params.filterByTk,
-        userId: currentUserId,
-        changes
-      }
-    });
-  } catch (error) {
-    throw new Error("Failed to create API log");
+    return next();
   }
+  await next();
+  apilogsRepo.create({
+    values: {
+      action: actionName,
+      createdAt: currentTime,
+      collectionName: resourceName,
+      recordId: params.filterByTk,
+      userId: currentUserId,
+      changes
+    },
+    hooks: false
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/hooks/getFieldChange.d.ts

@@ -1,5 +1,5 @@
 /** 获得真正变动的数据库字段 */
-export declare function getChanged(ctx: any): Promise<{
+export declare function getChanged(ctx: any, filterByTk: any): Promise<{
     changed?: string[];
     data?: any;
     error: Error;

package/dist/server/hooks/getFieldChange.js

@@ -89,13 +89,16 @@ function getDiffKeyExceptAfter(before, after, path = "") {
   }
   return [...beforeDiffKeys];
 }
-async function getChanged(ctx) {
+async function getChanged(ctx, filterByTk) {
   try {
     const params = import_utils.lodash.cloneDeep(ctx.action.params);
-    const repo = ctx.db.getRepository(ctx.action.resourceName);
+    if (!filterByTk) {
+      filterByTk = params.filterByTk;
+    }
     const fieldsObj = {};
     const app = ctx.app;
     const collection = app.mainDataSource.collectionManager.getCollection(ctx.action.resourceName);
+    const repo = ctx.db.getRepository(collection.name);
     const fields = collection.getFields();
     for (const field of fields) {
       fieldsObj[field.options.name] = field;
@@ -115,9 +118,7 @@ async function getChanged(ctx) {
       }
     }
     let dataBefore = (await repo.findOne({
-      filter: {
-        id: params.filterByTk
-      },
+      filterByTk,
       appends: [...appendSet]
     })).toJSON();
     const lostKeys = getLostKey(dataBefore, params.values);
@@ -127,9 +128,7 @@ async function getChanged(ctx) {
       }
     }
     dataBefore = (await repo.findOne({
-      filter: {
-        id: params.filterByTk
-      },
+      filterByTk,
       appends: [...appendSet]
     })).toJSON();
     const changed = getDiffKeyExceptAfter(dataBefore, params.values);

package/dist/server/plugin.d.ts

@@ -1,7 +1,7 @@
 import { Plugin } from '@tachybase/server';
+import { ApiFilter } from './ApiFilter';
 export declare class PluginApiLogsServer extends Plugin {
-    afterAdd(): Promise<void>;
-    beforeLoad(): Promise<void>;
+    apiFilter: ApiFilter;
     addApiListener(): Promise<void>;
     load(): Promise<void>;
 }

package/dist/server/plugin.js

@@ -76,42 +76,38 @@ _PluginApiLogsServer_decorators = [(0, import_server.InjectedPlugin)({
   Controllers: [import_apiLogsController.ApiLogsController]
 })];
 class PluginApiLogsServer extends (_a = import_server.Plugin) {
-  async afterAdd() {
-    if (!import_node_worker_threads.isMainThread) {
-      this.addApiListener();
-    }
-  }
-  async beforeLoad() {
-    if (import_node_worker_threads.isMainThread) {
-      this.addApiListener();
-    }
+  constructor() {
+    super(...arguments);
+    this.apiFilter = null;
   }
   async addApiListener() {
-    const apiFilter = new import_ApiFilter.ApiFilter(this.db);
     this.app.on("afterStart", async () => {
-      await apiFilter.load();
+      this.apiFilter = new import_ApiFilter.ApiFilter(this.db);
+      await this.apiFilter.load();
     });
     this.app.resourcer.use(
       async (ctx, next) => {
+        var _a2;
         const { actionName, resourceName, params } = ctx.action;
-        if (!apiFilter.check(resourceName, actionName)) {
+        if (!((_a2 = this.apiFilter) == null ? void 0 : _a2.check(resourceName, actionName))) {
           return next();
         }
         if (actionName === "update") {
-          (0, import_hooks.handleUpdate)(ctx);
+          return await (0, import_hooks.handleUpdate)(ctx, next);
+        } else if (actionName === "create") {
+          return await (0, import_hooks.handleCreate)(ctx, next);
+        } else if (actionName === "destroy") {
+          return await (0, import_hooks.handleDestroy)(ctx, next);
         }
-        if (actionName === "create") {
-          (0, import_hooks.handleCreate)(ctx);
-        }
-        if (actionName === "destroy") {
-          (0, import_hooks.handleDestroy)(ctx);
-        }
-        await next();
+        return next();
       },
       { tag: "apiLogs", after: "acl", before: "dataSource" }
     );
   }
   async load() {
+    if (import_node_worker_threads.isMainThread) {
+      this.addApiListener();
+    }
     this.app.acl.registerSnippet({
       name: `pm.system-services.apiLogsConfig`,
       actions: ["apiLogsConfig:*"]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-api-logs",
   "displayName": "Api Logs",
-  "version": "0.23.43",
+  "version": "0.23.54",
   "description": "Provides seamless tracking of API actions through enhanced user interface components, configuration panels, and dashboards",
   "keywords": [
     "Logging and monitoring"
@@ -15,16 +15,16 @@
     "react-router-dom": "6.28.1"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.47",
-    "@tachybase/client": "0.23.47",
-    "@tachybase/components": "0.23.47",
-    "@tachybase/data-source": "0.23.47",
-    "@tachybase/database": "0.23.47",
-    "@tachybase/schema": "0.23.47",
-    "@tachybase/resourcer": "0.23.47",
-    "@tachybase/server": "0.23.47",
-    "@tachybase/utils": "0.23.47",
-    "@tachybase/test": "0.23.47"
+    "@tachybase/actions": "0.23.58",
+    "@tachybase/components": "0.23.58",
+    "@tachybase/data-source": "0.23.58",
+    "@tachybase/database": "0.23.58",
+    "@tachybase/client": "0.23.58",
+    "@tachybase/resourcer": "0.23.58",
+    "@tachybase/schema": "0.23.58",
+    "@tachybase/test": "0.23.58",
+    "@tachybase/server": "0.23.58",
+    "@tachybase/utils": "0.23.58"
   },
   "description.zh-CN": "Api Logs通过增强的用户界面组件、配置面板和仪表板提供对 API 操作的无缝跟踪",
   "displayName.zh-CN": "Api 日志"