diff --git a/deploy/data-seed/plugin-config.json b/deploy/data-seed/plugin-config.json index 90e345b..29ca674 100644 --- a/deploy/data-seed/plugin-config.json +++ b/deploy/data-seed/plugin-config.json @@ -1 +1 @@ -{"plugins":{"plugin-domain":{"enabled":true,"admin_prefix":"plugin-domain"},"plugin-llm":{"enabled":true,"admin_prefix":"plugin-llm"},"plugin-apix":{"enabled":true,"admin_prefix":"plugin-apix"}}} +{"plugins":{"domain":{"enabled":true,"admin_prefix":"domain"},"llm":{"enabled":true,"admin_prefix":"llm"},"apix":{"enabled":true,"admin_prefix":"apix"}}} diff --git a/rust/gateway/src/lib.rs b/rust/gateway/src/lib.rs index 9b1dcd9..0259b13 100644 --- a/rust/gateway/src/lib.rs +++ b/rust/gateway/src/lib.rs @@ -225,6 +225,11 @@ fn loc_switch(request: &mut Request, s: Switch) -> bool { /// 管理 API 分发:按 PLUGINS 顺序问每个插件,都不认领才统一 404。 fn dispatch_api(r: *mut ngx_http_request_t) -> Status { for p in PLUGINS { + // R19:被禁插件不认领路由(自然落到下面的统一 404)。 + // core 是网关身份底座,永不跳过;gateway-routes(trend)不在注册表内,恒启用。 + if p.name() != "core" && !ipass_core::plugin_registry::plugin_enabled(p.name()) { + continue; + } if let Some(s) = p.dispatch_api(r) { return s; } @@ -353,6 +358,14 @@ impl HttpModule for Module { unsafe extern "C" fn postconfiguration(cf: *mut ngx_conf_t) -> ngx_int_t { let cf = unsafe { &mut *cf }; + // R19:装载插件启停注册表。`ipass_data_dir` 指令在配置解析阶段已写入 + // store;postconfiguration 在 master 单次执行(reload 重进 = 热更新)。 + let cfg = ipass_core::plugin_registry::load(&format!( + "{}/plugin-config.json", + store::data_dir() + )); + ipass_core::plugin_registry::set_current(cfg); + // 把本模块 ctx_index 注入内核契约:插件在 r->ctx 上挂请求级状态 // (如 ipass-plugin-llm 的 usage_filter 扫描窗口)用它定位自己的槽位 ipass_core::plugin::set_ctx_index(Module::module().ctx_index as usize); diff --git a/scripts/collect-plugin-dist.sh b/scripts/collect-plugin-dist.sh index f5be317..f30a5de 100755 --- a/scripts/collect-plugin-dist.sh +++ b/scripts/collect-plugin-dist.sh @@ -6,13 +6,17 @@ # - 核心壳来自 ipass-core/www(index.html + assets) # - 插件管理页是 UMD 产物,壳按 # /static/plugins//dist/-admin.umd.js 动态加载 -# (寻址约定见 ipass-core www/src/loader.ts, 即 plugin-config.json 的键) +# (寻址约定见 ipass-core www/src/loader.ts;R19 起 统一为 +# Plugin::name() 短名(domain/llm/apix),即 plugin-config.json 的键, +# 也即 /api/core/plugins 返回的 name) # conf/nginx.conf 严禁把 /static/plugins/ alias 到 workspace 根—— # 会连带暴露各仓 data/*.json 等敏感文件(曾犯,同 ipass-sso 21c0f6f 修复)。 # # 输出布局(默认 ASSEMBLY_DIR=build,本机 dev,build/ 已整体 gitignore): # $ASSEMBLY_DIR/shell/ ← ../ipass-core/www/dist -# $ASSEMBLY_DIR/static-plugins//dist/ ← ../ipass-/www/dist(仅 enabled) +# $ASSEMBLY_DIR/static-plugins//dist/ ← ../ipass-plugin-/www/dist(仅 enabled) +# ( = R19 统一后的短名 domain/llm/apix;UMD 产物原名 plugin--admin.umd.js, +# 脚本另存一份 -admin.umd.js 别名供壳按短名加载) # # 用法: # bash scripts/collect-plugin-dist.sh # → build/(dev,配合 conf/nginx.conf) @@ -45,13 +49,14 @@ CONFIG="$ROOT/data/plugin-config.json" PYTHON="${PYTHON:-python3}" command -v "$PYTHON" >/dev/null 2>&1 || { echo "!! 缺 python3(解析 plugin-config.json 用)" >&2; exit 1; } -# enabled 插件名清单(如 plugin-domain;对应仓库目录 ipass-) +# enabled 插件短名清单(R19 统一键 = Plugin::name(),如 domain;对应仓库 ipass-plugin-<短名>。 +# 兼容旧 plugin- 前缀拼写:一律去掉前缀再映射目录) PLUGINS="$("$PYTHON" - "$CONFIG" <<'PY' import json, sys cfg = json.load(open(sys.argv[1], encoding="utf-8")) for name, p in cfg.get("plugins", {}).items(): if p.get("enabled"): - print(name) + print(name.removeprefix("plugin-")) PY )" @@ -74,16 +79,23 @@ mkdir -p "$PLUGINS_OUT" find "$PLUGINS_OUT" -mindepth 1 -maxdepth 1 ! -name .gitkeep -exec rm -rf {} + count=0 -while IFS= read -r name; do - [ -n "$name" ] || continue - src="$IPASS_DIR/ipass-${name}/www/dist" +while IFS= read -r short; do + [ -n "$short" ] || continue + src="$IPASS_DIR/ipass-plugin-${short}/www/dist" if [ ! -d "$src" ]; then - echo "!! $name:$src 缺失(先在 ipass-${name}/www 跑 npm run build),跳过" >&2 + echo "!! $short:$src 缺失(先在 ipass-plugin-${short}/www 跑 npm run build),跳过" >&2 continue fi - mkdir -p "$PLUGINS_OUT/$name/dist" - rsync -a --delete "$src/" "$PLUGINS_OUT/$name/dist/" - echo "plugin: $src → $PLUGINS_OUT/$name/dist" + mkdir -p "$PLUGINS_OUT/$short/dist" + rsync -a --delete "$src/" "$PLUGINS_OUT/$short/dist/" + # 产物原文件名是 plugin-<短名>-admin.umd.js;壳按短名请求 + # /static/plugins/<短名>/dist/<短名>-admin.umd.js(loader.ts 约定)→ 补一份短名别名 + if [ ! -f "$PLUGINS_OUT/$short/dist/${short}-admin.umd.js" ] \ + && [ -f "$PLUGINS_OUT/$short/dist/plugin-${short}-admin.umd.js" ]; then + cp "$PLUGINS_OUT/$short/dist/plugin-${short}-admin.umd.js" \ + "$PLUGINS_OUT/$short/dist/${short}-admin.umd.js" + fi + echo "plugin: $src → $PLUGINS_OUT/$short/dist" count=$((count + 1)) done <