@coeiro-operator/core 1.2.0 → 1.2.1
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.
- package/dist/operator/config-manager.d.ts +13 -5
- package/dist/operator/config-manager.d.ts.map +1 -1
- package/dist/operator/config-manager.js +54 -5
- package/dist/operator/config-manager.js.map +1 -1
- package/dist/terminal/terminal-background.d.ts.map +1 -1
- package/dist/terminal/terminal-background.js +38 -29
- package/dist/terminal/terminal-background.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,13 +9,17 @@ export interface FullConfig extends Omit<BaseFullConfig, 'characters'> {
|
|
|
9
9
|
}
|
|
10
10
|
export interface TerminalBackgroundConfig {
|
|
11
11
|
enabled: boolean;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
imagePaths?: Record<string, string | null | false>;
|
|
13
|
+
display?: {
|
|
14
|
+
opacity?: number;
|
|
15
|
+
position?: 'top-right' | 'bottom-right';
|
|
16
|
+
scale?: number;
|
|
14
17
|
};
|
|
18
|
+
backgroundImages?: Record<string, string>;
|
|
15
19
|
operatorImage?: {
|
|
16
20
|
display: 'api' | 'file' | 'none';
|
|
17
|
-
position
|
|
18
|
-
opacity
|
|
21
|
+
position?: 'top-right' | 'bottom-right';
|
|
22
|
+
opacity?: number;
|
|
19
23
|
filePath?: string;
|
|
20
24
|
};
|
|
21
25
|
}
|
|
@@ -88,9 +92,13 @@ export declare class ConfigManager {
|
|
|
88
92
|
*/
|
|
89
93
|
ensureConfigDir(): Promise<void>;
|
|
90
94
|
/**
|
|
91
|
-
*
|
|
95
|
+
* ターミナル背景設定を取得（旧設定の移行処理付き）
|
|
92
96
|
*/
|
|
93
97
|
getTerminalBackgroundConfig(): Promise<TerminalBackgroundConfig>;
|
|
98
|
+
/**
|
|
99
|
+
* 旧設定から新設定への移行
|
|
100
|
+
*/
|
|
101
|
+
private migrateBackgroundConfig;
|
|
94
102
|
/**
|
|
95
103
|
* 接続設定を取得
|
|
96
104
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../src/operator/config-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAEL,mBAAmB,EACnB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAE,UAAU,IAAI,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIxF,MAAM,WAAW,UAAW,SAAQ,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC;IACpE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,eAAe,CAAC,CAAC;CACnE;AAGD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../src/operator/config-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,10 +22,12 @@ const DEFAULT_CONFIG = {
|
|
|
22
22
|
terminal: {
|
|
23
23
|
background: {
|
|
24
24
|
enabled: true,
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
// デフォルトは空（すべてAPIから取得）
|
|
26
|
+
imagePaths: {},
|
|
27
|
+
display: {
|
|
28
28
|
opacity: 0.3,
|
|
29
|
+
position: 'bottom-right',
|
|
30
|
+
scale: 0.15,
|
|
29
31
|
},
|
|
30
32
|
},
|
|
31
33
|
},
|
|
@@ -172,11 +174,58 @@ export class ConfigManager {
|
|
|
172
174
|
}
|
|
173
175
|
}
|
|
174
176
|
/**
|
|
175
|
-
*
|
|
177
|
+
* ターミナル背景設定を取得（旧設定の移行処理付き）
|
|
176
178
|
*/
|
|
177
179
|
async getTerminalBackgroundConfig() {
|
|
178
180
|
const config = await this.loadConfig();
|
|
179
|
-
|
|
181
|
+
const rawConfig = deepMerge(DEFAULT_CONFIG.terminal.background, config.terminal?.background);
|
|
182
|
+
// 旧設定から新設定への移行
|
|
183
|
+
return this.migrateBackgroundConfig(rawConfig);
|
|
184
|
+
}
|
|
185
|
+
/**
|
|
186
|
+
* 旧設定から新設定への移行
|
|
187
|
+
*/
|
|
188
|
+
migrateBackgroundConfig(oldConfig) {
|
|
189
|
+
const newConfig = {
|
|
190
|
+
enabled: oldConfig.enabled || false,
|
|
191
|
+
imagePaths: oldConfig.imagePaths || {},
|
|
192
|
+
display: oldConfig.display || {
|
|
193
|
+
opacity: 0.3,
|
|
194
|
+
position: 'bottom-right',
|
|
195
|
+
scale: 0.15,
|
|
196
|
+
},
|
|
197
|
+
};
|
|
198
|
+
// backgroundImagesの移行
|
|
199
|
+
if (oldConfig.backgroundImages && Object.keys(oldConfig.backgroundImages).length > 0) {
|
|
200
|
+
console.warn('config.terminal.background.backgroundImages は非推奨です。imagePaths を使用してください。');
|
|
201
|
+
// 既存のimagePathsとマージ（imagePathsが優先）
|
|
202
|
+
newConfig.imagePaths = {
|
|
203
|
+
...oldConfig.backgroundImages,
|
|
204
|
+
...newConfig.imagePaths,
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
// operatorImageの移行
|
|
208
|
+
if (oldConfig.operatorImage) {
|
|
209
|
+
const { display, filePath, opacity, position } = oldConfig.operatorImage;
|
|
210
|
+
// display: 'none' の場合
|
|
211
|
+
if (display === 'none') {
|
|
212
|
+
console.warn('config.terminal.background.operatorImage.display: "none" は非推奨です。enabled: false を使用してください。');
|
|
213
|
+
newConfig.enabled = false;
|
|
214
|
+
}
|
|
215
|
+
// display: 'file' とfilePathの場合（全キャラクター共通として警告）
|
|
216
|
+
if (display === 'file' && filePath) {
|
|
217
|
+
console.warn('config.terminal.background.operatorImage.filePath は非推奨です。imagePaths でキャラクターごとに設定してください。');
|
|
218
|
+
}
|
|
219
|
+
// display設定の移行
|
|
220
|
+
if (opacity !== undefined || position !== undefined) {
|
|
221
|
+
newConfig.display = {
|
|
222
|
+
...newConfig.display,
|
|
223
|
+
...(opacity !== undefined && { opacity }),
|
|
224
|
+
...(position !== undefined && { position }),
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
return newConfig;
|
|
180
229
|
}
|
|
181
230
|
/**
|
|
182
231
|
* 接続設定を取得
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-manager.js","sourceRoot":"","sources":["../../src/operator/config-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EACL,yBAAyB,GAG1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-manager.js","sourceRoot":"","sources":["../../src/operator/config-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-background.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAI9D,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAqB;gBAE1B,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,MAAM;IAM5D;;OAEG;IACH,OAAO,CAAC,YAAY;IAkBpB;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAenC;;OAEG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-background.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAI9D,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAqB;gBAE1B,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,MAAM;IAM5D;;OAEG;IACH,OAAO,CAAC,YAAY;IAkBpB;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAenC;;OAEG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEzD;;OAEG;YACW,kBAAkB;IA2ChC;;OAEG;YACW,yBAAyB;IAiDvC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IActC;;OAEG;IACH,mBAAmB,IAAI,MAAM,GAAG,IAAI;CAGrC"}
|
|
@@ -57,6 +57,7 @@ export class TerminalBackground {
|
|
|
57
57
|
configEnabled: config.enabled,
|
|
58
58
|
isITerm2: this.termBg.isITerm2()
|
|
59
59
|
});
|
|
60
|
+
// 1. 機能が無効ならスキップ
|
|
60
61
|
if (!config.enabled || !this.termBg.isITerm2()) {
|
|
61
62
|
logger.error('⏭️ 背景画像設定をスキップ:', {
|
|
62
63
|
reason: !config.enabled ? '設定が無効' : 'iTerm2ではない',
|
|
@@ -67,35 +68,42 @@ export class TerminalBackground {
|
|
|
67
68
|
}
|
|
68
69
|
this.currentCharacterId = characterId;
|
|
69
70
|
try {
|
|
70
|
-
//
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
71
|
+
// 2. 画像パスを決定
|
|
72
|
+
let imagePath = null;
|
|
73
|
+
if (config.imagePaths && characterId in config.imagePaths) {
|
|
74
|
+
// 明示的な設定がある場合
|
|
75
|
+
const pathValue = config.imagePaths[characterId];
|
|
76
|
+
if (pathValue === null || pathValue === false) {
|
|
77
|
+
// null/false = このキャラクターは画像なし
|
|
78
|
+
logger.error(`🚫 ${characterId} は画像無効設定`);
|
|
79
|
+
await this.clearBackground();
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
// string = ファイルパス
|
|
83
|
+
imagePath = pathValue;
|
|
84
|
+
logger.error(`📷 キャラクター専用画像を使用: ${characterId}`);
|
|
74
85
|
}
|
|
75
|
-
|
|
76
|
-
|
|
86
|
+
else {
|
|
87
|
+
// 設定がない場合はAPIから取得
|
|
77
88
|
logger.error('🌐 APIからオペレータ画像を取得中...');
|
|
78
|
-
|
|
79
|
-
if (imagePath) {
|
|
80
|
-
logger.error(`🖼️ APIから取得した画像を背景に設定中: ${imagePath}`);
|
|
81
|
-
await this.setBackgroundImage(imagePath, config.operatorImage.opacity);
|
|
82
|
-
}
|
|
83
|
-
else {
|
|
89
|
+
imagePath = await this.fetchOperatorImageFromAPI(characterId);
|
|
90
|
+
if (!imagePath) {
|
|
84
91
|
logger.error('⚠️ APIからオペレータ画像を取得できませんでした');
|
|
85
92
|
}
|
|
86
93
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
94
|
+
// 3. 画像を設定（パスがある場合のみ）
|
|
95
|
+
if (imagePath) {
|
|
96
|
+
const display = config.display || {};
|
|
97
|
+
logger.error(`🖼️ 背景画像を設定中: ${imagePath}`);
|
|
98
|
+
await this.setBackgroundImage(imagePath, {
|
|
99
|
+
opacity: display.opacity || 0.3,
|
|
100
|
+
position: display.position || 'bottom-right',
|
|
101
|
+
scale: display.scale || 0.15
|
|
102
|
+
});
|
|
93
103
|
}
|
|
94
104
|
else {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
hasFilePath: !!config.operatorImage?.filePath
|
|
98
|
-
});
|
|
105
|
+
// 画像が取得できない場合はクリア
|
|
106
|
+
await this.clearBackground();
|
|
99
107
|
}
|
|
100
108
|
}
|
|
101
109
|
catch (error) {
|
|
@@ -105,22 +113,23 @@ export class TerminalBackground {
|
|
|
105
113
|
/**
|
|
106
114
|
* 背景画像を設定
|
|
107
115
|
*/
|
|
108
|
-
async setBackgroundImage(imagePath,
|
|
116
|
+
async setBackgroundImage(imagePath, options) {
|
|
109
117
|
try {
|
|
110
118
|
// 絶対パスに変換
|
|
111
119
|
const absolutePath = imagePath.startsWith('/') ? imagePath : join(process.cwd(), imagePath);
|
|
120
|
+
const { opacity = 0.3, position = 'bottom-right', scale = 0.15 } = options || {};
|
|
112
121
|
logger.error('🔄 背景画像設定を試行中:', {
|
|
113
122
|
imagePath: absolutePath,
|
|
114
123
|
sessionId: this.sessionId,
|
|
115
|
-
opacity
|
|
116
|
-
position
|
|
117
|
-
scale
|
|
124
|
+
opacity,
|
|
125
|
+
position,
|
|
126
|
+
scale
|
|
118
127
|
});
|
|
119
128
|
await this.termBg.setBackground({
|
|
120
129
|
imagePath: absolutePath,
|
|
121
|
-
opacity
|
|
122
|
-
position
|
|
123
|
-
scale
|
|
130
|
+
opacity,
|
|
131
|
+
position,
|
|
132
|
+
scale,
|
|
124
133
|
mode: 'fit', // アスペクト比を保持
|
|
125
134
|
sessionId: this.sessionId // SessionIDを指定
|
|
126
135
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-background.js","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"terminal-background.js","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"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"}
|