@aalis/runtime 0.19.0 → 0.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (67) hide show
  1. package/README.md +1 -1
  2. package/dist/config-store.d.ts +9 -1
  3. package/dist/config-store.d.ts.map +1 -1
  4. package/dist/config-store.js +76 -25
  5. package/dist/config-store.js.map +1 -1
  6. package/dist/config-sync.d.ts +9 -15
  7. package/dist/config-sync.d.ts.map +1 -1
  8. package/dist/config-sync.js +45 -50
  9. package/dist/config-sync.js.map +1 -1
  10. package/dist/console-sink.d.ts +1 -1
  11. package/dist/console-sink.d.ts.map +1 -1
  12. package/dist/console-sink.js +1 -5
  13. package/dist/console-sink.js.map +1 -1
  14. package/dist/data-dir.d.ts +2 -2
  15. package/dist/data-dir.d.ts.map +1 -1
  16. package/dist/data-dir.js +1 -1
  17. package/dist/file-logger.d.ts +2 -2
  18. package/dist/file-logger.d.ts.map +1 -1
  19. package/dist/file-logger.js +12 -9
  20. package/dist/file-logger.js.map +1 -1
  21. package/dist/host-logs.d.ts +1 -1
  22. package/dist/host-logs.js +1 -1
  23. package/dist/index.d.ts +1 -3
  24. package/dist/index.d.ts.map +1 -1
  25. package/dist/index.js +2 -4
  26. package/dist/index.js.map +1 -1
  27. package/dist/instance-lock.js +2 -2
  28. package/dist/instance-lock.js.map +1 -1
  29. package/dist/locales/en.d.ts +4 -0
  30. package/dist/locales/en.d.ts.map +1 -1
  31. package/dist/locales/en.js +4 -0
  32. package/dist/locales/en.js.map +1 -1
  33. package/dist/node-modules-loader.d.ts +4 -7
  34. package/dist/node-modules-loader.d.ts.map +1 -1
  35. package/dist/node-modules-loader.js +17 -24
  36. package/dist/node-modules-loader.js.map +1 -1
  37. package/dist/plugin-discovery.d.ts +10 -3
  38. package/dist/plugin-discovery.d.ts.map +1 -1
  39. package/dist/plugin-discovery.js +64 -30
  40. package/dist/plugin-discovery.js.map +1 -1
  41. package/dist/providers.d.ts +10 -10
  42. package/dist/providers.d.ts.map +1 -1
  43. package/dist/providers.js +19 -32
  44. package/dist/providers.js.map +1 -1
  45. package/dist/start.d.ts +2 -4
  46. package/dist/start.d.ts.map +1 -1
  47. package/dist/start.js +78 -53
  48. package/dist/start.js.map +1 -1
  49. package/dist/subcommand.d.ts +1 -1
  50. package/dist/subcommand.js +1 -1
  51. package/dist/texts.d.ts +8 -0
  52. package/dist/texts.d.ts.map +1 -1
  53. package/dist/texts.js +4 -0
  54. package/dist/texts.js.map +1 -1
  55. package/dist/yaml-file.d.ts +4 -2
  56. package/dist/yaml-file.d.ts.map +1 -1
  57. package/dist/yaml-file.js +9 -5
  58. package/dist/yaml-file.js.map +1 -1
  59. package/package.json +5 -5
  60. package/dist/bootstrap-buffer.d.ts +0 -34
  61. package/dist/bootstrap-buffer.d.ts.map +0 -1
  62. package/dist/bootstrap-buffer.js +0 -42
  63. package/dist/bootstrap-buffer.js.map +0 -1
  64. package/dist/terminal.d.ts +0 -16
  65. package/dist/terminal.d.ts.map +0 -1
  66. package/dist/terminal.js +0 -43
  67. package/dist/terminal.js.map +0 -1
package/README.md CHANGED
@@ -10,7 +10,7 @@ pnpm add @aalis/runtime
10
10
 
11
11
  ## 提供 / 依赖
12
12
 
13
- 宿主组装件,不是插件,无 `provides` / `uses`;`startAalis` 在根上独占登记 `host-paths`(`@aalis/api-host-paths`)、`host-logs`(`@aalis/api-host-logs`)、`host-config`(`@aalis/api-host-config`)与 `plugin-source`(`@aalis/api-plugin-source`)四个服务。主要导出:`startAalis`、数据目录的 `parseHostArgs` / `resolveDataDir` / `derivePaths` / `isDataDirInitialized` / `initDataDir`、`createNodeModulesPluginLoader`、`createFsPluginLoader`、`createPluginDiscovery`、`createConfigStore`、`installHostConfig`、`createHostLogs`、`withPluginConfigSync`、`createFsYamlConfigProvider`、`createFsSecretsProvider`、`createProcessRespawnStrategy`。peer:`@aalis/core`(`>=0.20.0 <1.0.0`)。
13
+ 宿主组装件,不是插件,无 `provides` / `uses`;`startAalis` 在根上独占登记 `host-paths`(`@aalis/api-host-paths`)、`host-logs`(`@aalis/api-host-logs`)、`host-config`(`@aalis/api-host-config`)与 `plugin-source`(`@aalis/api-plugin-source`)四个服务。主要导出:`startAalis`、数据目录的 `parseHostArgs` / `resolveDataDir` / `derivePaths` / `isDataDirInitialized` / `initDataDir`、`createNodeModulesPluginLoader`、`createFsPluginLoader`、`createPluginDiscovery`、`createConfigStore`、`installHostConfig`、`createHostLogs`、`withPluginConfigSync`、`createFsYamlConfigProvider`、`createFsSecretsProvider`、`createProcessRespawnStrategy`。peer:`@aalis/core`(`>=0.21.0 <1.0.0`)。
14
14
 
15
15
  ```ts
16
16
  import { dirname } from 'node:path';
@@ -33,7 +33,7 @@ export interface ConfigStore extends Omit<HostConfig, 'save' | 'trimUnknownField
33
33
  persist(): Promise<boolean>;
34
34
  /**
35
35
  * 订阅外部变更(配置文件或密钥文件;新内容已过同一道闸替换进来后回调,参数是替换前的文档);单订阅者,返回退订。
36
- * 密钥文件拒写之后的那次变更按文件对账,同主配置拒写:还没写成的密钥作废,文档退回配置文件上最后读入或写出的那一份
36
+ * 密钥文件拒写之后的那次变更按文件核对,同主配置拒写:还没写成的密钥作废,文档退回配置文件上最后读入或写出的那一份
37
37
  */
38
38
  watch(onChange: (previous: Readonly<AalisConfig>) => void): () => void;
39
39
  unwatch(): void;
@@ -57,6 +57,9 @@ export interface SecretStoreInit {
57
57
  values: Record<string, unknown>;
58
58
  provider?: SecretProvider;
59
59
  }
60
+ /**
61
+ * @param secrets 宿主的密钥存储;不给时没有密钥存储(嵌入式宿主、只在内存里的配置),密钥照旧以明文留在文档里
62
+ */
60
63
  export declare function createConfigStore(initial: Partial<AalisConfig>, provider?: ConfigProvider, secrets?: SecretStoreInit): ConfigStore;
61
64
  /**
62
65
  * 把文档接到 App:以 host-config 服务独占登记在根激活上,应用文档里的服务偏好。
@@ -70,4 +73,9 @@ export declare function installHostConfig(app: App, store: ConfigStore, opts?: C
70
73
  * 没变的不动;不给时(启动)全部应用
71
74
  */
72
75
  export declare function applyServicePreferences(live: Pick<Services, 'prefer' | 'unprefer'>, next: Readonly<AalisConfig>, previous?: Readonly<AalisConfig>): void;
76
+ /**
77
+ * 文档里由宿主专门处理的顶层键:读入时逐个规范化,保存时按固定顺序写在最前;其余顶层键(含 slowThresholdMs 这类核心配置)
78
+ * 原样透传
79
+ */
80
+ export declare const CORE_TOP_LEVEL_KEYS: ReadonlySet<string>;
73
81
  //# sourceMappingURL=config-store.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config-store.d.ts","sourceRoot":"","sources":["../src/config-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config-store.d.ts","sourceRoot":"","sources":["../src/config-store.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@
3
3
  //
4
4
  // 运行态(实例配置、禁用态、服务偏好)在 core;本模块持「下次启动用什么」的文档:
5
5
  // - 启动:宿主从文档取每个实例的配置(解析密钥引用后)与禁用标记交给 app.pluginAll,偏好(全局与本插件)经根绑定
6
- // services.prefer 应用,热重载时按改动前后的文档对账;
6
+ // services.prefer 应用,热重载时按改动前后的文档核对;
7
7
  // - 运行:改插件配置经 host-config 的 applyPluginConfig 一步完成;启停、偏好等管理动作只改运行态,
8
8
  // 要跨重启保留的调用方经 host-config 自己写文档并 save()。
9
9
  // 文档是文档形态:schema 里 `secret: true` 的字段只放引用 `{ $secret: '<键>' }`,值在密钥存储里(见 secrets.ts)。
@@ -19,6 +19,7 @@ import { configToReload } from './config-sync.js';
19
19
  import { moduleDefinitionOf } from './plugin-discovery.js';
20
20
  import { describeDangling, plainSecretPaths, referencedKeys, resolveSecrets, secretPlaces, splitSecrets, } from './secrets.js';
21
21
  import { t } from './texts.js';
22
+ import { describeNonMapping } from './yaml-file.js';
22
23
  /**
23
24
  * 插件 id 不得当 `plugins` / 禁用名单的对象键——那三条会落到原型链。
24
25
  * 按 id 取放的入口共用这一抛错,文案给 WebUI 映射 400。
@@ -27,9 +28,6 @@ function assertSafePluginId(id) {
27
28
  if (isUnsafeConfigKey(id))
28
29
  throw new TextError(t('unsafePluginId', { id }));
29
30
  }
30
- /**
31
- * @param secrets 宿主的密钥存储;不给时没有密钥存储(嵌入式宿主、只在内存里的配置),密钥照旧以明文留在文档里
32
- */
33
31
  /**
34
32
  * 写进文档的值(set 与 setPluginConfig 共用):整份深复制,调用方之后改入参写不穿文档,函数这类复制不了的值在这里就抛给
35
33
  * 写入方;再按配置拷贝规则滤掉落到原型链的键,外来对象(WebUI 请求体、工具参数)里 JSON 解出的 __proto__ 等不进文档
@@ -37,18 +35,21 @@ function assertSafePluginId(id) {
37
35
  function intoDocument(value) {
38
36
  return cloneConfigObject({ value: structuredClone(value) }).value;
39
37
  }
38
+ /**
39
+ * @param secrets 宿主的密钥存储;不给时没有密钥存储(嵌入式宿主、只在内存里的配置),密钥照旧以明文留在文档里
40
+ */
40
41
  export function createConfigStore(initial, provider, secrets) {
41
42
  // 配置会落盘、密钥却不能:引用写进文件,值只在内存里,重启后全部落空
42
43
  if (secrets && !secrets.provider?.save && provider?.save) {
43
44
  throw new Error('The config document is persisted but the secret store cannot save, so references would be lost after a restart: give the secret store a provider that can save, or give no secret store');
44
45
  }
45
46
  let config = normalize(initial);
46
- // 配置文件上的那一份(最后读入或写出的):密钥文件拒写之后按文件对账时,文档退回这一份
47
+ // 配置文件上的那一份(最后读入或写出的):密钥文件拒写之后按文件核对时,文档退回这一份
47
48
  let fileDoc = snapshot(config);
48
49
  let values = secretMap(secrets?.values ?? {});
49
50
  // 已提交、还没写进密钥文件的值:密钥文件在这期间被外部改动重新读入时并进新内容,文档里的引用可能正指着它们
50
51
  const pending = new Map();
51
- // 密钥文件拒写过:下一次密钥文件变更按文件对账,不再并进 pending(见 watch)。refusedGen 是拒写的代数:
52
+ // 密钥文件拒写过:下一次密钥文件变更按文件核对,不再并进 pending(见 watch)。refusedGen 是拒写的代数:
52
53
  // 写成的那次保存只在它写盘期间没有新的拒写时清标志,并发的另一次保存被拒时标志留着
53
54
  let secretsRefused = false;
54
55
  let refusedGen = 0;
@@ -147,7 +148,7 @@ export function createConfigStore(initial, provider, secrets) {
147
148
  });
148
149
  values.set(key, value);
149
150
  pending.set(key, value);
150
- // 新写入的键同样是候选:落盘时还有人引用就留着,没人引用了(文件对账回退、被后来的写入顶掉)就删
151
+ // 新写入的键同样是候选:落盘时还有人引用就留着,没人引用了(文件核对回退、被后来的写入顶掉)就删
151
152
  orphanCandidates.add(key);
152
153
  }
153
154
  return () => {
@@ -181,7 +182,7 @@ export function createConfigStore(initial, provider, secrets) {
181
182
  }
182
183
  throw err;
183
184
  }
184
- // 写成了:盘上已是内存里的内容,不必再按文件对账(文件被原样改回后保存就会走到这里)
185
+ // 写成了:盘上已是内存里的内容,不必再按文件核对(文件被原样改回后保存就会走到这里)
185
186
  if (refusedGen === gen)
186
187
  secretsRefused = false;
187
188
  for (const [key, value] of flushing)
@@ -230,8 +231,11 @@ export function createConfigStore(initial, provider, secrets) {
230
231
  onChangeCallback = onChange;
231
232
  const configWatch = provider?.watch?.(next => {
232
233
  const previous = config;
233
- config = normalize(next);
234
- fileDoc = snapshot(config);
234
+ // 先算完再换:拷贝拒收(如成环的数组)时抛出,文档与运行态都不动,文件层据此搁置这次变更
235
+ const normalized = normalize(next);
236
+ const doc = snapshot(normalized);
237
+ config = normalized;
238
+ fileDoc = doc;
235
239
  onChangeCallback?.(previous);
236
240
  });
237
241
  if (configWatch)
@@ -240,7 +244,7 @@ export function createConfigStore(initial, provider, secrets) {
240
244
  const previous = config;
241
245
  values = secretMap(next);
242
246
  if (secretsRefused) {
243
- // 拒写之后的这次变更按文件对账,同主配置拒写:没写成的密钥作废,与它们一起改的文档退回配置文件上那一份。
247
+ // 拒写之后的这次变更按文件核对,同主配置拒写:没写成的密钥作废,与它们一起改的文档退回配置文件上那一份。
244
248
  // 配置不落盘的宿主没有那一份,文档不动
245
249
  secretsRefused = false;
246
250
  pending.clear();
@@ -336,6 +340,7 @@ export function installHostConfig(app, store, opts) {
336
340
  };
337
341
  const applyPluginConfig = async (instanceId, submitted) => {
338
342
  assertSafePluginId(instanceId);
343
+ assertPluginSection(instanceId, submitted);
339
344
  const entry = app.plugins.getPlugin(instanceId);
340
345
  const definition = entry?.definition ?? definitionOf(app, instanceId);
341
346
  if (!definition)
@@ -401,7 +406,7 @@ export function installHostConfig(app, store, opts) {
401
406
  host.provide.use(hostConfig, {
402
407
  get: key => structuredClone(store.get(key)),
403
408
  getAll: () => structuredClone(store.getAll()),
404
- // plugins 整块替换会绕过下面 setPluginConfig 的形态检查与孤儿键记账
409
+ // plugins 整块替换会绕过下面 setPluginConfig 的形态检查与孤儿键记录
405
410
  set: (key, value) => {
406
411
  if (key === 'plugins')
407
412
  throw new Error('plugins 不能整块替换:改插件配置用 applyPluginConfig 或 setPluginConfig');
@@ -411,6 +416,7 @@ export function installHostConfig(app, store, opts) {
411
416
  // 只收文档形态:查得到 schema 时,密钥字段上的明文(例如把 caps.config 原样写回)拒绝,不让原值进文档
412
417
  setPluginConfig: (instanceId, next) => {
413
418
  assertSafePluginId(instanceId);
419
+ assertPluginSection(instanceId, next);
414
420
  const schema = store.hasSecretStore ? definitionOf(app, instanceId)?.configSchema : undefined;
415
421
  const plain = plainSecretPaths(schema, next);
416
422
  if (plain.length > 0)
@@ -490,6 +496,46 @@ function withoutSessionFields(schema, config) {
490
496
  function snapshot(doc) {
491
497
  return cloneConfigObject(doc);
492
498
  }
499
+ /**
500
+ * 文档里的插件配置:plugins 与其中每一段都须是映射。留空(null)读入即 {},与整份文件为空同一规则;
501
+ * 数组、标量报错点名那一段——启动时拒启,热重载时搁置这次变更,不按 Object.entries 摊开写回文件
502
+ */
503
+ function pluginSections(input) {
504
+ const plugins = cloneConfigObject(mappingAt(input, 'plugins'));
505
+ for (const [id, section] of Object.entries(plugins))
506
+ plugins[id] = mappingAt(section, `plugins.${id}`);
507
+ return plugins;
508
+ }
509
+ function mappingAt(value, at) {
510
+ if (value === null || value === undefined)
511
+ return {};
512
+ const kind = describeNonMapping(value);
513
+ if (kind)
514
+ throw new TextError(t('sectionNotMapping', { at, kind }));
515
+ return value;
516
+ }
517
+ /**
518
+ * 文档里的停用名单:实例 id 的列表。留空读入即 [];不是列表、或列表里有不是字符串的,与插件段不是映射同一处置,报错点名。
519
+ * 照收的话写成字符串时按子串判停用,启停开关与写成映射时的读取抛 TypeError
520
+ */
521
+ function disabledIds(input) {
522
+ if (input === null || input === undefined)
523
+ return [];
524
+ if (!Array.isArray(input)) {
525
+ throw new TextError(t('sectionNotList', { at: 'disabledPlugins', kind: describeNonMapping(input) ?? 'mapping' }));
526
+ }
527
+ for (const [i, id] of input.entries()) {
528
+ if (typeof id !== 'string') {
529
+ throw new TextError(t('entryNotString', { at: `disabledPlugins[${i}]`, kind: describeNonMapping(id) ?? 'mapping' }));
530
+ }
531
+ }
532
+ return input;
533
+ }
534
+ /** host-config 写插件配置的入口与读入同一规则;写进文档的数组、标量、null 会让下次读入失败 */
535
+ function assertPluginSection(instanceId, value) {
536
+ if (describeNonMapping(value))
537
+ throw new TextError(t('notMapping', { instance: instanceId }));
538
+ }
493
539
  /** 一个范围里的偏好:不给 `for` 是全局偏好,给了是那个插件实例的本插件偏好;还没有时为 undefined */
494
540
  function preferencesIn(doc, scope) {
495
541
  if (scope?.for === undefined)
@@ -529,6 +575,18 @@ function copyOwnSafeStringDict(input) {
529
575
  }
530
576
  return out;
531
577
  }
578
+ /**
579
+ * 文档里由宿主专门处理的顶层键:读入时逐个规范化,保存时按固定顺序写在最前;其余顶层键(含 slowThresholdMs 这类核心配置)
580
+ * 原样透传
581
+ */
582
+ export const CORE_TOP_LEVEL_KEYS = new Set([
583
+ 'name',
584
+ 'logLevel',
585
+ 'plugins',
586
+ 'disabledPlugins',
587
+ 'servicePreferences',
588
+ 'pluginServicePreferences',
589
+ ]);
532
590
  function normalize(input) {
533
591
  // 核心字段的缺省值取自 CORE_CONFIG_SCHEMA,与 WebUI 设置页显示、比较用的默认值同一来源
534
592
  const coreDefaults = defaultsFrom(CORE_CONFIG_SCHEMA);
@@ -536,23 +594,16 @@ function normalize(input) {
536
594
  name: input.name ?? coreDefaults.name,
537
595
  logLevel: input.logLevel ?? coreDefaults.logLevel,
538
596
  // 键与值都过闸:JSON 解出的 plugins.__proto__ / 插件配置里的 __proto__ 都不能当自有键留下
539
- plugins: cloneConfigObject((input.plugins ?? {})),
540
- disabledPlugins: input.disabledPlugins ?? [],
597
+ plugins: pluginSections(input.plugins),
598
+ disabledPlugins: disabledIds(input.disabledPlugins),
541
599
  };
542
600
  for (const [key, value] of Object.entries(input)) {
543
- if (key === 'name' || key === 'logLevel' || key === 'plugins' || key === 'disabledPlugins')
544
- continue;
545
- if (isUnsafeConfigKey(key))
546
- continue;
547
- if (key === 'servicePreferences') {
601
+ if (key === 'servicePreferences')
548
602
  merged.servicePreferences = copyOwnSafeStringDict(value);
549
- continue;
550
- }
551
- if (key === 'pluginServicePreferences') {
603
+ else if (key === 'pluginServicePreferences')
552
604
  merged.pluginServicePreferences = copyPluginPreferences(value);
553
- continue;
554
- }
555
- merged[key] = value;
605
+ else if (!CORE_TOP_LEVEL_KEYS.has(key) && !isUnsafeConfigKey(key))
606
+ merged[key] = value;
556
607
  }
557
608
  return merged;
558
609
  }
@@ -1 +1 @@
1
- {"version":3,"file":"config-store.js","sourceRoot":"","sources":["../src/config-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config-store.js","sourceRoot":"","sources":["../src/config-store.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { type AalisConfig } from '@aalis/api-host-config';
2
- import { type App, type PluginDefinition } from '@aalis/core';
2
+ import { type App } from '@aalis/core';
3
3
  import { type ConfigStore } from './config-store.js';
4
- import { type PluginDiscovery, type PluginLoader } from './plugin-discovery.js';
4
+ import { type PluginDiscovery, type PluginDiscoveryOptions } from './plugin-discovery.js';
5
5
  export interface ConfigSyncOptions {
6
6
  /**
7
7
  * 是否按 configSchema 裁剪未知字段(默认 `true`)。
@@ -26,23 +26,17 @@ export interface ConfigSyncOptions {
26
26
  */
27
27
  export declare function syncPluginDefaults(app: App, store: ConfigStore, opts?: ConfigSyncOptions, previous?: Readonly<AalisConfig>): string[];
28
28
  /**
29
- * 宿主加载政策:导入定义后、交给 Core 注册前规范化主实例与已配置的复用实例。
30
- * 首次加载批次只落盘一次;随后市场 rescan 的 load/reload 也走同一政策。
29
+ * 宿主加载政策,交给 createPluginDiscovery 的 options:发现驱动每批定下要登记的定义后、交给 Core 注册前,规范化各定义的主实例
30
+ * 与已配置的复用实例,这一批有改动就落盘一次(冷启动整批一次,之后每次热扫描一次)。
31
+ * 不在导入时做:导入了不等于要登记,被跳过、拒载的定义按它的 schema 同步,会裁掉同名配置段的字段。
31
32
  * 发现驱动随后按文档取每个实例的配置交给 core,首次 apply 拿到的就是规范化后的这一份。
32
- * 配置段被改了的实例各发一次 host-config:changed(带 instanceId)。
33
+ * 配置段被改了的实例各发一次 host-config:changed(带 instanceId)。某个定义同步时抛错只记该条、不登记它,其余照常
33
34
  */
34
- export declare function withPluginConfigSync(loader: PluginLoader, app: App, store: ConfigStore, opts?: ConfigSyncOptions): {
35
- loader: {
36
- reload?: ((descriptor: import("./plugin-discovery.js").PluginDescriptor) => Promise<PluginDefinition<{}> | null>) | undefined;
37
- discover: () => Promise<import("./plugin-discovery.js").PluginDescriptor[]>;
38
- load: (descriptor: import("./plugin-discovery.js").PluginDescriptor) => Promise<PluginDefinition<{}> | null>;
39
- };
40
- finishInitialLoad(): void;
41
- };
35
+ export declare function withPluginConfigSync(app: App, store: ConfigStore, opts?: ConfigSyncOptions): PluginDiscoveryOptions;
42
36
  /**
43
- * 配置外部变更时的处理:先对账服务偏好(全局与本插件),卸载文件里已没有配置段的 `name:suffix` 实例,再按启动路径同一政策同步,
37
+ * 配置外部变更时的处理:先核对服务偏好(全局与本插件),卸载文件里已没有配置段的 `name:suffix` 实例,再按启动路径同一政策同步,
44
38
  * 重新计算各插件配置并热重载差异(updateConfig → bounce),最后经发现驱动登记文件里新出现的后缀实例
45
- * (判据同冷启动与热扫描)。`previous` 是变更前的文档:对账偏好的基线(不给时只应用新文档里的),也交给同步作拆密钥的基线
39
+ * (判据同冷启动与热扫描)。`previous` 是变更前的文档:核对偏好的基线(不给时只应用新文档里的),也交给同步作拆密钥的基线
46
40
  * (见 {@link syncPluginDefaults})。
47
41
  * 结束时(成功与失败都一样)文档与 `previous` 不同就发 host-config:changed(带 document):热重载换下整份文档,不经 host-config
48
42
  * 的写方法。只换了密钥文件、文档没换时不发;不给 `previous` 时按变了处理。配置文件解析失败的变更到不了这里
@@ -1 +1 @@
1
- {"version":3,"file":"config-sync.d.ts","sourceRoot":"","sources":["../src/config-sync.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,KAAK,GAAG,EAAU,KAAK,gBAAgB,EAA6B,MAAM,aAAa,CAAC;AAEjG,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAsB,KAAK,eAAe,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGpG,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,IAAI,CAAC,EAAE,iBAAiB,EACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,GAC/B,MAAM,EAAE,CAkBV;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,iBAAiB;;;;;;;EAwChH;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,6BAA6B,CAAC,EAC/D,IAAI,CAAC,EAAE,iBAAiB,EACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,6BAA6B,CAAC,EAC/D,IAAI,CAAC,EAAE,iBAAiB,GACvB,IAAI,CAGN;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAarC"}
1
+ {"version":3,"file":"config-sync.d.ts","sourceRoot":"","sources":["../src/config-sync.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,KAAK,GAAG,EAA4D,MAAM,aAAa,CAAC;AAEjG,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAsB,KAAK,eAAe,EAAE,KAAK,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAG9G,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,IAAI,CAAC,EAAE,iBAAiB,EACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,GAC/B,MAAM,EAAE,CAkBV;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,sBAAsB,CAgCnH;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,6BAA6B,CAAC,EAC/D,IAAI,CAAC,EAAE,iBAAiB,EACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,6BAA6B,CAAC,EAC/D,IAAI,CAAC,EAAE,iBAAiB,GACvB,IAAI,CAGN;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAarC"}
@@ -54,62 +54,53 @@ export function syncPluginDefaults(app, store, opts, previous) {
54
54
  return changed;
55
55
  }
56
56
  /**
57
- * 宿主加载政策:导入定义后、交给 Core 注册前规范化主实例与已配置的复用实例。
58
- * 首次加载批次只落盘一次;随后市场 rescan 的 load/reload 也走同一政策。
57
+ * 宿主加载政策,交给 createPluginDiscovery 的 options:发现驱动每批定下要登记的定义后、交给 Core 注册前,规范化各定义的主实例
58
+ * 与已配置的复用实例,这一批有改动就落盘一次(冷启动整批一次,之后每次热扫描一次)。
59
+ * 不在导入时做:导入了不等于要登记,被跳过、拒载的定义按它的 schema 同步,会裁掉同名配置段的字段。
59
60
  * 发现驱动随后按文档取每个实例的配置交给 core,首次 apply 拿到的就是规范化后的这一份。
60
- * 配置段被改了的实例各发一次 host-config:changed(带 instanceId)。
61
+ * 配置段被改了的实例各发一次 host-config:changed(带 instanceId)。某个定义同步时抛错只记该条、不登记它,其余照常
61
62
  */
62
- export function withPluginConfigSync(loader, app, store, opts) {
63
+ export function withPluginConfigSync(app, store, opts) {
63
64
  const host = app.bind({ events });
64
- let initialLoad = true;
65
- let initialChanged = false;
66
- // 首次加载批次里移进密钥存储的字段:合并的那次保存写成之后再记
67
- const initialMoved = [];
68
- const prepare = async (loaded) => {
69
- const definition = await loaded;
70
- if (!definition)
71
- return null;
72
- const ids = [definition.name];
73
- if (definition.reusable) {
74
- for (const id of Object.keys(store.get('plugins'))) {
75
- const { moduleName, suffix } = parseInstanceId(id);
76
- if (suffix && moduleName === definition.name)
77
- ids.push(id);
78
- }
79
- }
80
- let changed = false;
81
- const moved = initialLoad ? initialMoved : [];
82
- for (const id of ids) {
83
- if (!syncPluginConfig(app, store, definition, id, moved, opts))
84
- continue;
85
- app.logger.debug(`同步插件配置: ${id}`);
86
- changed = true;
87
- void host.events.use.emit('host-config:changed', { instanceId: id });
88
- }
89
- if (initialLoad)
90
- initialChanged ||= changed;
91
- else if (changed)
92
- saveSyncedConfig(app, store, moved);
93
- return definition;
94
- };
95
65
  return {
96
- loader: {
97
- discover: () => loader.discover(),
98
- load: descriptor => prepare(loader.load(descriptor)),
99
- ...(loader.reload ? { reload: descriptor => prepare(loader.reload(descriptor)) } : {}),
100
- },
101
- finishInitialLoad() {
102
- initialLoad = false;
103
- if (initialChanged)
104
- saveSyncedConfig(app, store, initialMoved.splice(0));
105
- initialChanged = false;
66
+ prepare(definitions) {
67
+ const ready = [];
68
+ let changed = false;
69
+ // 这一批移进密钥存储的字段:落盘写成之后再记
70
+ const moved = [];
71
+ for (const definition of definitions) {
72
+ try {
73
+ const ids = [definition.name];
74
+ if (definition.reusable) {
75
+ for (const id of Object.keys(store.get('plugins'))) {
76
+ const { moduleName, suffix } = parseInstanceId(id);
77
+ if (suffix && moduleName === definition.name)
78
+ ids.push(id);
79
+ }
80
+ }
81
+ for (const id of ids) {
82
+ if (!syncPluginConfig(app, store, definition, id, moved, opts))
83
+ continue;
84
+ app.logger.debug(`同步插件配置: ${id}`);
85
+ changed = true;
86
+ void host.events.use.emit('host-config:changed', { instanceId: id });
87
+ }
88
+ ready.push(definition);
89
+ }
90
+ catch (err) {
91
+ app.logger.error(`同步插件 "${definition.name}" 的配置失败,不加载:`, err);
92
+ }
93
+ }
94
+ if (changed)
95
+ saveSyncedConfig(app, store, moved);
96
+ return ready;
106
97
  },
107
98
  };
108
99
  }
109
100
  /**
110
- * 配置外部变更时的处理:先对账服务偏好(全局与本插件),卸载文件里已没有配置段的 `name:suffix` 实例,再按启动路径同一政策同步,
101
+ * 配置外部变更时的处理:先核对服务偏好(全局与本插件),卸载文件里已没有配置段的 `name:suffix` 实例,再按启动路径同一政策同步,
111
102
  * 重新计算各插件配置并热重载差异(updateConfig → bounce),最后经发现驱动登记文件里新出现的后缀实例
112
- * (判据同冷启动与热扫描)。`previous` 是变更前的文档:对账偏好的基线(不给时只应用新文档里的),也交给同步作拆密钥的基线
103
+ * (判据同冷启动与热扫描)。`previous` 是变更前的文档:核对偏好的基线(不给时只应用新文档里的),也交给同步作拆密钥的基线
113
104
  * (见 {@link syncPluginDefaults})。
114
105
  * 结束时(成功与失败都一样)文档与 `previous` 不同就发 host-config:changed(带 document):热重载换下整份文档,不经 host-config
115
106
  * 的写方法。只换了密钥文件、文档没换时不发;不给 `previous` 时按变了处理。配置文件解析失败的变更到不了这里
@@ -182,7 +173,10 @@ export function configToReload(app, store, instanceId, change) {
182
173
  return config;
183
174
  }
184
175
  // ---- helpers ----
185
- /** 同步一个实例的配置,返回文档有没有变。移进密钥存储的字段说明记进 `moved`,由落盘写成之后记日志 */
176
+ /**
177
+ * 同步一个实例的配置,返回文档有没有变。移进密钥存储的字段说明在这个实例写进文档之后才记进 `moved`(写不进时抛错、不记),
178
+ * 由落盘写成之后记日志
179
+ */
186
180
  function syncPluginConfig(app, store, definition, id, moved, opts, base) {
187
181
  const schema = definition.configSchema;
188
182
  const fileConfig = store.getPluginConfig(id);
@@ -199,8 +193,6 @@ function syncPluginConfig(app, store, definition, id, moved, opts, base) {
199
193
  if (writes.size > 0) {
200
194
  store.commitSecrets(writes);
201
195
  merged = doc;
202
- for (const p of placed)
203
- moved.push(`${id} 的 ${p.path} 移进 secrets.yaml(键 ${p.key})`);
204
196
  }
205
197
  // 脏值在这里只告警、不改文档也不拦登记,读取时怎么处置归插件(parseConfig 回落默认值、忽略或拒绝激活);
206
198
  // 禁用实例的休眠配置不产生必填缺失噪音。
@@ -214,6 +206,9 @@ function syncPluginConfig(app, store, definition, id, moved, opts, base) {
214
206
  if (JSON.stringify(merged) === JSON.stringify(fileConfig))
215
207
  return false;
216
208
  store.setPluginConfig(id, merged);
209
+ // 拆出了密钥时文档换成了引用、与原段必然不同,一定走到这里
210
+ for (const p of placed)
211
+ moved.push(`${id} 的 ${p.path} 移进 secrets.yaml(键 ${p.key})`);
217
212
  return true;
218
213
  }
219
214
  /** 落盘;`moved` 是这批移进密钥存储的字段,写成之后才记:拒写或写失败时明文还在配置文件里 */
@@ -1 +1 @@
1
- {"version":3,"file":"config-sync.js","sourceRoot":"","sources":["../src/config-sync.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config-sync.js","sourceRoot":"","sources":["../src/config-sync.ts"],"names":[],"mappings":"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"}
@@ -27,7 +27,7 @@ export interface ConsoleSinkHandle {
27
27
  readonly colorized: boolean;
28
28
  }
29
29
  /**
30
- * 安装 console sink:先冲洗启动前缓冲的日志,然后订阅后续 LogEntry。
30
+ * 安装 console sink:订阅 LogEntry,按需染色写到 stdout(或 stderr)。
31
31
  *
32
32
  * 与 CLI/TUI 等"独占终端 UI"的协调通过事件 `terminal:claimed/released` 完成,
33
33
  * sink 自己根据事件决定是否写 stdout——UI 不直接干预 sink。
@@ -1 +1 @@
1
- {"version":3,"file":"console-sink.d.ts","sourceRoot":"","sources":["../src/console-sink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI5D;;;;;;GAMG;AACH,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,WAAW;QACnB,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpC,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACtC;CACF;AA+DD,MAAM,WAAW,iBAAiB;IAChC,OAAO,IAAI,IAAI,CAAC;IAChB;;;;;;OAMG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,6BAA6B;IAC7B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAO,GAC/D,iBAAiB,CA+CnB"}
1
+ {"version":3,"file":"console-sink.d.ts","sourceRoot":"","sources":["../src/console-sink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;;;;;GAMG;AACH,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,WAAW;QACnB,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpC,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACtC;CACF;AA+DD,MAAM,WAAW,iBAAiB;IAChC,OAAO,IAAI,IAAI,CAAC;IAChB;;;;;;OAMG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,6BAA6B;IAC7B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAO,GAC/D,iBAAiB,CA4CnB"}