@certd/lib-server 1.41.3 → 1.42.0

package/dist/basic/base-controller.d.ts

@@ -1,5 +1,5 @@
-import type { IMidwayContainer } from '@midwayjs/core';
-import * as koa from '@midwayjs/koa';
+import type { IMidwayContainer } from "@midwayjs/core";
+import * as koa from "@midwayjs/koa";
 export declare abstract class BaseController {
     ctx: koa.Context;
     applicationContext: IMidwayContainer;

package/dist/basic/base-controller.js

@@ -7,10 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { ApplicationContext, Inject } from '@midwayjs/core';
-import * as koa from '@midwayjs/koa';
-import { Constants } from './constants.js';
-import { isEnterprise } from './mode.js';
+import { ApplicationContext, Inject } from "@midwayjs/core";
+import * as koa from "@midwayjs/koa";
+import { Constants } from "./constants.js";
+import { isEnterprise } from "./mode.js";
 export class BaseController {
     ctx;
     applicationContext;
@@ -42,14 +42,14 @@ export class BaseController {
     getUserId() {
         const userId = this.ctx.user?.id;
         if (userId == null) {
-            throw new Error('Token已过期');
+            throw new Error("Token已过期");
         }
         return userId;
     }
     getLoginUser() {
         const user = this.ctx.user;
         if (user == null) {
-            throw new Error('Token已过期');
+            throw new Error("Token已过期");
         }
         return user;
     }
@@ -83,7 +83,8 @@ export class BaseController {
             userId = -1; // 企业管理模式下，用户id固定-1
         }
         return {
-            projectId, userId
+            projectId,
+            userId,
         };
     }
     async getProjectUserIdRead() {
@@ -105,7 +106,7 @@ export class BaseController {
      * @param id
      */
     async checkOwner(service, id, permission, allowAdmin = false) {
-        let { projectId, userId } = await this.getProjectUserId(permission);
+        const { projectId, userId } = await this.getProjectUserId(permission);
         const authService = await this.applicationContext.getAsync("authService");
         if (projectId) {
             await authService.checkProjectId(service, id, projectId);

package/dist/basic/base-service.d.ts

@@ -1,7 +1,7 @@
-import { EntityTarget, FindOneOptions, Repository, SelectQueryBuilder } from 'typeorm';
-import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
-import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
-import { FindManyOptions } from 'typeorm';
+import { EntityTarget, FindOneOptions, Repository, SelectQueryBuilder } from "typeorm";
+import { TypeORMDataSourceManager } from "@midwayjs/typeorm";
+import { EntityManager } from "typeorm/entity-manager/EntityManager.js";
+import { FindManyOptions } from "typeorm";
 export type PageReq<T = any> = {
     page?: {
         offset: number;
@@ -32,7 +32,7 @@ export declare abstract class BaseService<T> {
      */
     protected transactionWithCtx<T>(ctx: ServiceContext, callback: (manager: EntityManager) => Promise<T>): Promise<T>;
     protected getRepo<E>(ctx: ServiceContext, entity: EntityTarget<E>): Repository<E>;
-    protected buildUserProjectQuery(userId: number, projectId?: number): {
+    buildUserProjectQuery(userId: number, projectId?: number): {
         [key: string]: any;
         userId: number;
         projectId?: number;
@@ -70,7 +70,8 @@ export declare abstract class BaseService<T> {
      * @param param 数据
      */
     add(param: any): Promise<{
-        id: any;
+        id: number;
+        [key: string]: any;
     }>;
     /**
      * 修改

package/dist/basic/base-service.js

@@ -7,18 +7,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { PermissionException, ValidateException } from './exception/index.js';
-import { In } from 'typeorm';
-import { Inject } from '@midwayjs/core';
-import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
-import { Constants } from './constants.js';
+import { PermissionException, ValidateException } from "./exception/index.js";
+import { In } from "typeorm";
+import { Inject } from "@midwayjs/core";
+import { TypeORMDataSourceManager } from "@midwayjs/typeorm";
+import { Constants } from "./constants.js";
 /**
  * 服务基类
  */
 export class BaseService {
     dataSourceManager;
     async transaction(callback) {
-        const dataSource = this.dataSourceManager.getDataSource('default');
+        const dataSource = this.dataSourceManager.getDataSource("default");
         return await dataSource.transaction(callback);
     }
     /**
@@ -34,7 +34,7 @@ export class BaseService {
         if (ctx.manager) {
             return ctx.manager.getRepository(entity);
         }
-        const dataSource = this.dataSourceManager.getDataSource('default');
+        const dataSource = this.dataSourceManager.getDataSource("default");
         return dataSource.getRepository(entity);
     }
     buildUserProjectQuery(userId, projectId) {
@@ -53,7 +53,7 @@ export class BaseService {
      */
     async info(id, infoIgnoreProperty) {
         if (!id) {
-            throw new ValidateException('id不能为空');
+            throw new ValidateException("id不能为空");
         }
         const info = await this.getRepository().findOneBy({ id });
         if (info && infoIgnoreProperty) {
@@ -99,10 +99,10 @@ export class BaseService {
     }
     resolveIdArr(ids) {
         if (!ids) {
-            throw new ValidateException('ids不能为空');
+            throw new ValidateException("ids不能为空");
         }
-        if (typeof ids === 'string') {
-            return ids.split(',');
+        if (typeof ids === "string") {
+            return ids.split(",");
         }
         else if (!Array.isArray(ids)) {
             return [ids];
@@ -138,7 +138,7 @@ export class BaseService {
      */
     async update(param) {
         if (!param.id)
-            throw new ValidateException('id 不能为空');
+            throw new ValidateException("id 不能为空");
         param.updateTime = new Date();
         await this.addOrUpdate(param);
         await this.modifyAfter(param);
@@ -173,7 +173,7 @@ export class BaseService {
     }
     buildListQuery(listReq) {
         const { query, sort, buildQuery, select } = listReq;
-        const qb = this.getRepository().createQueryBuilder('main');
+        const qb = this.getRepository().createQueryBuilder("main");
         if (select) {
             qb.setFindOptions({ select });
         }
@@ -194,10 +194,10 @@ export class BaseService {
                 }
             });
             if (found) {
-                qb.addOrderBy('main.' + sort.prop, sort.asc ? 'ASC' : 'DESC');
+                qb.addOrderBy("main." + sort.prop, sort.asc ? "ASC" : "DESC");
             }
         }
-        qb.addOrderBy('id', 'DESC');
+        qb.addOrderBy("id", "DESC");
         //自定义query
         if (buildQuery) {
             buildQuery(qb);
@@ -211,12 +211,12 @@ export class BaseService {
         const qb = this.buildListQuery(listReq);
         return await qb.getMany();
     }
-    async checkUserId(ids = 0, userId, userKey = 'userId') {
+    async checkUserId(ids = 0, userId, userKey = "userId") {
         if (ids == null) {
-            throw new ValidateException('id不能为空');
+            throw new ValidateException("id不能为空");
         }
         if (userId == null) {
-            throw new ValidateException('userId不能为空');
+            throw new ValidateException("userId不能为空");
         }
         if (!Array.isArray(ids)) {
             ids = [ids];
@@ -236,13 +236,13 @@ export class BaseService {
         if (!res || res.length === ids.length) {
             return;
         }
-        throw new PermissionException('权限不足');
+        throw new PermissionException("权限不足");
     }
     filterIds(ids) {
         if (!ids) {
-            throw new ValidateException('ids不能为空');
+            throw new ValidateException("ids不能为空");
         }
-        return ids.filter((item) => {
+        return ids.filter(item => {
             return item != null && item != "";
         });
     }
@@ -273,7 +273,7 @@ __decorate([
 export function checkUserProjectParam(userId, projectId) {
     if (projectId != null) {
         if (userId !== Constants.enterpriseUserId) {
-            throw new ValidateException('userId projectId 错误');
+            throw new ValidateException("userId projectId 错误");
         }
         return true;
     }
@@ -281,6 +281,6 @@ export function checkUserProjectParam(userId, projectId) {
         if (userId != null) {
             return true;
         }
-        throw new ValidateException('userId不能为空');
+        throw new ValidateException("userId不能为空");
     }
 }

package/dist/system/basic/service/plus-service.d.ts

@@ -1,6 +1,6 @@
-import { PlusRequestService } from '@certd/plus-core';
-import { HttpRequestConfig } from '@certd/basic';
-import { SysSettingsService } from '../../settings/index.js';
+import { PlusRequestService } from "@certd/plus-core";
+import { HttpRequestConfig } from "@certd/basic";
+import { SysSettingsService } from "../../settings/index.js";
 export declare class PlusService {
     sysSettingsService: SysSettingsService;
     plusRequestService: PlusRequestService;

package/dist/system/basic/service/plus-service.js

@@ -7,12 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
-import { AppKey, PlusRequestService } from '@certd/plus-core';
-import { cache, http, logger } from '@certd/basic';
-import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js';
-import { merge } from 'lodash-es';
-import fs from 'fs';
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { AppKey, PlusRequestService } from "@certd/plus-core";
+import { cache, http, logger } from "@certd/basic";
+import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from "../../settings/index.js";
+import { merge } from "lodash-es";
+import fs from "fs";
 let PlusService = class PlusService {
     sysSettingsService;
     plusRequestService;
@@ -63,15 +63,15 @@ let PlusService = class PlusService {
         const licenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo);
         if (!licenseInfo.license) {
             await plusRequestService.register();
-            logger.info('站点注册成功');
+            logger.info("站点注册成功");
             this.plusRequestService = null;
         }
     }
     async userPreBind(userId) {
         const plusRequestService = await this.getPlusRequestService();
         await plusRequestService.requestWithoutSign({
-            url: '/activation/subject/preBind',
-            method: 'POST',
+            url: "/activation/subject/preBind",
+            method: "POST",
             data: {
                 userId,
                 appKey: AppKey,
@@ -85,9 +85,9 @@ let PlusService = class PlusService {
         if (attachments.length > 0) {
             const newAttachments = [];
             attachments.forEach((item) => {
-                const name = item.filename || item.path.split('/').pop();
+                const name = item.filename || item.path.split("/").pop();
                 const body = item.content || fs.readFileSync(item.path);
-                const bodyBase64 = Buffer.from(body).toString('base64');
+                const bodyBase64 = Buffer.from(body).toString("base64");
                 item = {
                     name,
                     body: bodyBase64,
@@ -97,7 +97,7 @@ let PlusService = class PlusService {
             attachments = newAttachments;
         }
         await plusRequestService.request({
-            url: '/activation/emailSend',
+            url: "/activation/emailSend",
             data: {
                 subject: email.subject,
                 to: email.receivers,
@@ -108,7 +108,7 @@ let PlusService = class PlusService {
         });
     }
     async getAccessToken() {
-        const cacheKey = 'certd:subject:access_token';
+        const cacheKey = "certd:subject:access_token";
         const token = cache.get(cacheKey);
         if (token) {
             return token;
@@ -126,11 +126,11 @@ let PlusService = class PlusService {
         await this.register();
         const plusRequestService = await this.getPlusRequestService();
         const res = await plusRequestService.request({
-            url: '/activation/subject/vip/trialGet',
-            method: 'POST',
+            url: "/activation/subject/vip/trialGet",
+            method: "POST",
             data: {
-                vipType
-            }
+                vipType,
+            },
         });
         if (res.license) {
             await this.updateLicense(res.license);
@@ -139,7 +139,7 @@ let PlusService = class PlusService {
             };
         }
         else {
-            throw new Error('您已经领取过VIP试用了');
+            throw new Error("您已经领取过VIP试用了");
         }
     }
     async getTodayOrderCount() {
@@ -152,7 +152,7 @@ let PlusService = class PlusService {
         const token = await this.getAccessToken();
         merge(config, {
             baseURL: plusRequestService.getBaseURL(),
-            method: 'post',
+            method: "post",
             headers: {
                 Authorization: `Berear ${token}`,
             },

package/dist/system/settings/entity/sys-settings.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 /**
  */
 let SysSettingsEntity = class SysSettingsEntity {
@@ -25,38 +25,38 @@ __decorate([
     __metadata("design:type", Number)
 ], SysSettingsEntity.prototype, "id", void 0);
 __decorate([
-    Column({ comment: 'key', length: 100 }),
+    Column({ comment: "key", length: 100 }),
     __metadata("design:type", String)
 ], SysSettingsEntity.prototype, "key", void 0);
 __decorate([
-    Column({ comment: '名称', length: 100 }),
+    Column({ comment: "名称", length: 100 }),
     __metadata("design:type", String)
 ], SysSettingsEntity.prototype, "title", void 0);
 __decorate([
-    Column({ name: 'setting', comment: '设置', length: 1024, nullable: true }),
+    Column({ name: "setting", comment: "设置", length: 1024, nullable: true }),
     __metadata("design:type", String)
 ], SysSettingsEntity.prototype, "setting", void 0);
 __decorate([
-    Column({ name: 'access', comment: '访问权限' }),
+    Column({ name: "access", comment: "访问权限" }),
     __metadata("design:type", String)
 ], SysSettingsEntity.prototype, "access", void 0);
 __decorate([
     Column({
-        name: 'create_time',
-        comment: '创建时间',
-        default: () => 'CURRENT_TIMESTAMP',
+        name: "create_time",
+        comment: "创建时间",
+        default: () => "CURRENT_TIMESTAMP",
     }),
     __metadata("design:type", Date)
 ], SysSettingsEntity.prototype, "createTime", void 0);
 __decorate([
     Column({
-        name: 'update_time',
-        comment: '修改时间',
-        default: () => 'CURRENT_TIMESTAMP',
+        name: "update_time",
+        comment: "修改时间",
+        default: () => "CURRENT_TIMESTAMP",
     }),
     __metadata("design:type", Date)
 ], SysSettingsEntity.prototype, "updateTime", void 0);
 SysSettingsEntity = __decorate([
-    Entity('sys_settings')
+    Entity("sys_settings")
 ], SysSettingsEntity);
 export { SysSettingsEntity };

package/dist/system/settings/service/models.js

@@ -1,16 +1,16 @@
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep } from "lodash-es";
 export class BaseSettings {
     static __key__;
     static __title__;
-    static __access__ = 'private';
+    static __access__ = "private";
     static getCacheKey() {
-        return 'settings.' + this.__key__;
+        return "settings." + this.__key__;
     }
 }
 export class SysPublicSettings extends BaseSettings {
-    static __key__ = 'sys.public';
-    static __title__ = '系统公共设置';
-    static __access__ = 'public';
+    static __key__ = "sys.public";
+    static __title__ = "系统公共设置";
+    static __access__ = "public";
     registerEnabled = false;
     userValidTimeEnabled = false;
     passwordLoginEnabled = true;
@@ -50,24 +50,24 @@ export class SysPublicSettings extends BaseSettings {
     adminMode = "saas";
 }
 export class SysPrivateSettings extends BaseSettings {
-    static __title__ = '系统私有设置';
-    static __access__ = 'private';
-    static __key__ = 'sys.private';
+    static __title__ = "系统私有设置";
+    static __access__ = "private";
+    static __key__ = "sys.private";
     jwtKey;
     encryptSecret;
-    httpsProxy = '';
-    httpProxy = '';
-    noProxy = '';
-    commonHeaders = '';
+    httpsProxy = "";
+    httpProxy = "";
+    noProxy = "";
+    commonHeaders = "";
     reverseProxies = {};
-    dnsResultOrder = '';
+    dnsResultOrder = "";
     commonCnameEnabled = true;
     httpRequestTimeout = 30;
     pipelineMaxRunningCount;
-    environmentVars = '';
+    environmentVars = "";
     acmeWalkFromAuthoritative = true;
     sms = {
-        type: 'aliyun',
+        type: "aliyun",
         config: {},
     };
     removeSecret() {
@@ -78,9 +78,9 @@ export class SysPrivateSettings extends BaseSettings {
     }
 }
 export class SysInstallInfo extends BaseSettings {
-    static __title__ = '系统安装信息';
-    static __key__ = 'sys.install';
-    static __access__ = 'private';
+    static __title__ = "系统安装信息";
+    static __key__ = "sys.install";
+    static __access__ = "private";
     installTime;
     siteId;
     bindUserId;
@@ -90,15 +90,15 @@ export class SysInstallInfo extends BaseSettings {
     appKey;
 }
 export class SysLicenseInfo extends BaseSettings {
-    static __title__ = '授权许可信息';
-    static __key__ = 'sys.license';
-    static __access__ = 'private';
+    static __title__ = "授权许可信息";
+    static __key__ = "sys.license";
+    static __access__ = "private";
     license;
 }
 export class SysEmailConf extends BaseSettings {
-    static __title__ = '邮箱配置';
-    static __key__ = 'sys.email';
-    static __access__ = 'private';
+    static __title__ = "邮箱配置";
+    static __key__ = "sys.email";
+    static __access__ = "private";
     host;
     port;
     auth;
@@ -109,18 +109,18 @@ export class SysEmailConf extends BaseSettings {
     templates;
 }
 export class SysSiteInfo extends BaseSettings {
-    static __title__ = '站点信息';
-    static __key__ = 'sys.site';
-    static __access__ = 'public';
+    static __title__ = "站点信息";
+    static __key__ = "sys.site";
+    static __access__ = "public";
     title;
     slogan;
     logo;
     loginLogo;
 }
 export class SysSecretBackup extends BaseSettings {
-    static __title__ = '密钥信息备份';
-    static __key__ = 'sys.secret.backup';
-    static __access__ = 'private';
+    static __title__ = "密钥信息备份";
+    static __key__ = "sys.secret.backup";
+    static __access__ = "private";
     siteId;
     encryptSecret;
 }
@@ -128,9 +128,9 @@ export class SysSecretBackup extends BaseSettings {
  * 不要修改
  */
 export class SysSecret extends BaseSettings {
-    static __title__ = '密钥信息';
-    static __key__ = 'sys.secret';
-    static __access__ = 'private';
+    static __title__ = "密钥信息";
+    static __key__ = "sys.secret";
+    static __access__ = "private";
     siteId;
     encryptSecret;
 }
@@ -138,38 +138,38 @@ export class SysSiteEnv {
     agent;
 }
 export class SysHeaderMenus extends BaseSettings {
-    static __title__ = '顶部菜单';
-    static __key__ = 'sys.header.menus';
-    static __access__ = 'public';
+    static __title__ = "顶部菜单";
+    static __key__ = "sys.header.menus";
+    static __access__ = "public";
     menus;
 }
 export class SysPaymentSetting extends BaseSettings {
-    static __title__ = '支付设置';
-    static __key__ = 'sys.payment';
-    static __access__ = 'private';
+    static __title__ = "支付设置";
+    static __key__ = "sys.payment";
+    static __access__ = "private";
     yizhifu = { enabled: false };
     alipay = { enabled: false };
     wxpay = { enabled: false };
 }
 export class SysSuiteSetting extends BaseSettings {
-    static __title__ = '套餐设置';
-    static __key__ = 'sys.suite';
-    static __access__ = 'private';
+    static __title__ = "套餐设置";
+    static __key__ = "sys.suite";
+    static __access__ = "private";
     enabled = false;
     allowSuiteStack = false;
     registerGift;
     intro;
 }
 export class SysAutoFixSetting extends BaseSettings {
-    static __title__ = '自动修复记录';
-    static __key__ = 'sys.auto.fix';
-    static __access__ = 'private';
+    static __title__ = "自动修复记录";
+    static __key__ = "sys.auto.fix";
+    static __access__ = "private";
     fixed = {};
 }
 export class SysSafeSetting extends BaseSettings {
-    static __title__ = '站点安全设置';
-    static __key__ = 'sys.safe';
-    static __access__ = 'private';
+    static __title__ = "站点安全设置";
+    static __key__ = "sys.safe";
+    static __access__ = "private";
     // 站点隐藏
     hidden = {
         enabled: false,

package/dist/user/access/service/access-getter.d.ts

@@ -1,9 +1,11 @@
-import { IAccessService } from "@certd/pipeline";
+import { IAccessService, IRuntimeDepsService } from "@certd/pipeline";
+export type AccessRuntimeDepsService = IRuntimeDepsService;
 export declare class AccessGetter implements IAccessService {
     userId: number;
     projectId?: number;
-    getter: <T>(id: any, userId?: number, projectId?: number, ignorePermission?: boolean) => Promise<T>;
-    constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean) => Promise<any>);
+    runtimeDepsService?: AccessRuntimeDepsService;
+    getter: <T>(id: any, userId?: number, projectId?: number, ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService) => Promise<T>;
+    constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService) => Promise<any>, runtimeDepsService?: AccessRuntimeDepsService);
     getById<T = any>(id: any): Promise<T>;
     getCommonById<T = any>(id: any): Promise<T>;
 }

package/dist/user/access/service/access-getter.js

@@ -1,16 +1,18 @@
 export class AccessGetter {
     userId;
     projectId;
+    runtimeDepsService;
     getter;
-    constructor(userId, projectId, getter) {
+    constructor(userId, projectId, getter, runtimeDepsService) {
         this.userId = userId;
         this.projectId = projectId;
         this.getter = getter;
+        this.runtimeDepsService = runtimeDepsService;
     }
     async getById(id) {
-        return await this.getter(id, this.userId, this.projectId);
+        return await this.getter(id, this.userId, this.projectId, false, this.runtimeDepsService);
     }
     async getCommonById(id) {
-        return await this.getter(id, 0, null);
+        return await this.getter(id, 0, null, false, this.runtimeDepsService);
     }
 }

package/dist/user/access/service/access-service.d.ts

@@ -1,5 +1,6 @@
 import { Repository } from "typeorm";
 import { BaseService, PageReq } from "../../../index.js";
+import type { AccessRuntimeDepsService } from "./access-getter.js";
 import { AccessEntity } from "../entity/access.js";
 import { EncryptService } from "./encrypt-service.js";
 /**
@@ -16,7 +17,8 @@ export declare class AccessService extends BaseService<AccessEntity> {
         limit: number;
     }>;
     add(param: any): Promise<{
-        id: any;
+        id: number;
+        [key: string]: any;
     }>;
     encryptSetting(param: any, oldSettingEntity?: AccessEntity): void;
     /**
@@ -33,8 +35,8 @@ export declare class AccessService extends BaseService<AccessEntity> {
         userId: number;
         projectId: number;
     }>;
-    getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number): Promise<any>;
-    getById(id: any, userId: number, projectId?: number): Promise<any>;
+    getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number, runtimeDepsService?: AccessRuntimeDepsService): Promise<any>;
+    getById(id: any, userId: number, projectId?: number, _ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService): Promise<any>;
     decryptAccessEntity(entity: AccessEntity): any;
     getDefineList(): {
         key: string;

package/dist/user/access/service/access-service.js

@@ -14,7 +14,7 @@ import { AccessGetter, BaseService, PermissionException, ValidateException } fro
 import { AccessEntity } from "../entity/access.js";
 import { accessRegistry, newAccess } from "@certd/pipeline";
 import { EncryptService } from "./encrypt-service.js";
-import { logger, utils } from "@certd/basic";
+import { http, logger, utils } from "@certd/basic";
 /**
  * 授权
  */
@@ -154,7 +154,7 @@ let AccessService = class AccessService extends BaseService {
             projectId: entity.projectId,
         };
     }
-    async getAccessById(id, checkUserId, userId, projectId) {
+    async getAccessById(id, checkUserId, userId, projectId, runtimeDepsService) {
         const entity = await this.info(id);
         if (entity == null) {
             throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
@@ -176,11 +176,19 @@ let AccessService = class AccessService extends BaseService {
             id: entity.id,
             ...setting,
         };
-        const accessGetter = new AccessGetter(userId, projectId, this.getById.bind(this));
-        return await newAccess(entity.type, input, accessGetter);
+        const getAccessById = this.getById.bind(this);
+        const accessGetter = new AccessGetter(userId, projectId, getAccessById, runtimeDepsService);
+        const accessContext = {
+            logger,
+            http,
+            utils,
+            accessService: accessGetter,
+        };
+        const access = await newAccess(entity.type, input, accessGetter, accessContext);
+        return access;
     }
-    async getById(id, userId, projectId) {
-        return await this.getAccessById(id, true, userId, projectId);
+    async getById(id, userId, projectId, _ignorePermission, runtimeDepsService) {
+        return await this.getAccessById(id, true, userId, projectId, runtimeDepsService);
     }
     decryptAccessEntity(entity) {
         let setting = {};

package/dist/user/addon/api/api.d.ts

@@ -1,5 +1,5 @@
 import { HttpClient, ILogger, utils } from "@certd/basic";
-import { FormItemProps, IServiceGetter, PluginRequestHandleReq, Registrable } from "@certd/pipeline";
+import { FormItemProps, IRuntimeDepsService, IServiceGetter, PluginRequestHandleReq, Registrable } from "@certd/pipeline";
 export type AddonRequestHandleReqInput<T = any> = {
     id?: number;
     title?: string;
@@ -15,6 +15,8 @@ export type AddonInputDefine = FormItemProps & {
 export type AddonDefine = Registrable & {
     addonType: string;
     needPlus?: boolean;
+    dependPlugins?: Record<string, string>;
+    dependPackages?: Record<string, string>;
     input?: {
         [key: string]: AddonInputDefine;
     };
@@ -46,10 +48,12 @@ export declare abstract class BaseAddon implements IAddon {
     ctx: AddonContext;
     http: HttpClient;
     logger: ILogger;
+    runtimeDepsService?: IRuntimeDepsService;
+    importRuntime(specifier: string): Promise<any>;
     title: string;
     onInstance(): Promise<void>;
     getAccess<T = any>(accessId: string | number, isCommon?: boolean): Promise<T>;
-    setCtx(ctx: AddonContext): void;
+    setCtx(ctx: AddonContext): Promise<void>;
     setDefine: (define: AddonDefine) => void;
     onRequest(req: AddonRequestHandleReq): Promise<any>;
 }

package/dist/user/addon/api/api.js

@@ -5,6 +5,13 @@ export class BaseAddon {
     ctx;
     http;
     logger;
+    runtimeDepsService;
+    async importRuntime(specifier) {
+        if (!this.runtimeDepsService) {
+            return await import(specifier);
+        }
+        return await this.runtimeDepsService.importRuntime(specifier, this.logger);
+    }
     title;
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     async onInstance() { }
@@ -40,10 +47,16 @@ export class BaseAddon {
         }
         return res;
     }
-    setCtx(ctx) {
+    async setCtx(ctx) {
         this.ctx = ctx;
         this.http = ctx.http;
         this.logger = ctx.logger;
+        if (!this.runtimeDepsService && this.ctx.serviceGetter) {
+            this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
+        }
+        if (this.runtimeDepsService && this.define?.addonType && this.define?.name) {
+            await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `addon:${this.define.addonType}:${this.define.name}`, logger: this.logger });
+        }
     }
     setDefine = (define) => {
         this.define = define;

package/dist/user/addon/api/decorator.js

@@ -57,7 +57,7 @@ export async function newAddon(addonType, type, input, ctx) {
         throw new Error("ctx is required");
     }
     plugin.setDefine(register.define);
-    plugin.setCtx(ctx);
+    await plugin.setCtx(ctx);
     await plugin.onInstance();
     return plugin;
 }

package/dist/user/addon/service/addon-service.d.ts

@@ -14,7 +14,8 @@ export declare class AddonService extends BaseService<AddonEntity> {
         limit: number;
     }>;
     add(param: any): Promise<{
-        id: any;
+        [key: string]: any;
+        id: number;
     }>;
     /**
      * 修改

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.41.3",
+  "version": "1.42.0",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -15,11 +15,11 @@
     "test:unit": "cross-env NODE_ENV=unittest mocha --no-config --node-option no-warnings --node-option loader=ts-node/esm \"src/**/*.test.ts\"",
     "test1": "midway-bin test --ts -V -f test/blank.test.ts -t 'hash-check'",
     "cov": "midway-bin cov --ts",
-    "lint": "mwts check",
-    "lint:fix": "mwts fix",
     "prepublish": "npm run build",
     "pub": "npm publish",
-    "compile": "tsc --skipLibCheck --watch"
+    "compile": "tsc --skipLibCheck --watch",
+    "format": "prettier --write src",
+    "lint": "eslint --fix"
   },
   "keywords": [],
   "author": "greper",
@@ -29,11 +29,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.41.3",
-    "@certd/basic": "^1.41.3",
-    "@certd/pipeline": "^1.41.3",
-    "@certd/plugin-lib": "^1.41.3",
-    "@certd/plus-core": "^1.41.3",
+    "@certd/acme-client": "^1.42.0",
+    "@certd/basic": "^1.42.0",
+    "@certd/pipeline": "^1.42.0",
+    "@certd/plugin-lib": "^1.42.0",
+    "@certd/plus-core": "^1.42.0",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
@@ -46,28 +46,28 @@
     "better-sqlite3": "^11.1.2",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
-    "mwts": "^1.3.0",
-    "mwtsc": "^1.4.0",
     "typeorm": "^0.3.20"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.3",
-    "@types/mocha": "^10.0.1",
+    "@types/chai": "^4.3.12",
+    "@types/mocha": "^10.0.6",
     "@types/node": "^18",
     "@typescript-eslint/eslint-plugin": "^8.26.1",
     "@typescript-eslint/parser": "^8.26.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.24.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "esmock": "^2.7.5",
-    "mocha": "^10.2.0",
-    "prettier": "^2.8.8",
+    "mocha": "^10.6.0",
+    "mwts": "^1.3.0",
+    "mwtsc": "^1.4.0",
+    "prettier": "3.3.3",
     "rimraf": "^5.0.5",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
-    "typeorm": "^0.3.11",
+    "typeorm": "^0.3.20",
     "typescript": "^5.4.2"
   },
-  "gitHead": "6cbd62977731a3b72c42b5f88c49500631da0a46"
+  "gitHead": "b46948c0ba67069ebcd2bb71b21b6c289d99f1b8"
 }