OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
feat(geo): make geo a package instead of service (#161)
Carl-Gerhard Lindesvärd34414e1d3e41
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.ymlindex e55983749..966f79f65 100644--- a/.github/workflows/docker-build.yml+++ b/.github/workflows/docker-build.yml@@ -2,7 +2,7 @@ name: Docker Build and Pushon:push:- branches: [ "main" ]+ # branches: [ "main" ]paths:- 'apps/api/**'- 'apps/worker/**'diff --git a/.gitignore b/.gitignoreindex 3890854dd..96b7ab033 100644--- a/.gitignore+++ b/.gitignore@@ -8,6 +8,7 @@ dump-*.sqltmpdocker/data*+*.mmdb# Logsdiff --git a/apps/api/Dockerfile b/apps/api/Dockerfileindex e0f41d075..292eda4ca 100644--- a/apps/api/Dockerfile+++ b/apps/api/Dockerfile@@ -28,6 +28,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./COPY apps/api/package.json ./apps/api/# PackagesCOPY packages/db/package.json packages/db/+COPY packages/geo/package.json packages/geo/COPY packages/trpc/package.json packages/trpc/COPY packages/auth/package.json packages/auth/COPY packages/json/package.json packages/json/@@ -59,7 +60,7 @@ COPY apps/api ./apps/apiCOPY packages ./packagesCOPY tooling ./tooling-RUN pnpm db:codegen && \+RUN pnpm codegen && \pnpm --filter api run build# PROD@@ -91,6 +92,7 @@ COPY --from=build /app/apps/api ./apps/api# PackagesCOPY --from=build /app/packages/db ./packages/db+COPY --from=build /app/packages/geo ./packages/geoCOPY --from=build /app/packages/auth ./packages/authCOPY --from=build /app/packages/trpc ./packages/trpcCOPY --from=build /app/packages/json ./packages/jsondiff --git a/apps/api/package.json b/apps/api/package.jsonindex d56abc79f..546415173 100644--- a/apps/api/package.json+++ b/apps/api/package.json@@ -23,6 +23,7 @@"@openpanel/common": "workspace:*","@openpanel/constants": "workspace:*","@openpanel/db": "workspace:*",+ "@openpanel/geo": "workspace:*","@openpanel/integrations": "workspace:^","@openpanel/json": "workspace:*","@openpanel/logger": "workspace:*",diff --git a/apps/api/src/controllers/event.controller.ts b/apps/api/src/controllers/event.controller.tsindex 6834891fa..bb911908f 100644--- a/apps/api/src/controllers/event.controller.ts+++ b/apps/api/src/controllers/event.controller.ts@@ -1,4 +1,4 @@-import { getClientIp, parseIp } from '@/utils/parse-ip';+import { getClientIp } from '@/utils/get-client-ip';import type { FastifyReply, FastifyRequest } from 'fastify';import { generateDeviceId } from '@openpanel/common/server';@@ -8,6 +8,7 @@ import { getLock } from '@openpanel/redis';import type { PostEventPayload } from '@openpanel/sdk';import { checkDuplicatedEvent } from '@/utils/deduplicate';+import { getGeoLocation } from '@openpanel/geo';import { getStringHeaders, getTimestamp } from './track.controller';export async function postEvent(@@ -26,7 +27,7 @@ export async function postEvent(return;}- const [salts, geo] = await Promise.all([getSalts(), parseIp(ip)]);+ const [salts, geo] = await Promise.all([getSalts(), getGeoLocation(ip)]);const currentDeviceId = generateDeviceId({salt: salts.current,origin: projectId,diff --git a/apps/api/src/controllers/misc.controller.ts b/apps/api/src/controllers/misc.controller.tsindex e623f34f7..99323e33c 100644--- a/apps/api/src/controllers/misc.controller.ts+++ b/apps/api/src/controllers/misc.controller.ts@@ -4,8 +4,10 @@ import type { FastifyReply, FastifyRequest } from 'fastify';import icoToPng from 'ico-to-png';import sharp from 'sharp';+import { getClientIp } from '@/utils/get-client-ip';import { createHash } from '@openpanel/common/server';import { TABLE_NAMES, ch, chQuery, formatClickhouseDate } from '@openpanel/db';+import { getGeoLocation } from '@openpanel/geo';import { cacheable, getCache, getRedisCache } from '@openpanel/redis';interface GetFaviconParams {@@ -170,3 +172,12 @@ export async function stats(request: FastifyRequest, reply: FastifyReply) {eventsLast24hCount: res.last24hCount,});}++export async function getGeo(request: FastifyRequest, reply: FastifyReply) {+ const ip = getClientIp(request);+ if (!ip) {+ return reply.status(400).send('Bad Request');+ }+ const geo = await getGeoLocation(ip);+ return reply.status(200).send(geo);+}diff --git a/apps/api/src/controllers/profile.controller.ts b/apps/api/src/controllers/profile.controller.tsindex 3da6bee51..ed11d2291 100644--- a/apps/api/src/controllers/profile.controller.ts+++ b/apps/api/src/controllers/profile.controller.ts@@ -1,10 +1,11 @@-import { getClientIp, parseIp } from '@/utils/parse-ip';+import { getClientIp } from '@/utils/get-client-ip';import type { FastifyReply, FastifyRequest } from 'fastify';import { assocPath, pathOr } from 'ramda';import { checkDuplicatedEvent, isDuplicatedEvent } from '@/utils/deduplicate';import { parseUserAgent } from '@openpanel/common/server';import { getProfileById, upsertProfile } from '@openpanel/db';+import { getGeoLocation } from '@openpanel/geo';import type {IncrementProfilePayload,UpdateProfilePayload,@@ -24,7 +25,7 @@ export async function updateProfile(const ip = getClientIp(request)!;const ua = request.headers['user-agent']!;const uaInfo = parseUserAgent(ua, properties);- const geo = await parseIp(ip);+ const geo = await getGeoLocation(ip);if (await checkDuplicatedEvent({diff --git a/apps/api/src/controllers/track.controller.ts b/apps/api/src/controllers/track.controller.tsindex ac926ee9a..ff618f4c2 100644--- a/apps/api/src/controllers/track.controller.ts+++ b/apps/api/src/controllers/track.controller.ts@@ -1,11 +1,11 @@-import type { GeoLocation } from '@/utils/parse-ip';-import { getClientIp, parseIp } from '@/utils/parse-ip';+import { getClientIp } from '@/utils/get-client-ip';import type { FastifyReply, FastifyRequest } from 'fastify';import { path, assocPath, pathOr, pick } from 'ramda';-import { checkDuplicatedEvent, isDuplicatedEvent } from '@/utils/deduplicate';+import { checkDuplicatedEvent } from '@/utils/deduplicate';import { generateDeviceId, parseUserAgent } from '@openpanel/common/server';import { getProfileById, getSalts, upsertProfile } from '@openpanel/db';+import { type GeoLocation, getGeoLocation } from '@openpanel/geo';import { eventsQueue } from '@openpanel/queue';import { getLock } from '@openpanel/redis';import type {@@ -114,7 +114,7 @@ export async function handler(switch (request.body.type) {case 'track': {- const [salts, geo] = await Promise.all([getSalts(), parseIp(ip)]);+ const [salts, geo] = await Promise.all([getSalts(), getGeoLocation(ip)]);const currentDeviceId = ua? generateDeviceId({salt: salts.current,@@ -190,7 +190,7 @@ export async function handler(return;}- const geo = await parseIp(ip);+ const geo = await getGeoLocation(ip);await identify({payload: request.body.payload,projectId,diff --git a/apps/api/src/hooks/ip.hook.ts b/apps/api/src/hooks/ip.hook.tsindex 6dec9d9e0..a1fdcbe64 100644--- a/apps/api/src/hooks/ip.hook.ts+++ b/apps/api/src/hooks/ip.hook.ts@@ -1,4 +1,4 @@-import { getClientIp } from '@/utils/parse-ip';+import { getClientIp } from '@/utils/get-client-ip';import type {FastifyReply,FastifyRequest,diff --git a/apps/api/src/index.ts b/apps/api/src/index.tsindex e180edbc3..9be940a4f 100644--- a/apps/api/src/index.ts+++ b/apps/api/src/index.ts@@ -239,5 +239,4 @@ const startServer = async () => {}};-// startstartServer();diff --git a/apps/api/src/routes/misc.router.ts b/apps/api/src/routes/misc.router.tsindex 4328d0845..842c85d49 100644--- a/apps/api/src/routes/misc.router.ts+++ b/apps/api/src/routes/misc.router.ts@@ -25,6 +25,12 @@ const miscRouter: FastifyPluginCallback = async (fastify) => {url: '/favicon/clear',handler: controller.clearFavicons,});++ fastify.route({+ method: 'GET',+ url: '/geo',+ handler: controller.getGeo,+ });};export default miscRouter;diff --git a/apps/api/src/utils/get-client-ip.ts b/apps/api/src/utils/get-client-ip.tsnew file mode 100644index 000000000..ad4729c8a--- /dev/null+++ b/apps/api/src/utils/get-client-ip.ts@@ -0,0 +1,8 @@+import type { FastifyRequest } from 'fastify';+import requestIp from 'request-ip';++const ignore = ['127.0.0.1', '::1'];++export function getClientIp(req: FastifyRequest) {+ return requestIp.getClientIp(req);+}diff --git a/apps/api/src/utils/parse-ip.ts b/apps/api/src/utils/parse-ip.tsdeleted file mode 100644index 90d5ae832..000000000--- a/apps/api/src/utils/parse-ip.ts+++ /dev/null@@ -1,85 +0,0 @@-import crypto from 'node:crypto';-import { getRedisCache } from '@openpanel/redis';-import type { FastifyRequest } from 'fastify';-import requestIp from 'request-ip';-import { logger } from './logger';--interface RemoteIpLookupResponse {- country: string | undefined;- city: string | undefined;- stateprov: string | undefined;- longitude: number | undefined;- latitude: number | undefined;-}--export interface GeoLocation {- country: string | undefined;- city: string | undefined;- region: string | undefined;- longitude: number | undefined;- latitude: number | undefined;-}--const DEFAULT_GEO: GeoLocation = {- country: undefined,- city: undefined,- region: undefined,- longitude: undefined,- latitude: undefined,-};--const ignore = ['127.0.0.1', '::1'];--export function getClientIp(req: FastifyRequest) {- return requestIp.getClientIp(req);-}--export async function parseIp(ip?: string): Promise<GeoLocation> {- if (!ip || ignore.includes(ip)) {- return DEFAULT_GEO;- }-- const hash = crypto.createHash('sha256').update(ip).digest('hex');- const cached = await getRedisCache()- .get(`geo:${hash}`)- .catch(() => {- logger.warn('Failed to get geo location from cache', { hash });- return null;- });-- if (cached) {- return JSON.parse(cached);- }-- try {- const res = await fetch(`${process.env.GEO_IP_HOST}/${ip}`, {- signal: AbortSignal.timeout(4000),- });-- if (!res.ok) {- return DEFAULT_GEO;- }-- const json = (await res.json()) as RemoteIpLookupResponse;-- const geo = {- country: json.country,- city: json.city,- region: json.stateprov,- longitude: json.longitude,- latitude: json.latitude,- };-- await getRedisCache().set(- `geo:${hash}`,- JSON.stringify(geo),- 'EX',- 60 * 60 * 24,- );-- return geo;- } catch (error) {- logger.error('Failed to fetch geo location for ip', { error });- return DEFAULT_GEO;- }-}diff --git a/apps/worker/Dockerfile b/apps/worker/Dockerfileindex 630808b9e..b34882b1f 100644--- a/apps/worker/Dockerfile+++ b/apps/worker/Dockerfile@@ -27,6 +27,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./COPY apps/worker/package.json ./apps/worker/# PackagesCOPY packages/db/package.json ./packages/db/+COPY packages/geo/package.json ./packages/geo/COPY packages/json/package.json ./packages/json/COPY packages/email/package.json ./packages/email/COPY packages/redis/package.json ./packages/redis/@@ -48,7 +49,7 @@ COPY apps/worker ./apps/workerCOPY packages ./packagesCOPY tooling ./tooling-RUN pnpm db:codegen && \+RUN pnpm codegen && \pnpm --filter worker run build# PROD@@ -73,6 +74,7 @@ COPY --from=build /app/apps/worker ./apps/worker# PackagesCOPY --from=build /app/packages/db ./packages/db+COPY --from=build /app/packages/geo ./packages/geoCOPY --from=build /app/packages/json ./packages/jsonCOPY --from=build /app/packages/email ./packages/emailCOPY --from=build /app/packages/redis ./packages/redisdiff --git a/docker-compose.yml b/docker-compose.ymlindex 3768ecff6..59e0965d2 100644--- a/docker-compose.yml+++ b/docker-compose.yml@@ -21,12 +21,6 @@ services:ports:- 6379:6379- op-geo:- image: observabilitystack/geoip-api:latest- restart: always- ports:- - 8080:8080-op-ch:image: clickhouse/clickhouse-server:24.12.2.29-alpinerestart: alwaysdiff --git a/package.json b/package.jsonindex 6642f8cb3..141e749ff 100644--- a/package.json+++ b/package.json@@ -11,7 +11,7 @@"dock:ch": "docker compose exec -it op-ch clickhouse-client -d openpanel","dock:redis": "docker compose exec -it op-kv redis-cli","db:codegen": "pnpm -r --filter db run codegen",- "codegen": "pnpm db:codegen",+ "codegen": "pnpm -r --filter db --filter geo run codegen","migrate": "pnpm -r --filter db run migrate","migrate:deploy": "pnpm -r --filter db run migrate:deploy","dev": "pnpm -r --parallel testing",diff --git a/packages/GeoLite2-City.mmdb b/packages/GeoLite2-City.mmdbnew file mode 100644index 000000000..948b7cf2aBinary files /dev/null and b/packages/GeoLite2-City.mmdb differdiff --git a/packages/geo/index.ts b/packages/geo/index.tsnew file mode 100644index 000000000..4ef7304d9--- /dev/null+++ b/packages/geo/index.ts@@ -0,0 +1 @@+export * from './src/geo';diff --git a/packages/geo/package.json b/packages/geo/package.jsonnew file mode 100644index 000000000..6f9616437--- /dev/null+++ b/packages/geo/package.json@@ -0,0 +1,20 @@+{+ "name": "@openpanel/geo",+ "version": "0.0.1",+ "main": "index.ts",+ "scripts": {+ "typecheck": "tsc --noEmit",+ "codegen": "jiti scripts/download.ts"+ },+ "dependencies": {+ "@maxmind/geoip2-node": "^6.1.0"+ },+ "devDependencies": {+ "@openpanel/tsconfig": "workspace:*",+ "@types/node": "20.14.8",+ "fast-extract": "^1.4.3",+ "tar": "^7.4.3",+ "typescript": "^5.2.2",+ "jiti": "^2.4.1"+ }+}diff --git a/packages/geo/scripts/download.ts b/packages/geo/scripts/download.tsnew file mode 100644index 000000000..025f778a9--- /dev/null+++ b/packages/geo/scripts/download.ts@@ -0,0 +1,66 @@+import fs from 'node:fs';+import https from 'node:https';+import path from 'node:path';+import zlib from 'node:zlib';+import * as tar from 'tar';+import type { Parser } from 'tar';++const db = 'GeoLite2-City';++const download = async (url: string): Promise<Parser> => {+ return new Promise((resolve) => {+ https.get(url, (res) => {+ const gunzip = zlib.createGunzip();+ const parser = tar.t();++ res.pipe(gunzip).pipe(parser as any);+ resolve(parser);+ });+ });+};++async function main(): Promise<void> {+ let url = `https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/${db}.tar.gz`;++ if (process.env.MAXMIND_LICENSE_KEY) {+ url = [+ 'https://download.maxmind.com/app/geoip_download',+ `?edition_id=${db}&license_key=${process.env.MAXMIND_LICENSE_KEY}&suffix=tar.gz`,+ ].join('');+ }++ const dest = path.resolve(__dirname, '../');++ if (!fs.existsSync(dest)) {+ console.log('Geo database not found');+ process.exit(1);+ }++ try {+ const res = await download(url);++ await new Promise<void>((resolve, reject) => {+ res.on('entry', (entry) => {+ if (entry.path.endsWith('.mmdb')) {+ const filename = path.join(dest, path.basename(entry.path));+ entry.pipe(fs.createWriteStream(filename));++ console.log('Saved geo database:', filename);+ }+ });++ res.on('error', (e) => {+ reject(e);+ });++ res.on('finish', () => {+ resolve();+ });+ });+ } catch (error) {+ console.error('Error downloading geo database:', error);+ process.exit(1);+ }+}++main();diff --git a/packages/geo/src/geo.ts b/packages/geo/src/geo.tsnew file mode 100644index 000000000..fd0a1189c--- /dev/null+++ b/packages/geo/src/geo.ts@@ -0,0 +1,69 @@+import { readFile } from 'node:fs/promises';+import path from 'node:path';+import type { ReaderModel } from '@maxmind/geoip2-node';+import { Reader } from '@maxmind/geoip2-node';++const filename = 'GeoLite2-City.mmdb';+// From api or worker package+const dbPath = path.join(__dirname, `../../../packages/geo/${filename}`);+// From local package+const dbPathLocal = path.join(__dirname, `../${filename}`);++let reader: ReaderModel | null = null;++async function loadDatabase(dbPath: string) {+ try {+ const dbBuffer = await readFile(dbPath);+ reader = Reader.openBuffer(dbBuffer);+ console.log('GeoLite2-City.mmdb loaded (dist)');+ } catch (error) {+ try {+ const dbBuffer = await readFile(dbPathLocal);+ reader = Reader.openBuffer(dbBuffer);+ console.log('GeoLite2-City.mmdb loaded (local)');+ } catch (error) {+ console.error('GeoLite2-City.mmdb not found');+ }+ }+}++export interface GeoLocation {+ country: string | undefined;+ city: string | undefined;+ region: string | undefined;+ longitude: number | undefined;+ latitude: number | undefined;+}++const DEFAULT_GEO: GeoLocation = {+ country: undefined,+ city: undefined,+ region: undefined,+ longitude: undefined,+ latitude: undefined,+};++const ignore = ['127.0.0.1', '::1'];++export async function getGeoLocation(ip?: string): Promise<GeoLocation> {+ if (!ip || ignore.includes(ip)) {+ return DEFAULT_GEO;+ }++ if (!reader) {+ await loadDatabase(dbPath);+ }++ try {+ const response = await reader?.city(ip);+ return {+ city: response?.city?.names.en,+ country: response?.country?.isoCode,+ region: response?.subdivisions?.[0]?.names.en,+ longitude: response?.location?.longitude,+ latitude: response?.location?.latitude,+ };+ } catch (error) {+ return DEFAULT_GEO;+ }+}diff --git a/packages/geo/tsconfig.json b/packages/geo/tsconfig.jsonnew file mode 100644index 000000000..748885aa0--- /dev/null+++ b/packages/geo/tsconfig.json@@ -0,0 +1,12 @@+{+ "extends": "@openpanel/tsconfig/base.json",+ "compilerOptions": {+ "baseUrl": ".",+ "paths": {+ "@/*": ["./src/*"]+ },+ "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"+ },+ "include": [".", "*.mmdb"],+ "exclude": ["node_modules"]+}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 5265b1089..4e1729ab1 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -75,6 +75,9 @@ importers:'@openpanel/db':specifier: workspace:*version: link:../../packages/db+ '@openpanel/geo':+ specifier: workspace:*+ version: link:../../packages/geo'@openpanel/integrations':specifier: workspace:^version: link:../../packages/integrations@@ -1072,6 +1075,31 @@ importers:specifier: ^5.2.2version: 5.6.3+ packages/geo:+ dependencies:+ '@maxmind/geoip2-node':+ specifier: ^6.1.0+ version: 6.1.0+ devDependencies:+ '@openpanel/tsconfig':+ specifier: workspace:*+ version: link:../../tooling/typescript+ '@types/node':+ specifier: 20.14.8+ version: 20.14.8+ fast-extract:+ specifier: ^1.4.3+ version: 1.4.3([email protected])+ jiti:+ specifier: ^2.4.1+ version: 2.4.1+ tar:+ specifier: ^7.4.3+ version: 7.4.3+ typescript:+ specifier: ^5.2.2+ version: 5.6.3+packages/integrations:dependencies:'@slack/bolt':@@ -3375,6 +3403,10 @@ packages:resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}engines: {node: '>=12'}+ '@isaacs/[email protected]':+ resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}+ engines: {node: '>=18.0.0'}+'@isaacs/[email protected]':resolution: {integrity: sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA==}engines: {node: '>=12'}@@ -3449,6 +3481,9 @@ packages:resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}hasBin: true+ '@maxmind/[email protected]':+ resolution: {integrity: sha512-yJWQNxKRqPaGKorzpDKZBAR+gLk80XnZ3w/fhLEdfGnqls+Rv3ui0qQSd3akpvAC2NX8cjn7VJ5xxrlVw7i6KA==}+'@mdx-js/[email protected]':resolution: {integrity: sha512-/QxEhPAvGwbQmy1Px8F899L5Uc2KZ6JtXwlCgJmjSTBedwOZkByYcBG4GceIGPXRDsmfxhHazuS+hlOShRLeDw==}@@ -6825,6 +6860,10 @@ packages:engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'}hasBin: true+ resolution: {integrity: sha512-85Zm+9dPSBAfa9kwh93pSN6ESrMj66pbaZBImaTD2hdHMK21q12GjZD8MWZ/javrhckmRpTkf75xl8mNsHt8qQ==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}@@ -6920,6 +6959,10 @@ packages:resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==}+ resolution: {integrity: sha512-Pj9L87dCdGcKlSqPVUjD+q96pbIx1zQQLb2CUiWURfjiBELv84YX+0nGnKmyT/9KkC7PQk7UN1w+Al8bBozaxQ==}+ engines: {node: '>= 0.4'}+resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}@@ -6952,6 +6995,12 @@ packages:resolution: {integrity: sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==}+ resolution: {integrity: sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==}++ resolution: {integrity: sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==}+resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}@@ -6972,6 +7021,9 @@ packages:resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}+ resolution: {integrity: sha512-Cx1zStcMp+YoFan8OgudNPMih82eJZE+27feki1WeyoFTR9Ye7AR1SUW3saE6QQvdS/g52aJ2IojBjWOiRiLbw==}+resolution: {integrity: sha512-F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw==}engines: {node: '>=18'}@@ -7032,6 +7084,9 @@ packages:resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}+ resolution: {integrity: sha512-LdUw/JMZyKN+EBDbOHqynYtOLXDjgo+uf5vCUhfO5hVsU2chvbqyexizvxUMaU4ipYZy9MiQyIFwMeIgsb6nBA==}+resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}@@ -7074,6 +7129,10 @@ packages:resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}engines: {node: '>= 0.4'}+ resolution: {integrity: sha512-aSu6eFg1N+L81d6RFbzfQ6I9AZVwxx5aK+4CpEtMtNEG+DOefqA+qmph0GAuBHVpBayK7IKhXzB2dLIa2D8CiA==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==}engines: {node: '>=4'}@@ -7173,6 +7232,10 @@ packages:resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}engines: {node: '>=10'}+ resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ==}engines: {node: '>=12.13.0'}@@ -8224,6 +8287,10 @@ packages:resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}engines: {node: '>=4'}+ resolution: {integrity: sha512-GqgTxPCueENknfj0jCVa7IulNwVGRd4Qfw92XlHSjuKKyUX6NV1g1+3uUk4+6FmwDL5gjyPL53/8Z/kwUbFGpw==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==}@@ -8237,6 +8304,15 @@ packages:resolution: {integrity: sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==}engines: {node: '>=6.0.0'}+ resolution: {integrity: sha512-CrZ3mJHcnVTm0Frh/gdow94acvDkIqHcT+kZ5QkfMoAQCbgDS7Hw/B3ccgDSOvrrjVdq0DrTgsTvUO5io9VrWA==}+ engines: {node: '>=0.8'}+ peerDependencies:+ lzma-native: '*'+ peerDependenciesMeta:+ lzma-native:+ optional: true+resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}engines: {node: '>=8.6.0'}@@ -8315,6 +8391,9 @@ packages:resolution: {integrity: sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA==}+ resolution: {integrity: sha512-XTbUCNmo54Jav0hcL6VxDuY4x1eCQH61HEF80C2Oww283pfjQ2C8avZeyq4v43sW2S2403kmzssE9j4lbF66Sg==}+resolution: {integrity: sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==}engines: {node: '>=14'}@@ -8378,6 +8457,9 @@ packages:resolution: {integrity: sha512-HVzoK3r6Vsg+lKvlIZzaWNBVai+FXTX1wdYhz/wVlH13tb/gOdLXmlTqy6odmTBhT5UoWUbq0k8263Qhr9d88w==}engines: {node: '>=0.4.0'}+ resolution: {integrity: sha512-uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g==}+resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}@@ -8480,6 +8562,9 @@ packages:resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}engines: {node: '>= 0.6'}+ resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}+resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}engines: {node: '>=6 <7 || >=8'}@@ -8712,6 +8797,9 @@ packages:resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}+ resolution: {integrity: sha512-dtNNyxXobzHavayZwOwRWhBTqS9GX4jDjIMsGc0fDyaN2A+4zMn5Ua9ODDCggN6w3Spma6mAHL3ImmW3BkWDmQ==}+resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==}engines: {node: '>= 0.4'}@@ -8959,6 +9047,10 @@ packages:resolution: {integrity: sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==}@@ -9037,6 +9129,9 @@ packages:resolution: {integrity: sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg==}+ resolution: {integrity: sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==}+resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}engines: {node: '>=0.10.0'}@@ -9119,10 +9214,17 @@ packages:resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}engines: {node: '>=0.10.0'}+ resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}+resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}engines: {node: '>= 0.4'}+ resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}@@ -9153,6 +9255,10 @@ packages:resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}engines: {node: '>= 0.4'}+ resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}engines: {node: '>=10'}@@ -9172,6 +9278,10 @@ packages:resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==}engines: {node: '>=12.13'}+ resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==}engines: {node: '>=4'}@@ -9392,6 +9502,9 @@ packages:resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}engines: {node: '>=6'}+ resolution: {integrity: sha512-FJx0SNrM2rouctdOH4rATsHT+BvgyXX4LEQ+Yn9COQNPK3u4XAPp9qS7OKpRO22MeT39oxkjZkRcLnHxSmiduw==}+resolution: {integrity: sha512-CHYbu8RtboSIoVsHZ6Ye4cj4Aw/yg2oAFimlF7mNvfDV192LR7nDiKtSIfCuLT7KokPSTn/9kfVLm5OGN0A28A==}@@ -9488,6 +9601,9 @@ packages:resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==}+ resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==}+resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}@@ -9651,6 +9767,10 @@ packages:engines: {node: '>= 18'}hasBin: true+ resolution: {integrity: sha512-u7L6LrbXZUtpdoovTVHo/l4/EoWUT2eHfCKWDMNNTsW9BaLa7h0jCHjqVx5ZeS5aWorLGZSsZwqxcpoollBw1g==}+ engines: {node: '>=12', npm: '>=6'}+resolution: {integrity: sha512-OvAXqwq57uOk+WZqFFNCMZz8yDp8BD3WazW1wAKHUrPbbdr89K9DWS6JXY09vd9xNdPNeurI8DU/X4flcfaD8A==}peerDependencies:@@ -10004,9 +10124,16 @@ packages:resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}engines: {node: '>= 8'}+ resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==}+ engines: {node: '>= 18'}+resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}+ resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}+resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}hasBin: true@@ -10016,9 +10143,22 @@ packages:engines: {node: '>=10'}hasBin: true+ resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}+ engines: {node: '>=10'}+ hasBin: true++ resolution: {integrity: sha512-V6DDh3v8tfZFWbeH6fsL5uBIlWL7SvRgGDaAZWFC5kjQ2xP5dl/mLpWwJQ1Ho6ZbEKVp/351QF1JXYTAmeZ/zA==}+ engines: {node: '>=10', npm: '>=6'}+resolution: {integrity: sha512-kdd8AFNig2AD5Rkih7EPCXhu/iMvwevQFX/uEiGhZyPZi7fHqOoF4V4kHLpCfysxXMgQ4B52kdPMCwARshKvEg==}+ resolution: {integrity: sha512-P8nKtCgmnX9flup2Ywv6eoHIH7qjnpF0nQ8tRIG2qqy7UyeqLH8/VtHhTSP00hgTM/VkHDUS23mFPLacEfnmSQ==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}@@ -10120,6 +10260,9 @@ packages:react: ^16.8 || ^17 || ^18react-dom: ^16.8 || ^17 || ^18+ resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}+resolution: {integrity: sha512-SF3TJnKdH43PMkCcErLPv+x/DY1YCklslk3ZmwaVoyUfDgHKexuKlf9sEfBQ69w+ue8jQ3msLb+hSj1T19hGag==}engines: {node: '>=18.17.0'}@@ -10370,6 +10513,10 @@ packages:resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==}engines: {node: '>= 0.8'}+ resolution: {integrity: sha512-MFN1Fjufz1bin2pBI4hbGa8ncJeYgn+INSwVbOTUwD8ZuS9FJtjl5DItq0wgNf1ySwwo0t5cOk+F4ory9sUEng==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}@@ -10420,6 +10567,10 @@ packages:resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==}engines: {node: '>=0.10.0'}+ resolution: {integrity: sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A==}+ engines: {node: '>= 0.4.0'}+resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}engines: {node: '>=0.10.0'}@@ -10790,6 +10941,9 @@ packages:resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}engines: {node: '>= 0.6.0'}+ resolution: {integrity: sha512-xJwOWR46jcXUq6EH9yYyqp+I52skPySOeHfkxOZ2IY1AiBi/sFJhbhAKHoV3OTw/omQ45KTio9215dRJ2Yxd3Q==}+resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}engines: {node: '>=0.4.0'}@@ -10877,6 +11031,10 @@ packages:resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}+ resolution: {integrity: sha512-D4QWxO66oOMNXLbayJNZiBll/jyOnByN73QqIyE1P16Hytlb4FXzZcKXypPbqbSm3b56Rcr5DZRz49deN9QSwQ==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}@@ -11371,6 +11529,9 @@ packages:resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}+ resolution: {integrity: sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==}+resolution: {integrity: sha512-nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg==}engines: {node: '>= 4.0.0'}@@ -11392,6 +11553,10 @@ packages:resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}+ resolution: {integrity: sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==}engines: {node: '>=4'}@@ -11455,6 +11620,15 @@ packages:resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==}+ resolution: {integrity: sha512-Bz7P3Zu6lEpek5LduIqg5A2mRu8kCllR+rGYofqq9bRRiHC9m+Py/EiINPt9iu/XOqQ//Q++XSka7EwL3K3Chw==}+ hasBin: true+ peerDependencies:+ glob: '*'+ peerDependenciesMeta:+ glob:+ optional: true+resolution: {integrity: sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==}deprecated: Rimraf versions prior to v4 are no longer supported@@ -11668,6 +11842,9 @@ packages:resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}+ resolution: {integrity: sha512-qbUCD2Pkl4IXRyVqneEjGnUr0NGDGLzZnBUVGJngIQZf/FrhOL0yJhH+JQzak0t8xMmScIKpoX1SxOsPHdwa4w==}+resolution: {integrity: sha512-yhniEILouC0s4lpH0h7rJsfylZdca10W9mDJRAFh3EpcSUanCHGb0R7kcFOIUCZYSAPo0PUD5ZxWQdW0T4xaug==}hasBin: true@@ -11765,6 +11942,9 @@ packages:resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}+ resolution: {integrity: sha512-lgxErLl/7A5+vgIIXsh9MbeukOaCb2axgQ+bKCdIE+ibNT4XNYGNCR1qFEGq6F+YDASXK3Fh/c5FgtZchFolxw==}+resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}engines: {node: '>= 10.x'}@@ -11783,6 +11963,10 @@ packages:resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}engines: {node: '>= 8'}+ resolution: {integrity: sha512-26nw6030uzxzSh/XeFB463EYbtzri6zuRrxQbSfIuSgXwrqYcNNIk4eT7m3PZ+1mZBwT+h/eDYBUxeuTLtCwcQ==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}@@ -12012,10 +12196,22 @@ packages:engines: {node: '>=14.0.0'}hasBin: true+ resolution: {integrity: sha512-3qMUT7GWQXEpxwJdo4GUR5GZmG6Ing0vCfzrXnXtHy8ltOjh32F4D1M5niSDGVh08eMTrsrgJfAGYD/EZLwEAA==}+ engines: {node: '>=0.8'}++ resolution: {integrity: sha512-hhIcRHj6S+y7IDR+VO8IcOjPUsAJ+50POvGK1fDFqbOTLTs/J7YA07TUgvpSkYkYuRUfYsuAFM/0SrvrdIZMdQ==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==}engines: {node: '>=10'}+ resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==}@@ -12027,6 +12223,10 @@ packages:resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}engines: {node: '>=8'}+ resolution: {integrity: sha512-mXH9Y9dyCVqHEFW+T12vClHHik6UQPTl5hJBTrTb0eqo3CM7JBDAj3pLF8+z8SO+CpyaazWSxltWXOJ/YgbpxA==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}engines: {node: '>=6.0.0'}@@ -12086,6 +12286,10 @@ packages:resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}+ resolution: {integrity: sha512-27BIW0dIWTYYoWNnqSmoNMKe5WIbkXsc0xaCQHd3/3xT2XMuMJrzHdrO9QBFR14emBz1Bu0dOAs2sCBBrvgPQA==}+ engines: {node: '>=12'}+resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}@@ -12111,6 +12315,9 @@ packages:resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}engines: {node: '>=8.0'}+ resolution: {integrity: sha512-zks18/TWT1iHO3v0vFp5qLKOG27m67ycq/Y7a7cTiRuUNlc4gf3HGnkRgMv0NyhnfTamtkYBJl+YeD1/j07gBQ==}+resolution: {integrity: sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==}engines: {node: '>=12'}@@ -12281,6 +12488,13 @@ packages:resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}+ resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}++ resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}@@ -12775,6 +12989,10 @@ packages:resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}+ resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==}engines: {node: '>= 14'}@@ -12815,6 +13033,13 @@ packages:resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==}engines: {node: '>=18'}+ resolution: {integrity: sha512-dm0WYknZQP1FZ1ZfturvUbqjtj0OSr2npuxYW5FaYdXTf2WFlUPE8+dO3cYD7uf0JWAb7wNPSQBQlGcN/hiH/Q==}+ engines: {node: '>=0.8'}++ resolution: {integrity: sha512-8B4Z9BXJKkI8BkHhKvQan4rwCzUENnj95YHFYrI7F1NbqKCIdW86kujctzEB+kJ6XapHPiAhiZ9xi5GbW5SPdw==}+resolution: {integrity: sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==}peerDependencies:@@ -14939,6 +15164,10 @@ snapshots:wrap-ansi: 8.1.0wrap-ansi-cjs: [email protected]+ '@isaacs/[email protected]':+ dependencies:+ minipass: 7.1.2+'@isaacs/[email protected]': {}'@jest/[email protected]':@@ -15038,6 +15267,10 @@ snapshots:- encoding- supports-color+ '@maxmind/[email protected]':+ dependencies:+ maxmind: 4.3.25+'@mdx-js/[email protected]([email protected])':dependencies:'@types/estree': 1.0.5@@ -19149,6 +19382,11 @@ snapshots:- uploadthing- yaml+ dependencies:+ is-error: 2.2.2+ is-promise: 4.0.0+@@ -19292,6 +19530,8 @@ snapshots:+ [email protected]: {}+@@ -19318,6 +19558,15 @@ snapshots:+ dependencies:+ readable-stream: 2.3.8+ safe-buffer: 5.2.1++ dependencies:+ readable-stream: 3.6.2+dependencies:buffer: 5.7.1@@ -19364,6 +19613,11 @@ snapshots:+ dependencies:+ base64-js: 0.0.2+ to-utf8: 0.0.1+dependencies:ansi-align: 3.0.1@@ -19439,6 +19693,8 @@ snapshots:+ [email protected]: {}+dependencies:base64-js: 1.5.1@@ -19509,6 +19765,8 @@ snapshots:get-intrinsic: 1.2.4set-function-length: 1.2.1+ [email protected]: {}+dependencies:callsites: 2.0.0@@ -19605,6 +19863,8 @@ snapshots:+ [email protected]: {}+dependencies:'@types/node': 20.14.8@@ -20341,7 +20601,7 @@ snapshots:'@one-ini/wasm': 0.1.1commander: 10.0.1minimatch: 9.0.1- semver: 7.6.3+ semver: 7.7.1@@ -20937,6 +21197,19 @@ snapshots:iconv-lite: 0.4.24tmp: 0.0.33+ dependencies:+ graceful-fs: 4.2.11+ is-absolute: 1.0.0+ lodash.compact: 3.0.1+ mkdirp-classic: 0.5.3+ object-assign: 4.1.1+ queue-cb: 1.5.0+ rimraf2: 2.8.2([email protected])+ stack-base-iterator: 1.2.10+ transitivePeerDependencies:+ - glob+@@ -20945,6 +21218,32 @@ snapshots:+ dependencies:+ bl: 3.0.1+ buffer-v6-polyfill: 1.0.5+ call-once-fn: 1.0.17+ content-disposition: 0.5.4+ flush-write-stream: 2.0.0+ lodash.throttle: 4.1.1+ mkdirp-classic: 0.5.3+ mock-require-lazy: 1.0.17+ next-tick: 1.1.0+ on-one: 0.1.6+ progress-stream: 2.0.0+ pumpify: 2.0.1+ queue-cb: 1.5.0+ readable-stream: 2.3.8+ require_optional: 1.0.1+ rimraf2: 2.8.2([email protected])+ signal-exit: 3.0.7+ tar-iterator: 1.3.4([email protected])+ temp-suffix: 0.1.18+ unbzip2-stream: 1.4.3+ zip-iterator: 1.3.5([email protected])+ transitivePeerDependencies:+ - glob+dependencies:'@nodelib/fs.stat': 2.0.5@@ -21055,6 +21354,8 @@ snapshots:+ [email protected]: {}+dependencies:escape-string-regexp: 5.0.0@@ -21136,6 +21437,11 @@ snapshots:+ dependencies:+ inherits: 2.0.4+ readable-stream: 3.6.2+@@ -21223,6 +21529,8 @@ snapshots:+ [email protected]: {}+dependencies:graceful-fs: 4.2.11@@ -21536,6 +21844,8 @@ snapshots:+ [email protected]: {}+dependencies:function-bind: 1.1.2@@ -21917,6 +22227,11 @@ snapshots:+ dependencies:+ is-relative: 1.0.0+ is-windows: 1.0.2+@@ -21986,6 +22301,8 @@ snapshots:+ [email protected]: {}+@@ -22040,11 +22357,17 @@ snapshots:dependencies:isobject: 3.0.1+ [email protected]: {}+dependencies:call-bind: 1.0.7has-tostringtag: 1.0.2+ dependencies:+ is-unc-path: 1.0.0+@@ -22071,6 +22394,10 @@ snapshots:dependencies:which-typed-array: 1.1.14+ dependencies:+ unc-path-regex: 0.1.2+@@ -22085,6 +22412,8 @@ snapshots:+ [email protected]: {}+@@ -22350,6 +22679,8 @@ snapshots:+ [email protected]: {}+dependencies:cookie: 1.0.2@@ -22427,6 +22758,8 @@ snapshots:+ [email protected]: {}+@@ -22579,6 +22912,11 @@ snapshots:tiny-emitter: 2.1.0typed-function: 4.1.1+ dependencies:+ mmdb-lib: 2.2.0+ tiny-lru: 11.2.11+dependencies:marked: 7.0.4@@ -23313,18 +23651,33 @@ snapshots:minipass: 3.3.6yallist: 4.0.0+ dependencies:+ minipass: 7.1.2++ [email protected]: {}+dependencies:minimist: 1.2.8+ [email protected]: {}++ [email protected]: {}+dependencies:obliterator: 2.0.4+ dependencies:+ get-caller-file: 2.0.5+ normalize-path: 3.0.0+@@ -23417,6 +23770,8 @@ snapshots:react: 18.3.1react-dom: 18.3.1([email protected])+ [email protected]: {}+[email protected](@babel/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected]):dependencies:'@next/env': 14.2.1@@ -23673,6 +24028,8 @@ snapshots:+ [email protected]: {}+dependencies:wrappy: 1.0.2@@ -23746,6 +24103,8 @@ snapshots:+ [email protected]: {}+@@ -24128,6 +24487,11 @@ snapshots:+ dependencies:+ speedometer: 1.0.0+ through2: 2.0.5+@@ -24230,6 +24594,8 @@ snapshots:+ [email protected]: {}+@@ -25041,6 +25407,11 @@ snapshots:+ dependencies:+ resolve-from: 2.0.0+ semver: 5.7.2+dependencies:nested-error-stacks: 2.0.1@@ -25064,6 +25435,8 @@ snapshots:+ [email protected]: {}+@@ -25130,6 +25503,10 @@ snapshots:+ optionalDependencies:+ glob: 10.4.5+dependencies:glob: 6.0.4@@ -25410,6 +25787,10 @@ snapshots:+ dependencies:+ hash-string: 1.0.0+@@ -25511,6 +25892,8 @@ snapshots:+ [email protected]: {}+@@ -25525,6 +25908,13 @@ snapshots:dependencies:minipass: 3.3.6+ dependencies:+ asap: 2.0.6+ async-compat: 1.6.10+ call-once-fn: 1.0.17+ fifo: 2.4.1+@@ -25821,6 +26211,28 @@ snapshots:transitivePeerDependencies:- ts-node+ dependencies:+ call-once-fn: 1.0.17+ extract-base-iterator: 1.3.11([email protected])+ lifecycle: 1.0.4+ lodash.compact: 3.0.1+ mkdirp-classic: 0.5.3+ on-one: 0.1.6+ rimraf2: 2.8.2([email protected])+ tar-stream-compat: 2.1.5+ transitivePeerDependencies:+ - glob++ dependencies:+ bl: 2.2.1+ buffer-alloc: 1.2.0+ end-of-stream: 1.4.4+ fs-constants: 1.0.0+ inherits: 2.0.4+ readable-stream: 2.3.8+dependencies:chownr: 2.0.0@@ -25830,6 +26242,15 @@ snapshots:mkdirp: 1.0.4yallist: 4.0.0+ dependencies:+ '@isaacs/fs-minipass': 4.0.1+ chownr: 3.0.0+ minipass: 7.1.2+ minizlib: 3.0.2+ mkdirp: 3.0.1+ yallist: 5.0.0+dependencies:bintrees: 1.0.2@@ -25838,6 +26259,10 @@ snapshots:+ dependencies:+ imurmurhash: 0.1.4+dependencies:rimraf: 2.6.3@@ -25901,6 +26326,8 @@ snapshots:+ [email protected]: {}+@@ -25922,6 +26349,8 @@ snapshots:dependencies:is-number: 7.0.0+ [email protected]: {}+@@ -26109,6 +26538,13 @@ snapshots:has-symbols: 1.0.3which-boxed-primitive: 1.0.2+ dependencies:+ buffer: 5.7.1+ through: 2.3.8++ [email protected]: {}+@@ -26556,6 +26992,8 @@ snapshots:+ [email protected]: {}+@@ -26601,6 +27039,29 @@ snapshots:+ dependencies:+ buffer-v6-polyfill: 1.0.5+ call-once-fn: 1.0.17+ extract-base-iterator: 1.3.11([email protected])+ lifecycle: 1.0.4+ lodash.compact: 3.0.1+ mkdirp-classic: 0.5.3+ on-one: 0.1.6+ os-shim: 0.1.3+ queue-cb: 1.5.0+ readable-stream: 2.3.8+ rimraf2: 2.8.2([email protected])+ short-hash: 1.0.0+ temp-suffix: 0.1.18+ zip: 1.2.0+ transitivePeerDependencies:+ - glob++ dependencies:+ bops: 0.1.1+dependencies:zod: 3.24.2diff --git a/self-hosting/docker-compose.template.yml b/self-hosting/docker-compose.template.ymlindex 2d07d33ab..6cf10fabe 100644--- a/self-hosting/docker-compose.template.yml+++ b/self-hosting/docker-compose.template.yml@@ -42,10 +42,6 @@ services:# ports:# - 6379:6379- op-geo:- image: observabilitystack/geoip-api:latest- restart: always-op-ch:image: clickhouse/clickhouse-server:24.3.2-alpinerestart: always@@ -91,7 +87,6 @@ services:- op-db- op-ch- op-kv- - op-geoenv_file:- .env