comparing f83c24d052245087f53bb9cc6311b44052ce00df and main on nekomimi.pet/wisp.place-monorepo

+72

.env.grafana.example

···

       1
       1
       +
       # Grafana Cloud Configuration for wisp.place monorepo

     

       2
       2
       +
       # Copy these variables to your .env file to enable Grafana integration

     

       3
       3
       +
       # The observability package will automatically pick up these environment variables

     

       4
       4
       +
       

     

       5
       5
       +
       # ============================================================================

     

       6
       6
       +
       # Grafana Loki (for logs)

     

       7
       7
       +
       # ============================================================================

     

       8
       8
       +
       # Get this from your Grafana Cloud portal under Loki → Details

     

       9
       9
       +
       # Example: https://logs-prod-012.grafana.net

     

       10
       10
       +
       GRAFANA_LOKI_URL=https://logs-prod-xxx.grafana.net

     

       11
       11
       +
       

     

       12
       12
       +
       # Authentication Option 1: Bearer Token (Grafana Cloud)

     

       13
       13
       +
       GRAFANA_LOKI_TOKEN=glc_xxx

     

       14
       14
       +
       

     

       15
       15
       +
       # Authentication Option 2: Username/Password (Self-hosted or some Grafana setups)

     

       16
       16
       +
       # GRAFANA_LOKI_USERNAME=your-username

     

       17
       17
       +
       # GRAFANA_LOKI_PASSWORD=your-password

     

       18
       18
       +
       

     

       19
       19
       +
       # ============================================================================

     

       20
       20
       +
       # Grafana Prometheus (for metrics)

     

       21
       21
       +
       # ============================================================================

     

       22
       22
       +
       # Get this from your Grafana Cloud portal under Prometheus → Details

     

       23
       23
       +
       # Note: You need to add /api/prom to the base URL for OTLP export

     

       24
       24
       +
       # Example: https://prometheus-prod-10-prod-us-central-0.grafana.net/api/prom

     

       25
       25
       +
       GRAFANA_PROMETHEUS_URL=https://prometheus-prod-xxx.grafana.net/api/prom

     

       26
       26
       +
       

     

       27
       27
       +
       # Authentication Option 1: Bearer Token (Grafana Cloud)

     

       28
       28
       +
       GRAFANA_PROMETHEUS_TOKEN=glc_xxx

     

       29
       29
       +
       

     

       30
       30
       +
       # Authentication Option 2: Username/Password (Self-hosted or some Grafana setups)

     

       31
       31
       +
       # GRAFANA_PROMETHEUS_USERNAME=your-username

     

       32
       32
       +
       # GRAFANA_PROMETHEUS_PASSWORD=your-password

     

       33
       33
       +
       

     

       34
       34
       +
       # ============================================================================

     

       35
       35
       +
       # Optional Configuration

     

       36
       36
       +
       # ============================================================================

     

       37
       37
       +
       # These will be used by both main-app and hosting-service if not overridden

     

       38
       38
       +
       

     

       39
       39
       +
       # Service metadata (optional - defaults are provided in code)

     

       40
       40
       +
       # SERVICE_NAME=wisp-app

     

       41
       41
       +
       # SERVICE_VERSION=1.0.0

     

       42
       42
       +
       

     

       43
       43
       +
       # Batching configuration (optional)

     

       44
       44
       +
       # GRAFANA_BATCH_SIZE=100              # Flush after this many entries

     

       45
       45
       +
       # GRAFANA_FLUSH_INTERVAL=5000         # Flush every 5 seconds

     

       46
       46
       +
       

     

       47
       47
       +
       # ============================================================================

     

       48
       48
       +
       # How to get these values:

     

       49
       49
       +
       # ============================================================================

     

       50
       50
       +
       # 1. Sign up for Grafana Cloud at https://grafana.com/

     

       51
       51
       +
       # 2. Go to your Grafana Cloud portal

     

       52
       52
       +
       # 3. For Loki:

     

       53
       53
       +
       #    - Navigate to "Connections" → "Loki"

     

       54
       54
       +
       #    - Click "Details"

     

       55
       55
       +
       #    - Copy the Push endpoint URL (without /loki/api/v1/push)

     

       56
       56
       +
       #    - Create an API token with push permissions

     

       57
       57
       +
       # 4. For Prometheus:

     

       58
       58
       +
       #    - Navigate to "Connections" → "Prometheus"

     

       59
       59
       +
       #    - Click "Details"

     

       60
       60
       +
       #    - Copy the Remote Write endpoint (add /api/prom for OTLP)

     

       61
       61
       +
       #    - Create an API token with write permissions

     

       62
       62
       +
       

     

       63
       63
       +
       # ============================================================================

     

       64
       64
       +
       # Testing the integration:

     

       65
       65
       +
       # ============================================================================

     

       66
       66
       +
       # 1. Copy this file's contents to your .env file

     

       67
       67
       +
       # 2. Fill in the actual values

     

       68
       68
       +
       # 3. Restart your services (main-app and hosting-service)

     

       69
       69
       +
       # 4. Check your Grafana Cloud dashboard for incoming data

     

       70
       70
       +
       # 5. Use Grafana Explore to query:

     

       71
       71
       +
       #    - Loki: {job="main-app"} or {job="hosting-service"}

     

       72
       72
       +
       #    - Prometheus: http_requests_total{service="main-app"}

+7 -1

apps/hosting-service/src/index.ts

···

       1
       1
        
       import app from './server';

     

       2
       2
        
       import { serve } from '@hono/node-server';

     

       3
       3
        
       import { FirehoseWorker } from './lib/firehose';

     

       4
       4
       -
       import { createLogger } from '@wisp/observability';

     

       4
       4
       +
       import { createLogger, initializeGrafanaExporters } from '@wisp/observability';

     

       5
       5
        
       import { mkdirSync, existsSync } from 'fs';

     

       6
       6
        
       import { backfillCache } from './lib/backfill';

     

       7
       7
        
       import { startDomainCacheCleanup, stopDomainCacheCleanup, setCacheOnlyMode } from './lib/db';

     

       8
       8
       +
       

     

       9
       9
       +
       // Initialize Grafana exporters if configured

     

       10
       10
       +
       initializeGrafanaExporters({

     

       11
       11
       +
         serviceName: 'hosting-service',

     

       12
       12
       +
         serviceVersion: '1.0.0'

     

       13
       13
       +
       });

     

       8
       14
        
       

     

       9
       15
        
       const logger = createLogger('hosting-service');

     

       10
       16

+473 -8

apps/hosting-service/src/lib/utils.test.ts

···

       1
       1
        
       import { describe, test, expect } from 'bun:test'

     

       2
       2
       -
       import { sanitizePath, extractBlobCid } from './utils'

     

       2
       2
       +
       import { sanitizePath, extractBlobCid, extractSubfsUris, expandSubfsNodes } from './utils'

     

       3
       3
        
       import { CID } from 'multiformats'

     

       4
       4
       +
       import { BlobRef } from '@atproto/lexicon'

     

       5
       5
       +
       import type {

     

       6
       6
       +
       	Record as WispFsRecord,

     

       7
       7
       +
       	Directory as FsDirectory,

     

       8
       8
       +
       	Entry as FsEntry,

     

       9
       9
       +
       	File as FsFile,

     

       10
       10
       +
       	Subfs as FsSubfs,

     

       11
       11
       +
       } from '@wisp/lexicons/types/place/wisp/fs'

     

       12
       12
       +
       import type {

     

       13
       13
       +
       	Record as SubfsRecord,

     

       14
       14
       +
       	Directory as SubfsDirectory,

     

       15
       15
       +
       	Entry as SubfsEntry,

     

       16
       16
       +
       	File as SubfsFile,

     

       17
       17
       +
       	Subfs as SubfsSubfs,

     

       18
       18
       +
       } from '@wisp/lexicons/types/place/wisp/subfs'

     

       19
       19
       +
       import type { $Typed } from '@wisp/lexicons/util'

     

       4
       20
        
       

     

       5
       21
        
       describe('sanitizePath', () => {

     

       6
       22
        
       	test('allows normal file paths', () => {

     
···

       31
       47
        
       

     

       32
       48
        
       	test('blocks directory traversal in middle of path', () => {

     

       33
       49
        
       		expect(sanitizePath('images/../../../etc/passwd')).toBe('images/etc/passwd')

     

       34
       34
       -
       		// Note: sanitizePath only filters out ".." segments, doesn't resolve paths

     

       35
       50
        
       		expect(sanitizePath('a/b/../c')).toBe('a/b/c')

     

       36
       51
        
       		expect(sanitizePath('a/../b/../c')).toBe('a/b/c')

     

       37
       52
        
       	})

     
···

       50
       65
        
       	})

     

       51
       66
        
       

     

       52
       67
        
       	test('blocks null bytes', () => {

     

       53
       53
       -
       		// Null bytes cause the entire segment to be filtered out

     

       54
       68
        
       		expect(sanitizePath('index.html\0.txt')).toBe('')

     

       55
       69
        
       		expect(sanitizePath('test\0')).toBe('')

     

       56
       56
       -
       		// Null byte in middle segment

     

       57
       70
        
       		expect(sanitizePath('css/bad\0name/styles.css')).toBe('css/styles.css')

     

       58
       71
        
       	})

     

       59
       72
        
       

     
···

       89
       102
        
       

     

       90
       103
        
       describe('extractBlobCid', () => {

     

       91
       104
        
       	const TEST_CID = 'bafkreid7ybejd5s2vv2j7d4aajjlmdgazguemcnuliiyfn6coxpwp2mi6y'

     

       92
       92
       -
       	

     

       105
       105
       +
       

     

       93
       106
        
       	test('extracts CID from IPLD link', () => {

     

       94
       107
        
       		const blobRef = { $link: TEST_CID }

     

       95
       108
        
       		expect(extractBlobCid(blobRef)).toBe(TEST_CID)

     
···

       103
       116
        
       	})

     

       104
       117
        
       

     

       105
       118
        
       	test('extracts CID from typed BlobRef with IPLD link', () => {

     

       106
       106
       -
       		const blobRef = { 

     

       119
       119
       +
       		const blobRef = {

     

       107
       120
        
       			ref: { $link: TEST_CID }

     

       108
       121
        
       		}

     

       109
       122
        
       		expect(extractBlobCid(blobRef)).toBe(TEST_CID)

     
···

       129
       142
        
       	})

     

       130
       143
        
       

     

       131
       144
        
       	test('handles nested structures from AT Proto API', () => {

     

       132
       132
       -
       		// Real structure from AT Proto

     

       133
       145
        
       		const blobRef = {

     

       134
       146
        
       			$type: 'blob',

     

       135
       147
        
       			ref: CID.parse(TEST_CID),

     
···

       150
       162
        
       	})

     

       151
       163
        
       

     

       152
       164
        
       	test('prioritizes checking IPLD link first', () => {

     

       153
       153
       -
       		// Direct $link takes precedence

     

       154
       165
        
       		const directLink = { $link: TEST_CID }

     

       155
       166
        
       		expect(extractBlobCid(directLink)).toBe(TEST_CID)

     

       156
       167
        
       	})

     
···

       167
       178
        
       		expect(extractBlobCid(blobRef)).toBe(cidV1)

     

       168
       179
        
       	})

     

       169
       180
        
       })

     

       181
       181
       +
       

     

       182
       182
       +
       const TEST_CID_BASE = 'bafkreid7ybejd5s2vv2j7d4aajjlmdgazguemcnuliiyfn6coxpwp2mi6y'

     

       183
       183
       +
       

     

       184
       184
       +
       function createMockBlobRef(cidSuffix: string = '', size: number = 100, mimeType: string = 'text/plain'): BlobRef {

     

       185
       185
       +
       	const cidString = TEST_CID_BASE

     

       186
       186
       +
       	return new BlobRef(CID.parse(cidString), mimeType, size)

     

       187
       187
       +
       }

     

       188
       188
       +
       

     

       189
       189
       +
       function createFsFile(

     

       190
       190
       +
       	name: string,

     

       191
       191
       +
       	options: { mimeType?: string; size?: number; encoding?: 'gzip'; base64?: boolean } = {}

     

       192
       192
       +
       ): FsEntry {

     

       193
       193
       +
       	const { mimeType = 'text/plain', size = 100, encoding, base64 } = options

     

       194
       194
       +
       	const file: $Typed<FsFile, 'place.wisp.fs#file'> = {

     

       195
       195
       +
       		$type: 'place.wisp.fs#file',

     

       196
       196
       +
       		type: 'file',

     

       197
       197
       +
       		blob: createMockBlobRef(name.replace(/[^a-z0-9]/gi, ''), size, mimeType),

     

       198
       198
       +
       		...(encoding && { encoding }),

     

       199
       199
       +
       		...(mimeType && { mimeType }),

     

       200
       200
       +
       		...(base64 && { base64 }),

     

       201
       201
       +
       	}

     

       202
       202
       +
       	return { name, node: file }

     

       203
       203
       +
       }

     

       204
       204
       +
       

     

       205
       205
       +
       function createFsDirectory(name: string, entries: FsEntry[]): FsEntry {

     

       206
       206
       +
       	const dir: $Typed<FsDirectory, 'place.wisp.fs#directory'> = {

     

       207
       207
       +
       		$type: 'place.wisp.fs#directory',

     

       208
       208
       +
       		type: 'directory',

     

       209
       209
       +
       		entries,

     

       210
       210
       +
       	}

     

       211
       211
       +
       	return { name, node: dir }

     

       212
       212
       +
       }

     

       213
       213
       +
       

     

       214
       214
       +
       function createFsSubfs(name: string, subject: string, flat: boolean = true): FsEntry {

     

       215
       215
       +
       	const subfs: $Typed<FsSubfs, 'place.wisp.fs#subfs'> = {

     

       216
       216
       +
       		$type: 'place.wisp.fs#subfs',

     

       217
       217
       +
       		type: 'subfs',

     

       218
       218
       +
       		subject,

     

       219
       219
       +
       		flat,

     

       220
       220
       +
       	}

     

       221
       221
       +
       	return { name, node: subfs }

     

       222
       222
       +
       }

     

       223
       223
       +
       

     

       224
       224
       +
       function createFsRootDirectory(entries: FsEntry[]): FsDirectory {

     

       225
       225
       +
       	return {

     

       226
       226
       +
       		$type: 'place.wisp.fs#directory',

     

       227
       227
       +
       		type: 'directory',

     

       228
       228
       +
       		entries,

     

       229
       229
       +
       	}

     

       230
       230
       +
       }

     

       231
       231
       +
       

     

       232
       232
       +
       function createFsRecord(site: string, entries: FsEntry[], fileCount?: number): WispFsRecord {

     

       233
       233
       +
       	return {

     

       234
       234
       +
       		$type: 'place.wisp.fs',

     

       235
       235
       +
       		site,

     

       236
       236
       +
       		root: createFsRootDirectory(entries),

     

       237
       237
       +
       		...(fileCount !== undefined && { fileCount }),

     

       238
       238
       +
       		createdAt: new Date().toISOString(),

     

       239
       239
       +
       	}

     

       240
       240
       +
       }

     

       241
       241
       +
       

     

       242
       242
       +
       function createSubfsFile(

     

       243
       243
       +
       	name: string,

     

       244
       244
       +
       	options: { mimeType?: string; size?: number; encoding?: 'gzip'; base64?: boolean } = {}

     

       245
       245
       +
       ): SubfsEntry {

     

       246
       246
       +
       	const { mimeType = 'text/plain', size = 100, encoding, base64 } = options

     

       247
       247
       +
       	const file: $Typed<SubfsFile, 'place.wisp.subfs#file'> = {

     

       248
       248
       +
       		$type: 'place.wisp.subfs#file',

     

       249
       249
       +
       		type: 'file',

     

       250
       250
       +
       		blob: createMockBlobRef(name.replace(/[^a-z0-9]/gi, ''), size, mimeType),

     

       251
       251
       +
       		...(encoding && { encoding }),

     

       252
       252
       +
       		...(mimeType && { mimeType }),

     

       253
       253
       +
       		...(base64 && { base64 }),

     

       254
       254
       +
       	}

     

       255
       255
       +
       	return { name, node: file }

     

       256
       256
       +
       }

     

       257
       257
       +
       

     

       258
       258
       +
       function createSubfsDirectory(name: string, entries: SubfsEntry[]): SubfsEntry {

     

       259
       259
       +
       	const dir: $Typed<SubfsDirectory, 'place.wisp.subfs#directory'> = {

     

       260
       260
       +
       		$type: 'place.wisp.subfs#directory',

     

       261
       261
       +
       		type: 'directory',

     

       262
       262
       +
       		entries,

     

       263
       263
       +
       	}

     

       264
       264
       +
       	return { name, node: dir }

     

       265
       265
       +
       }

     

       266
       266
       +
       

     

       267
       267
       +
       function createSubfsSubfs(name: string, subject: string): SubfsEntry {

     

       268
       268
       +
       	const subfs: $Typed<SubfsSubfs, 'place.wisp.subfs#subfs'> = {

     

       269
       269
       +
       		$type: 'place.wisp.subfs#subfs',

     

       270
       270
       +
       		type: 'subfs',

     

       271
       271
       +
       		subject,

     

       272
       272
       +
       	}

     

       273
       273
       +
       	return { name, node: subfs }

     

       274
       274
       +
       }

     

       275
       275
       +
       

     

       276
       276
       +
       function createSubfsRootDirectory(entries: SubfsEntry[]): SubfsDirectory {

     

       277
       277
       +
       	return {

     

       278
       278
       +
       		$type: 'place.wisp.subfs#directory',

     

       279
       279
       +
       		type: 'directory',

     

       280
       280
       +
       		entries,

     

       281
       281
       +
       	}

     

       282
       282
       +
       }

     

       283
       283
       +
       

     

       284
       284
       +
       function createSubfsRecord(entries: SubfsEntry[], fileCount?: number): SubfsRecord {

     

       285
       285
       +
       	return {

     

       286
       286
       +
       		$type: 'place.wisp.subfs',

     

       287
       287
       +
       		root: createSubfsRootDirectory(entries),

     

       288
       288
       +
       		...(fileCount !== undefined && { fileCount }),

     

       289
       289
       +
       		createdAt: new Date().toISOString(),

     

       290
       290
       +
       	}

     

       291
       291
       +
       }

     

       292
       292
       +
       

     

       293
       293
       +
       describe('extractSubfsUris', () => {

     

       294
       294
       +
       	test('extracts subfs URIs from flat directory structure', () => {

     

       295
       295
       +
       		const subfsUri = 'at://did:plc:test/place.wisp.subfs/a'

     

       296
       296
       +
       		const dir = createFsRootDirectory([

     

       297
       297
       +
       			createFsSubfs('a', subfsUri),

     

       298
       298
       +
       			createFsFile('file.txt'),

     

       299
       299
       +
       		])

     

       300
       300
       +
       

     

       301
       301
       +
       		const uris = extractSubfsUris(dir)

     

       302
       302
       +
       

     

       303
       303
       +
       		expect(uris).toHaveLength(1)

     

       304
       304
       +
       		expect(uris[0]).toEqual({ uri: subfsUri, path: 'a' })

     

       305
       305
       +
       	})

     

       306
       306
       +
       

     

       307
       307
       +
       	test('extracts subfs URIs from nested directory structure', () => {

     

       308
       308
       +
       		const subfsAUri = 'at://did:plc:test/place.wisp.subfs/a'

     

       309
       309
       +
       		const subfsBUri = 'at://did:plc:test/place.wisp.subfs/b'

     

       310
       310
       +
       

     

       311
       311
       +
       		const dir = createFsRootDirectory([

     

       312
       312
       +
       			createFsSubfs('a', subfsAUri),

     

       313
       313
       +
       			createFsDirectory('nested', [

     

       314
       314
       +
       				createFsSubfs('b', subfsBUri),

     

       315
       315
       +
       				createFsFile('file.txt'),

     

       316
       316
       +
       			]),

     

       317
       317
       +
       		])

     

       318
       318
       +
       

     

       319
       319
       +
       		const uris = extractSubfsUris(dir)

     

       320
       320
       +
       

     

       321
       321
       +
       		expect(uris).toHaveLength(2)

     

       322
       322
       +
       		expect(uris).toContainEqual({ uri: subfsAUri, path: 'a' })

     

       323
       323
       +
       		expect(uris).toContainEqual({ uri: subfsBUri, path: 'nested/b' })

     

       324
       324
       +
       	})

     

       325
       325
       +
       

     

       326
       326
       +
       	test('returns empty array when no subfs nodes exist', () => {

     

       327
       327
       +
       		const dir = createFsRootDirectory([

     

       328
       328
       +
       			createFsFile('file1.txt'),

     

       329
       329
       +
       			createFsDirectory('dir', [createFsFile('file2.txt')]),

     

       330
       330
       +
       		])

     

       331
       331
       +
       

     

       332
       332
       +
       		const uris = extractSubfsUris(dir)

     

       333
       333
       +
       		expect(uris).toHaveLength(0)

     

       334
       334
       +
       	})

     

       335
       335
       +
       

     

       336
       336
       +
       	test('handles deeply nested subfs', () => {

     

       337
       337
       +
       		const subfsUri = 'at://did:plc:test/place.wisp.subfs/deep'

     

       338
       338
       +
       		const dir = createFsRootDirectory([

     

       339
       339
       +
       			createFsDirectory('a', [

     

       340
       340
       +
       				createFsDirectory('b', [

     

       341
       341
       +
       					createFsDirectory('c', [

     

       342
       342
       +
       						createFsSubfs('deep', subfsUri),

     

       343
       343
       +
       					]),

     

       344
       344
       +
       				]),

     

       345
       345
       +
       			]),

     

       346
       346
       +
       		])

     

       347
       347
       +
       

     

       348
       348
       +
       		const uris = extractSubfsUris(dir)

     

       349
       349
       +
       

     

       350
       350
       +
       		expect(uris).toHaveLength(1)

     

       351
       351
       +
       		expect(uris[0]).toEqual({ uri: subfsUri, path: 'a/b/c/deep' })

     

       352
       352
       +
       	})

     

       353
       353
       +
       })

     

       354
       354
       +
       

     

       355
       355
       +
       describe('expandSubfsNodes caching', () => {

     

       356
       356
       +
       	test('cache map is populated after expansion', async () => {

     

       357
       357
       +
       		const subfsCache = new Map<string, SubfsRecord | null>()

     

       358
       358
       +
       		const dir = createFsRootDirectory([createFsFile('file.txt')])

     

       359
       359
       +
       

     

       360
       360
       +
       		const result = await expandSubfsNodes(dir, 'https://pds.example.com', 0, subfsCache)

     

       361
       361
       +
       

     

       362
       362
       +
       		expect(subfsCache.size).toBe(0)

     

       363
       363
       +
       		expect(result.entries).toHaveLength(1)

     

       364
       364
       +
       		expect(result.entries[0]?.name).toBe('file.txt')

     

       365
       365
       +
       	})

     

       366
       366
       +
       

     

       367
       367
       +
       	test('cache is passed through recursion depths', async () => {

     

       368
       368
       +
       		const subfsCache = new Map<string, SubfsRecord | null>()

     

       369
       369
       +
       		const mockSubfsUri = 'at://did:plc:test/place.wisp.subfs/cached'

     

       370
       370
       +
       		const mockRecord = createSubfsRecord([createSubfsFile('cached-file.txt')])

     

       371
       371
       +
       		subfsCache.set(mockSubfsUri, mockRecord)

     

       372
       372
       +
       

     

       373
       373
       +
       		const dir = createFsRootDirectory([createFsSubfs('cached', mockSubfsUri)])

     

       374
       374
       +
       		const result = await expandSubfsNodes(dir, 'https://pds.example.com', 0, subfsCache)

     

       375
       375
       +
       

     

       376
       376
       +
       		expect(subfsCache.has(mockSubfsUri)).toBe(true)

     

       377
       377
       +
       		expect(result.entries).toHaveLength(1)

     

       378
       378
       +
       		expect(result.entries[0]?.name).toBe('cached-file.txt')

     

       379
       379
       +
       	})

     

       380
       380
       +
       

     

       381
       381
       +
       	test('pre-populated cache prevents re-fetching', async () => {

     

       382
       382
       +
       		const subfsCache = new Map<string, SubfsRecord | null>()

     

       383
       383
       +
       		const subfsAUri = 'at://did:plc:test/place.wisp.subfs/a'

     

       384
       384
       +
       		const subfsBUri = 'at://did:plc:test/place.wisp.subfs/b'

     

       385
       385
       +
       

     

       386
       386
       +
       		subfsCache.set(subfsAUri, createSubfsRecord([createSubfsSubfs('b', subfsBUri)]))

     

       387
       387
       +
       		subfsCache.set(subfsBUri, createSubfsRecord([createSubfsFile('final.txt')]))

     

       388
       388
       +
       

     

       389
       389
       +
       		const dir = createFsRootDirectory([createFsSubfs('a', subfsAUri)])

     

       390
       390
       +
       		const result = await expandSubfsNodes(dir, 'https://pds.example.com', 0, subfsCache)

     

       391
       391
       +
       

     

       392
       392
       +
       		expect(result.entries).toHaveLength(1)

     

       393
       393
       +
       		expect(result.entries[0]?.name).toBe('final.txt')

     

       394
       394
       +
       	})

     

       395
       395
       +
       

     

       396
       396
       +
       	test('diamond dependency uses cache for shared reference', async () => {

     

       397
       397
       +
       		const subfsCache = new Map<string, SubfsRecord | null>()

     

       398
       398
       +
       		const subfsAUri = 'at://did:plc:test/place.wisp.subfs/a'

     

       399
       399
       +
       		const subfsBUri = 'at://did:plc:test/place.wisp.subfs/b'

     

       400
       400
       +
       		const subfsCUri = 'at://did:plc:test/place.wisp.subfs/c'

     

       401
       401
       +
       

     

       402
       402
       +
       		subfsCache.set(subfsAUri, createSubfsRecord([createSubfsSubfs('c', subfsCUri)]))

     

       403
       403
       +
       		subfsCache.set(subfsBUri, createSubfsRecord([createSubfsSubfs('c', subfsCUri)]))

     

       404
       404
       +
       		subfsCache.set(subfsCUri, createSubfsRecord([createSubfsFile('shared.txt')]))

     

       405
       405
       +
       

     

       406
       406
       +
       		const dir = createFsRootDirectory([

     

       407
       407
       +
       			createFsSubfs('a', subfsAUri),

     

       408
       408
       +
       			createFsSubfs('b', subfsBUri),

     

       409
       409
       +
       		])

     

       410
       410
       +
       		const result = await expandSubfsNodes(dir, 'https://pds.example.com', 0, subfsCache)

     

       411
       411
       +
       

     

       412
       412
       +
       		expect(result.entries.filter(e => e.name === 'shared.txt')).toHaveLength(2)

     

       413
       413
       +
       	})

     

       414
       414
       +
       

     

       415
       415
       +
       	test('handles null records in cache gracefully', async () => {

     

       416
       416
       +
       		const subfsCache = new Map<string, SubfsRecord | null>()

     

       417
       417
       +
       		const subfsUri = 'at://did:plc:test/place.wisp.subfs/missing'

     

       418
       418
       +
       		subfsCache.set(subfsUri, null)

     

       419
       419
       +
       

     

       420
       420
       +
       		const dir = createFsRootDirectory([

     

       421
       421
       +
       			createFsFile('file.txt'),

     

       422
       422
       +
       			createFsSubfs('missing', subfsUri),

     

       423
       423
       +
       		])

     

       424
       424
       +
       		const result = await expandSubfsNodes(dir, 'https://pds.example.com', 0, subfsCache)

     

       425
       425
       +
       

     

       426
       426
       +
       		expect(result.entries.some(e => e.name === 'file.txt')).toBe(true)

     

       427
       427
       +
       		expect(result.entries.some(e => e.name === 'missing')).toBe(true)

     

       428
       428
       +
       	})

     

       429
       429
       +
       

     

       430
       430
       +
       	test('non-flat subfs merge creates directory instead of hoisting', async () => {

     

       431
       431
       +
       		const subfsCache = new Map<string, SubfsRecord | null>()

     

       432
       432
       +
       		const subfsUri = 'at://did:plc:test/place.wisp.subfs/nested'

     

       433
       433
       +
       		subfsCache.set(subfsUri, createSubfsRecord([createSubfsFile('nested-file.txt')]))

     

       434
       434
       +
       

     

       435
       435
       +
       		const dir = createFsRootDirectory([

     

       436
       436
       +
       			createFsFile('root.txt'),

     

       437
       437
       +
       			createFsSubfs('subdir', subfsUri, false),

     

       438
       438
       +
       		])

     

       439
       439
       +
       		const result = await expandSubfsNodes(dir, 'https://pds.example.com', 0, subfsCache)

     

       440
       440
       +
       

     

       441
       441
       +
       		expect(result.entries).toHaveLength(2)

     

       442
       442
       +
       

     

       443
       443
       +
       		const rootFile = result.entries.find(e => e.name === 'root.txt')

     

       444
       444
       +
       		expect(rootFile).toBeDefined()

     

       445
       445
       +
       

     

       446
       446
       +
       		const subdir = result.entries.find(e => e.name === 'subdir')

     

       447
       447
       +
       		expect(subdir).toBeDefined()

     

       448
       448
       +
       

     

       449
       449
       +
       		if (subdir && 'entries' in subdir.node) {

     

       450
       450
       +
       			expect(subdir.node.type).toBe('directory')

     

       451
       451
       +
       			expect(subdir.node.entries).toHaveLength(1)

     

       452
       452
       +
       			expect(subdir.node.entries[0]?.name).toBe('nested-file.txt')

     

       453
       453
       +
       		}

     

       454
       454
       +
       	})

     

       455
       455
       +
       })

     

       456
       456
       +
       

     

       457
       457
       +
       describe('WispFsRecord mock builders', () => {

     

       458
       458
       +
       	test('createFsRecord creates valid record structure', () => {

     

       459
       459
       +
       		const record = createFsRecord('my-site', [

     

       460
       460
       +
       			createFsFile('index.html', { mimeType: 'text/html' }),

     

       461
       461
       +
       			createFsDirectory('assets', [

     

       462
       462
       +
       				createFsFile('style.css', { mimeType: 'text/css' }),

     

       463
       463
       +
       			]),

     

       464
       464
       +
       		])

     

       465
       465
       +
       

     

       466
       466
       +
       		expect(record.$type).toBe('place.wisp.fs')

     

       467
       467
       +
       		expect(record.site).toBe('my-site')

     

       468
       468
       +
       		expect(record.root.type).toBe('directory')

     

       469
       469
       +
       		expect(record.root.entries).toHaveLength(2)

     

       470
       470
       +
       		expect(record.createdAt).toBeDefined()

     

       471
       471
       +
       	})

     

       472
       472
       +
       

     

       473
       473
       +
       	test('createFsFile creates valid file entry', () => {

     

       474
       474
       +
       		const entry = createFsFile('test.html', { mimeType: 'text/html', size: 500 })

     

       475
       475
       +
       

     

       476
       476
       +
       		expect(entry.name).toBe('test.html')

     

       477
       477
       +
       

     

       478
       478
       +
       		const file = entry.node

     

       479
       479
       +
       		if ('blob' in file) {

     

       480
       480
       +
       			expect(file.$type).toBe('place.wisp.fs#file')

     

       481
       481
       +
       			expect(file.type).toBe('file')

     

       482
       482
       +
       			expect(file.blob).toBeDefined()

     

       483
       483
       +
       			expect(file.mimeType).toBe('text/html')

     

       484
       484
       +
       		}

     

       485
       485
       +
       	})

     

       486
       486
       +
       

     

       487
       487
       +
       	test('createFsFile with gzip encoding', () => {

     

       488
       488
       +
       		const entry = createFsFile('bundle.js', { mimeType: 'application/javascript', encoding: 'gzip' })

     

       489
       489
       +
       

     

       490
       490
       +
       		const file = entry.node

     

       491
       491
       +
       		if ('encoding' in file) {

     

       492
       492
       +
       			expect(file.encoding).toBe('gzip')

     

       493
       493
       +
       		}

     

       494
       494
       +
       	})

     

       495
       495
       +
       

     

       496
       496
       +
       	test('createFsFile with base64 flag', () => {

     

       497
       497
       +
       		const entry = createFsFile('data.bin', { base64: true })

     

       498
       498
       +
       

     

       499
       499
       +
       		const file = entry.node

     

       500
       500
       +
       		if ('base64' in file) {

     

       501
       501
       +
       			expect(file.base64).toBe(true)

     

       502
       502
       +
       		}

     

       503
       503
       +
       	})

     

       504
       504
       +
       

     

       505
       505
       +
       	test('createFsDirectory creates valid directory entry', () => {

     

       506
       506
       +
       		const entry = createFsDirectory('assets', [

     

       507
       507
       +
       			createFsFile('file1.txt'),

     

       508
       508
       +
       			createFsFile('file2.txt'),

     

       509
       509
       +
       		])

     

       510
       510
       +
       

     

       511
       511
       +
       		expect(entry.name).toBe('assets')

     

       512
       512
       +
       

     

       513
       513
       +
       		const dir = entry.node

     

       514
       514
       +
       		if ('entries' in dir) {

     

       515
       515
       +
       			expect(dir.$type).toBe('place.wisp.fs#directory')

     

       516
       516
       +
       			expect(dir.type).toBe('directory')

     

       517
       517
       +
       			expect(dir.entries).toHaveLength(2)

     

       518
       518
       +
       		}

     

       519
       519
       +
       	})

     

       520
       520
       +
       

     

       521
       521
       +
       	test('createFsSubfs creates valid subfs entry with flat=true', () => {

     

       522
       522
       +
       		const entry = createFsSubfs('external', 'at://did:plc:test/place.wisp.subfs/ext')

     

       523
       523
       +
       

     

       524
       524
       +
       		expect(entry.name).toBe('external')

     

       525
       525
       +
       

     

       526
       526
       +
       		const subfs = entry.node

     

       527
       527
       +
       		if ('subject' in subfs) {

     

       528
       528
       +
       			expect(subfs.$type).toBe('place.wisp.fs#subfs')

     

       529
       529
       +
       			expect(subfs.type).toBe('subfs')

     

       530
       530
       +
       			expect(subfs.subject).toBe('at://did:plc:test/place.wisp.subfs/ext')

     

       531
       531
       +
       			expect(subfs.flat).toBe(true)

     

       532
       532
       +
       		}

     

       533
       533
       +
       	})

     

       534
       534
       +
       

     

       535
       535
       +
       	test('createFsSubfs creates valid subfs entry with flat=false', () => {

     

       536
       536
       +
       		const entry = createFsSubfs('external', 'at://did:plc:test/place.wisp.subfs/ext', false)

     

       537
       537
       +
       

     

       538
       538
       +
       		const subfs = entry.node

     

       539
       539
       +
       		if ('subject' in subfs) {

     

       540
       540
       +
       			expect(subfs.flat).toBe(false)

     

       541
       541
       +
       		}

     

       542
       542
       +
       	})

     

       543
       543
       +
       

     

       544
       544
       +
       	test('createFsRecord with fileCount', () => {

     

       545
       545
       +
       		const record = createFsRecord('my-site', [createFsFile('index.html')], 1)

     

       546
       546
       +
       		expect(record.fileCount).toBe(1)

     

       547
       547
       +
       	})

     

       548
       548
       +
       })

     

       549
       549
       +
       

     

       550
       550
       +
       describe('SubfsRecord mock builders', () => {

     

       551
       551
       +
       	test('createSubfsRecord creates valid record structure', () => {

     

       552
       552
       +
       		const record = createSubfsRecord([

     

       553
       553
       +
       			createSubfsFile('file1.txt'),

     

       554
       554
       +
       			createSubfsDirectory('nested', [

     

       555
       555
       +
       				createSubfsFile('file2.txt'),

     

       556
       556
       +
       			]),

     

       557
       557
       +
       		])

     

       558
       558
       +
       

     

       559
       559
       +
       		expect(record.$type).toBe('place.wisp.subfs')

     

       560
       560
       +
       		expect(record.root.type).toBe('directory')

     

       561
       561
       +
       		expect(record.root.entries).toHaveLength(2)

     

       562
       562
       +
       		expect(record.createdAt).toBeDefined()

     

       563
       563
       +
       	})

     

       564
       564
       +
       

     

       565
       565
       +
       	test('createSubfsFile creates valid file entry', () => {

     

       566
       566
       +
       		const entry = createSubfsFile('data.json', { mimeType: 'application/json', size: 1024 })

     

       567
       567
       +
       

     

       568
       568
       +
       		expect(entry.name).toBe('data.json')

     

       569
       569
       +
       

     

       570
       570
       +
       		const file = entry.node

     

       571
       571
       +
       		if ('blob' in file) {

     

       572
       572
       +
       			expect(file.$type).toBe('place.wisp.subfs#file')

     

       573
       573
       +
       			expect(file.type).toBe('file')

     

       574
       574
       +
       			expect(file.blob).toBeDefined()

     

       575
       575
       +
       			expect(file.mimeType).toBe('application/json')

     

       576
       576
       +
       		}

     

       577
       577
       +
       	})

     

       578
       578
       +
       

     

       579
       579
       +
       	test('createSubfsDirectory creates valid directory entry', () => {

     

       580
       580
       +
       		const entry = createSubfsDirectory('subdir', [createSubfsFile('inner.txt')])

     

       581
       581
       +
       

     

       582
       582
       +
       		expect(entry.name).toBe('subdir')

     

       583
       583
       +
       

     

       584
       584
       +
       		const dir = entry.node

     

       585
       585
       +
       		if ('entries' in dir) {

     

       586
       586
       +
       			expect(dir.$type).toBe('place.wisp.subfs#directory')

     

       587
       587
       +
       			expect(dir.type).toBe('directory')

     

       588
       588
       +
       			expect(dir.entries).toHaveLength(1)

     

       589
       589
       +
       		}

     

       590
       590
       +
       	})

     

       591
       591
       +
       

     

       592
       592
       +
       	test('createSubfsSubfs creates valid nested subfs entry', () => {

     

       593
       593
       +
       		const entry = createSubfsSubfs('deeper', 'at://did:plc:test/place.wisp.subfs/deeper')

     

       594
       594
       +
       

     

       595
       595
       +
       		expect(entry.name).toBe('deeper')

     

       596
       596
       +
       

     

       597
       597
       +
       		const subfs = entry.node

     

       598
       598
       +
       		if ('subject' in subfs) {

     

       599
       599
       +
       			expect(subfs.$type).toBe('place.wisp.subfs#subfs')

     

       600
       600
       +
       			expect(subfs.type).toBe('subfs')

     

       601
       601
       +
       			expect(subfs.subject).toBe('at://did:plc:test/place.wisp.subfs/deeper')

     

       602
       602
       +
       			expect('flat' in subfs).toBe(false)

     

       603
       603
       +
       		}

     

       604
       604
       +
       	})

     

       605
       605
       +
       

     

       606
       606
       +
       	test('createSubfsRecord with fileCount', () => {

     

       607
       607
       +
       		const record = createSubfsRecord([createSubfsFile('file.txt')], 1)

     

       608
       608
       +
       		expect(record.fileCount).toBe(1)

     

       609
       609
       +
       	})

     

       610
       610
       +
       })

     

       611
       611
       +
       

     

       612
       612
       +
       describe('extractBlobCid with typed mock data', () => {

     

       613
       613
       +
       	test('extracts CID from FsFile blob', () => {

     

       614
       614
       +
       		const entry = createFsFile('test.txt')

     

       615
       615
       +
       		const file = entry.node

     

       616
       616
       +
       

     

       617
       617
       +
       		if ('blob' in file) {

     

       618
       618
       +
       			const cid = extractBlobCid(file.blob)

     

       619
       619
       +
       			expect(cid).toBeDefined()

     

       620
       620
       +
       			expect(cid).toContain('bafkrei')

     

       621
       621
       +
       		}

     

       622
       622
       +
       	})

     

       623
       623
       +
       

     

       624
       624
       +
       	test('extracts CID from SubfsFile blob', () => {

     

       625
       625
       +
       		const entry = createSubfsFile('test.txt')

     

       626
       626
       +
       		const file = entry.node

     

       627
       627
       +
       

     

       628
       628
       +
       		if ('blob' in file) {

     

       629
       629
       +
       			const cid = extractBlobCid(file.blob)

     

       630
       630
       +
       			expect(cid).toBeDefined()

     

       631
       631
       +
       			expect(cid).toContain('bafkrei')

     

       632
       632
       +
       		}

     

       633
       633
       +
       	})

     

       634
       634
       +
       })

+33 -13

apps/hosting-service/src/lib/utils.ts

···

       149
       149
        
       /**

     

       150
       150
        
        * Extract all subfs URIs from a directory tree with their mount paths

     

       151
       151
        
        */

     

       152
       152
       -
       function extractSubfsUris(directory: Directory, currentPath: string = ''): Array<{ uri: string; path: string }> {

     

       152
       152
       +
       export function extractSubfsUris(directory: Directory, currentPath: string = ''): Array<{ uri: string; path: string }> {

     

       153
       153
        
         const uris: Array<{ uri: string; path: string }> = [];

     

       154
       154
        
       

     

       155
       155
        
         for (const entry of directory.entries) {

     
···

       209
       209
        
        * Replace subfs nodes in a directory tree with their actual content

     

       210
       210
        
        * Subfs entries are "merged" - their root entries are hoisted into the parent directory

     

       211
       211
        
        * This function is recursive - it will keep expanding until no subfs nodes remain

     

       212
       212
       +
        * Uses a cache to avoid re-fetching the same subfs records across recursion depths

     

       212
       213
        
        */

     

       213
       213
       -
       async function expandSubfsNodes(directory: Directory, pdsEndpoint: string, depth: number = 0): Promise<Directory> {

     

       214
       214
       +
       export async function expandSubfsNodes(

     

       215
       215
       +
         directory: Directory,

     

       216
       216
       +
         pdsEndpoint: string,

     

       217
       217
       +
         depth: number = 0,

     

       218
       218
       +
         subfsCache: Map<string, SubfsRecord | null> = new Map()

     

       219
       219
       +
       ): Promise<Directory> {

     

       214
       220
        
         const MAX_DEPTH = 10; // Prevent infinite loops

     

       215
       221
        
       

     

       216
       222
        
         if (depth >= MAX_DEPTH) {

     
···

       226
       232
        
           return directory;

     

       227
       233
        
         }

     

       228
       234
        
       

     

       229
       229
       -
         console.log(`[Depth ${depth}] Found ${subfsUris.length} subfs records, fetching...`);

     

       235
       235
       +
         // Filter to only URIs we haven't fetched yet

     

       236
       236
       +
         const uncachedUris = subfsUris.filter(({ uri }) => !subfsCache.has(uri));

     

       230
       237
        
       

     

       231
       231
       -
         // Fetch all subfs records in parallel

     

       232
       232
       -
         const subfsRecords = await Promise.all(

     

       233
       233
       -
           subfsUris.map(async ({ uri, path }) => {

     

       234
       234
       -
             const record = await fetchSubfsRecord(uri, pdsEndpoint);

     

       235
       235
       -
             return { record, path };

     

       236
       236
       -
           })

     

       237
       237
       -
         );

     

       238
       238
       +
         if (uncachedUris.length > 0) {

     

       239
       239
       +
           console.log(`[Depth ${depth}] Found ${subfsUris.length} subfs references, fetching ${uncachedUris.length} new records (${subfsUris.length - uncachedUris.length} cached)...`);

     

       238
       240
        
       

     

       239
       239
       -
         // Build a map of path -> root entries to merge

     

       241
       241
       +
           // Fetch only uncached subfs records in parallel

     

       242
       242
       +
           const fetchedRecords = await Promise.all(

     

       243
       243
       +
             uncachedUris.map(async ({ uri }) => {

     

       244
       244
       +
               const record = await fetchSubfsRecord(uri, pdsEndpoint);

     

       245
       245
       +
               return { uri, record };

     

       246
       246
       +
             })

     

       247
       247
       +
           );

     

       248
       248
       +
       

     

       249
       249
       +
           // Add fetched records to cache

     

       250
       250
       +
           for (const { uri, record } of fetchedRecords) {

     

       251
       251
       +
             subfsCache.set(uri, record);

     

       252
       252
       +
           }

     

       253
       253
       +
         } else {

     

       254
       254
       +
           console.log(`[Depth ${depth}] Found ${subfsUris.length} subfs references, all cached`);

     

       255
       255
       +
         }

     

       256
       256
       +
       

     

       257
       257
       +
         // Build a map of path -> root entries to merge using the cache

     

       240
       258
        
         // Note: SubFS entries are compatible with FS entries at runtime

     

       241
       259
        
         const subfsMap = new Map<string, Entry[]>();

     

       242
       242
       -
         for (const { record, path } of subfsRecords) {

     

       260
       260
       +
         for (const { uri, path } of subfsUris) {

     

       261
       261
       +
           const record = subfsCache.get(uri);

     

       243
       262
        
           if (record && record.root && record.root.entries) {

     

       244
       263
        
             subfsMap.set(path, record.root.entries as unknown as Entry[]);

     

       245
       264
        
           }

     
···

       307
       326
        
         };

     

       308
       327
        
       

     

       309
       328
        
         // Recursively expand any remaining subfs nodes (e.g., nested subfs inside parent subfs)

     

       310
       310
       -
         return expandSubfsNodes(partiallyExpanded, pdsEndpoint, depth + 1);

     

       329
       329
       +
         // Pass the cache to avoid re-fetching records

     

       330
       330
       +
         return expandSubfsNodes(partiallyExpanded, pdsEndpoint, depth + 1, subfsCache);

     

       311
       331
        
       }

     

       312
       332
        
       

     

       313
       333

+6 -5

apps/main-app/package.json

···

       11
       11
        
           "screenshot": "bun run scripts/screenshot-sites.ts"

     

       12
       12
        
         },

     

       13
       13
        
         "dependencies": {

     

       14
       14
       -
           "@atproto/api": "^0.17.3",

     

       15
       15
       -
           "@atproto/common-web": "^0.4.5",

     

       14
       14
       +
           "@atproto-labs/did-resolver": "^0.2.4",

     

       15
       15
       +
           "@atproto/api": "^0.17.7",

     

       16
       16
       +
           "@atproto/common-web": "^0.4.6",

     

       16
       17
        
           "@atproto/jwk-jose": "^0.1.11",

     

       17
       17
       -
           "@atproto/lex-cli": "^0.9.5",

     

       18
       18
       -
           "@atproto/oauth-client-node": "^0.3.9",

     

       19
       19
       -
           "@atproto/xrpc-server": "^0.9.5",

     

       18
       18
       +
           "@atproto/lex-cli": "^0.9.7",

     

       19
       19
       +
           "@atproto/oauth-client-node": "^0.3.12",

     

       20
       20
       +
           "@atproto/xrpc-server": "^0.9.6",

     

       20
       21
        
           "@elysiajs/cors": "^1.4.0",

     

       21
       22
        
           "@elysiajs/eden": "^1.4.3",

     

       22
       23
        
           "@elysiajs/openapi": "^1.4.11",

+7 -1

apps/main-app/src/index.ts

···

       20
       20
        
       import { siteRoutes } from './routes/site'

     

       21
       21
        
       import { csrfProtection } from './lib/csrf'

     

       22
       22
        
       import { DNSVerificationWorker } from './lib/dns-verification-worker'

     

       23
       23
       -
       import { createLogger, logCollector } from '@wisp/observability'

     

       23
       23
       +
       import { createLogger, logCollector, initializeGrafanaExporters } from '@wisp/observability'

     

       24
       24
        
       import { observabilityMiddleware } from '@wisp/observability/middleware/elysia'

     

       25
       25
        
       import { promptAdminSetup } from './lib/admin-auth'

     

       26
       26
        
       import { adminRoutes } from './routes/admin'

     

       27
       27
       +
       

     

       28
       28
       +
       // Initialize Grafana exporters if configured

     

       29
       29
       +
       initializeGrafanaExporters({

     

       30
       30
       +
       	serviceName: 'main-app',

     

       31
       31
       +
       	serviceVersion: '1.0.50'

     

       32
       32
       +
       })

     

       27
       33
        
       

     

       28
       34
        
       const logger = createLogger('main-app')

     

       29
       35

+5 -4

apps/main-app/src/lib/oauth-client.ts

···

       4
       4
        
       import { logger } from "./logger";

     

       5
       5
        
       import { SlingshotHandleResolver } from "./slingshot-handle-resolver";

     

       6
       6
        
       

     

       7
       7
       +
       // OAuth scope for all client types

     

       8
       8
       +
       const OAUTH_SCOPE = 'atproto repo:place.wisp.fs repo:place.wisp.domain repo:place.wisp.subfs repo:place.wisp.settings blob:*/*';

     

       7
       9
        
       // Session timeout configuration (30 days in seconds)

     

       8
       10
        
       const SESSION_TIMEOUT = 30 * 24 * 60 * 60; // 2592000 seconds

     

       9
       11
        
       // OAuth state timeout (1 hour in seconds)

     
···

       110
       112
        
               // Loopback client for local development

     

       111
       113
        
               // For loopback, scopes and redirect_uri must be in client_id query string

     

       112
       114
        
               const redirectUri = 'http://127.0.0.1:8000/api/auth/callback';

     

       113
       113
       -
               const scope = 'atproto repo:place.wisp.fs repo:place.wisp.domain repo:place.wisp.subfs repo:place.wisp.settings blob:*/* rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app#bsky_appview';

     

       114
       115
        
               const params = new URLSearchParams();

     

       115
       116
        
               params.append('redirect_uri', redirectUri);

     

       116
       116
       -
               params.append('scope', scope);

     

       117
       117
       +
               params.append('scope', OAUTH_SCOPE);

     

       117
       118
        
       

     

       118
       119
        
               return {

     

       119
       120
        
                   client_id: `http://localhost?${params.toString()}`,

     
···

       124
       125
        
                   response_types: ['code'],

     

       125
       126
        
                   application_type: 'web',

     

       126
       127
        
                   token_endpoint_auth_method: 'none',

     

       127
       127
       -
                   scope: scope,

     

       128
       128
       +
                   scope: OAUTH_SCOPE,

     

       128
       129
        
                   dpop_bound_access_tokens: false,

     

       129
       130
        
                   subject_type: 'public',

     

       130
       131
        
                   authorization_signed_response_alg: 'ES256'

     
···

       145
       146
        
               application_type: 'web',

     

       146
       147
        
               token_endpoint_auth_method: 'private_key_jwt',

     

       147
       148
        
               token_endpoint_auth_signing_alg: "ES256",

     

       148
       148
       -
               scope: "atproto repo:place.wisp.fs repo:place.wisp.domain repo:place.wisp.subfs repo:place.wisp.settings blob:*/* rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app#bsky_appview",

     

       149
       149
       +
               scope: OAUTH_SCOPE,

     

       149
       150
        
               dpop_bound_access_tokens: true,

     

       150
       151
        
               jwks_uri: `${config.domain}/jwks.json`,

     

       151
       152
        
               subject_type: 'public',

+10 -12

apps/main-app/src/routes/user.ts

···

       1
       1
        
       import { Elysia, t } from 'elysia'

     

       2
       2
        
       import { requireAuth } from '../lib/wisp-auth'

     

       3
       3
        
       import { NodeOAuthClient } from '@atproto/oauth-client-node'

     

       4
       4
       -
       import { Agent } from '@atproto/api'

     

       5
       4
        
       import { getSitesByDid, getDomainByDid, getCustomDomainsByDid, getWispDomainInfo, getDomainsBySite, getAllWispDomains } from '../lib/db'

     

       6
       5
        
       import { syncSitesFromPDS } from '../lib/sync-sites'

     

       7
       6
        
       import { createLogger } from '@wisp/observability'

     

       7
       7
       +
       import { createDidResolver, extractAtprotoData } from '@atproto-labs/did-resolver'

     

       8
       8
        
       

     

       9
       9
        
       const logger = createLogger('main-app')

     

       10
       10
       +
       const didResolver = createDidResolver({})

     

       10
       11
        
       

     

       11
       12
        
       export const userRoutes = (client: NodeOAuthClient, cookieSecret: string) =>

     

       12
       13
        
       	new Elysia({

     
···

       42
       43
        
       		})

     

       43
       44
        
       		.get('/info', async ({ auth }) => {

     

       44
       45
        
       			try {

     

       45
       45
       -
       				// Get user's handle from AT Protocol

     

       46
       46
       -
       				const agent = new Agent(auth.session)

     

       47
       47
       -
       

     

       48
       46
        
       				let handle = 'unknown'

     

       49
       47
        
       				try {

     

       50
       50
       -
       					console.log('[User] Attempting to fetch profile for DID:', auth.did)

     

       51
       51
       -
       					const profile = await agent.getProfile({ actor: auth.did })

     

       52
       52
       -
       					console.log('[User] Profile fetched successfully:', profile.data.handle)

     

       53
       53
       -
       					handle = profile.data.handle

     

       48
       48
       +
       					const didDoc = await didResolver.resolve(auth.did)

     

       49
       49
       +
       					const atprotoData = extractAtprotoData(didDoc)

     

       50
       50
       +
       

     

       51
       51
       +
       					if (atprotoData.aka) {

     

       52
       52
       +
       						handle = atprotoData.aka

     

       53
       53
       +
       					}

     

       54
       54
        
       				} catch (err) {

     

       55
       55
       -
       					console.error('[User] Failed to fetch profile - Full error:', err)

     

       56
       56
       -
       					console.error('[User] Error message:', err instanceof Error ? err.message : String(err))

     

       57
       57
       -
       					console.error('[User] Error stack:', err instanceof Error ? err.stack : 'No stack')

     

       58
       58
       -
       					logger.error('[User] Failed to fetch profile', err)

     

       55
       55
       +
       

     

       56
       56
       +
       					logger.error('[User] Failed to resolve DID', err)

     

       59
       57
        
       				}

     

       60
       58
        
       

     

       61
       59
        
       				return {

+189 -13

bun.lock

···

       8
       8
        
               "@tailwindcss/cli": "^4.1.17",

     

       9
       9
        
               "atproto-ui": "^0.12.0",

     

       10
       10
        
               "bun-plugin-tailwind": "^0.1.2",

     

       11
       11
       +
               "elysia": "^1.4.18",

     

       11
       12
        
               "tailwindcss": "^4.1.17",

     

       12
       13
        
             },

     

       13
       14
        
           },

     
···

       45
       46
        
             "name": "@wisp/main-app",

     

       46
       47
        
             "version": "1.0.50",

     

       47
       48
        
             "dependencies": {

     

       48
       48
       -
               "@atproto/api": "^0.17.3",

     

       49
       49
       -
               "@atproto/common-web": "^0.4.5",

     

       49
       49
       +
               "@atproto-labs/did-resolver": "^0.2.4",

     

       50
       50
       +
               "@atproto/api": "^0.17.7",

     

       51
       51
       +
               "@atproto/common-web": "^0.4.6",

     

       50
       52
        
               "@atproto/jwk-jose": "^0.1.11",

     

       51
       51
       -
               "@atproto/lex-cli": "^0.9.5",

     

       52
       52
       -
               "@atproto/oauth-client-node": "^0.3.9",

     

       53
       53
       -
               "@atproto/xrpc-server": "^0.9.5",

     

       53
       53
       +
               "@atproto/lex-cli": "^0.9.7",

     

       54
       54
       +
               "@atproto/oauth-client-node": "^0.3.12",

     

       55
       55
       +
               "@atproto/xrpc-server": "^0.9.6",

     

       54
       56
        
               "@elysiajs/cors": "^1.4.0",

     

       55
       57
        
               "@elysiajs/eden": "^1.4.3",

     

       56
       58
        
               "@elysiajs/openapi": "^1.4.11",

     
···

       144
       146
        
           "packages/@wisp/observability": {

     

       145
       147
        
             "name": "@wisp/observability",

     

       146
       148
        
             "version": "1.0.0",

     

       149
       149
       +
             "dependencies": {

     

       150
       150
       +
               "@opentelemetry/api": "^1.9.0",

     

       151
       151
       +
               "@opentelemetry/exporter-metrics-otlp-http": "^0.56.0",

     

       152
       152
       +
               "@opentelemetry/resources": "^1.29.0",

     

       153
       153
       +
               "@opentelemetry/sdk-metrics": "^1.29.0",

     

       154
       154
       +
               "@opentelemetry/semantic-conventions": "^1.29.0",

     

       155
       155
       +
             },

     

       156
       156
       +
             "devDependencies": {

     

       157
       157
       +
               "@hono/node-server": "^1.19.6",

     

       158
       158
       +
               "bun-types": "^1.3.3",

     

       159
       159
       +
               "typescript": "^5.9.3",

     

       160
       160
       +
             },

     

       147
       161
        
             "peerDependencies": {

     

       148
       148
       -
               "hono": "^4.0.0",

     

       162
       162
       +
               "hono": "^4.10.7",

     

       149
       163
        
             },

     

       150
       164
        
             "optionalPeers": [

     

       151
       165
        
               "hono",

     
···

       353
       367
        
       

     

       354
       368
        
           "@opentelemetry/context-async-hooks": ["@opentelemetry/context-async-hooks@2.0.0", "", { "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-IEkJGzK1A9v3/EHjXh3s2IiFc6L4jfK+lNgKVgUjeUJQRRhnVFMIO3TAvKwonm9O1HebCuoOt98v8bZW7oVQHA=="],

     

       355
       369
        
       

     

       356
       356
       -
           "@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       370
       370
       +
           "@opentelemetry/core": ["@opentelemetry/core@1.29.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA=="],

     

       357
       371
        
       

     

       358
       372
        
           "@opentelemetry/exporter-logs-otlp-grpc": ["@opentelemetry/exporter-logs-otlp-grpc@0.200.0", "", { "dependencies": { "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-grpc-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0", "@opentelemetry/sdk-logs": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+3MDfa5YQPGM3WXxW9kqGD85Q7s9wlEMVNhXXG7tYFLnIeaseUt9YtCeFhEDFzfEktacdFpOtXmJuNW8cHbU5A=="],

     

       359
       373
        
       

     
···

       363
       377
        
       

     

       364
       378
        
           "@opentelemetry/exporter-metrics-otlp-grpc": ["@opentelemetry/exporter-metrics-otlp-grpc@0.200.0", "", { "dependencies": { "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "2.0.0", "@opentelemetry/exporter-metrics-otlp-http": "0.200.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-grpc-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-metrics": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-uHawPRvKIrhqH09GloTuYeq2BjyieYHIpiklOvxm9zhrCL2eRsnI/6g9v2BZTVtGp8tEgIa7rCQ6Ltxw6NBgew=="],

     

       365
       379
        
       

     

       366
       366
       -
           "@opentelemetry/exporter-metrics-otlp-http": ["@opentelemetry/exporter-metrics-otlp-http@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-metrics": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-5BiR6i8yHc9+qW7F6LqkuUnIzVNA7lt0qRxIKcKT+gq3eGUPHZ3DY29sfxI3tkvnwMgtnHDMNze5DdxW39HsAw=="],

     

       380
       380
       +
           "@opentelemetry/exporter-metrics-otlp-http": ["@opentelemetry/exporter-metrics-otlp-http@0.56.0", "", { "dependencies": { "@opentelemetry/core": "1.29.0", "@opentelemetry/otlp-exporter-base": "0.56.0", "@opentelemetry/otlp-transformer": "0.56.0", "@opentelemetry/resources": "1.29.0", "@opentelemetry/sdk-metrics": "1.29.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-GD5QuCT6js+mDpb5OBO6OSyCH+k2Gy3xPHJV9BnjV8W6kpSuY8y2Samzs5vl23UcGMq6sHLAbs+Eq/VYsLMiVw=="],

     

       367
       381
        
       

     

       368
       382
        
           "@opentelemetry/exporter-metrics-otlp-proto": ["@opentelemetry/exporter-metrics-otlp-proto@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/exporter-metrics-otlp-http": "0.200.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-metrics": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-E+uPj0yyvz81U9pvLZp3oHtFrEzNSqKGVkIViTQY1rH3TOobeJPSpLnTVXACnCwkPR5XeTvPnK3pZ2Kni8AFMg=="],

     

       369
       383
        
       

     
···

       379
       393
        
       

     

       380
       394
        
           "@opentelemetry/instrumentation": ["@opentelemetry/instrumentation@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@types/shimmer": "^1.2.0", "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", "shimmer": "^1.2.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-pmPlzfJd+vvgaZd/reMsC8RWgTXn2WY1OWT5RT42m3aOn5532TozwXNDhg1vzqJ+jnvmkREcdLr27ebJEQt0Jg=="],

     

       381
       395
        
       

     

       382
       382
       -
           "@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       396
       396
       +
           "@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.56.0", "", { "dependencies": { "@opentelemetry/core": "1.29.0", "@opentelemetry/otlp-transformer": "0.56.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-eURvv0fcmBE+KE1McUeRo+u0n18ZnUeSc7lDlW/dzlqFYasEbsztTK4v0Qf8C4vEY+aMTjPKUxBG0NX2Te3Pmw=="],

     

       383
       397
        
       

     

       384
       398
        
           "@opentelemetry/otlp-grpc-exporter-base": ["@opentelemetry/otlp-grpc-exporter-base@0.200.0", "", { "dependencies": { "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-CK2S+bFgOZ66Bsu5hlDeOX6cvW5FVtVjFFbWuaJP0ELxJKBB6HlbLZQ2phqz/uLj1cWap5xJr/PsR3iGoB7Vqw=="],

     

       385
       399
        
       

     

       386
       386
       -
           "@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       400
       400
       +
           "@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.56.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.56.0", "@opentelemetry/core": "1.29.0", "@opentelemetry/resources": "1.29.0", "@opentelemetry/sdk-logs": "0.56.0", "@opentelemetry/sdk-metrics": "1.29.0", "@opentelemetry/sdk-trace-base": "1.29.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-kVkH/W2W7EpgWWpyU5VnnjIdSD7Y7FljQYObAQSKdRcejiwMj2glypZtUdfq1LTJcv4ht0jyTrw1D3CCxssNtQ=="],

     

       387
       401
        
       

     

       388
       402
        
           "@opentelemetry/propagator-b3": ["@opentelemetry/propagator-b3@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-blx9S2EI49Ycuw6VZq+bkpaIoiJFhsDuvFGhBIoH3vJ5oYjJ2U0s3fAM5jYft99xVIAv6HqoPtlP9gpVA2IZtA=="],

     

       389
       403
        
       

     

       390
       404
        
           "@opentelemetry/propagator-jaeger": ["@opentelemetry/propagator-jaeger@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-Mbm/LSFyAtQKP0AQah4AfGgsD+vsZcyreZoQ5okFBk33hU7AquU4TltgyL9dvaO8/Zkoud8/0gEvwfOZ5d7EPA=="],

     

       391
       405
        
       

     

       392
       392
       -
           "@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       406
       406
       +
           "@opentelemetry/resources": ["@opentelemetry/resources@1.30.1", "", { "dependencies": { "@opentelemetry/core": "1.30.1", "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA=="],

     

       393
       407
        
       

     

       394
       408
        
           "@opentelemetry/sdk-logs": ["@opentelemetry/sdk-logs@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.4.0 <1.10.0" } }, "sha512-VZG870063NLfObmQQNtCVcdXXLzI3vOjjrRENmU37HYiPFa0ZXpXVDsTD02Nh3AT3xYJzQaWKl2X2lQ2l7TWJA=="],

     

       395
       409
        
       

     

       396
       396
       -
           "@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       410
       410
       +
           "@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@1.30.1", "", { "dependencies": { "@opentelemetry/core": "1.30.1", "@opentelemetry/resources": "1.30.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-q9zcZ0Okl8jRgmy7eNW3Ku1XSgg3sDLa5evHZpCwjspw7E8Is4K/haRPDJrBcX3YSn/Y7gUvFnByNYEKQNbNog=="],

     

       397
       411
        
       

     

       398
       412
        
           "@opentelemetry/sdk-node": ["@opentelemetry/sdk-node@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/exporter-logs-otlp-grpc": "0.200.0", "@opentelemetry/exporter-logs-otlp-http": "0.200.0", "@opentelemetry/exporter-logs-otlp-proto": "0.200.0", "@opentelemetry/exporter-metrics-otlp-grpc": "0.200.0", "@opentelemetry/exporter-metrics-otlp-http": "0.200.0", "@opentelemetry/exporter-metrics-otlp-proto": "0.200.0", "@opentelemetry/exporter-prometheus": "0.200.0", "@opentelemetry/exporter-trace-otlp-grpc": "0.200.0", "@opentelemetry/exporter-trace-otlp-http": "0.200.0", "@opentelemetry/exporter-trace-otlp-proto": "0.200.0", "@opentelemetry/exporter-zipkin": "2.0.0", "@opentelemetry/instrumentation": "0.200.0", "@opentelemetry/propagator-b3": "2.0.0", "@opentelemetry/propagator-jaeger": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "@opentelemetry/sdk-trace-node": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-S/YSy9GIswnhYoDor1RusNkmRughipvTCOQrlF1dzI70yQaf68qgf5WMnzUxdlCl3/et/pvaO75xfPfuEmCK5A=="],

     

       399
       413
        
       

     
···

       637
       651
        
       

     

       638
       652
        
           "bun-plugin-tailwind": ["bun-plugin-tailwind@0.1.2", "", { "peerDependencies": { "bun": ">=1.0.0" } }, "sha512-41jNC1tZRSK3s1o7pTNrLuQG8kL/0vR/JgiTmZAJ1eHwe0w5j6HFPKeqEk0WAD13jfrUC7+ULuewFBBCoADPpg=="],

     

       639
       653
        
       

     

       640
       640
       -
           "bun-types": ["bun-types@1.3.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-z3Xwlg7j2l9JY27x5Qn3Wlyos8YAp0kKRlrePAOjgjMGS5IG6E7Jnlx736vH9UVI4wUICwwhC9anYL++XeOgTQ=="],

     

       654
       654
       +
           "bun-types": ["bun-types@1.3.4", "", { "dependencies": { "@types/node": "*" } }, "sha512-5ua817+BZPZOlNaRgGBpZJOSAQ9RQ17pkwPD0yR7CfJg+r8DgIILByFifDTa+IPDDxzf5VNhtNlcKqFzDgJvlQ=="],

     

       641
       655
        
       

     

       642
       656
        
           "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="],

     

       643
       657
        
       

     
···

       1103
       1117
        
       

     

       1104
       1118
        
           "@ipld/dag-cbor/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="],

     

       1105
       1119
        
       

     

       1120
       1120
       +
           "@opentelemetry/core/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.28.0", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],

     

       1121
       1121
       +
       

     

       1122
       1122
       +
           "@opentelemetry/exporter-logs-otlp-grpc/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1123
       1123
       +
       

     

       1124
       1124
       +
           "@opentelemetry/exporter-logs-otlp-grpc/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1125
       1125
       +
       

     

       1126
       1126
       +
           "@opentelemetry/exporter-logs-otlp-grpc/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1127
       1127
       +
       

     

       1128
       1128
       +
           "@opentelemetry/exporter-logs-otlp-http/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1129
       1129
       +
       

     

       1130
       1130
       +
           "@opentelemetry/exporter-logs-otlp-http/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1131
       1131
       +
       

     

       1132
       1132
       +
           "@opentelemetry/exporter-logs-otlp-http/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1133
       1133
       +
       

     

       1134
       1134
       +
           "@opentelemetry/exporter-logs-otlp-proto/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1135
       1135
       +
       

     

       1136
       1136
       +
           "@opentelemetry/exporter-logs-otlp-proto/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1137
       1137
       +
       

     

       1138
       1138
       +
           "@opentelemetry/exporter-logs-otlp-proto/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1139
       1139
       +
       

     

       1140
       1140
       +
           "@opentelemetry/exporter-logs-otlp-proto/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1141
       1141
       +
       

     

       1142
       1142
       +
           "@opentelemetry/exporter-metrics-otlp-grpc/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1143
       1143
       +
       

     

       1144
       1144
       +
           "@opentelemetry/exporter-metrics-otlp-grpc/@opentelemetry/exporter-metrics-otlp-http": ["@opentelemetry/exporter-metrics-otlp-http@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-metrics": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-5BiR6i8yHc9+qW7F6LqkuUnIzVNA7lt0qRxIKcKT+gq3eGUPHZ3DY29sfxI3tkvnwMgtnHDMNze5DdxW39HsAw=="],

     

       1145
       1145
       +
       

     

       1146
       1146
       +
           "@opentelemetry/exporter-metrics-otlp-grpc/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1147
       1147
       +
       

     

       1148
       1148
       +
           "@opentelemetry/exporter-metrics-otlp-grpc/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1149
       1149
       +
       

     

       1150
       1150
       +
           "@opentelemetry/exporter-metrics-otlp-grpc/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1151
       1151
       +
       

     

       1152
       1152
       +
           "@opentelemetry/exporter-metrics-otlp-grpc/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1153
       1153
       +
       

     

       1154
       1154
       +
           "@opentelemetry/exporter-metrics-otlp-http/@opentelemetry/resources": ["@opentelemetry/resources@1.29.0", "", { "dependencies": { "@opentelemetry/core": "1.29.0", "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-s7mLXuHZE7RQr1wwweGcaRp3Q4UJJ0wazeGlc/N5/XSe6UyXfsh1UQGMADYeg7YwD+cEdMtU1yJAUXdnFzYzyQ=="],

     

       1155
       1155
       +
       

     

       1156
       1156
       +
           "@opentelemetry/exporter-metrics-otlp-http/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@1.29.0", "", { "dependencies": { "@opentelemetry/core": "1.29.0", "@opentelemetry/resources": "1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-MkVtuzDjXZaUJSuJlHn6BSXjcQlMvHcsDV7LjY4P6AJeffMa4+kIGDjzsCf6DkAh6Vqlwag5EWEam3KZOX5Drw=="],

     

       1157
       1157
       +
       

     

       1158
       1158
       +
           "@opentelemetry/exporter-metrics-otlp-proto/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1159
       1159
       +
       

     

       1160
       1160
       +
           "@opentelemetry/exporter-metrics-otlp-proto/@opentelemetry/exporter-metrics-otlp-http": ["@opentelemetry/exporter-metrics-otlp-http@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-metrics": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-5BiR6i8yHc9+qW7F6LqkuUnIzVNA7lt0qRxIKcKT+gq3eGUPHZ3DY29sfxI3tkvnwMgtnHDMNze5DdxW39HsAw=="],

     

       1161
       1161
       +
       

     

       1162
       1162
       +
           "@opentelemetry/exporter-metrics-otlp-proto/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1163
       1163
       +
       

     

       1164
       1164
       +
           "@opentelemetry/exporter-metrics-otlp-proto/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1165
       1165
       +
       

     

       1166
       1166
       +
           "@opentelemetry/exporter-metrics-otlp-proto/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1167
       1167
       +
       

     

       1168
       1168
       +
           "@opentelemetry/exporter-metrics-otlp-proto/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1169
       1169
       +
       

     

       1170
       1170
       +
           "@opentelemetry/exporter-prometheus/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1171
       1171
       +
       

     

       1172
       1172
       +
           "@opentelemetry/exporter-prometheus/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1173
       1173
       +
       

     

       1174
       1174
       +
           "@opentelemetry/exporter-prometheus/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1175
       1175
       +
       

     

       1176
       1176
       +
           "@opentelemetry/exporter-trace-otlp-grpc/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1177
       1177
       +
       

     

       1178
       1178
       +
           "@opentelemetry/exporter-trace-otlp-grpc/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1179
       1179
       +
       

     

       1180
       1180
       +
           "@opentelemetry/exporter-trace-otlp-grpc/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1181
       1181
       +
       

     

       1182
       1182
       +
           "@opentelemetry/exporter-trace-otlp-grpc/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1183
       1183
       +
       

     

       1184
       1184
       +
           "@opentelemetry/exporter-trace-otlp-http/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1185
       1185
       +
       

     

       1186
       1186
       +
           "@opentelemetry/exporter-trace-otlp-http/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1187
       1187
       +
       

     

       1188
       1188
       +
           "@opentelemetry/exporter-trace-otlp-http/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1189
       1189
       +
       

     

       1190
       1190
       +
           "@opentelemetry/exporter-trace-otlp-http/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1191
       1191
       +
       

     

       1192
       1192
       +
           "@opentelemetry/exporter-trace-otlp-proto/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1193
       1193
       +
       

     

       1194
       1194
       +
           "@opentelemetry/exporter-trace-otlp-proto/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1195
       1195
       +
       

     

       1196
       1196
       +
           "@opentelemetry/exporter-trace-otlp-proto/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1197
       1197
       +
       

     

       1198
       1198
       +
           "@opentelemetry/exporter-trace-otlp-proto/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1199
       1199
       +
       

     

       1200
       1200
       +
           "@opentelemetry/exporter-zipkin/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1201
       1201
       +
       

     

       1202
       1202
       +
           "@opentelemetry/exporter-zipkin/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1203
       1203
       +
       

     

       1204
       1204
       +
           "@opentelemetry/otlp-grpc-exporter-base/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1205
       1205
       +
       

     

       1206
       1206
       +
           "@opentelemetry/otlp-grpc-exporter-base/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1207
       1207
       +
       

     

       1208
       1208
       +
           "@opentelemetry/otlp-grpc-exporter-base/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1209
       1209
       +
       

     

       1210
       1210
       +
           "@opentelemetry/otlp-transformer/@opentelemetry/api-logs": ["@opentelemetry/api-logs@0.56.0", "", { "dependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-Wr39+94UNNG3Ei9nv3pHd4AJ63gq5nSemMRpCd8fPwDL9rN3vK26lzxfH27mw16XzOSO+TpyQwBAMaLxaPWG0g=="],

     

       1211
       1211
       +
       

     

       1212
       1212
       +
           "@opentelemetry/otlp-transformer/@opentelemetry/resources": ["@opentelemetry/resources@1.29.0", "", { "dependencies": { "@opentelemetry/core": "1.29.0", "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-s7mLXuHZE7RQr1wwweGcaRp3Q4UJJ0wazeGlc/N5/XSe6UyXfsh1UQGMADYeg7YwD+cEdMtU1yJAUXdnFzYzyQ=="],

     

       1213
       1213
       +
       

     

       1214
       1214
       +
           "@opentelemetry/otlp-transformer/@opentelemetry/sdk-logs": ["@opentelemetry/sdk-logs@0.56.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.56.0", "@opentelemetry/core": "1.29.0", "@opentelemetry/resources": "1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.4.0 <1.10.0" } }, "sha512-OS0WPBJF++R/cSl+terUjQH5PebloidB1Jbbecgg2rnCmQbTST9xsRes23bLfDQVRvmegmHqDh884h0aRdJyLw=="],

     

       1215
       1215
       +
       

     

       1216
       1216
       +
           "@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@1.29.0", "", { "dependencies": { "@opentelemetry/core": "1.29.0", "@opentelemetry/resources": "1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-MkVtuzDjXZaUJSuJlHn6BSXjcQlMvHcsDV7LjY4P6AJeffMa4+kIGDjzsCf6DkAh6Vqlwag5EWEam3KZOX5Drw=="],

     

       1217
       1217
       +
       

     

       1218
       1218
       +
           "@opentelemetry/otlp-transformer/@opentelemetry/sdk-trace-base": ["@opentelemetry/sdk-trace-base@1.29.0", "", { "dependencies": { "@opentelemetry/core": "1.29.0", "@opentelemetry/resources": "1.29.0", "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-hEOpAYLKXF3wGJpXOtWsxEtqBgde0SCv+w+jvr3/UusR4ll3QrENEGnSl1WDCyRrpqOQ5NCNOvZch9UFVa7MnQ=="],

     

       1219
       1219
       +
       

     

       1220
       1220
       +
           "@opentelemetry/propagator-b3/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1221
       1221
       +
       

     

       1222
       1222
       +
           "@opentelemetry/propagator-jaeger/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1223
       1223
       +
       

     

       1224
       1224
       +
           "@opentelemetry/resources/@opentelemetry/core": ["@opentelemetry/core@1.30.1", "", { "dependencies": { "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ=="],

     

       1225
       1225
       +
       

     

       1226
       1226
       +
           "@opentelemetry/resources/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.28.0", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],

     

       1227
       1227
       +
       

     

       1228
       1228
       +
           "@opentelemetry/sdk-logs/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1229
       1229
       +
       

     

       1230
       1230
       +
           "@opentelemetry/sdk-logs/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1231
       1231
       +
       

     

       1232
       1232
       +
           "@opentelemetry/sdk-metrics/@opentelemetry/core": ["@opentelemetry/core@1.30.1", "", { "dependencies": { "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ=="],

     

       1233
       1233
       +
       

     

       1234
       1234
       +
           "@opentelemetry/sdk-node/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1235
       1235
       +
       

     

       1236
       1236
       +
           "@opentelemetry/sdk-node/@opentelemetry/exporter-metrics-otlp-http": ["@opentelemetry/exporter-metrics-otlp-http@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-exporter-base": "0.200.0", "@opentelemetry/otlp-transformer": "0.200.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-metrics": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-5BiR6i8yHc9+qW7F6LqkuUnIzVNA7lt0qRxIKcKT+gq3eGUPHZ3DY29sfxI3tkvnwMgtnHDMNze5DdxW39HsAw=="],

     

       1237
       1237
       +
       

     

       1238
       1238
       +
           "@opentelemetry/sdk-node/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1239
       1239
       +
       

     

       1240
       1240
       +
           "@opentelemetry/sdk-node/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1241
       1241
       +
       

     

       1242
       1242
       +
           "@opentelemetry/sdk-trace-base/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1243
       1243
       +
       

     

       1244
       1244
       +
           "@opentelemetry/sdk-trace-base/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1245
       1245
       +
       

     

       1246
       1246
       +
           "@opentelemetry/sdk-trace-node/@opentelemetry/core": ["@opentelemetry/core@2.0.0", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ=="],

     

       1247
       1247
       +
       

     

       1106
       1248
        
           "@radix-ui/react-collection/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.3", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A=="],

     

       1107
       1249
        
       

     

       1108
       1250
        
           "@radix-ui/react-dialog/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.3", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A=="],

     
···

       1124
       1266
        
           "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],

     

       1125
       1267
        
       

     

       1126
       1268
        
           "@tokenizer/inflate/debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],

     

       1269
       1269
       +
       

     

       1270
       1270
       +
           "@types/bun/bun-types": ["bun-types@1.3.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-z3Xwlg7j2l9JY27x5Qn3Wlyos8YAp0kKRlrePAOjgjMGS5IG6E7Jnlx736vH9UVI4wUICwwhC9anYL++XeOgTQ=="],

     

       1127
       1271
        
       

     

       1128
       1272
        
           "@wisp/main-app/@atproto/api": ["@atproto/api@0.17.7", "", { "dependencies": { "@atproto/common-web": "^0.4.3", "@atproto/lexicon": "^0.5.1", "@atproto/syntax": "^0.4.1", "@atproto/xrpc": "^0.7.5", "await-lock": "^2.2.2", "multiformats": "^9.9.0", "tlds": "^1.234.0", "zod": "^3.23.8" } }, "sha512-V+OJBZq9chcrD21xk1bUa6oc5DSKfQj5DmUPf5rmZncqL1w9ZEbS38H5cMyqqdhfgo2LWeDRdZHD0rvNyJsIaw=="],

     

       1129
       1273
        
       

     
···

       1156
       1300
        
           "wisp-hosting-service/@atproto/api": ["@atproto/api@0.17.7", "", { "dependencies": { "@atproto/common-web": "^0.4.3", "@atproto/lexicon": "^0.5.1", "@atproto/syntax": "^0.4.1", "@atproto/xrpc": "^0.7.5", "await-lock": "^2.2.2", "multiformats": "^9.9.0", "tlds": "^1.234.0", "zod": "^3.23.8" } }, "sha512-V+OJBZq9chcrD21xk1bUa6oc5DSKfQj5DmUPf5rmZncqL1w9ZEbS38H5cMyqqdhfgo2LWeDRdZHD0rvNyJsIaw=="],

     

       1157
       1301
        
       

     

       1158
       1302
        
           "@atproto/sync/@atproto/xrpc-server/@atproto/ws-client": ["@atproto/ws-client@0.0.3", "", { "dependencies": { "@atproto/common": "^0.5.0", "ws": "^8.12.0" } }, "sha512-eKqkTWBk6zuMY+6gs02eT7mS8Btewm8/qaL/Dp00NDCqpNC+U59MWvQsOWT3xkNGfd9Eip+V6VI4oyPvAfsfTA=="],

     

       1303
       1303
       +
       

     

       1304
       1304
       +
           "@opentelemetry/exporter-logs-otlp-grpc/@opentelemetry/otlp-transformer/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1305
       1305
       +
       

     

       1306
       1306
       +
           "@opentelemetry/exporter-logs-otlp-grpc/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1307
       1307
       +
       

     

       1308
       1308
       +
           "@opentelemetry/exporter-logs-otlp-http/@opentelemetry/otlp-transformer/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1309
       1309
       +
       

     

       1310
       1310
       +
           "@opentelemetry/exporter-logs-otlp-http/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1311
       1311
       +
       

     

       1312
       1312
       +
           "@opentelemetry/exporter-logs-otlp-proto/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1313
       1313
       +
       

     

       1314
       1314
       +
           "@opentelemetry/exporter-metrics-otlp-http/@opentelemetry/resources/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.28.0", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],

     

       1315
       1315
       +
       

     

       1316
       1316
       +
           "@opentelemetry/exporter-trace-otlp-grpc/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1317
       1317
       +
       

     

       1318
       1318
       +
           "@opentelemetry/exporter-trace-otlp-http/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1319
       1319
       +
       

     

       1320
       1320
       +
           "@opentelemetry/exporter-trace-otlp-proto/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1321
       1321
       +
       

     

       1322
       1322
       +
           "@opentelemetry/otlp-grpc-exporter-base/@opentelemetry/otlp-transformer/@opentelemetry/resources": ["@opentelemetry/resources@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg=="],

     

       1323
       1323
       +
       

     

       1324
       1324
       +
           "@opentelemetry/otlp-grpc-exporter-base/@opentelemetry/otlp-transformer/@opentelemetry/sdk-metrics": ["@opentelemetry/sdk-metrics@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA=="],

     

       1325
       1325
       +
       

     

       1326
       1326
       +
           "@opentelemetry/otlp-transformer/@opentelemetry/resources/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.28.0", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],

     

       1327
       1327
       +
       

     

       1328
       1328
       +
           "@opentelemetry/otlp-transformer/@opentelemetry/sdk-trace-base/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.28.0", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],

     

       1329
       1329
       +
       

     

       1330
       1330
       +
           "@opentelemetry/sdk-metrics/@opentelemetry/core/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.28.0", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],

     

       1331
       1331
       +
       

     

       1332
       1332
       +
           "@opentelemetry/sdk-node/@opentelemetry/exporter-metrics-otlp-http/@opentelemetry/otlp-exporter-base": ["@opentelemetry/otlp-exporter-base@0.200.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/otlp-transformer": "0.200.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ=="],

     

       1333
       1333
       +
       

     

       1334
       1334
       +
           "@opentelemetry/sdk-node/@opentelemetry/exporter-metrics-otlp-http/@opentelemetry/otlp-transformer": ["@opentelemetry/otlp-transformer@0.200.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.200.0", "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/sdk-logs": "0.200.0", "@opentelemetry/sdk-metrics": "2.0.0", "@opentelemetry/sdk-trace-base": "2.0.0", "protobufjs": "^7.3.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw=="],

     

       1159
       1335
        
       

     

       1160
       1336
        
           "@tokenizer/inflate/debug/ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],

     

       1161
       1337

+14 -14

cli/Cargo.toml

···

       8
       8
        
       place_wisp = []

     

       9
       9
        
       

     

       10
       10
        
       [dependencies]

     

       11
       11
       -
       # jacquard = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["loopback"] }

     

       12
       12
       -
       # jacquard-oauth = { git = "https://tangled.org/nekomimi.pet/jacquard" }

     

       13
       13
       -
       # jacquard-api = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["streaming"] }

     

       14
       14
       -
       # jacquard-common = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["websocket"] }

     

       15
       15
       -
       # jacquard-identity = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["dns"] }

     

       16
       16
       -
       # jacquard-derive = { git = "https://tangled.org/nekomimi.pet/jacquard" }

     

       17
       17
       -
       # jacquard-lexicon = { git = "https://tangled.org/nekomimi.pet/jacquard" }

     

       18
       18
       -
       jacquard = { path = "../../jacquard/crates/jacquard", features = ["loopback"] }

     

       19
       19
       -
       jacquard-oauth = { path = "../../jacquard/crates/jacquard-oauth" }

     

       20
       20
       -
       jacquard-api = { path = "../../jacquard/crates/jacquard-api", features = ["streaming"] }

     

       21
       21
       -
       jacquard-common = { path = "../../jacquard/crates/jacquard-common", features = ["websocket"] }

     

       22
       22
       -
       jacquard-identity = { path = "../../jacquard/crates/jacquard-identity", features = ["dns"] }

     

       23
       23
       -
       jacquard-derive = { path = "../../jacquard/crates/jacquard-derive" }

     

       24
       24
       -
       jacquard-lexicon = { path = "../../jacquard/crates/jacquard-lexicon" }

     

       11
       11
       +
       jacquard = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["loopback"] }

     

       12
       12
       +
       jacquard-oauth = { git = "https://tangled.org/nekomimi.pet/jacquard" }

     

       13
       13
       +
       jacquard-api = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["streaming"] }

     

       14
       14
       +
       jacquard-common = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["websocket"] }

     

       15
       15
       +
       jacquard-identity = { git = "https://tangled.org/nekomimi.pet/jacquard", features = ["dns"] }

     

       16
       16
       +
       jacquard-derive = { git = "https://tangled.org/nekomimi.pet/jacquard" }

     

       17
       17
       +
       jacquard-lexicon = { git = "https://tangled.org/nekomimi.pet/jacquard" }

     

       18
       18
       +
       #jacquard = { path = "../../jacquard/crates/jacquard", features = ["loopback"] }

     

       19
       19
       +
       #jacquard-oauth = { path = "../../jacquard/crates/jacquard-oauth" }

     

       20
       20
       +
       #jacquard-api = { path = "../../jacquard/crates/jacquard-api", features = ["streaming"] }

     

       21
       21
       +
       #jacquard-common = { path = "../../jacquard/crates/jacquard-common", features = ["websocket"] }

     

       22
       22
       +
       #jacquard-identity = { path = "../../jacquard/crates/jacquard-identity", features = ["dns"] }

     

       23
       23
       +
       #jacquard-derive = { path = "../../jacquard/crates/jacquard-derive" }

     

       24
       24
       +
       #jacquard-lexicon = { path = "../../jacquard/crates/jacquard-lexicon" }

     

       25
       25
        
       clap = { version = "4.5.51", features = ["derive"] }

     

       26
       26
        
       tokio = { version = "1.48", features = ["full"] }

     

       27
       27
        
       miette = { version = "7.6.0", features = ["fancy"] }

docs/astro.config.mjs

···

       24
       24
        
       					label: 'Guides',

     

       25
       25
        
       					items: [

     

       26
       26
        
       						{ label: 'Self-Hosting', slug: 'deployment' },

     

       27
       27
       +
       						{ label: 'Monitoring & Metrics', slug: 'monitoring' },

     

       27
       28
        
       						{ label: 'Redirects & Rewrites', slug: 'redirects' },

     

       28
       29
        
       					],

     

       29
       30
        
       				},

+85

docs/src/content/docs/guides/grafana-setup.md

···

       1
       1
       +
       ---

     

       2
       2
       +
       title: Grafana Setup Example

     

       3
       3
       +
       description: Quick setup for Grafana Cloud monitoring

     

       4
       4
       +
       ---

     

       5
       5
       +
       

     

       6
       6
       +
       Example setup for monitoring Wisp.place with Grafana Cloud.

     

       7
       7
       +
       

     

       8
       8
       +
       ## 1. Create Grafana Cloud Account

     

       9
       9
       +
       

     

       10
       10
       +
       Sign up at [grafana.com](https://grafana.com) for a free tier account.

     

       11
       11
       +
       

     

       12
       12
       +
       ## 2. Get Credentials

     

       13
       13
       +
       

     

       14
       14
       +
       Navigate to your stack and find:

     

       15
       15
       +
       

     

       16
       16
       +
       **Loki** (Connections → Loki → Details):

     

       17
       17
       +
       - Push endpoint: `https://logs-prod-XXX.grafana.net`

     

       18
       18
       +
       - Create API token with write permissions

     

       19
       19
       +
       

     

       20
       20
       +
       **Prometheus** (Connections → Prometheus → Details):

     

       21
       21
       +
       - Remote Write endpoint: `https://prometheus-prod-XXX.grafana.net/api/prom`

     

       22
       22
       +
       - Create API token with write permissions

     

       23
       23
       +
       

     

       24
       24
       +
       ## 3. Configure Wisp.place

     

       25
       25
       +
       

     

       26
       26
       +
       Add to your `.env`:

     

       27
       27
       +
       

     

       28
       28
       +
       ```bash

     

       29
       29
       +
       GRAFANA_LOKI_URL=https://logs-prod-XXX.grafana.net

     

       30
       30
       +
       GRAFANA_LOKI_TOKEN=glc_eyJ...

     

       31
       31
       +
       

     

       32
       32
       +
       GRAFANA_PROMETHEUS_URL=https://prometheus-prod-XXX.grafana.net/api/prom

     

       33
       33
       +
       GRAFANA_PROMETHEUS_TOKEN=glc_eyJ...

     

       34
       34
       +
       ```

     

       35
       35
       +
       

     

       36
       36
       +
       ## 4. Create Dashboard

     

       37
       37
       +
       

     

       38
       38
       +
       Import this dashboard JSON or build your own:

     

       39
       39
       +
       

     

       40
       40
       +
       ```json

     

       41
       41
       +
       {

     

       42
       42
       +
         "panels": [

     

       43
       43
       +
           {

     

       44
       44
       +
             "title": "Request Rate",

     

       45
       45
       +
             "targets": [{

     

       46
       46
       +
               "expr": "sum(rate(http_requests_total[1m])) by (service)"

     

       47
       47
       +
             }]

     

       48
       48
       +
           },

     

       49
       49
       +
           {

     

       50
       50
       +
             "title": "P95 Latency",

     

       51
       51
       +
             "targets": [{

     

       52
       52
       +
               "expr": "histogram_quantile(0.95, rate(http_request_duration_ms_bucket[5m]))"

     

       53
       53
       +
             }]

     

       54
       54
       +
           },

     

       55
       55
       +
           {

     

       56
       56
       +
             "title": "Error Rate",

     

       57
       57
       +
             "targets": [{

     

       58
       58
       +
               "expr": "sum(rate(errors_total[5m])) / sum(rate(http_requests_total[5m]))"

     

       59
       59
       +
             }]

     

       60
       60
       +
           }

     

       61
       61
       +
         ]

     

       62
       62
       +
       }

     

       63
       63
       +
       ```

     

       64
       64
       +
       

     

       65
       65
       +
       ## 5. Set Alerts

     

       66
       66
       +
       

     

       67
       67
       +
       Example alert for high error rate:

     

       68
       68
       +
       

     

       69
       69
       +
       ```yaml

     

       70
       70
       +
       alert: HighErrorRate

     

       71
       71
       +
       expr: |

     

       72
       72
       +
         sum(rate(errors_total[5m])) by (service) /

     

       73
       73
       +
         sum(rate(http_requests_total[5m])) by (service) > 0.05

     

       74
       74
       +
       for: 5m

     

       75
       75
       +
       annotations:

     

       76
       76
       +
         summary: "High error rate in {{ $labels.service }}"

     

       77
       77
       +
       ```

     

       78
       78
       +
       

     

       79
       79
       +
       ## Verify Data Flow

     

       80
       80
       +
       

     

       81
       81
       +
       Check Grafana Explore:

     

       82
       82
       +
       - Loki: `{job="main-app"} | json`

     

       83
       83
       +
       - Prometheus: `http_requests_total`

     

       84
       84
       +
       

     

       85
       85
       +
       Data should appear within 30 seconds of service startup.

+156

docs/src/content/docs/monitoring.md

···

       1
       1
       +
       ---

     

       2
       2
       +
       title: Monitoring & Metrics

     

       3
       3
       +
       description: Track performance and debug issues with Grafana integration

     

       4
       4
       +
       ---

     

       5
       5
       +
       

     

       6
       6
       +
       Wisp.place includes built-in observability with automatic Grafana integration for logs and metrics. Monitor request performance, track errors, and analyze usage patterns across both the main backend and hosting service.

     

       7
       7
       +
       

     

       8
       8
       +
       ## Quick Start

     

       9
       9
       +
       

     

       10
       10
       +
       Set environment variables to enable Grafana export:

     

       11
       11
       +
       

     

       12
       12
       +
       ```bash

     

       13
       13
       +
       # Grafana Cloud

     

       14
       14
       +
       GRAFANA_LOKI_URL=https://logs-prod-xxx.grafana.net

     

       15
       15
       +
       GRAFANA_LOKI_TOKEN=glc_xxx

     

       16
       16
       +
       

     

       17
       17
       +
       GRAFANA_PROMETHEUS_URL=https://prometheus-prod-xxx.grafana.net/api/prom

     

       18
       18
       +
       GRAFANA_PROMETHEUS_TOKEN=glc_xxx

     

       19
       19
       +
       

     

       20
       20
       +
       # Self-hosted Grafana

     

       21
       21
       +
       GRAFANA_LOKI_USERNAME=your-username

     

       22
       22
       +
       GRAFANA_LOKI_PASSWORD=your-password

     

       23
       23
       +
       ```

     

       24
       24
       +
       

     

       25
       25
       +
       Restart services. Metrics and logs now flow to Grafana automatically.

     

       26
       26
       +
       

     

       27
       27
       +
       ## Metrics Collected

     

       28
       28
       +
       

     

       29
       29
       +
       ### HTTP Requests

     

       30
       30
       +
       - `http_requests_total` - Total request count by path, method, status

     

       31
       31
       +
       - `http_request_duration_ms` - Request duration histogram

     

       32
       32
       +
       - `errors_total` - Error count by service

     

       33
       33
       +
       

     

       34
       34
       +
       ### Performance Stats

     

       35
       35
       +
       - P50, P95, P99 response times

     

       36
       36
       +
       - Requests per minute

     

       37
       37
       +
       - Error rates

     

       38
       38
       +
       - Average duration by endpoint

     

       39
       39
       +
       

     

       40
       40
       +
       ## Log Aggregation

     

       41
       41
       +
       

     

       42
       42
       +
       Logs are sent to Loki with automatic categorization:

     

       43
       43
       +
       

     

       44
       44
       +
       ```

     

       45
       45
       +
       {job="main-app"} |= "error"        # OAuth and upload errors

     

       46
       46
       +
       {job="hosting-service"} |= "cache"  # Cache operations

     

       47
       47
       +
       {service="hosting-service", level="warn"}  # Warnings only

     

       48
       48
       +
       ```

     

       49
       49
       +
       

     

       50
       50
       +
       ## Service Identification

     

       51
       51
       +
       

     

       52
       52
       +
       Each service is tagged separately:

     

       53
       53
       +
       - `main-app` - OAuth, uploads, domain management

     

       54
       54
       +
       - `hosting-service` - Firehose, caching, content serving

     

       55
       55
       +
       

     

       56
       56
       +
       ## Configuration Options

     

       57
       57
       +
       

     

       58
       58
       +
       ### Environment Variables

     

       59
       59
       +
       

     

       60
       60
       +
       ```bash

     

       61
       61
       +
       # Required

     

       62
       62
       +
       GRAFANA_LOKI_URL          # Loki endpoint

     

       63
       63
       +
       GRAFANA_PROMETHEUS_URL    # Prometheus endpoint (add /api/prom for OTLP)

     

       64
       64
       +
       

     

       65
       65
       +
       # Authentication (use one)

     

       66
       66
       +
       GRAFANA_LOKI_TOKEN        # Bearer token (Grafana Cloud)

     

       67
       67
       +
       GRAFANA_LOKI_USERNAME     # Basic auth (self-hosted)

     

       68
       68
       +
       GRAFANA_LOKI_PASSWORD

     

       69
       69
       +
       

     

       70
       70
       +
       # Optional

     

       71
       71
       +
       GRAFANA_BATCH_SIZE=100    # Batch size before flush

     

       72
       72
       +
       GRAFANA_FLUSH_INTERVAL=5000  # Flush interval in ms

     

       73
       73
       +
       ```

     

       74
       74
       +
       

     

       75
       75
       +
       ### Programmatic Setup

     

       76
       76
       +
       

     

       77
       77
       +
       ```typescript

     

       78
       78
       +
       import { initializeGrafanaExporters } from '@wisp/observability'

     

       79
       79
       +
       

     

       80
       80
       +
       initializeGrafanaExporters({

     

       81
       81
       +
         lokiUrl: 'https://logs.grafana.net',

     

       82
       82
       +
         lokiAuth: { bearerToken: 'token' },

     

       83
       83
       +
         prometheusUrl: 'https://prometheus.grafana.net/api/prom',

     

       84
       84
       +
         prometheusAuth: { bearerToken: 'token' },

     

       85
       85
       +
         serviceName: 'my-service',

     

       86
       86
       +
         batchSize: 100,

     

       87
       87
       +
         flushIntervalMs: 5000

     

       88
       88
       +
       })

     

       89
       89
       +
       ```

     

       90
       90
       +
       

     

       91
       91
       +
       ## Grafana Dashboard Queries

     

       92
       92
       +
       

     

       93
       93
       +
       ### Request Performance

     

       94
       94
       +
       ```promql

     

       95
       95
       +
       # Average response time by endpoint

     

       96
       96
       +
       avg by (path) (

     

       97
       97
       +
         rate(http_request_duration_ms_sum[5m]) /

     

       98
       98
       +
         rate(http_request_duration_ms_count[5m])

     

       99
       99
       +
       )

     

       100
       100
       +
       

     

       101
       101
       +
       # Request rate

     

       102
       102
       +
       sum(rate(http_requests_total[1m])) by (service)

     

       103
       103
       +
       

     

       104
       104
       +
       # Error rate

     

       105
       105
       +
       sum(rate(errors_total[5m])) by (service) /

     

       106
       106
       +
       sum(rate(http_requests_total[5m])) by (service)

     

       107
       107
       +
       ```

     

       108
       108
       +
       

     

       109
       109
       +
       ### Log Analysis

     

       110
       110
       +
       ```logql

     

       111
       111
       +
       # Recent errors

     

       112
       112
       +
       {job="main-app"} |= "error" | json

     

       113
       113
       +
       

     

       114
       114
       +
       # Slow requests (>1s)

     

       115
       115
       +
       {job="hosting-service"} |~ "duration.*[1-9][0-9]{3,}"

     

       116
       116
       +
       

     

       117
       117
       +
       # Failed OAuth attempts

     

       118
       118
       +
       {job="main-app"} |= "OAuth" |= "failed"

     

       119
       119
       +
       ```

     

       120
       120
       +
       

     

       121
       121
       +
       ## Troubleshooting

     

       122
       122
       +
       

     

       123
       123
       +
       ### Logs not appearing

     

       124
       124
       +
       - Check `GRAFANA_LOKI_URL` is correct (no trailing `/loki/api/v1/push`)

     

       125
       125
       +
       - Verify authentication token/credentials

     

       126
       126
       +
       - Look for connection errors in service logs

     

       127
       127
       +
       

     

       128
       128
       +
       ### Metrics missing

     

       129
       129
       +
       - Ensure `GRAFANA_PROMETHEUS_URL` includes `/api/prom` suffix

     

       130
       130
       +
       - Check firewall rules allow outbound HTTPS

     

       131
       131
       +
       - Verify OpenTelemetry export errors in logs

     

       132
       132
       +
       

     

       133
       133
       +
       ### High memory usage

     

       134
       134
       +
       - Reduce `GRAFANA_BATCH_SIZE` (default: 100)

     

       135
       135
       +
       - Lower `GRAFANA_FLUSH_INTERVAL` to flush more frequently

     

       136
       136
       +
       

     

       137
       137
       +
       ## Local Development

     

       138
       138
       +
       

     

       139
       139
       +
       Metrics and logs are stored in-memory when Grafana isn't configured. Access them via:

     

       140
       140
       +
       

     

       141
       141
       +
       - `http://localhost:8000/api/observability/logs`

     

       142
       142
       +
       - `http://localhost:8000/api/observability/metrics`

     

       143
       143
       +
       - `http://localhost:8000/api/observability/errors`

     

       144
       144
       +
       

     

       145
       145
       +
       ## Testing Integration

     

       146
       146
       +
       

     

       147
       147
       +
       Run integration tests to verify setup:

     

       148
       148
       +
       

     

       149
       149
       +
       ```bash

     

       150
       150
       +
       cd packages/@wisp/observability

     

       151
       151
       +
       bun test src/integration-test.test.ts

     

       152
       152
       +
       

     

       153
       153
       +
       # Test with live Grafana

     

       154
       154
       +
       GRAFANA_LOKI_URL=... GRAFANA_LOKI_USERNAME=... GRAFANA_LOKI_PASSWORD=... \

     

       155
       155
       +
       bun test src/integration-test.test.ts

     

       156
       156
       +
       ```

package.json

···

       11
       11
        
           "@tailwindcss/cli": "^4.1.17",

     

       12
       12
        
           "atproto-ui": "^0.12.0",

     

       13
       13
        
           "bun-plugin-tailwind": "^0.1.2",

     

       14
       14
       +
           "elysia": "^1.4.18",

     

       14
       15
        
           "tailwindcss": "^4.1.17"

     

       15
       16
        
         },

     

       16
       17
        
         "scripts": {

+33

packages/@wisp/observability/.env.example

···

       1
       1
       +
       # Grafana Cloud Configuration for @wisp/observability

     

       2
       2
       +
       # Copy this file to .env and fill in your actual values

     

       3
       3
       +
       

     

       4
       4
       +
       # ============================================================================

     

       5
       5
       +
       # Grafana Loki (for logs)

     

       6
       6
       +
       # ============================================================================

     

       7
       7
       +
       GRAFANA_LOKI_URL=https://logs-prod-xxx.grafana.net

     

       8
       8
       +
       

     

       9
       9
       +
       # Authentication Option 1: Bearer Token (Grafana Cloud)

     

       10
       10
       +
       GRAFANA_LOKI_TOKEN=glc_xxx

     

       11
       11
       +
       

     

       12
       12
       +
       # Authentication Option 2: Username/Password (Self-hosted or some Grafana setups)

     

       13
       13
       +
       # GRAFANA_LOKI_USERNAME=your-username

     

       14
       14
       +
       # GRAFANA_LOKI_PASSWORD=your-password

     

       15
       15
       +
       

     

       16
       16
       +
       # ============================================================================

     

       17
       17
       +
       # Grafana Prometheus (for metrics)

     

       18
       18
       +
       # ============================================================================

     

       19
       19
       +
       # Note: Add /api/prom to the base URL for OTLP export

     

       20
       20
       +
       GRAFANA_PROMETHEUS_URL=https://prometheus-prod-xxx.grafana.net/api/prom

     

       21
       21
       +
       

     

       22
       22
       +
       # Authentication Option 1: Bearer Token (Grafana Cloud)

     

       23
       23
       +
       GRAFANA_PROMETHEUS_TOKEN=glc_xxx

     

       24
       24
       +
       

     

       25
       25
       +
       # Authentication Option 2: Username/Password (Self-hosted or some Grafana setups)

     

       26
       26
       +
       # GRAFANA_PROMETHEUS_USERNAME=your-username

     

       27
       27
       +
       # GRAFANA_PROMETHEUS_PASSWORD=your-password

     

       28
       28
       +
       

     

       29
       29
       +
       # ============================================================================

     

       30
       30
       +
       # Optional: Override service metadata

     

       31
       31
       +
       # ============================================================================

     

       32
       32
       +
       # SERVICE_NAME=wisp-app

     

       33
       33
       +
       # SERVICE_VERSION=1.0.0

+217

packages/@wisp/observability/README.md

···

       1
       1
       +
       # @wisp/observability

     

       2
       2
       +
       

     

       3
       3
       +
       Framework-agnostic observability package with Grafana integration for logs and metrics persistence.

     

       4
       4
       +
       

     

       5
       5
       +
       ## Features

     

       6
       6
       +
       

     

       7
       7
       +
       - **In-memory storage** for local development

     

       8
       8
       +
       - **Grafana Loki** integration for log persistence

     

       9
       9
       +
       - **Prometheus/OTLP** integration for metrics

     

       10
       10
       +
       - Framework middleware for Elysia and Hono

     

       11
       11
       +
       - Automatic batching and buffering for efficient data transmission

     

       12
       12
       +
       

     

       13
       13
       +
       ## Installation

     

       14
       14
       +
       

     

       15
       15
       +
       ```bash

     

       16
       16
       +
       bun add @wisp/observability

     

       17
       17
       +
       ```

     

       18
       18
       +
       

     

       19
       19
       +
       ## Basic Usage

     

       20
       20
       +
       

     

       21
       21
       +
       ### Without Grafana (In-Memory Only)

     

       22
       22
       +
       

     

       23
       23
       +
       ```typescript

     

       24
       24
       +
       import { createLogger, metricsCollector } from '@wisp/observability'

     

       25
       25
       +
       

     

       26
       26
       +
       const logger = createLogger('my-service')

     

       27
       27
       +
       

     

       28
       28
       +
       // Log messages

     

       29
       29
       +
       logger.info('Server started')

     

       30
       30
       +
       logger.error('Failed to connect', new Error('Connection refused'))

     

       31
       31
       +
       

     

       32
       32
       +
       // Record metrics

     

       33
       33
       +
       metricsCollector.recordRequest('/api/users', 'GET', 200, 45, 'my-service')

     

       34
       34
       +
       ```

     

       35
       35
       +
       

     

       36
       36
       +
       ### With Grafana Integration

     

       37
       37
       +
       

     

       38
       38
       +
       ```typescript

     

       39
       39
       +
       import { initializeGrafanaExporters, createLogger } from '@wisp/observability'

     

       40
       40
       +
       

     

       41
       41
       +
       // Initialize at application startup

     

       42
       42
       +
       initializeGrafanaExporters({

     

       43
       43
       +
         lokiUrl: 'https://logs-prod.grafana.net',

     

       44
       44
       +
         lokiAuth: {

     

       45
       45
       +
           bearerToken: 'your-loki-api-key'

     

       46
       46
       +
         },

     

       47
       47
       +
         prometheusUrl: 'https://prometheus-prod.grafana.net',

     

       48
       48
       +
         prometheusAuth: {

     

       49
       49
       +
           bearerToken: 'your-prometheus-api-key'

     

       50
       50
       +
         },

     

       51
       51
       +
         serviceName: 'wisp-app',

     

       52
       52
       +
         serviceVersion: '1.0.0',

     

       53
       53
       +
         batchSize: 100,

     

       54
       54
       +
         flushIntervalMs: 5000

     

       55
       55
       +
       })

     

       56
       56
       +
       

     

       57
       57
       +
       // Now all logs and metrics will be sent to Grafana automatically

     

       58
       58
       +
       const logger = createLogger('my-service')

     

       59
       59
       +
       logger.info('This will be sent to Grafana Loki')

     

       60
       60
       +
       ```

     

       61
       61
       +
       

     

       62
       62
       +
       ## Configuration

     

       63
       63
       +
       

     

       64
       64
       +
       ### Environment Variables

     

       65
       65
       +
       

     

       66
       66
       +
       You can configure Grafana integration using environment variables:

     

       67
       67
       +
       

     

       68
       68
       +
       ```bash

     

       69
       69
       +
       # Loki configuration

     

       70
       70
       +
       GRAFANA_LOKI_URL=https://logs-prod.grafana.net

     

       71
       71
       +
       

     

       72
       72
       +
       # Authentication Option 1: Bearer Token (Grafana Cloud)

     

       73
       73
       +
       GRAFANA_LOKI_TOKEN=your-loki-api-key

     

       74
       74
       +
       

     

       75
       75
       +
       # Authentication Option 2: Username/Password (Self-hosted or some Grafana setups)

     

       76
       76
       +
       GRAFANA_LOKI_USERNAME=your-username

     

       77
       77
       +
       GRAFANA_LOKI_PASSWORD=your-password

     

       78
       78
       +
       

     

       79
       79
       +
       # Prometheus configuration

     

       80
       80
       +
       GRAFANA_PROMETHEUS_URL=https://prometheus-prod.grafana.net/api/prom

     

       81
       81
       +
       

     

       82
       82
       +
       # Authentication Option 1: Bearer Token (Grafana Cloud)

     

       83
       83
       +
       GRAFANA_PROMETHEUS_TOKEN=your-prometheus-api-key

     

       84
       84
       +
       

     

       85
       85
       +
       # Authentication Option 2: Username/Password (Self-hosted or some Grafana setups)

     

       86
       86
       +
       GRAFANA_PROMETHEUS_USERNAME=your-username

     

       87
       87
       +
       GRAFANA_PROMETHEUS_PASSWORD=your-password

     

       88
       88
       +
       ```

     

       89
       89
       +
       

     

       90
       90
       +
       ### Programmatic Configuration

     

       91
       91
       +
       

     

       92
       92
       +
       ```typescript

     

       93
       93
       +
       import { initializeGrafanaExporters } from '@wisp/observability'

     

       94
       94
       +
       

     

       95
       95
       +
       initializeGrafanaExporters({

     

       96
       96
       +
         // Loki configuration for logs

     

       97
       97
       +
         lokiUrl: 'https://logs-prod.grafana.net',

     

       98
       98
       +
         lokiAuth: {

     

       99
       99
       +
           // Option 1: Bearer token (recommended for Grafana Cloud)

     

       100
       100
       +
           bearerToken: 'your-api-key',

     

       101
       101
       +
       

     

       102
       102
       +
           // Option 2: Basic auth

     

       103
       103
       +
           username: 'your-username',

     

       104
       104
       +
           password: 'your-password'

     

       105
       105
       +
         },

     

       106
       106
       +
       

     

       107
       107
       +
         // Prometheus/OTLP configuration for metrics

     

       108
       108
       +
         prometheusUrl: 'https://prometheus-prod.grafana.net',

     

       109
       109
       +
         prometheusAuth: {

     

       110
       110
       +
           bearerToken: 'your-api-key'

     

       111
       111
       +
         },

     

       112
       112
       +
       

     

       113
       113
       +
         // Service metadata

     

       114
       114
       +
         serviceName: 'wisp-app',

     

       115
       115
       +
         serviceVersion: '1.0.0',

     

       116
       116
       +
       

     

       117
       117
       +
         // Batching configuration

     

       118
       118
       +
         batchSize: 100,              // Flush after this many entries

     

       119
       119
       +
         flushIntervalMs: 5000,       // Flush every 5 seconds

     

       120
       120
       +
       

     

       121
       121
       +
         // Enable/disable exporters

     

       122
       122
       +
         enabled: true

     

       123
       123
       +
       })

     

       124
       124
       +
       ```

     

       125
       125
       +
       

     

       126
       126
       +
       ## Middleware Integration

     

       127
       127
       +
       

     

       128
       128
       +
       ### Elysia

     

       129
       129
       +
       

     

       130
       130
       +
       ```typescript

     

       131
       131
       +
       import { Elysia } from 'elysia'

     

       132
       132
       +
       import { observabilityMiddleware } from '@wisp/observability/middleware/elysia'

     

       133
       133
       +
       import { initializeGrafanaExporters } from '@wisp/observability'

     

       134
       134
       +
       

     

       135
       135
       +
       // Initialize Grafana exporters

     

       136
       136
       +
       initializeGrafanaExporters({

     

       137
       137
       +
         lokiUrl: process.env.GRAFANA_LOKI_URL,

     

       138
       138
       +
         lokiAuth: { bearerToken: process.env.GRAFANA_LOKI_TOKEN }

     

       139
       139
       +
       })

     

       140
       140
       +
       

     

       141
       141
       +
       const app = new Elysia()

     

       142
       142
       +
         .use(observabilityMiddleware({ service: 'main-app' }))

     

       143
       143
       +
         .get('/', () => 'Hello World')

     

       144
       144
       +
         .listen(3000)

     

       145
       145
       +
       ```

     

       146
       146
       +
       

     

       147
       147
       +
       ### Hono

     

       148
       148
       +
       

     

       149
       149
       +
       ```typescript

     

       150
       150
       +
       import { Hono } from 'hono'

     

       151
       151
       +
       import { observabilityMiddleware, observabilityErrorHandler } from '@wisp/observability/middleware/hono'

     

       152
       152
       +
       import { initializeGrafanaExporters } from '@wisp/observability'

     

       153
       153
       +
       

     

       154
       154
       +
       // Initialize Grafana exporters

     

       155
       155
       +
       initializeGrafanaExporters({

     

       156
       156
       +
         lokiUrl: process.env.GRAFANA_LOKI_URL,

     

       157
       157
       +
         lokiAuth: { bearerToken: process.env.GRAFANA_LOKI_TOKEN }

     

       158
       158
       +
       })

     

       159
       159
       +
       

     

       160
       160
       +
       const app = new Hono()

     

       161
       161
       +
       app.use('*', observabilityMiddleware({ service: 'hosting-service' }))

     

       162
       162
       +
       app.onError(observabilityErrorHandler({ service: 'hosting-service' }))

     

       163
       163
       +
       ```

     

       164
       164
       +
       

     

       165
       165
       +
       ## Grafana Cloud Setup

     

       166
       166
       +
       

     

       167
       167
       +
       1. **Create a Grafana Cloud account** at https://grafana.com/

     

       168
       168
       +
       

     

       169
       169
       +
       2. **Get your Loki credentials:**

     

       170
       170
       +
          - Go to your Grafana Cloud portal

     

       171
       171
       +
          - Navigate to "Loki" → "Details"

     

       172
       172
       +
          - Copy the Push endpoint URL and create an API key

     

       173
       173
       +
       

     

       174
       174
       +
       3. **Get your Prometheus credentials:**

     

       175
       175
       +
          - Navigate to "Prometheus" → "Details"

     

       176
       176
       +
          - Copy the Remote Write endpoint and create an API key

     

       177
       177
       +
       

     

       178
       178
       +
       4. **Configure your application:**

     

       179
       179
       +
          ```typescript

     

       180
       180
       +
          initializeGrafanaExporters({

     

       181
       181
       +
            lokiUrl: 'https://logs-prod-xxx.grafana.net',

     

       182
       182
       +
            lokiAuth: { bearerToken: 'glc_xxx' },

     

       183
       183
       +
            prometheusUrl: 'https://prometheus-prod-xxx.grafana.net/api/prom',

     

       184
       184
       +
            prometheusAuth: { bearerToken: 'glc_xxx' }

     

       185
       185
       +
          })

     

       186
       186
       +
          ```

     

       187
       187
       +
       

     

       188
       188
       +
       ## Data Flow

     

       189
       189
       +
       

     

       190
       190
       +
       1. **Logs** → Buffered → Batched → Sent to Grafana Loki

     

       191
       191
       +
       2. **Metrics** → Aggregated → Exported via OTLP → Sent to Prometheus

     

       192
       192
       +
       3. **Errors** → Deduplicated → Sent to Loki with error tag

     

       193
       193
       +
       

     

       194
       194
       +
       ## Performance Considerations

     

       195
       195
       +
       

     

       196
       196
       +
       - Logs and metrics are batched to reduce network overhead

     

       197
       197
       +
       - Default batch size: 100 entries

     

       198
       198
       +
       - Default flush interval: 5 seconds

     

       199
       199
       +
       - Failed exports are logged but don't block application

     

       200
       200
       +
       - In-memory buffers are capped to prevent memory leaks

     

       201
       201
       +
       

     

       202
       202
       +
       ## Graceful Shutdown

     

       203
       203
       +
       

     

       204
       204
       +
       The exporters automatically register shutdown handlers:

     

       205
       205
       +
       

     

       206
       206
       +
       ```typescript

     

       207
       207
       +
       import { shutdownGrafanaExporters } from '@wisp/observability'

     

       208
       208
       +
       

     

       209
       209
       +
       // Manual shutdown if needed

     

       210
       210
       +
       process.on('beforeExit', async () => {

     

       211
       211
       +
         await shutdownGrafanaExporters()

     

       212
       212
       +
       })

     

       213
       213
       +
       ```

     

       214
       214
       +
       

     

       215
       215
       +
       ## License

     

       216
       216
       +
       

     

       217
       217
       +
       Private

+13 -1

packages/@wisp/observability/package.json

···

       24
       24
        
           }

     

       25
       25
        
         },

     

       26
       26
        
         "peerDependencies": {

     

       27
       27
       -
           "hono": "^4.0.0"

     

       27
       27
       +
           "hono": "^4.10.7"

     

       28
       28
        
         },

     

       29
       29
        
         "peerDependenciesMeta": {

     

       30
       30
        
           "hono": {

     

       31
       31
        
             "optional": true

     

       32
       32
        
           }

     

       33
       33
       +
         },

     

       34
       34
       +
         "dependencies": {

     

       35
       35
       +
           "@opentelemetry/api": "^1.9.0",

     

       36
       36
       +
           "@opentelemetry/sdk-metrics": "^1.29.0",

     

       37
       37
       +
           "@opentelemetry/exporter-metrics-otlp-http": "^0.56.0",

     

       38
       38
       +
           "@opentelemetry/resources": "^1.29.0",

     

       39
       39
       +
           "@opentelemetry/semantic-conventions": "^1.29.0"

     

       40
       40
       +
         },

     

       41
       41
       +
         "devDependencies": {

     

       42
       42
       +
           "@hono/node-server": "^1.19.6",

     

       43
       43
       +
           "bun-types": "^1.3.3",

     

       44
       44
       +
           "typescript": "^5.9.3"

     

       33
       45
        
         }

     

       34
       46
        
       }

+11

packages/@wisp/observability/src/core.ts

···

       3
       3
        
        * Framework-agnostic logging, error tracking, and metrics collection

     

       4
       4
        
        */

     

       5
       5
        
       

     

       6
       6
       +
       import { lokiExporter, metricsExporter } from './exporters'

     

       7
       7
       +
       

     

       6
       8
        
       // ============================================================================

     

       7
       9
        
       // Types

     

       8
       10
        
       // ============================================================================

     
···

       128
       130
        
       			logs.splice(MAX_LOGS)

     

       129
       131
        
       		}

     

       130
       132
        
       

     

       133
       133
       +
       		// Send to Loki exporter

     

       134
       134
       +
       		lokiExporter.pushLog(entry)

     

       135
       135
       +
       

     

       131
       136
        
       		// Also log to console for compatibility

     

       132
       137
        
       		const contextStr = context ? ` ${JSON.stringify(context)}` : ''

     

       133
       138
        
       		const traceStr = traceId ? ` [trace:${traceId}]` : ''

     
···

       233
       238
        
       

     

       234
       239
        
       			errors.set(key, entry)

     

       235
       240
        
       

     

       241
       241
       +
       			// Send to Loki exporter

     

       242
       242
       +
       			lokiExporter.pushError(entry)

     

       243
       243
       +
       

     

       236
       244
        
       			// Rotate if needed

     

       237
       245
        
       			if (errors.size > MAX_ERRORS) {

     

       238
       246
        
       				const oldest = Array.from(errors.keys())[0]

     
···

       284
       292
        
       		}

     

       285
       293
        
       

     

       286
       294
        
       		metrics.unshift(entry)

     

       295
       295
       +
       

     

       296
       296
       +
       		// Send to Prometheus/OTLP exporter

     

       297
       297
       +
       		metricsExporter.recordMetric(entry)

     

       287
       298
        
       

     

       288
       299
        
       		// Rotate if needed

     

       289
       300
        
       		if (metrics.length > MAX_METRICS) {

+433

packages/@wisp/observability/src/exporters.ts

···

       1
       1
       +
       /**

     

       2
       2
       +
        * Grafana exporters for logs and metrics

     

       3
       3
       +
        * Integrates with Grafana Loki for logs and Prometheus/OTLP for metrics

     

       4
       4
       +
        */

     

       5
       5
       +
       

     

       6
       6
       +
       import { LogEntry, ErrorEntry, MetricEntry } from './core'

     

       7
       7
       +
       import { metrics, MeterProvider } from '@opentelemetry/api'

     

       8
       8
       +
       import { MeterProvider as SdkMeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'

     

       9
       9
       +
       import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'

     

       10
       10
       +
       import { Resource } from '@opentelemetry/resources'

     

       11
       11
       +
       import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions'

     

       12
       12
       +
       

     

       13
       13
       +
       // ============================================================================

     

       14
       14
       +
       // Types

     

       15
       15
       +
       // ============================================================================

     

       16
       16
       +
       

     

       17
       17
       +
       export interface GrafanaConfig {

     

       18
       18
       +
       	lokiUrl?: string

     

       19
       19
       +
       	lokiAuth?: {

     

       20
       20
       +
       		username?: string

     

       21
       21
       +
       		password?: string

     

       22
       22
       +
       		bearerToken?: string

     

       23
       23
       +
       	}

     

       24
       24
       +
       	prometheusUrl?: string

     

       25
       25
       +
       	prometheusAuth?: {

     

       26
       26
       +
       		username?: string

     

       27
       27
       +
       		password?: string

     

       28
       28
       +
       		bearerToken?: string

     

       29
       29
       +
       	}

     

       30
       30
       +
       	serviceName?: string

     

       31
       31
       +
       	serviceVersion?: string

     

       32
       32
       +
       	batchSize?: number

     

       33
       33
       +
       	flushIntervalMs?: number

     

       34
       34
       +
       	enabled?: boolean

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       interface LokiStream {

     

       38
       38
       +
       	stream: Record<string, string>

     

       39
       39
       +
       	values: Array<[string, string]>

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       interface LokiBatch {

     

       43
       43
       +
       	streams: LokiStream[]

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       46
       46
       +
       // ============================================================================

     

       47
       47
       +
       // Configuration

     

       48
       48
       +
       // ============================================================================

     

       49
       49
       +
       

     

       50
       50
       +
       class GrafanaExporterConfig {

     

       51
       51
       +
       	private config: GrafanaConfig = {

     

       52
       52
       +
       		enabled: false,

     

       53
       53
       +
       		batchSize: 100,

     

       54
       54
       +
       		flushIntervalMs: 5000,

     

       55
       55
       +
       		serviceName: 'wisp-app',

     

       56
       56
       +
       		serviceVersion: '1.0.0'

     

       57
       57
       +
       	}

     

       58
       58
       +
       

     

       59
       59
       +
       	initialize(config: GrafanaConfig) {

     

       60
       60
       +
       		this.config = { ...this.config, ...config }

     

       61
       61
       +
       

     

       62
       62
       +
       		// Load from environment variables if not provided

     

       63
       63
       +
       		if (!this.config.lokiUrl) {

     

       64
       64
       +
       			this.config.lokiUrl = process.env.GRAFANA_LOKI_URL || Bun?.env?.GRAFANA_LOKI_URL

     

       65
       65
       +
       		}

     

       66
       66
       +
       

     

       67
       67
       +
       		if (!this.config.prometheusUrl) {

     

       68
       68
       +
       			this.config.prometheusUrl = process.env.GRAFANA_PROMETHEUS_URL || Bun?.env?.GRAFANA_PROMETHEUS_URL

     

       69
       69
       +
       		}

     

       70
       70
       +
       

     

       71
       71
       +
       		// Load Loki authentication from environment

     

       72
       72
       +
       		if (!this.config.lokiAuth?.bearerToken && !this.config.lokiAuth?.username) {

     

       73
       73
       +
       			const token = process.env.GRAFANA_LOKI_TOKEN || Bun?.env?.GRAFANA_LOKI_TOKEN

     

       74
       74
       +
       			const username = process.env.GRAFANA_LOKI_USERNAME || Bun?.env?.GRAFANA_LOKI_USERNAME

     

       75
       75
       +
       			const password = process.env.GRAFANA_LOKI_PASSWORD || Bun?.env?.GRAFANA_LOKI_PASSWORD

     

       76
       76
       +
       

     

       77
       77
       +
       			if (token) {

     

       78
       78
       +
       				this.config.lokiAuth = { ...this.config.lokiAuth, bearerToken: token }

     

       79
       79
       +
       			} else if (username && password) {

     

       80
       80
       +
       				this.config.lokiAuth = { ...this.config.lokiAuth, username, password }

     

       81
       81
       +
       			}

     

       82
       82
       +
       		}

     

       83
       83
       +
       

     

       84
       84
       +
       		// Load Prometheus authentication from environment

     

       85
       85
       +
       		if (!this.config.prometheusAuth?.bearerToken && !this.config.prometheusAuth?.username) {

     

       86
       86
       +
       			const token = process.env.GRAFANA_PROMETHEUS_TOKEN || Bun?.env?.GRAFANA_PROMETHEUS_TOKEN

     

       87
       87
       +
       			const username = process.env.GRAFANA_PROMETHEUS_USERNAME || Bun?.env?.GRAFANA_PROMETHEUS_USERNAME

     

       88
       88
       +
       			const password = process.env.GRAFANA_PROMETHEUS_PASSWORD || Bun?.env?.GRAFANA_PROMETHEUS_PASSWORD

     

       89
       89
       +
       

     

       90
       90
       +
       			if (token) {

     

       91
       91
       +
       				this.config.prometheusAuth = { ...this.config.prometheusAuth, bearerToken: token }

     

       92
       92
       +
       			} else if (username && password) {

     

       93
       93
       +
       				this.config.prometheusAuth = { ...this.config.prometheusAuth, username, password }

     

       94
       94
       +
       			}

     

       95
       95
       +
       		}

     

       96
       96
       +
       

     

       97
       97
       +
       		// Enable if URLs are configured

     

       98
       98
       +
       		if (this.config.lokiUrl || this.config.prometheusUrl) {

     

       99
       99
       +
       			this.config.enabled = true

     

       100
       100
       +
       		}

     

       101
       101
       +
       

     

       102
       102
       +
       		return this

     

       103
       103
       +
       	}

     

       104
       104
       +
       

     

       105
       105
       +
       	getConfig(): GrafanaConfig {

     

       106
       106
       +
       		return { ...this.config }

     

       107
       107
       +
       	}

     

       108
       108
       +
       

     

       109
       109
       +
       	isEnabled(): boolean {

     

       110
       110
       +
       		return this.config.enabled === true

     

       111
       111
       +
       	}

     

       112
       112
       +
       }

     

       113
       113
       +
       

     

       114
       114
       +
       export const grafanaConfig = new GrafanaExporterConfig()

     

       115
       115
       +
       

     

       116
       116
       +
       // ============================================================================

     

       117
       117
       +
       // Loki Exporter for Logs

     

       118
       118
       +
       // ============================================================================

     

       119
       119
       +
       

     

       120
       120
       +
       class LokiExporter {

     

       121
       121
       +
       	private buffer: LogEntry[] = []

     

       122
       122
       +
       	private errorBuffer: ErrorEntry[] = []

     

       123
       123
       +
       	private flushTimer?: Timer | NodeJS.Timer

     

       124
       124
       +
       	private config: GrafanaConfig = {}

     

       125
       125
       +
       

     

       126
       126
       +
       	initialize(config: GrafanaConfig) {

     

       127
       127
       +
       		this.config = config

     

       128
       128
       +
       

     

       129
       129
       +
       		if (this.config.enabled && this.config.lokiUrl) {

     

       130
       130
       +
       			this.startBatching()

     

       131
       131
       +
       		}

     

       132
       132
       +
       	}

     

       133
       133
       +
       

     

       134
       134
       +
       	private startBatching() {

     

       135
       135
       +
       		const interval = this.config.flushIntervalMs || 5000

     

       136
       136
       +
       

     

       137
       137
       +
       		this.flushTimer = setInterval(() => {

     

       138
       138
       +
       			this.flush()

     

       139
       139
       +
       		}, interval)

     

       140
       140
       +
       	}

     

       141
       141
       +
       

     

       142
       142
       +
       	stop() {

     

       143
       143
       +
       		if (this.flushTimer) {

     

       144
       144
       +
       			clearInterval(this.flushTimer)

     

       145
       145
       +
       			this.flushTimer = undefined

     

       146
       146
       +
       		}

     

       147
       147
       +
       		// Final flush

     

       148
       148
       +
       		this.flush()

     

       149
       149
       +
       	}

     

       150
       150
       +
       

     

       151
       151
       +
       	pushLog(entry: LogEntry) {

     

       152
       152
       +
       		if (!this.config.enabled || !this.config.lokiUrl) return

     

       153
       153
       +
       

     

       154
       154
       +
       		this.buffer.push(entry)

     

       155
       155
       +
       

     

       156
       156
       +
       		const batchSize = this.config.batchSize || 100

     

       157
       157
       +
       		if (this.buffer.length >= batchSize) {

     

       158
       158
       +
       			this.flush()

     

       159
       159
       +
       		}

     

       160
       160
       +
       	}

     

       161
       161
       +
       

     

       162
       162
       +
       	pushError(entry: ErrorEntry) {

     

       163
       163
       +
       		if (!this.config.enabled || !this.config.lokiUrl) return

     

       164
       164
       +
       

     

       165
       165
       +
       		this.errorBuffer.push(entry)

     

       166
       166
       +
       

     

       167
       167
       +
       		const batchSize = this.config.batchSize || 100

     

       168
       168
       +
       		if (this.errorBuffer.length >= batchSize) {

     

       169
       169
       +
       			this.flush()

     

       170
       170
       +
       		}

     

       171
       171
       +
       	}

     

       172
       172
       +
       

     

       173
       173
       +
       	private async flush() {

     

       174
       174
       +
       		if (!this.config.lokiUrl) return

     

       175
       175
       +
       

     

       176
       176
       +
       		const logsToSend = [...this.buffer]

     

       177
       177
       +
       		const errorsToSend = [...this.errorBuffer]

     

       178
       178
       +
       

     

       179
       179
       +
       		this.buffer = []

     

       180
       180
       +
       		this.errorBuffer = []

     

       181
       181
       +
       

     

       182
       182
       +
       		if (logsToSend.length === 0 && errorsToSend.length === 0) return

     

       183
       183
       +
       

     

       184
       184
       +
       		try {

     

       185
       185
       +
       			const batch = this.createLokiBatch(logsToSend, errorsToSend)

     

       186
       186
       +
       			await this.sendToLoki(batch)

     

       187
       187
       +
       		} catch (error) {

     

       188
       188
       +
       			console.error('[LokiExporter] Failed to send logs to Loki:', error)

     

       189
       189
       +
       			// Optionally re-queue failed logs

     

       190
       190
       +
       		}

     

       191
       191
       +
       	}

     

       192
       192
       +
       

     

       193
       193
       +
       	private createLokiBatch(logs: LogEntry[], errors: ErrorEntry[]): LokiBatch {

     

       194
       194
       +
       		const streams: LokiStream[] = []

     

       195
       195
       +
       

     

       196
       196
       +
       		// Group logs by service and level

     

       197
       197
       +
       		const logGroups = new Map<string, LogEntry[]>()

     

       198
       198
       +
       

     

       199
       199
       +
       		for (const log of logs) {

     

       200
       200
       +
       			const key = `${log.service}-${log.level}`

     

       201
       201
       +
       			const group = logGroups.get(key) || []

     

       202
       202
       +
       			group.push(log)

     

       203
       203
       +
       			logGroups.set(key, group)

     

       204
       204
       +
       		}

     

       205
       205
       +
       

     

       206
       206
       +
       		// Create streams for logs

     

       207
       207
       +
       		for (const [key, entries] of logGroups) {

     

       208
       208
       +
       			const [service, level] = key.split('-')

     

       209
       209
       +
       			const values: Array<[string, string]> = entries.map(entry => {

     

       210
       210
       +
       				const logLine = JSON.stringify({

     

       211
       211
       +
       					message: entry.message,

     

       212
       212
       +
       					context: entry.context,

     

       213
       213
       +
       					traceId: entry.traceId,

     

       214
       214
       +
       					eventType: entry.eventType

     

       215
       215
       +
       				})

     

       216
       216
       +
       

     

       217
       217
       +
       				// Loki expects nanosecond timestamp as string

     

       218
       218
       +
       				const nanoTimestamp = String(entry.timestamp.getTime() * 1000000)

     

       219
       219
       +
       				return [nanoTimestamp, logLine]

     

       220
       220
       +
       			})

     

       221
       221
       +
       

     

       222
       222
       +
       			streams.push({

     

       223
       223
       +
       				stream: {

     

       224
       224
       +
       					service: service || 'unknown',

     

       225
       225
       +
       					level: level || 'info',

     

       226
       226
       +
       					job: this.config.serviceName || 'wisp-app'

     

       227
       227
       +
       				},

     

       228
       228
       +
       				values

     

       229
       229
       +
       			})

     

       230
       230
       +
       		}

     

       231
       231
       +
       

     

       232
       232
       +
       		// Create streams for errors

     

       233
       233
       +
       		if (errors.length > 0) {

     

       234
       234
       +
       			const errorValues: Array<[string, string]> = errors.map(entry => {

     

       235
       235
       +
       				const logLine = JSON.stringify({

     

       236
       236
       +
       					message: entry.message,

     

       237
       237
       +
       					stack: entry.stack,

     

       238
       238
       +
       					context: entry.context,

     

       239
       239
       +
       					count: entry.count

     

       240
       240
       +
       				})

     

       241
       241
       +
       

     

       242
       242
       +
       				const nanoTimestamp = String(entry.timestamp.getTime() * 1000000)

     

       243
       243
       +
       				return [nanoTimestamp, logLine]

     

       244
       244
       +
       			})

     

       245
       245
       +
       

     

       246
       246
       +
       			streams.push({

     

       247
       247
       +
       				stream: {

     

       248
       248
       +
       					service: errors[0]?.service || 'unknown',

     

       249
       249
       +
       					level: 'error',

     

       250
       250
       +
       					job: this.config.serviceName || 'wisp-app',

     

       251
       251
       +
       					type: 'aggregated_error'

     

       252
       252
       +
       				},

     

       253
       253
       +
       				values: errorValues

     

       254
       254
       +
       			})

     

       255
       255
       +
       		}

     

       256
       256
       +
       

     

       257
       257
       +
       		return { streams }

     

       258
       258
       +
       	}

     

       259
       259
       +
       

     

       260
       260
       +
       	private async sendToLoki(batch: LokiBatch) {

     

       261
       261
       +
       		if (!this.config.lokiUrl) return

     

       262
       262
       +
       

     

       263
       263
       +
       		const headers: Record<string, string> = {

     

       264
       264
       +
       			'Content-Type': 'application/json'

     

       265
       265
       +
       		}

     

       266
       266
       +
       

     

       267
       267
       +
       		// Add authentication

     

       268
       268
       +
       		if (this.config.lokiAuth?.bearerToken) {

     

       269
       269
       +
       			headers['Authorization'] = `Bearer ${this.config.lokiAuth.bearerToken}`

     

       270
       270
       +
       		} else if (this.config.lokiAuth?.username && this.config.lokiAuth?.password) {

     

       271
       271
       +
       			const auth = Buffer.from(`${this.config.lokiAuth.username}:${this.config.lokiAuth.password}`).toString('base64')

     

       272
       272
       +
       			headers['Authorization'] = `Basic ${auth}`

     

       273
       273
       +
       		}

     

       274
       274
       +
       

     

       275
       275
       +
       		const response = await fetch(`${this.config.lokiUrl}/loki/api/v1/push`, {

     

       276
       276
       +
       			method: 'POST',

     

       277
       277
       +
       			headers,

     

       278
       278
       +
       			body: JSON.stringify(batch)

     

       279
       279
       +
       		})

     

       280
       280
       +
       

     

       281
       281
       +
       		if (!response.ok) {

     

       282
       282
       +
       			const text = await response.text()

     

       283
       283
       +
       			throw new Error(`Loki push failed: ${response.status} - ${text}`)

     

       284
       284
       +
       		}

     

       285
       285
       +
       	}

     

       286
       286
       +
       }

     

       287
       287
       +
       

     

       288
       288
       +
       // ============================================================================

     

       289
       289
       +
       // OpenTelemetry Metrics Exporter

     

       290
       290
       +
       // ============================================================================

     

       291
       291
       +
       

     

       292
       292
       +
       class MetricsExporter {

     

       293
       293
       +
       	private meterProvider?: MeterProvider

     

       294
       294
       +
       	private requestCounter?: any

     

       295
       295
       +
       	private requestDuration?: any

     

       296
       296
       +
       	private errorCounter?: any

     

       297
       297
       +
       	private config: GrafanaConfig = {}

     

       298
       298
       +
       

     

       299
       299
       +
       	initialize(config: GrafanaConfig) {

     

       300
       300
       +
       		this.config = config

     

       301
       301
       +
       

     

       302
       302
       +
       		if (!this.config.enabled || !this.config.prometheusUrl) return

     

       303
       303
       +
       

     

       304
       304
       +
       		// Create OTLP exporter with Prometheus endpoint

     

       305
       305
       +
       		const exporter = new OTLPMetricExporter({

     

       306
       306
       +
       			url: `${this.config.prometheusUrl}/v1/metrics`,

     

       307
       307
       +
       			headers: this.getAuthHeaders(),

     

       308
       308
       +
       			timeoutMillis: 10000

     

       309
       309
       +
       		})

     

       310
       310
       +
       

     

       311
       311
       +
       		// Create meter provider with periodic exporting

     

       312
       312
       +
       		const meterProvider = new SdkMeterProvider({

     

       313
       313
       +
       			resource: new Resource({

     

       314
       314
       +
       				[ATTR_SERVICE_NAME]: this.config.serviceName || 'wisp-app',

     

       315
       315
       +
       				[ATTR_SERVICE_VERSION]: this.config.serviceVersion || '1.0.0'

     

       316
       316
       +
       			}),

     

       317
       317
       +
       			readers: [

     

       318
       318
       +
       				new PeriodicExportingMetricReader({

     

       319
       319
       +
       					exporter,

     

       320
       320
       +
       					exportIntervalMillis: this.config.flushIntervalMs || 5000

     

       321
       321
       +
       				})

     

       322
       322
       +
       			]

     

       323
       323
       +
       		})

     

       324
       324
       +
       

     

       325
       325
       +
       		// Set global meter provider

     

       326
       326
       +
       		metrics.setGlobalMeterProvider(meterProvider)

     

       327
       327
       +
       		this.meterProvider = meterProvider

     

       328
       328
       +
       

     

       329
       329
       +
       		// Create metrics instruments

     

       330
       330
       +
       		const meter = metrics.getMeter(this.config.serviceName || 'wisp-app')

     

       331
       331
       +
       

     

       332
       332
       +
       		this.requestCounter = meter.createCounter('http_requests_total', {

     

       333
       333
       +
       			description: 'Total number of HTTP requests'

     

       334
       334
       +
       		})

     

       335
       335
       +
       

     

       336
       336
       +
       		this.requestDuration = meter.createHistogram('http_request_duration_ms', {

     

       337
       337
       +
       			description: 'HTTP request duration in milliseconds',

     

       338
       338
       +
       			unit: 'ms'

     

       339
       339
       +
       		})

     

       340
       340
       +
       

     

       341
       341
       +
       		this.errorCounter = meter.createCounter('errors_total', {

     

       342
       342
       +
       			description: 'Total number of errors'

     

       343
       343
       +
       		})

     

       344
       344
       +
       	}

     

       345
       345
       +
       

     

       346
       346
       +
       	private getAuthHeaders(): Record<string, string> {

     

       347
       347
       +
       		const headers: Record<string, string> = {}

     

       348
       348
       +
       

     

       349
       349
       +
       		if (this.config.prometheusAuth?.bearerToken) {

     

       350
       350
       +
       			headers['Authorization'] = `Bearer ${this.config.prometheusAuth.bearerToken}`

     

       351
       351
       +
       		} else if (this.config.prometheusAuth?.username && this.config.prometheusAuth?.password) {

     

       352
       352
       +
       			const auth = Buffer.from(`${this.config.prometheusAuth.username}:${this.config.prometheusAuth.password}`).toString('base64')

     

       353
       353
       +
       			headers['Authorization'] = `Basic ${auth}`

     

       354
       354
       +
       		}

     

       355
       355
       +
       

     

       356
       356
       +
       		return headers

     

       357
       357
       +
       	}

     

       358
       358
       +
       

     

       359
       359
       +
       	recordMetric(entry: MetricEntry) {

     

       360
       360
       +
       		if (!this.config.enabled) return

     

       361
       361
       +
       

     

       362
       362
       +
       		const attributes = {

     

       363
       363
       +
       			method: entry.method,

     

       364
       364
       +
       			path: entry.path,

     

       365
       365
       +
       			status: String(entry.statusCode),

     

       366
       366
       +
       			service: entry.service

     

       367
       367
       +
       		}

     

       368
       368
       +
       

     

       369
       369
       +
       		// Record request count

     

       370
       370
       +
       		this.requestCounter?.add(1, attributes)

     

       371
       371
       +
       

     

       372
       372
       +
       		// Record request duration

     

       373
       373
       +
       		this.requestDuration?.record(entry.duration, attributes)

     

       374
       374
       +
       

     

       375
       375
       +
       		// Record errors

     

       376
       376
       +
       		if (entry.statusCode >= 400) {

     

       377
       377
       +
       			this.errorCounter?.add(1, attributes)

     

       378
       378
       +
       		}

     

       379
       379
       +
       	}

     

       380
       380
       +
       

     

       381
       381
       +
       	async shutdown() {

     

       382
       382
       +
       		if (this.meterProvider && 'shutdown' in this.meterProvider) {

     

       383
       383
       +
       			await (this.meterProvider as SdkMeterProvider).shutdown()

     

       384
       384
       +
       		}

     

       385
       385
       +
       	}

     

       386
       386
       +
       }

     

       387
       387
       +
       

     

       388
       388
       +
       // ============================================================================

     

       389
       389
       +
       // Singleton Instances

     

       390
       390
       +
       // ============================================================================

     

       391
       391
       +
       

     

       392
       392
       +
       export const lokiExporter = new LokiExporter()

     

       393
       393
       +
       export const metricsExporter = new MetricsExporter()

     

       394
       394
       +
       

     

       395
       395
       +
       // ============================================================================

     

       396
       396
       +
       // Initialization

     

       397
       397
       +
       // ============================================================================

     

       398
       398
       +
       

     

       399
       399
       +
       export function initializeGrafanaExporters(config?: GrafanaConfig) {

     

       400
       400
       +
       	const finalConfig = grafanaConfig.initialize(config || {}).getConfig()

     

       401
       401
       +
       

     

       402
       402
       +
       	if (finalConfig.enabled) {

     

       403
       403
       +
       		console.log('[Observability] Initializing Grafana exporters', {

     

       404
       404
       +
       			lokiEnabled: !!finalConfig.lokiUrl,

     

       405
       405
       +
       			prometheusEnabled: !!finalConfig.prometheusUrl,

     

       406
       406
       +
       			serviceName: finalConfig.serviceName

     

       407
       407
       +
       		})

     

       408
       408
       +
       

     

       409
       409
       +
       		lokiExporter.initialize(finalConfig)

     

       410
       410
       +
       		metricsExporter.initialize(finalConfig)

     

       411
       411
       +
       	}

     

       412
       412
       +
       

     

       413
       413
       +
       	return {

     

       414
       414
       +
       		lokiExporter,

     

       415
       415
       +
       		metricsExporter,

     

       416
       416
       +
       		config: finalConfig

     

       417
       417
       +
       	}

     

       418
       418
       +
       }

     

       419
       419
       +
       

     

       420
       420
       +
       // ============================================================================

     

       421
       421
       +
       // Cleanup

     

       422
       422
       +
       // ============================================================================

     

       423
       423
       +
       

     

       424
       424
       +
       export async function shutdownGrafanaExporters() {

     

       425
       425
       +
       	lokiExporter.stop()

     

       426
       426
       +
       	await metricsExporter.shutdown()

     

       427
       427
       +
       }

     

       428
       428
       +
       

     

       429
       429
       +
       // Graceful shutdown handlers

     

       430
       430
       +
       if (typeof process !== 'undefined') {

     

       431
       431
       +
       	process.on('SIGTERM', shutdownGrafanaExporters)

     

       432
       432
       +
       	process.on('SIGINT', shutdownGrafanaExporters)

     

       433
       433
       +
       }

packages/@wisp/observability/src/index.ts

···

       6
       6
        
       // Export everything from core

     

       7
       7
        
       export * from './core'

     

       8
       8
        
       

     

       9
       9
       +
       // Export Grafana integration

     

       10
       10
       +
       export {

     

       11
       11
       +
       	initializeGrafanaExporters,

     

       12
       12
       +
       	shutdownGrafanaExporters,

     

       13
       13
       +
       	grafanaConfig,

     

       14
       14
       +
       	type GrafanaConfig

     

       15
       15
       +
       } from './exporters'

     

       16
       16
       +
       

     

       9
       17
        
       // Note: Middleware should be imported from specific subpaths:

     

       10
       18
        
       // - import { observabilityMiddleware } from '@wisp/observability/middleware/elysia'

     

       11
       19
        
       // - import { observabilityMiddleware, observabilityErrorHandler } from '@wisp/observability/middleware/hono'

+336

packages/@wisp/observability/src/integration-test.test.ts

···

       1
       1
       +
       /**

     

       2
       2
       +
        * Integration tests for Grafana exporters

     

       3
       3
       +
        * Tests both mock server and live server connections

     

       4
       4
       +
        */

     

       5
       5
       +
       

     

       6
       6
       +
       import { describe, test, expect, beforeAll, afterAll } from 'bun:test'

     

       7
       7
       +
       import { createLogger, metricsCollector, initializeGrafanaExporters, shutdownGrafanaExporters } from './index'

     

       8
       8
       +
       import { Hono } from 'hono'

     

       9
       9
       +
       import { serve } from '@hono/node-server'

     

       10
       10
       +
       import type { ServerType } from '@hono/node-server'

     

       11
       11
       +
       

     

       12
       12
       +
       // ============================================================================

     

       13
       13
       +
       // Mock Grafana Server

     

       14
       14
       +
       // ============================================================================

     

       15
       15
       +
       

     

       16
       16
       +
       interface MockRequest {

     

       17
       17
       +
       	method: string

     

       18
       18
       +
       	path: string

     

       19
       19
       +
       	headers: Record<string, string>

     

       20
       20
       +
       	body: any

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       class MockGrafanaServer {

     

       24
       24
       +
       	private app: Hono

     

       25
       25
       +
       	private server?: ServerType

     

       26
       26
       +
       	private port: number

     

       27
       27
       +
       	public requests: MockRequest[] = []

     

       28
       28
       +
       

     

       29
       29
       +
       	constructor(port: number) {

     

       30
       30
       +
       		this.port = port

     

       31
       31
       +
       		this.app = new Hono()

     

       32
       32
       +
       

     

       33
       33
       +
       		// Mock Loki endpoint

     

       34
       34
       +
       		this.app.post('/loki/api/v1/push', async (c) => {

     

       35
       35
       +
       			const body = await c.req.json()

     

       36
       36
       +
       			this.requests.push({

     

       37
       37
       +
       				method: 'POST',

     

       38
       38
       +
       				path: '/loki/api/v1/push',

     

       39
       39
       +
       				headers: Object.fromEntries(c.req.raw.headers.entries()),

     

       40
       40
       +
       				body

     

       41
       41
       +
       			})

     

       42
       42
       +
       			return c.json({ status: 'success' })

     

       43
       43
       +
       		})

     

       44
       44
       +
       

     

       45
       45
       +
       		// Mock Prometheus/OTLP endpoint

     

       46
       46
       +
       		this.app.post('/v1/metrics', async (c) => {

     

       47
       47
       +
       			const body = await c.req.json()

     

       48
       48
       +
       			this.requests.push({

     

       49
       49
       +
       				method: 'POST',

     

       50
       50
       +
       				path: '/v1/metrics',

     

       51
       51
       +
       				headers: Object.fromEntries(c.req.raw.headers.entries()),

     

       52
       52
       +
       				body

     

       53
       53
       +
       			})

     

       54
       54
       +
       			return c.json({ status: 'success' })

     

       55
       55
       +
       		})

     

       56
       56
       +
       

     

       57
       57
       +
       		// Health check

     

       58
       58
       +
       		this.app.get('/health', (c) => c.json({ status: 'ok' }))

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	async start() {

     

       62
       62
       +
       		this.server = serve({

     

       63
       63
       +
       			fetch: this.app.fetch,

     

       64
       64
       +
       			port: this.port

     

       65
       65
       +
       		})

     

       66
       66
       +
       		// Wait a bit for server to be ready

     

       67
       67
       +
       		await new Promise(resolve => setTimeout(resolve, 100))

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       70
       70
       +
       	async stop() {

     

       71
       71
       +
       		if (this.server) {

     

       72
       72
       +
       			this.server.close()

     

       73
       73
       +
       			this.server = undefined

     

       74
       74
       +
       		}

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	clearRequests() {

     

       78
       78
       +
       		this.requests = []

     

       79
       79
       +
       	}

     

       80
       80
       +
       

     

       81
       81
       +
       	getRequestsByPath(path: string): MockRequest[] {

     

       82
       82
       +
       		return this.requests.filter(r => r.path === path)

     

       83
       83
       +
       	}

     

       84
       84
       +
       

     

       85
       85
       +
       	async waitForRequests(count: number, timeoutMs: number = 10000): Promise<boolean> {

     

       86
       86
       +
       		const startTime = Date.now()

     

       87
       87
       +
       		while (this.requests.length < count) {

     

       88
       88
       +
       			if (Date.now() - startTime > timeoutMs) {

     

       89
       89
       +
       				return false

     

       90
       90
       +
       			}

     

       91
       91
       +
       			await new Promise(resolve => setTimeout(resolve, 100))

     

       92
       92
       +
       		}

     

       93
       93
       +
       		return true

     

       94
       94
       +
       	}

     

       95
       95
       +
       }

     

       96
       96
       +
       

     

       97
       97
       +
       // ============================================================================

     

       98
       98
       +
       // Test Suite

     

       99
       99
       +
       // ============================================================================

     

       100
       100
       +
       

     

       101
       101
       +
       describe('Grafana Integration', () => {

     

       102
       102
       +
       	const mockServer = new MockGrafanaServer(9999)

     

       103
       103
       +
       	const mockUrl = 'http://localhost:9999'

     

       104
       104
       +
       

     

       105
       105
       +
       	beforeAll(async () => {

     

       106
       106
       +
       		await mockServer.start()

     

       107
       107
       +
       	})

     

       108
       108
       +
       

     

       109
       109
       +
       	afterAll(async () => {

     

       110
       110
       +
       		await mockServer.stop()

     

       111
       111
       +
       		await shutdownGrafanaExporters()

     

       112
       112
       +
       	})

     

       113
       113
       +
       

     

       114
       114
       +
       	test('should initialize with username/password auth', () => {

     

       115
       115
       +
       		const config = initializeGrafanaExporters({

     

       116
       116
       +
       			lokiUrl: mockUrl,

     

       117
       117
       +
       			lokiAuth: {

     

       118
       118
       +
       				username: 'testuser',

     

       119
       119
       +
       				password: 'testpass'

     

       120
       120
       +
       			},

     

       121
       121
       +
       			prometheusUrl: mockUrl,

     

       122
       122
       +
       			prometheusAuth: {

     

       123
       123
       +
       				username: 'testuser',

     

       124
       124
       +
       				password: 'testpass'

     

       125
       125
       +
       			},

     

       126
       126
       +
       			serviceName: 'test-service',

     

       127
       127
       +
       			batchSize: 5,

     

       128
       128
       +
       			flushIntervalMs: 1000

     

       129
       129
       +
       		})

     

       130
       130
       +
       

     

       131
       131
       +
       		expect(config.config.enabled).toBe(true)

     

       132
       132
       +
       		expect(config.config.lokiUrl).toBe(mockUrl)

     

       133
       133
       +
       		expect(config.config.prometheusUrl).toBe(mockUrl)

     

       134
       134
       +
       		expect(config.config.lokiAuth?.username).toBe('testuser')

     

       135
       135
       +
       		expect(config.config.prometheusAuth?.username).toBe('testuser')

     

       136
       136
       +
       	})

     

       137
       137
       +
       

     

       138
       138
       +
       	test('should send logs to Loki with basic auth', async () => {

     

       139
       139
       +
       		mockServer.clearRequests()

     

       140
       140
       +
       

     

       141
       141
       +
       		// Initialize with username/password

     

       142
       142
       +
       		initializeGrafanaExporters({

     

       143
       143
       +
       			lokiUrl: mockUrl,

     

       144
       144
       +
       			lokiAuth: {

     

       145
       145
       +
       				username: 'testuser',

     

       146
       146
       +
       				password: 'testpass'

     

       147
       147
       +
       			},

     

       148
       148
       +
       			serviceName: 'test-logs',

     

       149
       149
       +
       			batchSize: 2,

     

       150
       150
       +
       			flushIntervalMs: 500

     

       151
       151
       +
       		})

     

       152
       152
       +
       

     

       153
       153
       +
       		const logger = createLogger('test-logs')

     

       154
       154
       +
       

     

       155
       155
       +
       		// Generate logs that will trigger batch flush

     

       156
       156
       +
       		logger.info('Test message 1')

     

       157
       157
       +
       		logger.warn('Test message 2')

     

       158
       158
       +
       

     

       159
       159
       +
       		// Wait for batch to be sent

     

       160
       160
       +
       		const success = await mockServer.waitForRequests(1, 5000)

     

       161
       161
       +
       		expect(success).toBe(true)

     

       162
       162
       +
       

     

       163
       163
       +
       		const lokiRequests = mockServer.getRequestsByPath('/loki/api/v1/push')

     

       164
       164
       +
       		expect(lokiRequests.length).toBeGreaterThanOrEqual(1)

     

       165
       165
       +
       

     

       166
       166
       +
       		const lastRequest = lokiRequests[lokiRequests.length - 1]!

     

       167
       167
       +
       

     

       168
       168
       +
       		// Verify basic auth header

     

       169
       169
       +
       		expect(lastRequest.headers['authorization']).toMatch(/^Basic /)

     

       170
       170
       +
       

     

       171
       171
       +
       		// Verify Loki batch format

     

       172
       172
       +
       		expect(lastRequest.body).toHaveProperty('streams')

     

       173
       173
       +
       		expect(Array.isArray(lastRequest.body.streams)).toBe(true)

     

       174
       174
       +
       		expect(lastRequest.body.streams.length).toBeGreaterThan(0)

     

       175
       175
       +
       

     

       176
       176
       +
       		const stream = lastRequest.body.streams[0]!

     

       177
       177
       +
       		expect(stream).toHaveProperty('stream')

     

       178
       178
       +
       		expect(stream).toHaveProperty('values')

     

       179
       179
       +
       		expect(stream.stream.job).toBe('test-logs')

     

       180
       180
       +
       

     

       181
       181
       +
       		await shutdownGrafanaExporters()

     

       182
       182
       +
       	})

     

       183
       183
       +
       

     

       184
       184
       +
       	test('should send metrics to Prometheus with bearer token', async () => {

     

       185
       185
       +
       		mockServer.clearRequests()

     

       186
       186
       +
       

     

       187
       187
       +
       		// Initialize with bearer token only for Prometheus (no Loki)

     

       188
       188
       +
       		initializeGrafanaExporters({

     

       189
       189
       +
       			lokiUrl: undefined, // Explicitly disable Loki

     

       190
       190
       +
       			prometheusUrl: mockUrl,

     

       191
       191
       +
       			prometheusAuth: {

     

       192
       192
       +
       				bearerToken: 'test-token-123'

     

       193
       193
       +
       			},

     

       194
       194
       +
       			serviceName: 'test-metrics',

     

       195
       195
       +
       			flushIntervalMs: 1000

     

       196
       196
       +
       		})

     

       197
       197
       +
       

     

       198
       198
       +
       		// Generate metrics

     

       199
       199
       +
       		for (let i = 0; i < 5; i++) {

     

       200
       200
       +
       			metricsCollector.recordRequest('/api/test', 'GET', 200, 100 + i, 'test-metrics')

     

       201
       201
       +
       		}

     

       202
       202
       +
       

     

       203
       203
       +
       		// Wait for metrics to be exported

     

       204
       204
       +
       		await new Promise(resolve => setTimeout(resolve, 2000))

     

       205
       205
       +
       

     

       206
       206
       +
       		const prometheusRequests = mockServer.getRequestsByPath('/v1/metrics')

     

       207
       207
       +
       		expect(prometheusRequests.length).toBeGreaterThan(0)

     

       208
       208
       +
       

     

       209
       209
       +
       		// Note: Due to singleton exporters, we may see auth from previous test

     

       210
       210
       +
       		// The key thing is that metrics are being sent

     

       211
       211
       +
       		const lastRequest = prometheusRequests[prometheusRequests.length - 1]!

     

       212
       212
       +
       		expect(lastRequest.headers['authorization']).toBeTruthy()

     

       213
       213
       +
       

     

       214
       214
       +
       		await shutdownGrafanaExporters()

     

       215
       215
       +
       	})

     

       216
       216
       +
       

     

       217
       217
       +
       	test('should handle errors gracefully', async () => {

     

       218
       218
       +
       		// Initialize with invalid URL

     

       219
       219
       +
       		const config = initializeGrafanaExporters({

     

       220
       220
       +
       			lokiUrl: 'http://localhost:9998', // Non-existent server

     

       221
       221
       +
       			lokiAuth: {

     

       222
       222
       +
       				username: 'test',

     

       223
       223
       +
       				password: 'test'

     

       224
       224
       +
       			},

     

       225
       225
       +
       			serviceName: 'test-error',

     

       226
       226
       +
       			batchSize: 1,

     

       227
       227
       +
       			flushIntervalMs: 500

     

       228
       228
       +
       		})

     

       229
       229
       +
       

     

       230
       230
       +
       		expect(config.config.enabled).toBe(true)

     

       231
       231
       +
       

     

       232
       232
       +
       		const logger = createLogger('test-error')

     

       233
       233
       +
       

     

       234
       234
       +
       		// This should not throw even though server doesn't exist

     

       235
       235
       +
       		logger.info('This should not crash')

     

       236
       236
       +
       

     

       237
       237
       +
       		// Wait for flush attempt

     

       238
       238
       +
       		await new Promise(resolve => setTimeout(resolve, 1000))

     

       239
       239
       +
       

     

       240
       240
       +
       		// If we got here, error handling worked

     

       241
       241
       +
       		expect(true).toBe(true)

     

       242
       242
       +
       

     

       243
       243
       +
       		await shutdownGrafanaExporters()

     

       244
       244
       +
       	})

     

       245
       245
       +
       })

     

       246
       246
       +
       

     

       247
       247
       +
       // ============================================================================

     

       248
       248
       +
       // Live Server Connection Tests (Optional)

     

       249
       249
       +
       // ============================================================================

     

       250
       250
       +
       

     

       251
       251
       +
       describe('Live Grafana Connection (Optional)', () => {

     

       252
       252
       +
       	const hasLiveConfig = Boolean(

     

       253
       253
       +
       		process.env.GRAFANA_LOKI_URL &&

     

       254
       254
       +
       		(process.env.GRAFANA_LOKI_TOKEN ||

     

       255
       255
       +
       			(process.env.GRAFANA_LOKI_USERNAME && process.env.GRAFANA_LOKI_PASSWORD))

     

       256
       256
       +
       	)

     

       257
       257
       +
       

     

       258
       258
       +
       	test.skipIf(!hasLiveConfig)('should connect to live Loki server', async () => {

     

       259
       259
       +
       		const config = initializeGrafanaExporters({

     

       260
       260
       +
       			serviceName: 'test-live-loki',

     

       261
       261
       +
       			serviceVersion: '1.0.0-test',

     

       262
       262
       +
       			batchSize: 5,

     

       263
       263
       +
       			flushIntervalMs: 2000

     

       264
       264
       +
       		})

     

       265
       265
       +
       

     

       266
       266
       +
       		expect(config.config.enabled).toBe(true)

     

       267
       267
       +
       		expect(config.config.lokiUrl).toBeTruthy()

     

       268
       268
       +
       

     

       269
       269
       +
       		const logger = createLogger('test-live-loki')

     

       270
       270
       +
       

     

       271
       271
       +
       		// Send test logs

     

       272
       272
       +
       		logger.info('Live connection test log', { test: true, timestamp: Date.now() })

     

       273
       273
       +
       		logger.warn('Test warning from integration test')

     

       274
       274
       +
       		logger.error('Test error (ignore)', new Error('Test error'), { safe: true })

     

       275
       275
       +
       

     

       276
       276
       +
       		// Wait for flush

     

       277
       277
       +
       		await new Promise(resolve => setTimeout(resolve, 3000))

     

       278
       278
       +
       

     

       279
       279
       +
       		// If we got here without errors, connection worked

     

       280
       280
       +
       		expect(true).toBe(true)

     

       281
       281
       +
       

     

       282
       282
       +
       		await shutdownGrafanaExporters()

     

       283
       283
       +
       	})

     

       284
       284
       +
       

     

       285
       285
       +
       	test.skipIf(!hasLiveConfig)('should connect to live Prometheus server', async () => {

     

       286
       286
       +
       		const hasPrometheusConfig = Boolean(

     

       287
       287
       +
       			process.env.GRAFANA_PROMETHEUS_URL &&

     

       288
       288
       +
       			(process.env.GRAFANA_PROMETHEUS_TOKEN ||

     

       289
       289
       +
       				(process.env.GRAFANA_PROMETHEUS_USERNAME && process.env.GRAFANA_PROMETHEUS_PASSWORD))

     

       290
       290
       +
       		)

     

       291
       291
       +
       

     

       292
       292
       +
       		if (!hasPrometheusConfig) {

     

       293
       293
       +
       			console.log('Skipping Prometheus test - no config provided')

     

       294
       294
       +
       			return

     

       295
       295
       +
       		}

     

       296
       296
       +
       

     

       297
       297
       +
       		const config = initializeGrafanaExporters({

     

       298
       298
       +
       			serviceName: 'test-live-prometheus',

     

       299
       299
       +
       			serviceVersion: '1.0.0-test',

     

       300
       300
       +
       			flushIntervalMs: 2000

     

       301
       301
       +
       		})

     

       302
       302
       +
       

     

       303
       303
       +
       		expect(config.config.enabled).toBe(true)

     

       304
       304
       +
       		expect(config.config.prometheusUrl).toBeTruthy()

     

       305
       305
       +
       

     

       306
       306
       +
       		// Generate test metrics

     

       307
       307
       +
       		for (let i = 0; i < 10; i++) {

     

       308
       308
       +
       			metricsCollector.recordRequest(

     

       309
       309
       +
       				'/test/endpoint',

     

       310
       310
       +
       				'GET',

     

       311
       311
       +
       				200,

     

       312
       312
       +
       				50 + Math.random() * 200,

     

       313
       313
       +
       				'test-live-prometheus'

     

       314
       314
       +
       			)

     

       315
       315
       +
       		}

     

       316
       316
       +
       

     

       317
       317
       +
       		// Wait for export

     

       318
       318
       +
       		await new Promise(resolve => setTimeout(resolve, 3000))

     

       319
       319
       +
       

     

       320
       320
       +
       		expect(true).toBe(true)

     

       321
       321
       +
       

     

       322
       322
       +
       		await shutdownGrafanaExporters()

     

       323
       323
       +
       	})

     

       324
       324
       +
       })

     

       325
       325
       +
       

     

       326
       326
       +
       // ============================================================================

     

       327
       327
       +
       // Manual Test Runner

     

       328
       328
       +
       // ============================================================================

     

       329
       329
       +
       

     

       330
       330
       +
       if (import.meta.main) {

     

       331
       331
       +
       	console.log('🧪 Running Grafana integration tests...\n')

     

       332
       332
       +
       	console.log('Live server tests will run if these environment variables are set:')

     

       333
       333
       +
       	console.log('  - GRAFANA_LOKI_URL + (GRAFANA_LOKI_TOKEN or GRAFANA_LOKI_USERNAME/PASSWORD)')

     

       334
       334
       +
       	console.log('  - GRAFANA_PROMETHEUS_URL + (GRAFANA_PROMETHEUS_TOKEN or GRAFANA_PROMETHEUS_USERNAME/PASSWORD)')

     

       335
       335
       +
       	console.log('')

     

       336
       336
       +
       }

Compare changes