Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "git",
"url": "https://github.com/misskey-dev/misskey.git"
},
"packageManager": "pnpm@11.11.0",
"packageManager": "pnpm@11.21.0",
"workspaces": [
"packages/backend",
"packages/frontend-shared",
Expand Down Expand Up @@ -54,25 +54,25 @@
"cleanall": "pnpm clean-all"
},
"dependencies": {
"esbuild": "0.28.1",
"execa": "9.6.1",
"esbuild": "0.28.2",
"execa": "10.0.1",
"ignore-walk": "9.0.0",
"js-yaml": "5.2.2",
"tar": "7.5.21"
"js-yaml": "5.2.3",
"tar": "7.5.22"
},
"devDependencies": {
"@eslint/js": "9.39.5",
"@misskey-dev/eslint-plugin": "2.1.0",
"@types/node": "26.1.1",
"@typescript-eslint/eslint-plugin": "8.63.0",
"@typescript-eslint/parser": "8.63.0",
"@types/node": "26.2.0",
"@typescript-eslint/eslint-plugin": "8.67.0",
"@typescript-eslint/parser": "8.67.0",
"@typescript/native": "npm:typescript@7.0.2",
"cross-env": "10.1.0",
"eslint": "9.39.5",
"globals": "17.7.0",
"globals": "17.9.0",
"ncp": "2.0.0",
"pnpm": "11.11.0",
"start-server-and-test": "3.0.11",
"pnpm": "11.21.0",
"start-server-and-test": "3.0.12",
"typescript": "npm:@typescript/typescript6@6.0.2"
}
}
22 changes: 11 additions & 11 deletions packages-private/changelog-checker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"test:coverage": "vitest run --coverage",
"typecheck": "tsc --noEmit"
},
"devDependencies": {
"@types/mdast": "4.0.4",
"@types/node": "26.1.1",
"@vitest/coverage-v8": "4.1.10",
"mdast-util-to-string": "4.0.0",
"remark": "15.0.1",
"remark-parse": "11.0.0",
"tsx": "4.23.1",
"unified": "11.0.5",
"vitest": "4.1.10"
}
"devDependencies": {
"@types/mdast": "4.0.4",
"@types/node": "26.2.0",
"@vitest/coverage-v8": "4.1.10",
"mdast-util-to-string": "4.0.0",
"remark": "15.0.1",
"remark-parse": "11.0.0",
"tsx": "4.23.12",
"unified": "11.0.5",
"vitest": "4.1.10"
}
}
13 changes: 6 additions & 7 deletions packages-private/diagnostics-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
},
"dependencies": {
"diagnostics-shared": "workspace:*",
"execa": "9.6.1"
"execa": "10.0.1"
},
"devDependencies": {
"@types/node": "26.1.1",
"@types/pg": "8.20.0",
"ioredis": "5.11.1",
"pg": "8.22.0",
"tsx": "4.23.1",
"typescript": "5.9.3",
"@types/node": "26.2.0",
"@types/pg": "8.21.0",
"ioredis": "6.0.0",
"pg": "8.23.0",
"tsx": "4.23.12",
"vitest": "4.1.10"
}
}
7 changes: 3 additions & 4 deletions packages-private/diagnostics-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
"diagnostics-shared": "workspace:*"
},
"devDependencies": {
"@types/node": "26.1.1",
"@types/node": "26.2.0",
"frontend": "workspace:*",
"playwright": "1.61.1",
"tsx": "4.23.1",
"typescript": "5.9.3",
"playwright": "1.62.1",
"tsx": "4.23.12",
"vitest": "4.1.10"
}
}
3 changes: 1 addition & 2 deletions packages-private/diagnostics-shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"typecheck": "tsc --noEmit"
},
"devDependencies": {
"@types/node": "26.1.1",
"typescript": "5.9.3",
"@types/node": "26.2.0",
"vitest": "4.1.10"
}
}
80 changes: 40 additions & 40 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,79 +51,79 @@
"utf-8-validate": "6.0.6"
},
"dependencies": {
"@aws-sdk/client-s3": "3.1085.0",
"@aws-sdk/lib-storage": "3.1085.0",
"@aws-sdk/client-s3": "3.1107.0",
"@aws-sdk/lib-storage": "3.1107.0",
"@fastify/accepts": "5.0.4",
"@fastify/cors": "11.3.0",
"@fastify/http-proxy": "11.5.0",
"@fastify/http-proxy": "11.6.0",
"@fastify/multipart": "10.1.0",
"@fastify/static": "10.1.2",
"@fastify/static": "10.1.3",
"@kitajs/html": "4.2.13",
"@misskey-dev/emoji-assets": "17.0.3",
"@misskey-dev/emoji-data": "17.0.3",
"@misskey-dev/sharp-read-bmp": "1.3.1",
"@misskey-dev/summaly": "5.5.1",
"@napi-rs/canvas": "1.0.2",
"@nestjs/common": "11.1.28",
"@nestjs/core": "11.1.28",
"@nestjs/testing": "11.1.28",
"@oxc-project/runtime": "0.139.0",
"@napi-rs/canvas": "1.0.5",
"@nestjs/common": "11.1.29",
"@nestjs/core": "11.1.29",
"@nestjs/testing": "11.1.29",
"@oxc-project/runtime": "0.144.0",
"@peertube/http-signature": "1.7.0",
"@sentry/node": "10.65.0",
"@sentry/profiling-node": "10.65.0",
"@sentry/node": "10.70.0",
"@sentry/profiling-node": "10.70.0",
"@simplewebauthn/server": "13.3.2",
"@smithy/node-http-handler": "4.9.5",
"@smithy/node-http-handler": "4.9.13",
"accepts": "1.3.8",
"ajv": "8.20.0",
"archiver": "8.0.0",
"bcryptjs": "3.0.3",
"blurhash": "2.0.5",
"bullmq": "5.80.2",
"bullmq": "6.0.11",
"cacheable-lookup": "7.0.0",
"chalk": "5.6.2",
"chalk": "6.0.0",
"chalk-template": "1.1.2",
"chokidar": "5.0.0",
"color-convert": "3.1.3",
"content-disposition": "2.0.1",
"date-fns": "4.4.0",
"deep-email-validator": "0.1.27",
"fastify": "5.10.0",
"fastify-raw-body": "5.0.0",
"fastify": "5.11.3",
"fastify-raw-body": "6.0.1",
"feed": "6.0.0",
"file-type": "22.0.1",
"fluent-ffmpeg": "2.1.3",
"got": "15.1.0",
"hpagent": "1.2.0",
"http-link-header": "1.1.3",
"http-link-header": "1.1.4",
"i18n": "workspace:*",
"ioredis": "5.11.1",
"ip-cidr": "4.0.2",
"ipaddr.js": "2.4.0",
"ipaddr.js": "2.5.0",
"is-svg": "6.1.0",
"json5": "2.2.3",
"jsonld": "9.0.0",
"juice": "12.1.1",
"meilisearch": "0.59.0",
"juice": "12.1.2",
"meilisearch": "0.60.0",
"mfm-js": "0.26.0",
"mime-types": "3.0.2",
"misskey-js": "workspace:*",
"misskey-reversi": "workspace:*",
"ms": "3.0.0-canary.202508261828",
"nanoid": "6.0.0",
"nanoid": "6.0.1",
"nested-property": "4.0.0",
"node-fetch": "3.3.2",
"node-html-parser": "9.0.0",
"nodemailer": "9.0.3",
"node-html-parser": "9.0.1",
"nodemailer": "9.0.5",
"os-utils": "0.0.14",
"otpauth": "9.5.1",
"pg": "8.22.0",
"pg": "8.23.0",
"pkce-challenge": "6.0.0",
"probe-image-size": "7.3.0",
"promise-limit": "2.7.0",
"qrcode": "1.5.4",
"random-seed": "0.3.0",
"ratelimiter": "3.4.1",
"re2": "1.26.0",
"re2": "1.26.1",
"reflect-metadata": "0.2.2",
"rename": "1.0.4",
"rss-parser": "3.13.0",
Expand All @@ -134,22 +134,22 @@
"slacc": "0.1.5",
"strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0",
"systeminformation": "5.31.16",
"systeminformation": "5.33.1",
"tinycolor2": "1.6.0",
"tmp": "0.2.7",
"tsc-alias": "1.9.0",
"tsc-alias": "1.9.1",
"typeorm": "1.1.0",
"ulid": "3.0.2",
"vary": "1.1.2",
"web-push": "3.6.7",
"ws": "8.21.0",
"ws": "8.21.3",
"xev": "3.0.2"
},
"devDependencies": {
"@kitajs/ts-html-plugin": "4.1.4",
"@nestjs/platform-express": "11.1.28",
"@nestjs/platform-express": "11.1.29",
"@rollup/plugin-esm-shim": "0.1.8",
"@sentry/vue": "10.65.0",
"@sentry/vue": "10.70.0",
"@sinonjs/fake-timers": "15.4.0",
"@types/accepts": "1.3.7",
"@types/archiver": "8.0.0",
Expand All @@ -158,37 +158,37 @@
"@types/jsonld": "1.5.15",
"@types/mime-types": "3.0.1",
"@types/ms": "2.1.0",
"@types/node": "26.1.1",
"@types/node": "26.2.0",
"@types/nodemailer": "8.0.1",
"@types/pg": "8.20.0",
"@types/pg": "8.21.0",
"@types/qrcode": "1.5.6",
"@types/random-seed": "0.3.5",
"@types/ratelimiter": "3.4.6",
"@types/rename": "1.0.7",
"@types/sanitize-html": "2.16.1",
"@types/semver": "7.7.1",
"@types/semver": "7.8.0",
"@types/simple-oauth2": "5.0.8",
"@types/sinonjs__fake-timers": "15.0.1",
"@types/tinycolor2": "1.4.6",
"@types/tmp": "0.2.6",
"@types/vary": "1.1.3",
"@types/web-push": "3.6.4",
"@types/ws": "8.18.1",
"@typescript-eslint/eslint-plugin": "8.63.0",
"@typescript-eslint/parser": "8.63.0",
"@typescript-eslint/eslint-plugin": "8.67.0",
"@typescript-eslint/parser": "8.67.0",
"@vitest/coverage-v8": "4.1.10",
"aws-sdk-client-mock": "4.1.0",
"cbor2": "2.3.0",
"cross-env": "10.1.0",
"eslint-plugin-import": "2.32.0",
"execa": "9.6.1",
"execa": "10.0.1",
"fkill": "10.0.3",
"js-yaml": "5.2.2",
"js-yaml": "5.2.3",
"pid-port": "2.1.1",
"rolldown": "1.1.5",
"rolldown": "1.2.3",
"simple-oauth2": "5.1.0",
"vite": "8.1.4",
"vite": "8.2.1",
"vitest": "4.1.10",
"vitest-mock-extended": "4.0.0"
"vitest-mock-extended": "5.1.1"
}
}
19 changes: 11 additions & 8 deletions packages/backend/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@ import { dirname, resolve } from 'node:path';
import { type FastifyServerOptions } from 'fastify';
import type * as Sentry from '@sentry/node';
import type * as SentryVue from '@sentry/vue';
import type { RedisOptions } from 'ioredis';
import type { RedisOptions as IoRedisRedisOptions } from 'ioredis';
import type { RedisOptions as BullMqRedisOptions } from 'bullmq';
import type { AccessLogConfiguration, LogFormat, LogLevelSetting } from './logging/types.js';

type RedisOptionsSource = Partial<RedisOptions> & {
type RedisOptionsRequiredFields = {
host: string;
port: number;
family?: number;
pass: string;
db?: number;
prefix?: string;
};
type RedisOptionsSource = Partial<IoRedisRedisOptions & BullMqRedisOptions> & RedisOptionsRequiredFields;
type RedisOptionsResolved = IoRedisRedisOptions & BullMqRedisOptions & RedisOptionsRequiredFields;

type SentryBackendConfig = {
options: Partial<Sentry.NodeOptions>;
Expand Down Expand Up @@ -211,11 +214,11 @@ export type Config = {
mediaProxy: string;
externalMediaProxyEnabled: boolean;
videoThumbnailGenerator: string | null;
redis: RedisOptions & RedisOptionsSource;
redisForPubsub: RedisOptions & RedisOptionsSource;
redisForJobQueue: RedisOptions & RedisOptionsSource;
redisForTimelines: RedisOptions & RedisOptionsSource;
redisForReactions: RedisOptions & RedisOptionsSource;
redis: RedisOptionsResolved;
redisForPubsub: RedisOptionsResolved;
redisForJobQueue: RedisOptionsResolved;
redisForTimelines: RedisOptionsResolved;
redisForReactions: RedisOptionsResolved;
sentryForBackend: SentryBackendConfig | undefined;
sentryForFrontend: {
options: Partial<SentryVue.BrowserOptions> & { dsn: string };
Expand Down Expand Up @@ -366,7 +369,7 @@ function tryCreateUrl(url: string) {
}
}

function convertRedisOptions(options: RedisOptionsSource, host: string): RedisOptions & RedisOptionsSource {
function convertRedisOptions(options: RedisOptionsSource, host: string): RedisOptionsResolved {
return {
...options,
password: options.pass,
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/core/QueueService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ export class QueueService {
const isPaused = await queue.isPaused();
const metrics_completed = await queue.getMetrics('completed', 0, MetricsTime.ONE_WEEK);
const metrics_failed = await queue.getMetrics('failed', 0, MetricsTime.ONE_WEEK);
const db = parseRedisInfo(await (await queue.client).info());
const db = parseRedisInfo(await (await queue.getBackend().client).info());

return {
name: queueType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const paramDef = {
type: 'object',
properties: {
queue: { type: 'string', enum: QUEUE_TYPES },
state: { type: 'array', items: { type: 'string', enum: ['active', 'wait', 'delayed', 'completed', 'failed', 'paused'] } },
state: { type: 'array', items: { type: 'string', enum: ['active', 'wait', 'delayed', 'completed', 'failed'] } },
Comment thread
coderabbitai[bot] marked this conversation as resolved.
search: { type: 'string' },
},
required: ['queue', 'state'],
Expand Down
16 changes: 8 additions & 8 deletions packages/frontend-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
},
"devDependencies": {
"@types/estree": "1.0.9",
"@types/node": "26.1.1",
"@typescript-eslint/eslint-plugin": "8.63.0",
"@typescript-eslint/parser": "8.63.0",
"rollup": "4.62.2"
"@types/node": "26.2.0",
"@typescript-eslint/eslint-plugin": "8.67.0",
"@typescript-eslint/parser": "8.67.0",
"rollup": "4.62.4"
},
"dependencies": {
"i18n": "workspace:*",
"magic-string": "0.30.21",
"oxc-walker": "1.0.0",
"rolldown": "1.1.5",
"vite": "8.1.4"
"magic-string": "1.1.0",
"oxc-walker": "1.1.1",
"rolldown": "1.2.3",
"vite": "8.2.1"
}
}
Loading
Loading