mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-30 19:13:58 +02:00
enable and fix no-unused-vars and no-async-promise-executor (#17070)
* dev: set --no-bail for lint task * lint: enable no-async-promise-executor lint and fix them * lint: enable no-unused-vars with allowing _ prefix * lint: fix semi
This commit is contained in:
@@ -234,30 +234,26 @@ export async function isFired<C extends keyof Misskey.Channels, T extends keyof
|
||||
cond: (msg: Parameters<Misskey.Channels[C]['events'][T]>[0]) => boolean,
|
||||
params?: Misskey.Channels[C]['params'],
|
||||
): Promise<boolean> {
|
||||
return new Promise<boolean>(async (resolve, reject) => {
|
||||
const stream = new Misskey.Stream(`wss://${host}`, { token: user.i }, { WebSocket });
|
||||
const stream = new Misskey.Stream(`wss://${host}`, { token: user.i }, { WebSocket });
|
||||
try {
|
||||
const connection = stream.useChannel(channel, params);
|
||||
connection.on(type as any, ((msg: any) => {
|
||||
if (cond(msg)) {
|
||||
stream.close();
|
||||
clearTimeout(timer);
|
||||
resolve(true);
|
||||
}
|
||||
}) as any);
|
||||
|
||||
let timer: NodeJS.Timeout | undefined;
|
||||
|
||||
await trigger().then(() => {
|
||||
timer = setTimeout(() => {
|
||||
stream.close();
|
||||
resolve(false);
|
||||
}, 500);
|
||||
}).catch(err => {
|
||||
stream.close();
|
||||
clearTimeout(timer);
|
||||
reject(err);
|
||||
const receivePromise = new Promise<boolean>((resolve) => {
|
||||
connection.on(type as never, ((msg: any) => {
|
||||
if (cond(msg)) {
|
||||
resolve(true);
|
||||
}
|
||||
}) as any);
|
||||
});
|
||||
});
|
||||
|
||||
await trigger();
|
||||
return await Promise.race([
|
||||
receivePromise,
|
||||
sleep(500).then(() => false),
|
||||
]);
|
||||
} finally {
|
||||
stream.close();
|
||||
}
|
||||
};
|
||||
|
||||
export async function isNoteUpdatedEventFired(
|
||||
@@ -267,30 +263,27 @@ export async function isNoteUpdatedEventFired(
|
||||
trigger: () => Promise<unknown>,
|
||||
cond: (msg: Parameters<Misskey.StreamEvents['noteUpdated']>[0]) => boolean,
|
||||
): Promise<boolean> {
|
||||
return new Promise<boolean>(async (resolve, reject) => {
|
||||
const stream = new Misskey.Stream(`wss://${host}`, { token: user.i }, { WebSocket });
|
||||
const stream = new Misskey.Stream(`wss://${host}`, { token: user.i }, { WebSocket });
|
||||
try {
|
||||
stream.send('s', { id: noteId });
|
||||
stream.on('noteUpdated', msg => {
|
||||
if (cond(msg)) {
|
||||
stream.close();
|
||||
clearTimeout(timer);
|
||||
resolve(true);
|
||||
}
|
||||
|
||||
const receivePromise = new Promise<boolean>((resolve) => {
|
||||
stream.on('noteUpdated', msg => {
|
||||
if (cond(msg)) {
|
||||
resolve(true);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
let timer: NodeJS.Timeout | undefined;
|
||||
await trigger();
|
||||
|
||||
await trigger().then(() => {
|
||||
timer = setTimeout(() => {
|
||||
stream.close();
|
||||
resolve(false);
|
||||
}, 500);
|
||||
}).catch(err => {
|
||||
stream.close();
|
||||
clearTimeout(timer);
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
return await Promise.race([
|
||||
receivePromise,
|
||||
sleep(500).then(() => false),
|
||||
]);
|
||||
} finally {
|
||||
stream.close();
|
||||
}
|
||||
};
|
||||
|
||||
export async function assertNotificationReceived(
|
||||
|
||||
Reference in New Issue
Block a user