OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
ralph(M4-008): P4 close: core clients/email.ts wrapper, db self-contained pino, delete emptied packages, workspace cleanup
ralpha9f8293aca99
diff --git a/packages/common/index.ts b/packages/common/index.tsindex 329ab7223..dd40b81e2 100644--- a/packages/common/index.ts+++ b/packages/common/index.ts@@ -1,4 +1,5 @@export * from './src/date';+export * from './src/get-client-ip';export * from './src/get-previous-metric';export * from './src/group-by-labels';export * from './src/id';diff --git a/packages/common/src/get-client-ip.ts b/packages/common/src/get-client-ip.tsnew file mode 100644index 000000000..888debb8f--- /dev/null+++ b/packages/common/src/get-client-ip.ts@@ -0,0 +1,157 @@+/**+ * Get client IP from headers+ *+ * Can be configured via IP_HEADER_ORDER env variable+ * Example: IP_HEADER_ORDER="cf-connecting-ip,x-real-ip,x-forwarded-for"+ *+ * Kept in @openpanel/common (not @openpanel/core) so SDKs that need it+ * (packages/sdks/express) don't pull in core's backend-only dependency tree+ * (argon2, bullmq, aws-sdk, …) — see AGENTS.md/CLAUDE.md: "core is not a+ * grab-bag for cross-app code". @openpanel/core carries the same function+ * (src/shared/get-client-ip.ts) for backend consumers; this is the SDK-facing+ * copy, isomorphic by construction (no imports beyond globals).+ */++// Order matters: client-forwarded headers (set explicitly by SDKs/upstream+// servers) must come before infrastructure headers like `cf-connecting-ip`.+// Otherwise, when our API sits behind Cloudflare (orange cloud), Cloudflare+// rewrites `cf-connecting-ip` to the SDK server's IP — losing the original+// end-user IP that the SDK forwarded in `x-client-ip` / `openpanel-client-ip`.+export const DEFAULT_IP_HEADER_ORDER = [+ 'openpanel-client-ip',+ 'true-client-ip',+ 'x-client-ip',+ 'cf-connecting-ip',+ 'x-forwarded-for',+ 'x-real-ip',+ 'fastly-client-ip',+ 'x-cluster-client-ip',+ 'x-appengine-user-ip',+ 'do-connecting-ip',+ 'x-nf-client-connection-ip',+ 'x-forwarded',+ 'forwarded',+];++function isPublicIp(ip: string): boolean {+ // Handle IPv4-mapped IPv6 addresses (e.g., ::ffff:127.0.0.1)+ if (ip.startsWith('::ffff:')) {+ const ipv4Part = ip.substring(7); // Extract IPv4 part after "::ffff:"+ return isPublicIp(ipv4Part); // Recursively check the IPv4 address+ }++ // IPv6 loopback+ if (ip === '::1') {+ return false;+ }++ // IPv6 private ranges (fc00::/7 and fe80::/10)+ if (+ ip.startsWith('fc00:') ||+ ip.startsWith('fd00:') ||+ ip.startsWith('fe80:')+ ) {+ return false;+ }++ // IPv4 loopback (127.0.0.0/8)+ if (ip.startsWith('127.')) {+ return false;+ }++ // IPv4 private ranges+ // 10.0.0.0/8+ if (ip.startsWith('10.')) {+ return false;+ }+ // 172.16.0.0/12 (172.16.0.0 - 172.31.255.255)+ if (ip.startsWith('172.')) {+ const parts = ip.split('.');+ if (parts.length >= 2) {+ const secondOctet = Number.parseInt(parts[1] || '0', 10);+ if (secondOctet >= 16 && secondOctet <= 31) {+ return false;+ }+ }+ }+ // 192.168.0.0/16+ if (ip.startsWith('192.168.')) {+ return false;+ }+ // 169.254.0.0/16 (link-local)+ if (ip.startsWith('169.254.')) {+ return false;+ }++ return true;+}++function getHeaderOrder(): string[] {+ if (typeof process !== 'undefined' && process.env?.IP_HEADER_ORDER) {+ return process.env.IP_HEADER_ORDER.split(',').map((h) => h.trim());+ }+ return DEFAULT_IP_HEADER_ORDER;+}++function isValidIp(ip: string): boolean {+ // Basic IP validation+ const ipv4 = /^(\d{1,3}\.){3}\d{1,3}$/;+ const ipv6 = /^([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}$/;+ return isPublicIp(ip) && (ipv4.test(ip) || ipv6.test(ip));+}++export function getClientIpFromHeaders(+ headers: Record<string, string | string[] | undefined> | Headers,+ overrideHeaderName?: string+): {+ ip: string;+ header: string;+} {+ let headerOrder = getHeaderOrder();++ if (overrideHeaderName) {+ headerOrder = [overrideHeaderName];+ }++ for (const headerName of headerOrder) {+ let value: string | null = null;++ // Get header value+ if (headers instanceof Headers) {+ value = headers.get(headerName);+ } else {+ const headerValue = headers[headerName];+ if (Array.isArray(headerValue)) {+ value = headerValue[0] || null;+ } else {+ value = headerValue || null;+ }+ }++ if (!value) {+ continue;+ }++ // Handle x-forwarded-for (comma separated)+ if (headerName === 'x-forwarded-for') {+ const firstIp = value.split(',')[0]?.trim();+ if (firstIp && isValidIp(firstIp)) {+ return { ip: firstIp, header: headerName };+ }+ }+ // Handle forwarded header (RFC 7239)+ else if (headerName === 'forwarded') {+ const match = value.match(/for=(?:"?\[?([^\]"]+)\]?"?)/i);+ const ip = match?.[1];+ if (ip && isValidIp(ip)) {+ return { ip, header: headerName };+ }+ }+ // Regular headers+ else if (isValidIp(value)) {+ return { ip: value, header: headerName };+ }+ }++ return { ip: '', header: '' };+}diff --git a/packages/core/package.json b/packages/core/package.jsonindex 1ee2fac02..306b6fd7a 100644--- a/packages/core/package.json+++ b/packages/core/package.json@@ -28,6 +28,7 @@"@maxmind/geoip2-node": "^6.1.0","@node-rs/argon2": "^2.0.2","@openpanel/common": "workspace:*",+ "@openpanel/email": "workspace:*","@openpanel/validation": "workspace:*","@oslojs/crypto": "^1.0.1","@oslojs/encoding": "^1.1.0",diff --git a/packages/core/src/clients/email.ts b/packages/core/src/clients/email.tsnew file mode 100644index 000000000..fb22488f7--- /dev/null+++ b/packages/core/src/clients/email.ts@@ -0,0 +1,28 @@+// @openpanel/email stays its own package — the react-email JSX toolchain+// doesn't belong in core (TARGET_ARCHITECTURE §7: "email (react-email JSX+// stays out of core; core wraps it as clients/email)").+//+// Loaded lazily, deliberately: @openpanel/email depends on @openpanel/db+// (to check email-unsubscribe rows before sending), and @openpanel/db still+// depends on @openpanel/core for shared crypto/logging utilities that+// haven't moved yet (mid-P4 state). A static top-level import here would+// make core's own barrel eagerly load @openpanel/db while core is still+// mid-evaluation — the cycle resolves core's own exports (e.g. createLogger)+// as undefined partway through. Deferring the import to call time sidesteps+// it: by the time anything actually sends an email, core has finished+// loading.++import type { EmailData, EmailTemplate } from '@openpanel/email';++export type { EmailData, EmailTemplate } from '@openpanel/email';++export async function sendEmail<T extends EmailTemplate>(+ templateKey: T,+ options: {+ to: string;+ data: EmailData<T>;+ }+) {+ const { sendEmail: send } = await import('@openpanel/email');+ return send(templateKey, options);+}diff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex 63457ee7d..8b84bb5fd 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -33,6 +33,8 @@ export {} from './clients/ai/providers';export type { WinBackPitchInput } from './clients/ai/win-back';export { generateWinBackPitch } from './clients/ai/win-back';+export type { EmailData, EmailTemplate } from './clients/email';+export { sendEmail } from './clients/email';// Dissolved from @openpanel/geo (M4-004) — apps/api's ingest and tools// controllers call these directly, the same way they reach the logger below.export type { AsnInfo, GeoLocation } from './clients/geo';diff --git a/packages/db/package.json b/packages/db/package.jsonindex 910c8accd..5b8a25c15 100644--- a/packages/db/package.json+++ b/packages/db/package.json@@ -16,6 +16,7 @@},"dependencies": {"@clickhouse/client": "^1.18.5",+ "@hyperdx/node-opentelemetry": "catalog:","@openpanel/common": "workspace:*","@openpanel/constants": "workspace:*","@openpanel/core": "workspace:*",@@ -29,6 +30,8 @@"fast-deep-equal": "^3.1.3","jiti": "^2.4.1","mathjs": "^12.3.2",+ "pino": "catalog:",+ "pino-pretty": "catalog:","prisma-json-types-generator": "^3.1.1","ramda": "^0.29.1","sqlstring": "^2.3.3",diff --git a/packages/db/src/buffers/base-buffer.ts b/packages/db/src/buffers/base-buffer.tsindex fc8cd4ec5..d021f31fd 100644--- a/packages/db/src/buffers/base-buffer.ts+++ b/packages/db/src/buffers/base-buffer.ts@@ -1,8 +1,9 @@import { Readable } from 'node:stream';import type { ClickHouseSettings } from '@clickhouse/client';-import { createLogger, generateSecureId, type ILogger } from '@openpanel/core';+import { generateSecureId } from '@openpanel/core';import { cronQueue } from '@openpanel/queue';import { getRedisCache } from '@openpanel/redis';+import { createLogger, type ILogger } from '../logger';export type FlushPhaseTimings = {lrangeMs?: number;diff --git a/packages/db/src/clickhouse/client.ts b/packages/db/src/clickhouse/client.tsindex 56f0fca40..aae1f6a4b 100644--- a/packages/db/src/clickhouse/client.ts+++ b/packages/db/src/clickhouse/client.ts@@ -5,9 +5,9 @@ import type {} from '@clickhouse/client';import { ClickHouseLogLevel, createClient } from '@clickhouse/client';import type { NodeClickHouseClientConfigOptions } from '@clickhouse/client/dist/config';-import { createLogger } from '@openpanel/core';import type { IInterval } from '@openpanel/validation';import sqlstring from 'sqlstring';+import { createLogger } from '../logger';import { RoundRobinPicker, withRoundRobinRetry } from './round-robin';import { type SqlFragment, toStatement } from './sql';diff --git a/packages/db/src/clickhouse/round-robin.ts b/packages/db/src/clickhouse/round-robin.tsindex 72f5de752..bb386d503 100644--- a/packages/db/src/clickhouse/round-robin.ts+++ b/packages/db/src/clickhouse/round-robin.ts@@ -1,5 +1,5 @@import type { ClickHouseClient } from '@clickhouse/client';-import type { ILogger } from '@openpanel/core';+import type { ILogger } from '../logger';/*** Round-robin selection across multiple ClickHouse clients with simplediff --git a/packages/db/src/exports/batch-creator.ts b/packages/db/src/exports/batch-creator.tsindex 66be9a319..4bbb32da8 100644--- a/packages/db/src/exports/batch-creator.ts+++ b/packages/db/src/exports/batch-creator.ts@@ -1,7 +1,8 @@import { Readable } from 'node:stream';import { pipeline } from 'node:stream/promises';import { createGzip } from 'node:zlib';-import { createLogger, generateSecureId } from '@openpanel/core';+import { generateSecureId } from '@openpanel/core';+import { createLogger } from '../logger';import type { IExportEvent } from './export-event';const logger = createLogger({ name: 'batch-creator' });diff --git a/packages/db/src/gsc.ts b/packages/db/src/gsc.tsindex b1aa47ea5..c23a98a86 100644--- a/packages/db/src/gsc.ts+++ b/packages/db/src/gsc.ts@@ -1,7 +1,7 @@-import { createLogger } from '@openpanel/core';import { cacheable } from '@openpanel/redis';import { originalCh } from './clickhouse/client';import { decrypt, encrypt } from './encryption';+import { createLogger } from './logger';import { db } from './prisma-client';const logger = createLogger({ name: 'db:gsc' });diff --git a/packages/db/src/logger.ts b/packages/db/src/logger.tsindex 09fdaa8d6..b91fda0eb 100644--- a/packages/db/src/logger.ts+++ b/packages/db/src/logger.ts@@ -1,3 +1,132 @@-import { createLogger } from '@openpanel/core';+// Self-contained pino instantiation. packages/db is a leaf "stays" package+// (TARGET_ARCHITECTURE §7) and must not reach into @openpanel/core just to+// build a logger — that direction is backwards, since core itself depends on+// db. This is the same implementation @openpanel/core/clients/logger.ts+// carries (both descend from the pre-dissolve @openpanel/logger package,+// M4-003) — duplicated here deliberately rather than shared, because there is+// no home narrower than "the package itself" that both can reach without+// reintroducing the db <-> core cycle this file exists to remove.++import * as HyperDX from '@hyperdx/node-opentelemetry';+import pino, { type Logger as PinoLogger } from 'pino';++export type ILogger = PinoLogger;++const logLevel = process.env.LOG_LEVEL ?? 'info';+const silent = process.env.LOG_SILENT === 'true';++// Exactly one shipping path at a time (see logging-capture-plan.md):+// - 'otlp': pino ships via the HyperDX transport (requires HYPERDX_API_KEY).+// - 'stdout': pino writes JSON to stdout; an external collector ships it.+const logExporter =+ process.env.LOG_EXPORTER ?? (process.env.HYPERDX_API_KEY ? 'otlp' : 'stdout');++// Substring match (lowercased). Catches camelCase, snake_case, prefixed and+// suffixed variants in one entry — e.g. 'token' covers accessToken,+// refresh_token, jwtToken, etc.+const SENSITIVE_KEY_PATTERNS = [+ 'password',+ 'passwd',+ 'pwd',+ 'token',+ 'secret',+ 'authorization',+ 'apikey',+ 'accesskey',+ 'privatekey',+ 'cookie',+ 'bearer',+ 'credential',+ 'salt',+ 'signature',+ 'ip',+ 'email',+ 'firstname',+ 'lastname',+ 'surname',+];++const MAX_REDACT_DEPTH = 5;++function redactSensitive(value: unknown, depth = 0): unknown {+ if (value instanceof Error) {+ return {+ ...value,+ message: value.message,+ stack: value.stack,+ name: value.name,+ };+ }+ if (+ depth >= MAX_REDACT_DEPTH ||+ value === null ||+ typeof value !== 'object'+ ) {+ return value;+ }+ if (value instanceof Date) {+ return value;+ }+ if (Array.isArray(value)) {+ return value.map((v) => redactSensitive(v, depth + 1));+ }++ const result: Record<string, unknown> = {};+ for (const [key, val] of Object.entries(value as Record<string, unknown>)) {+ const lowered = key.toLowerCase();+ if (SENSITIVE_KEY_PATTERNS.some((k) => lowered.includes(k))) {+ result[key] = '[REDACTED]';+ } else {+ result[key] = redactSensitive(val, depth + 1);+ }+ }+ return result;+}++// Shared by logs and traces so both signals land under the same service+// name in ClickStack (e.g. new-api-production).+function getServiceName(name: string): string {+ return [process.env.LOG_PREFIX, name, process.env.NODE_ENV ?? 'dev']+ .filter(Boolean)+ .join('-');+}++export function createLogger({ name }: { name: string }): ILogger {+ const service = getServiceName(name);++ const useHyperDX = logExporter === 'otlp' && !!process.env.HYPERDX_API_KEY;+ const usePretty = !useHyperDX && process.env.NODE_ENV !== 'production';++ return pino({+ name: service,+ level: logLevel,+ enabled: !silent,+ formatters: {+ log: (obj) => {+ return redactSensitive(obj) as Record<string, unknown>;+ },+ },+ // Keep trace_id/span_id on every line even in stdout mode so trace↔log+ // correlation survives when a collector does the shipping.+ mixin: process.env.HYPERDX_API_KEY+ ? HyperDX.getPinoMixinFunction+ : undefined,+ transport: useHyperDX+ ? HyperDX.getPinoTransport(logLevel, {+ detectResources: true,+ service,+ })+ : usePretty+ ? {+ target: 'pino-pretty',+ options: {+ colorize: true,+ translateTime: 'SYS:standard',+ ignore: 'pid,hostname,service',+ },+ }+ : undefined,+ });+}export const logger = createLogger({ name: 'db:prisma' });diff --git a/packages/db/src/services/import.service.ts b/packages/db/src/services/import.service.tsindex 2094e4585..ec1d83546 100644--- a/packages/db/src/services/import.service.ts+++ b/packages/db/src/services/import.service.ts@@ -1,5 +1,4 @@import { createHash } from 'node:crypto';-import type { ILogger } from '@openpanel/core';import {ch,convertClickhouseDateToJs,@@ -7,6 +6,7 @@ import {getReplicatedTableName,TABLE_NAMES,} from '../clickhouse/client';+import type { ILogger } from '../logger';import { db, type Prisma } from '../prisma-client';import type { IClickhouseEvent } from './event.service';import type { IClickhouseProfile } from './profile.service';diff --git a/packages/geo/src/datacenter-asns.ts b/packages/geo/src/datacenter-asns.tsdeleted file mode 100644index ffc0168ae..000000000--- a/packages/geo/src/datacenter-asns.ts+++ /dev/null@@ -1,8 +0,0 @@-// This file is generated by the script get-datacenter-asns.ts--// Source: https://raw.githubusercontent.com/X4BNet/lists_vpn/main/input/datacenter/ASN.txt--// Autonomous System Numbers belonging to datacenters / hosting providers.-// Used to flag (not block) traffic that is unlikely to be a real end user.-const datacenterAsns: readonly number[] = [1442,3223,3561,3722,3842,4250,4323,4694,4851,5435,5577,6188,6698,6718,6724,6764,6870,6939,7203,7349,7489,7506,7595,7598,7850,7979,8075,8100,8455,8556,8560,8849,8972,9009,9166,9290,9370,9412,9667,9823,9925,10200,10207,10297,10439,10532,10929,11230,11235,11274,11588,11831,11878,12200,12222,12586,12617,12824,12876,12989,13209,13213,13378,13647,13739,13909,13926,13955,14061,14120,14127,14160,14244,14384,14415,14442,14567,14576,14618,14708,14956,14986,14987,14992,15003,15083,15169,15189,15391,15395,15497,15510,15626,15694,15734,15919,15967,16125,16262,16276,16284,16397,16509,16535,16625,16628,16652,16862,16973,17019,17216,17439,17669,17881,17918,17920,17971,18120,18450,18570,18779,18978,19084,19133,19148,19234,19318,19437,19531,19624,19844,19871,19969,19994,20021,20068,20248,20264,20401,20450,20454,20473,20552,20598,20692,20738,20773,20836,20860,20940,21100,21159,21217,21321,21342,21499,21501,21859,22152,22363,22552,22611,22720,22781,22903,23033,23052,23108,23273,23342,23352,23470,23535,23881,24220,24319,24381,24482,24549,24558,24611,24679,24725,24768,24806,24875,24931,24940,24958,24961,24971,24997,25048,25128,25163,25260,25291,25369,25379,25532,25642,25780,25820,25926,26277,26347,26481,26484,26496,26548,26978,27175,27223,27229,27257,27357,27411,27589,27597,27640,28099,28216,28333,28682,28747,28753,28855,28997,29066,29067,29073,29097,29119,29140,29182,29302,29311,29331,29354,29452,29522,29550,29593,29691,29713,29748,29802,29838,29854,29869,29883,30083,30152,30176,30235,30475,30633,30693,30836,30849,30900,30998,31034,31103,31240,31242,31472,31590,31659,31698,31898,31981,32097,32181,32244,32275,32306,32338,32400,32475,32489,32613,32647,32740,32780,32911,33070,33083,33182,33251,33260,33302,33322,33330,33387,33438,33480,33552,33569,33696,33724,33785,33891,33905,34011,34164,34305,34432,34541,34649,34745,34927,34971,34989,35017,35048,35278,35295,35366,35415,35470,35540,35662,35908,35913,35914,35916,35974,35994,36007,36024,36114,36183,36236,36290,36351,36352,36408,36536,36666,36791,36887,36970,37018,37088,37153,37170,37209,37230,37248,37269,37280,37308,37347,37377,37472,37506,37518,37521,37540,37643,37661,37692,37714,38001,38107,38279,38894,39020,39326,39351,39392,39451,39458,39486,39566,39572,39704,39756,39832,39839,40156,40244,40281,40374,40438,40476,40539,40676,40715,40728,40819,40824,40861,41062,41079,41369,41406,41427,41562,41653,41665,41828,42120,42160,42210,42244,42311,42331,42399,42400,42418,42442,42465,42473,42532,42612,42622,42675,42695,42699,42705,42708,42730,42776,42831,42927,43021,43128,43146,43198,43289,43317,43350,43472,43541,43620,43962,44050,44066,44144,44398,44477,44803,44901,45090,45102,45152,45179,45187,45201,45470,45481,45486,45577,45671,45693,45815,45887,46177,46260,46261,46430,46433,46475,46516,46562,46606,46664,46805,46816,46844,46873,46945,47143,47161,47172,47205,47223,47328,47385,47447,47544,47549,47577,47583,47588,47625,48031,48093,48282,48446,48505,48812,48825,48894,48896,49313,49349,49367,49453,49485,49505,49532,49544,49693,49815,49834,49949,49981,50297,50465,50608,50613,50655,50673,50835,50872,50915,50926,50968,50986,51050,51109,51159,51167,51191,51241,51248,51290,51294,51395,51430,51698,51731,51765,51790,51852,51862,52000,52048,52173,52219,52236,52270,52321,52335,52347,52465,52468,52674,52925,53013,53055,53057,53101,53221,53225,53281,53332,53340,53342,53370,53559,53589,53597,53667,53755,53850,53889,53914,53918,54104,54203,54290,54334,54455,54489,54500,54527,54540,54555,54641,54817,54825,54839,55051,55225,55229,55286,55293,55536,55720,55761,55799,55933,55967,55990,56106,56110,56322,56617,56630,56635,56732,56784,56799,56934,57043,57169,57230,57286,57345,57363,57367,57433,57669,57682,57752,57773,57858,57879,58065,58073,58113,58305,58667,58683,58797,58922,58936,59135,59253,59349,59432,59472,59504,59554,59615,59632,59677,59705,59711,59729,59764,59787,59791,59795,59816,59854,60011,60068,60117,60118,60253,60362,60404,60435,60476,60485,60505,60558,60567,60713,60729,60739,60781,60800,60973,61046,61102,61107,61138,61147,61157,61280,61317,61412,61440,62005,62026,62049,62071,62082,62088,62217,62240,62282,62310,62370,62471,62540,62563,62567,62605,62651,62756,62838,62899,62904,63008,63018,63119,63128,63129,63199,63213,63473,63567,63916,63949,64022,64245,64249,64286,64484,132070,132071,132203,132225,132425,132509,132717,132779,132816,132869,133120,133143,133229,133296,133393,133480,133499,133752,134351,134450,134451,134963,135377,135822,136052,136258,136557,136907,136988,137409,138608,141039,141995,142036,147049,149020,152390,196645,196678,196745,196827,197155,197226,197328,197372,197395,197439,197540,197648,197706,197902,197914,198047,198153,198171,198310,198313,198347,198414,198432,198524,198605,198651,198968,199129,199213,199481,199653,199733,199785,199847,199883,199990,199997,200000,200019,200039,200088,200147,200350,200532,200904,201011,201200,201449,201525,201553,201597,201630,201634,201670,201702,201709,201814,201862,201983,202015,202023,202053,202118,202276,202448,202836,203020,203417,203523,203629,203758,204196,204287,204601,204957,205016,205053,205544,206092,206216,206246,206589,206898,207990,208323,208566,208795,208969,210329,210558,210731,210779,211619,212238,212317,212861,213010,213230,213887,214036,214574,215859,216071,262170,262287,262603,262978,262990,263032,263093,263237,265620,327705,327784,327813,327942,328035,329184,393326,393886,394256,394330,394380,394474,395089,395111,395954,395978,396190,396362,396931,396982,397373,398101,398787,399804,400754];-export default datacenterAsns;diff --git a/packages/sdks/express/index.ts b/packages/sdks/express/index.tsindex 96e85e766..eeb8164ee 100644--- a/packages/sdks/express/index.ts+++ b/packages/sdks/express/index.ts@@ -1,4 +1,4 @@-import { getClientIpFromHeaders } from '@openpanel/core';+import { getClientIpFromHeaders } from '@openpanel/common';import type { OpenPanelOptions } from '@openpanel/sdk';import { OpenPanel } from '@openpanel/sdk';import type { NextFunction, Request, Response } from 'express';diff --git a/packages/sdks/express/package.json b/packages/sdks/express/package.jsonindex 8ea3ed812..da8b2f5f5 100644--- a/packages/sdks/express/package.json+++ b/packages/sdks/express/package.json@@ -12,8 +12,7 @@},"dependencies": {"@openpanel/sdk": "workspace:1.3.1-local",- "@openpanel/common": "workspace:*",- "@openpanel/core": "workspace:*"+ "@openpanel/common": "workspace:*"},"peerDependencies": {"express": "^4.17.0 || ^5.0.0"diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex cb7888ad2..e9bfb9a9d 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -45,6 +45,8 @@ overrides:'@nuxt/vite-builder>seroval': 1.4.0embla-carousel: 8.0.0-rc22+packageExtensionsChecksum: sha256-8pKsevF6VIp4dvYbdnOYuuSpx5qM62WntMQClY5PwWE=+patchedDependencies:nuqs: 4f93812bf7a04685f9477b2935e3acbf2aa24dfbb1b00b9ae0ed8f7a2877a98e@@ -929,10 +931,10 @@ importers:version: 3.1117.0'@bull-board/api':specifier: 6.14.0- version: 6.14.0(@bull-board/[email protected])+ version: 6.14.0(@bull-board/[email protected]([email protected]([email protected])))([email protected]([email protected]))'@bull-board/express':specifier: 6.14.0- version: 6.14.0([email protected])'@google-cloud/storage':specifier: ^7.18.0version: 7.22.0([email protected])@@ -1112,6 +1114,9 @@ importers:'@openpanel/common':specifier: workspace:*version: link:../common+ '@openpanel/email':+ specifier: workspace:*+ version: link:../email'@openpanel/validation':specifier: workspace:*version: link:../validation@@ -1200,6 +1205,9 @@ importers:'@clickhouse/client':specifier: ^1.18.5version: 1.18.5+ '@hyperdx/node-opentelemetry':+ specifier: 'catalog:'+ version: 0.10.3([email protected])'@openpanel/common':specifier: workspace:*version: link:../common@@ -1239,6 +1247,12 @@ importers:mathjs:specifier: ^12.3.2version: 12.3.2+ pino:+ specifier: 'catalog:'+ version: 10.3.1+ pino-pretty:+ specifier: 'catalog:'+ version: 13.1.3prisma-json-types-generator:specifier: ^3.1.1@@ -1567,9 +1581,6 @@ importers:'@openpanel/common':specifier: workspace:*version: link:../../common- '@openpanel/core':- specifier: workspace:*- version: link:../../core'@openpanel/sdk':specifier: workspace:1.3.1-localversion: link:../sdk@@ -3285,6 +3296,7 @@ packages:resolution: {integrity: sha512-oMDwXwoPn0RsdZ3Y68/bOErZ/qGZE5H97vgE/Pc8Uul/OHajlvajKW4NV+ZGTix82liUfH9CkjYx7PpwvBWhxg==}peerDependencies:'@bull-board/ui': 6.14.0+ bullmq: '*''@bull-board/[email protected]':resolution: {integrity: sha512-3H1ame2G1+eVnqqSsw6KfzTGYAWSpVsIx6EPwg9vPSP2eKfNAm12Cm4zvL6ZkwAvTCkAByt5PPDRWbbwWB6HHQ==}@@ -22505,23 +22517,27 @@ snapshots:'@borewit/[email protected]': {}- '@bull-board/[email protected](@bull-board/[email protected])':+ '@bull-board/[email protected](@bull-board/[email protected]([email protected]([email protected])))([email protected]([email protected]))':dependencies:- '@bull-board/ui': 6.14.0+ '@bull-board/ui': 6.14.0([email protected]([email protected]))+ bullmq: 5.63.0([email protected])redis-info: 3.1.0- '@bull-board/[email protected]([email protected])':dependencies:- '@bull-board/api': 6.14.0(@bull-board/[email protected])- '@bull-board/ui': 6.14.0+ '@bull-board/api': 6.14.0(@bull-board/[email protected]([email protected]([email protected])))([email protected]([email protected]))+ '@bull-board/ui': 6.14.0([email protected]([email protected]))ejs: 3.1.10express: 4.21.2([email protected])transitivePeerDependencies:+ - bullmq- supports-color- '@bull-board/[email protected]':dependencies:- '@bull-board/api': 6.14.0(@bull-board/[email protected])+ '@bull-board/api': 6.14.0(@bull-board/[email protected]([email protected]([email protected])))([email protected]([email protected]))+ transitivePeerDependencies:+ - bullmq'@capsizecss/[email protected]':dependencies:diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex e677c0d4b..0d532cf51 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -71,6 +71,25 @@ overrides:# peer to the copy embla-carousel-react actually uses.embla-carousel: 8.0.0-rc22+# @bull-board/api's BullMQAdapter takes a real bullmq Queue (instanceof check+# at runtime, per node_modules/@bull-board/api/dist/queueAdapters/bullMQ.js)+# but the package never declares bullmq as a (peer) dependency - just a+# devDependency used to build itself. Since M4-003 gave apps/worker a+# @openpanel/core dependency, and core pins bullmq exact 6.3.3 (ADR-016) while+# apps/worker/packages/queue stay on the V1 pin ^5.63.0 (ADR-016, same table),+# node's own "walk up and find bullmq" resolution started finding whichever+# copy pnpm happened to hoist nearest - 6.3.3, not the 5.63.0 the queues are+# actually built from. TS caught it as `Queue<...>` missing 6.x-only members+# (queueMetaInitialized, backend, ...); unpatched, the same mismatch trips+# BullMQAdapter's `instanceof Queue` guard at runtime. Declaring the peer+# forces pnpm to resolve it per-consumer like any other correctly-described+# package, matching apps/worker's own ^5.63.0 - no version decision here, just+# making the two pins ADR-016 already accepted resolve correctly.+packageExtensions:+ "@bull-board/[email protected]":+ peerDependencies:+ bullmq: "*"+# Define a catalog of version ranges.catalog:zod: ^4.1.8