From 5b22703949833d84eb9733d1b168787ca94a3e0a Mon Sep 17 00:00:00 2001 From: sunlei Date: Thu, 18 Jun 2026 08:49:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=8C=85=E8=B7=AF=E5=BE=84=E7=AD=96=E7=95=A5DI=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin-package-path-policy.service.ts | 17 +++++++++++++---- .../plugin-platform/plugin-platform-di.spec.ts | 12 ++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/modules/qqbot/plugin-platform/infrastructure/integration/package/plugin-package-path-policy.service.ts b/src/modules/qqbot/plugin-platform/infrastructure/integration/package/plugin-package-path-policy.service.ts index 10277cb..6c4bb6d 100644 --- a/src/modules/qqbot/plugin-platform/infrastructure/integration/package/plugin-package-path-policy.service.ts +++ b/src/modules/qqbot/plugin-platform/infrastructure/integration/package/plugin-package-path-policy.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@nestjs/common'; +import { Inject, Injectable, Optional } from '@nestjs/common'; import { existsSync, statSync } from 'node:fs'; import { isAbsolute, relative, resolve, sep } from 'node:path'; @@ -9,6 +9,9 @@ const DEFAULT_BUILTIN_PACKAGE_ROOT = resolve( 'qqbot', 'plugins', ); +export const QQBOT_PLUGIN_PACKAGE_CONTROLLED_ROOTS = Symbol( + 'QQBOT_PLUGIN_PACKAGE_CONTROLLED_ROOTS', +); /** * Restricts QQBot plugin package discovery and entry resolution to controlled package roots. @@ -19,10 +22,16 @@ export class QqbotPluginPackagePathPolicyService { /** * Creates a path policy for package roots that the plugin platform may scan. - * @param controlledRoots - Directory roots that may contain one-level QQBot plugin package folders. + * @param controlledRoots - Optional DI-provided package roots; production omits this token so the platform scans the standard built-in plugin root. */ - constructor(controlledRoots = [DEFAULT_BUILTIN_PACKAGE_ROOT]) { - this.controlledRoots = controlledRoots.map((root) => resolve(root)); + constructor( + @Optional() + @Inject(QQBOT_PLUGIN_PACKAGE_CONTROLLED_ROOTS) + controlledRoots?: string[], + ) { + this.controlledRoots = ( + controlledRoots?.length ? controlledRoots : [DEFAULT_BUILTIN_PACKAGE_ROOT] + ).map((root) => resolve(root)); } /** diff --git a/test/modules/qqbot/plugin-platform/plugin-platform-di.spec.ts b/test/modules/qqbot/plugin-platform/plugin-platform-di.spec.ts index 01964bf..bd9b879 100644 --- a/test/modules/qqbot/plugin-platform/plugin-platform-di.spec.ts +++ b/test/modules/qqbot/plugin-platform/plugin-platform-di.spec.ts @@ -1,6 +1,8 @@ import { readFileSync } from 'node:fs'; import { join } from 'node:path'; +import { Test } from '@nestjs/testing'; import { QqbotPluginPlatformService } from '../../../../src/modules/qqbot/plugin-platform/application/plugin-platform.service'; +import { QqbotPluginPackagePathPolicyService } from '../../../../src/modules/qqbot/plugin-platform/infrastructure/integration/package/plugin-package-path-policy.service'; import { QqbotPluginTaskWorkerProcessor } from '../../../../src/modules/qqbot/plugin-platform/application/task/qqbot-plugin-task-worker.processor'; describe('QQBot plugin platform DI tokens', () => { @@ -27,4 +29,14 @@ describe('QQBot plugin platform DI tokens', () => { expect(paramTypes[1]).toBe(QqbotPluginPlatformService); }); + + it('lets Nest instantiate the package path policy without a config-array provider', async () => { + const moduleRef = await Test.createTestingModule({ + providers: [QqbotPluginPackagePathPolicyService], + }).compile(); + + expect(moduleRef.get(QqbotPluginPackagePathPolicyService)).toBeInstanceOf( + QqbotPluginPackagePathPolicyService, + ); + }); });