curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-24 04:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance(frontend): improve plugin management

Browse Source
This commit is contained in:
syuilo
2025-03-10 09:28:07 +09:00
parent 88efc0a3be
commit d9858b03c9
5 changed files with 112 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
packages/frontend/src/plugin.ts
View File

@@ -131,6 +131,10 @@ export async function installPlugin(code: string, meta?: AiScriptPluginMeta) {
realMeta = meta;
}
if (prefer.s.plugins.some(x => x.name === realMeta.name)) {
throw new Error('Plugin already installed');
}
const installId = uuid();
const plugin = {
@@ -161,8 +165,14 @@ export async function uninstallPlugin(plugin: Plugin) {
}
}
const pluginContexts = new Map<string, Interpreter>();
export const pluginLogs = ref(new Map<string, string[]>());
const pluginContexts = new Map<Plugin['installId'], Interpreter>();
export const pluginLogs = ref(new Map<Plugin['installId'], {
at: number;
message: string;
isSystem?: boolean;
isError?: boolean;
}[]>());
type HandlerDef = {
post_form_action: {
@@ -197,6 +207,11 @@ type PluginHandler<K extends keyof HandlerDef> = {
let pluginHandlers: PluginHandler<keyof HandlerDef>[] = [];
function addPluginHandler<K extends keyof HandlerDef>(installId: Plugin['installId'], type: K, ctx: PluginHandler<K>['ctx']) {
pluginLogs.value.get(installId)!.push({
at: Date.now(),
isSystem: true,
message: `Handler registered: ${type}`,
});
pluginHandlers.push({ pluginInstallId: installId, type, ctx });
}
@@ -215,6 +230,19 @@ async function launchPlugin(id: Plugin['installId']): Promise<void> {
// 後方互換性のため
if (plugin.src == null) return;
pluginLogs.value.set(plugin.installId, []);
function systemLog(message: string, isError = false): void {
pluginLogs.value.get(plugin.installId)?.push({
at: Date.now(),
isSystem: true,
message,
isError,
});
}
systemLog('Starting plugin...');
await authorizePlugin(plugin);
const aiscript = new Interpreter(createPluginEnv({
@@ -223,26 +251,33 @@ async function launchPlugin(id: Plugin['installId']): Promise<void> {
}), {
in: aiScriptReadline,
out: (value): void => {
console.log(value);
pluginLogs.value.get(plugin.installId).push(utils.reprValue(value));
pluginLogs.value.get(plugin.installId)!.push({
at: Date.now(),
message: utils.reprValue(value),
});
},
log: (): void => {
},
err: (err): void => {
pluginLogs.value.get(plugin.installId).push(`${err}`);
pluginLogs.value.get(plugin.installId)!.push({
at: Date.now(),
message: `${err}`,
isError: true,
});
throw err; // install時のtry-catchに反応させる
},
});
pluginContexts.set(plugin.installId, aiscript);
pluginLogs.value.set(plugin.installId, []);
aiscript.exec(parser.parse(plugin.src)).then(
() => {
console.info('Plugin installed:', plugin.name, 'v' + plugin.version);
systemLog('Plugin started');
},
(err) => {
console.error('Plugin install failed:', plugin.name, 'v' + plugin.version);
systemLog(`${err}`, true);
throw err;
},
);
@@ -300,16 +335,15 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
}
function withContext<T>(fn: (ctx: Interpreter) => T): T {
console.log('withContext', id);
const ctx = pluginContexts.get(id);
if (!ctx) throw new Error('Plugin context not found');
return fn(ctx);
}
return {
const env: Record<string, values.Value> = {
...createAiScriptEnv({ ...opts, token: store.state.pluginTokens[id] }),
'Plugin:register_post_form_action': values.FN_NATIVE(([title, handler]) => {
'Plugin:register:post_form_action': values.FN_NATIVE(([title, handler]) => {
utils.assertString(title);
utils.assertFunction(handler);
addPluginHandler(id, 'post_form_action', {
@@ -325,7 +359,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
});
}),
'Plugin:register_user_action': values.FN_NATIVE(([title, handler]) => {
'Plugin:register:user_action': values.FN_NATIVE(([title, handler]) => {
utils.assertString(title);
utils.assertFunction(handler);
addPluginHandler(id, 'user_action', {
@@ -336,7 +370,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
});
}),
'Plugin:register_note_action': values.FN_NATIVE(([title, handler]) => {
'Plugin:register:note_action': values.FN_NATIVE(([title, handler]) => {
utils.assertString(title);
utils.assertFunction(handler);
addPluginHandler(id, 'note_action', {
@@ -347,7 +381,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
});
}),
'Plugin:register_note_view_interruptor': values.FN_NATIVE(([handler]) => {
'Plugin:register:note_view_interruptor': values.FN_NATIVE(([handler]) => {
utils.assertFunction(handler);
addPluginHandler(id, 'note_view_interruptor', {
handler: withContext(ctx => async (note) => {
@@ -356,7 +390,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
});
}),
'Plugin:register_note_post_interruptor': values.FN_NATIVE(([handler]) => {
'Plugin:register:note_post_interruptor': values.FN_NATIVE(([handler]) => {
utils.assertFunction(handler);
addPluginHandler(id, 'note_post_interruptor', {
handler: withContext(ctx => async (note) => {
@@ -365,7 +399,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
});
}),
'Plugin:register_page_view_interruptor': values.FN_NATIVE(([handler]) => {
'Plugin:register:page_view_interruptor': values.FN_NATIVE(([handler]) => {
utils.assertFunction(handler);
addPluginHandler(id, 'page_view_interruptor', {
handler: withContext(ctx => async (page) => {
@@ -381,6 +415,16 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
'Plugin:config': values.OBJ(config),
};
// 後方互換性のため
env['Plugin:register_post_form_action'] = env['Plugin:register:post_form_action'];
env['Plugin:register_user_action'] = env['Plugin:register:user_action'];
env['Plugin:register_note_action'] = env['Plugin:register:note_action'];
env['Plugin:register_note_view_interruptor'] = env['Plugin:register:note_view_interruptor'];
env['Plugin:register_note_post_interruptor'] = env['Plugin:register:note_post_interruptor'];
env['Plugin:register_page_view_interruptor'] = env['Plugin:register:page_view_interruptor'];
return env;
}
export function getPluginHandlers<K extends keyof HandlerDef>(type: K): HandlerDef[K][] {